diff --git a/.circleci/config.yml b/.circleci/config.yml index 02b47bc..c695a3a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -123,18 +123,6 @@ commands: - run: name: Deploy to Apache Maven Central command: mvn -s .circleci/maven-release-settings.xml -Ddeploy -Dmaven.test.skip=true -Pscala-<> -Pspark-<> deploy - release: - parameters: - scala-version: - type: 'string' - spark-version: - type: 'string' - steps: - - run: - name: Release to Apache Maven Central - command: mvn -s .circleci/maven-release-settings.xml -Ddeploy -Dmaven.test.skip=true -Pscala-<> -Pspark-<> nexus-staging:release - environment: - MAVEN_OPTS: "--add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED --add-opens=java.desktop/java.awt.font=ALL-UNNAMED" jobs: @@ -349,27 +337,6 @@ jobs: spark-version: <> - store_cache - release: - parameters: - scala-version: - type: 'string' - spark-version: - type: 'string' - executor: 'j17' - steps: - - timeout: - duration: '20m' - - checkout - - load_cache - - config_gpg - - deploy: - scala-version: <> - spark-version: <> - - release: - scala-version: <> - spark-version: <> - - store_cache - workflows: test-adb-version: when: @@ -565,22 +532,3 @@ workflows: only: /^deploy.*/ branches: ignore: /.*/ - release: - jobs: - - release: - name: release-spark<>-scala<> - matrix: - parameters: - spark-version: - - '3.3' - - '3.4' - - '3.5' - scala-version: - - '2.12' - - '2.13' - context: java-release - filters: - tags: - only: /^release.*/ - branches: - ignore: /.*/ diff --git a/.circleci/maven-release-settings.xml b/.circleci/maven-release-settings.xml index be5b9ae..d8e10fc 100644 --- a/.circleci/maven-release-settings.xml +++ b/.circleci/maven-release-settings.xml @@ -3,7 +3,7 @@ - ossrh + central true @@ -16,9 +16,9 @@ - ossrh - ${env.OSSRH_USERNAME} - ${env.OSSRH_PASSWORD} + central + ${env.CENTRAL_USERNAME} + ${env.CENTRAL_PASSWORD} diff --git a/arangodb-spark-commons/pom.xml b/arangodb-spark-commons/pom.xml index 8411101..5b44445 100644 --- a/arangodb-spark-commons/pom.xml +++ b/arangodb-spark-commons/pom.xml @@ -5,7 +5,7 @@ arangodb-spark-datasource com.arangodb - 1.8.0 + 1.9.0-SNAPSHOT 4.0.0 @@ -47,14 +47,6 @@ - - org.sonatype.plugins - nexus-staging-maven-plugin - true - - false - - diff --git a/arangodb-spark-datasource-3.3/pom.xml b/arangodb-spark-datasource-3.3/pom.xml index 7008c9c..cd23bd6 100644 --- a/arangodb-spark-datasource-3.3/pom.xml +++ b/arangodb-spark-datasource-3.3/pom.xml @@ -5,7 +5,7 @@ arangodb-spark-datasource com.arangodb - 1.8.0 + 1.9.0-SNAPSHOT 4.0.0 @@ -61,14 +61,6 @@ - - org.sonatype.plugins - nexus-staging-maven-plugin - true - - false - - diff --git a/arangodb-spark-datasource-3.4/pom.xml b/arangodb-spark-datasource-3.4/pom.xml index 35f9758..5bc8519 100644 --- a/arangodb-spark-datasource-3.4/pom.xml +++ b/arangodb-spark-datasource-3.4/pom.xml @@ -5,7 +5,7 @@ arangodb-spark-datasource com.arangodb - 1.8.0 + 1.9.0-SNAPSHOT 4.0.0 @@ -61,14 +61,6 @@ - - org.sonatype.plugins - nexus-staging-maven-plugin - true - - false - - diff --git a/arangodb-spark-datasource-3.5/pom.xml b/arangodb-spark-datasource-3.5/pom.xml index 1b8ccf2..95b24d5 100644 --- a/arangodb-spark-datasource-3.5/pom.xml +++ b/arangodb-spark-datasource-3.5/pom.xml @@ -5,7 +5,7 @@ arangodb-spark-datasource com.arangodb - 1.8.0 + 1.9.0-SNAPSHOT 4.0.0 @@ -61,14 +61,6 @@ - - org.sonatype.plugins - nexus-staging-maven-plugin - true - - false - - diff --git a/demo/README.md b/demo/README.md index 927406b..efc3c52 100644 --- a/demo/README.md +++ b/demo/README.md @@ -27,7 +27,7 @@ For the python demo, you will also need Set environment variables: ```shell -export ARANGO_SPARK_VERSION=1.8.0 +export ARANGO_SPARK_VERSION=1.9.0-SNAPSHOT ``` Start ArangoDB cluster with docker: diff --git a/demo/pom.xml b/demo/pom.xml index 57a3cd0..9baf056 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -6,7 +6,7 @@ com.arangodb demo - 1.8.0 + 1.9.0-SNAPSHOT 1.8 @@ -80,7 +80,7 @@ com.arangodb arangodb-spark-datasource-${spark.compat.version}_${scala.compat.version} - 1.8.0 + 1.9.0-SNAPSHOT org.apache.spark diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index ce8f1ba..21d9895 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -5,7 +5,7 @@ arangodb-spark-datasource com.arangodb - 1.8.0 + 1.9.0-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index d7074d9..464799c 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.arangodb arangodb-spark-datasource pom - 1.8.0 + 1.9.0-SNAPSHOT ${project.artifactId} ArangoDB Datasource for Apache Spark @@ -123,57 +123,6 @@ integration-tests - - deploy-gh - - - deployGH - - - - - github - GitHub arangodb/arangodb-spark-datasource Apache Maven Packages - https://maven.pkg.github.com/arangodb/arangodb-spark-datasource - - - - - deploy-ossrh - - - deploy - - - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.7.0 - true - - ossrh - https://oss.sonatype.org/ - 84aff6e87e214c - false - true - 15 - - - - - @@ -379,11 +328,14 @@ - org.apache.maven.plugins - maven-deploy-plugin - 3.1.2 + org.sonatype.central + central-publishing-maven-plugin + 0.8.0 + true - 10 + central + true + published