Skip to content

Commit 53ef9ea

Browse files
ali-inceali-ince
committed
build: remove scala 2.12 and mentions of spark 3
1 parent 1e2d904 commit 53ef9ea

File tree

54 files changed

+21
-23
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+21
-23
lines changed

‎.teamcity/builds/Common.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,8 @@ fun CompoundStage.dependentBuildType(bt: BuildType, reuse: ReuseBuilds = ReuseBu
209209
fun collectArtifacts(buildType: BuildType): BuildType {
210210
buildType.artifactRules =
211211
"""
212-
+:spark-3/target/*_for_spark_*.jar => packages
213-
+:spark-3/target/*.zip => packages
212+
+:spark/target/*_for_spark_*.jar => packages
213+
+:spark/target/*.zip => packages
214214
"""
215215
.trimIndent()
216216

‎README.md‎

Lines changed: 2 additions & 4 deletions

‎common/LICENSES.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ libraries. For an overview of the licenses see the NOTICE.txt file.
44

55
------------------------------------------------------------------------------
66
Apache Software License, Version 2.0
7-
IntelliJ IDEA Annotations
7+
JetBrains Java Annotations
88
Kotlin Stdlib
99
Neo4j Bolt Connection (Bolt Provider reference impl)
1010
Neo4j Bolt Connection (Pooled Source impl)

‎common/NOTICE.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Third-party licenses
1919
--------------------
2020

2121
Apache Software License, Version 2.0
22-
IntelliJ IDEA Annotations
22+
JetBrains Java Annotations
2323
Kotlin Stdlib
2424
Neo4j Bolt Connection (Bolt Provider reference impl)
2525
Neo4j Bolt Connection (Pooled Source impl)

‎jreleaser.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ assemble:
7373
output: .
7474
includes:
7575
- '{{projectName}}-{{projectVersion}}*.jar'
76-
templateDirectory: spark-3/src/jreleaser/assemblers/zip
76+
templateDirectory: spark/src/jreleaser/assemblers/zip
7777

7878
hooks:
7979
script:
@@ -88,16 +88,16 @@ hooks:
8888
includes: [ "assemble" ]
8989
matrix:
9090
vars:
91-
scala: [ "2.12", "2.13" ]
91+
scala: [ "2.13" ]
9292
continueOnError: false
9393
verbose: true
9494
shell: BASH
9595
run: |
9696
mkdir artifacts || true
9797
./maven-release.sh deploy {{matrix.scala}} default::file://{{basedir}}/target/{{matrix.scala}}/maven-artifacts
9898
cp -r {{basedir}}/target/{{matrix.scala}}/maven-artifacts artifacts/
99-
cp -r {{basedir}}/spark-3/target/{{projectName}}*.zip artifacts/
100-
cp -r {{basedir}}/spark-3/target/{{projectName}}*.jar artifacts/
99+
cp -r {{basedir}}/spark/target/{{projectName}}*.zip artifacts/
100+
cp -r {{basedir}}/spark/target/{{projectName}}*.jar artifacts/
101101
102102
signing:
103103
active: ALWAYS

‎maven-release.sh‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ exit_script() {
1212
mv -f pom.xml.bak pom.xml
1313
mv -f common/pom.xml.bak common/pom.xml
1414
mv -f test-support/pom.xml.bak test-support/pom.xml
15-
mv -f spark-3/pom.xml.bak spark-3/pom.xml
15+
mv -f spark/pom.xml.bak spark/pom.xml
1616
trap - SIGINT SIGTERM # clear the trap
1717
kill -- -$$ || true # Sends SIGTERM to child/sub processes
1818
}
@@ -48,7 +48,7 @@ SPARK_PACKAGES_VERSION="${PROJECT_VERSION}-s_$SCALA_VERSION"
4848
cp pom.xml pom.xml.bak
4949
cp common/pom.xml common/pom.xml.bak
5050
cp test-support/pom.xml test-support/pom.xml.bak
51-
cp spark-3/pom.xml spark-3/pom.xml.bak
51+
cp spark/pom.xml spark/pom.xml.bak
5252

5353
./mvnw -B versions:set -DnewVersion=${PROJECT_VERSION}_for_spark_${SPARK_VERSION} -DgenerateBackupPoms=false
5454

@@ -61,11 +61,11 @@ sed_i "s/<artifactId>neo4j-connector-apache-spark_common<\/artifactId>/<artifact
6161
sed_i "s/<artifactId>neo4j-connector-apache-spark_parent<\/artifactId>/<artifactId>neo4j-connector-apache-spark_${SCALA_VERSION}_parent<\/artifactId>/" "common/pom.xml"
6262
sed_i "s/<artifactId>neo4j-connector-apache-spark_test-support<\/artifactId>/<artifactId>neo4j-connector-apache-spark_${SCALA_VERSION}_test-support<\/artifactId>/" "common/pom.xml"
6363

64-
sed_i "s/<artifactId>neo4j-connector-apache-spark<\/artifactId>/<artifactId>neo4j-connector-apache-spark_${SCALA_VERSION}<\/artifactId>/" "spark-3/pom.xml"
65-
sed_i "s/<artifactId>neo4j-connector-apache-spark_parent<\/artifactId>/<artifactId>neo4j-connector-apache-spark_${SCALA_VERSION}_parent<\/artifactId>/" "spark-3/pom.xml"
66-
sed_i "s/<artifactId>neo4j-connector-apache-spark_common<\/artifactId>/<artifactId>neo4j-connector-apache-spark_${SCALA_VERSION}_common<\/artifactId>/" "spark-3/pom.xml"
67-
sed_i "s/<artifactId>neo4j-connector-apache-spark_test-support<\/artifactId>/<artifactId>neo4j-connector-apache-spark_${SCALA_VERSION}_test-support<\/artifactId>/" "spark-3/pom.xml"
68-
sed_i "s/<spark-packages.version\/>/<spark-packages.version>${SPARK_PACKAGES_VERSION}<\/spark-packages.version>/" "spark-3/pom.xml"
64+
sed_i "s/<artifactId>neo4j-connector-apache-spark<\/artifactId>/<artifactId>neo4j-connector-apache-spark_${SCALA_VERSION}<\/artifactId>/" "spark/pom.xml"
65+
sed_i "s/<artifactId>neo4j-connector-apache-spark_parent<\/artifactId>/<artifactId>neo4j-connector-apache-spark_${SCALA_VERSION}_parent<\/artifactId>/" "spark/pom.xml"
66+
sed_i "s/<artifactId>neo4j-connector-apache-spark_common<\/artifactId>/<artifactId>neo4j-connector-apache-spark_${SCALA_VERSION}_common<\/artifactId>/" "spark/pom.xml"
67+
sed_i "s/<artifactId>neo4j-connector-apache-spark_test-support<\/artifactId>/<artifactId>neo4j-connector-apache-spark_${SCALA_VERSION}_test-support<\/artifactId>/" "spark/pom.xml"
68+
sed_i "s/<spark-packages.version\/>/<spark-packages.version>${SPARK_PACKAGES_VERSION}<\/spark-packages.version>/" "spark/pom.xml"
6969

7070
# build
7171
./mvnw -B clean "${GOAL}" -Dscala-"${SCALA_VERSION}" -DskipTests ${ALT_DEPLOYMENT_REPOSITORY}

‎pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<modules>
3232
<module>common</module>
3333
<module>test-support</module>
34-
<module>spark-3</module>
34+
<module>spark</module>
3535
</modules>
3636
<scm>
3737
<url>https://github.com/neo4j/neo4j-spark-connector</url>
@@ -68,11 +68,11 @@
6868
<netty-bom.version>4.1.128.Final</netty-bom.version>
6969
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
7070
<scala-maven-plugin.version>4.9.6</scala-maven-plugin.version>
71-
<scala.binary.version>2.12</scala.binary.version>
72-
<scala.version>2.12.20</scala.version>
71+
<scala.binary.version>2.13</scala.binary.version>
72+
<scala.version>2.13.18</scala.version>
7373
<slf4j-api.version>2.0.17</slf4j-api.version>
7474
<sortpom-maven-plugin.version>4.0.0</sortpom-maven-plugin.version>
75-
<spark.version>3.5.7</spark.version>
75+
<spark.version>4.0.1</spark.version>
7676
<spotless-maven-plugin.version>3.0.0</spotless-maven-plugin.version>
7777
<surefire.jvm.args/>
7878
<testcontainers.version>2.0.2</testcontainers.version>

spark-3/LICENSES.txt renamed to spark/LICENSES.txt

File renamed without changes.

spark-3/NOTICE.txt renamed to spark/NOTICE.txt

File renamed without changes.

spark-3/pom.xml renamed to spark/pom.xml

File renamed without changes.

0 commit comments

Comments
 (0)