Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 0 additions & 52 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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-<<parameters.scala-version>> -Pspark-<<parameters.spark-version>> 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-<<parameters.scala-version>> -Pspark-<<parameters.spark-version>> 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:

Expand Down Expand Up @@ -349,27 +337,6 @@ jobs:
spark-version: <<parameters.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: <<parameters.scala-version>>
spark-version: <<parameters.spark-version>>
- release:
scala-version: <<parameters.scala-version>>
spark-version: <<parameters.spark-version>>
- store_cache

workflows:
test-adb-version:
when:
Expand Down Expand Up @@ -565,22 +532,3 @@ workflows:
only: /^deploy.*/
branches:
ignore: /.*/
release:
jobs:
- release:
name: release-spark<<matrix.spark-version>>-scala<<matrix.scala-version>>
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: /.*/
8 changes: 4 additions & 4 deletions .circleci/maven-release-settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<profiles>
<profile>
<id>ossrh</id>
<id>central</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
Expand All @@ -16,9 +16,9 @@

<servers>
<server>
<id>ossrh</id>
<username>${env.OSSRH_USERNAME}</username>
<password>${env.OSSRH_PASSWORD}</password>
<id>central</id>
<username>${env.CENTRAL_USERNAME}</username>
<password>${env.CENTRAL_PASSWORD}</password>
</server>
</servers>

Expand Down
10 changes: 1 addition & 9 deletions arangodb-spark-commons/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>arangodb-spark-datasource</artifactId>
<groupId>com.arangodb</groupId>
<version>1.8.0</version>
<version>1.9.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down Expand Up @@ -47,14 +47,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<skipNexusStagingDeployMojo>false</skipNexusStagingDeployMojo>
</configuration>
</plugin>
</plugins>
</build>

Expand Down
10 changes: 1 addition & 9 deletions arangodb-spark-datasource-3.3/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>arangodb-spark-datasource</artifactId>
<groupId>com.arangodb</groupId>
<version>1.8.0</version>
<version>1.9.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down Expand Up @@ -61,14 +61,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<skipNexusStagingDeployMojo>false</skipNexusStagingDeployMojo>
</configuration>
</plugin>
</plugins>
</build>

Expand Down
10 changes: 1 addition & 9 deletions arangodb-spark-datasource-3.4/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>arangodb-spark-datasource</artifactId>
<groupId>com.arangodb</groupId>
<version>1.8.0</version>
<version>1.9.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down Expand Up @@ -61,14 +61,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<skipNexusStagingDeployMojo>false</skipNexusStagingDeployMojo>
</configuration>
</plugin>
</plugins>
</build>

Expand Down
10 changes: 1 addition & 9 deletions arangodb-spark-datasource-3.5/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>arangodb-spark-datasource</artifactId>
<groupId>com.arangodb</groupId>
<version>1.8.0</version>
<version>1.9.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down Expand Up @@ -61,14 +61,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<skipNexusStagingDeployMojo>false</skipNexusStagingDeployMojo>
</configuration>
</plugin>
</plugins>
</build>

Expand Down
2 changes: 1 addition & 1 deletion demo/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions demo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.arangodb</groupId>
<artifactId>demo</artifactId>
<version>1.8.0</version>
<version>1.9.0-SNAPSHOT</version>

<properties>
<maven.compiler.source>1.8</maven.compiler.source>
Expand Down Expand Up @@ -80,7 +80,7 @@
<dependency>
<groupId>com.arangodb</groupId>
<artifactId>arangodb-spark-datasource-${spark.compat.version}_${scala.compat.version}</artifactId>
<version>1.8.0</version>
<version>1.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>arangodb-spark-datasource</artifactId>
<groupId>com.arangodb</groupId>
<version>1.8.0</version>
<version>1.9.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
64 changes: 8 additions & 56 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<groupId>com.arangodb</groupId>
<artifactId>arangodb-spark-datasource</artifactId>
<packaging>pom</packaging>
<version>1.8.0</version>
<version>1.9.0-SNAPSHOT</version>

<name>${project.artifactId}</name>
<description>ArangoDB Datasource for Apache Spark</description>
Expand Down Expand Up @@ -123,57 +123,6 @@
<module>integration-tests</module>
</modules>
</profile>
<profile>
<id>deploy-gh</id>
<activation>
<property>
<name>deployGH</name>
</property>
</activation>
<distributionManagement>
<repository>
<id>github</id>
<name>GitHub arangodb/arangodb-spark-datasource Apache Maven Packages</name>
<url>https://maven.pkg.github.com/arangodb/arangodb-spark-datasource</url>
</repository>
</distributionManagement>
</profile>
<profile>
<id>deploy-ossrh</id>
<activation>
<property>
<name>deploy</name>
</property>
</activation>
<distributionManagement>
<snapshotRepository>
<id>ossrh</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>ossrh</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>
<build>
<plugins>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.7.0</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<stagingProfileId>84aff6e87e214c</stagingProfileId>
<autoReleaseAfterClose>false</autoReleaseAfterClose>
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
<stagingProgressTimeoutMinutes>15</stagingProgressTimeoutMinutes>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<dependencies>
Expand Down Expand Up @@ -379,11 +328,14 @@
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>3.1.2</version>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<version>0.8.0</version>
<extensions>true</extensions>
<configuration>
<retryFailedDeploymentCount>10</retryFailedDeploymentCount>
<publishingServerId>central</publishingServerId>
<autoPublish>true</autoPublish>
<waitUntil>published</waitUntil>
</configuration>
</plugin>
<plugin>
Expand Down