From 5cdcd122b9a0482afb8b5b7e0c34abd1216672c0 Mon Sep 17 00:00:00 2001
From: Michele Rastelli <michele@arangodb.com>
Date: Tue, 29 Jul 2025 20:55:41 +0200
Subject: [PATCH 1/2] [DE-1050] Migrate to Maven Central Publishing Portal

---
 .circleci/config.yml                 | 29 ----------------------
 .circleci/maven-release-settings.xml |  8 +++---
 integration-tests/pom.xml            |  2 +-
 pom.xml                              | 37 ++++++----------------------
 tutorial/README.md                   |  2 +-
 tutorial/pom.xml                     |  2 +-
 6 files changed, 15 insertions(+), 65 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 81e96e2c..6b785d3d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -96,14 +96,6 @@ commands:
       - run:
           name: Deploy to Apache Maven Central
           command: mvn -s .circleci/maven-release-settings.xml -Dmaven.test.skip=true deploy
-  release:
-    steps:
-      - run:
-          name: Release to Apache Maven Central
-          command: mvn -s .circleci/maven-release-settings.xml -Dmaven.test.skip=true 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"
-
 
 executors:
   j17:
@@ -199,18 +191,6 @@ jobs:
       - deploy
       - store_cache
 
-  release:
-    executor: 'j17'
-    steps:
-      - timeout
-      - checkout
-      - load_cache
-      - mvn-info
-      - config_gpg
-      - deploy
-      - release
-      - store_cache
-
 workflows:
   test-adb-version:
     when:
@@ -284,12 +264,3 @@ workflows:
               only: /^deploy.*/
             branches:
               ignore: /.*/
-  release:
-    jobs:
-      - release:
-          context: java-release
-          filters:
-            tags:
-              only: /^release.*/
-            branches:
-              ignore: /.*/
diff --git a/.circleci/maven-release-settings.xml b/.circleci/maven-release-settings.xml
index be5b9aef..d8e10fc5 100644
--- a/.circleci/maven-release-settings.xml
+++ b/.circleci/maven-release-settings.xml
@@ -3,7 +3,7 @@
 
     <profiles>
         <profile>
-            <id>ossrh</id>
+            <id>central</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
@@ -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>
 
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 9cd1974f..24bc9fb1 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>com.arangodb</groupId>
     <artifactId>arangodb-spring-data-integration-tests</artifactId>
-    <version>4.6.0</version>
+    <version>4.7.0-SNAPSHOT</version>
 
     <name>arangodb-spring-data-integration-tests</name>
     <description>ArangoDB Spring Data Integration Tests</description>
diff --git a/pom.xml b/pom.xml
index c6b95424..274022bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.arangodb</groupId>
     <artifactId>arangodb-spring-data</artifactId>
-    <version>4.6.0</version>
+    <version>4.7.0-SNAPSHOT</version>
     <inceptionYear>2017</inceptionYear>
     <packaging>jar</packaging>
 
@@ -35,17 +35,6 @@
         </developer>
     </developers>
 
-    <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>
-
     <repositories>
         <repository>
             <id>arangodb-snapshots</id>
@@ -89,19 +78,6 @@
                 </executions>
             </plugin>
 
-            <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>
-                </configuration>
-            </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
@@ -189,11 +165,14 @@
             </plugin>
 
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <version>3.1.1</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>
 
diff --git a/tutorial/README.md b/tutorial/README.md
index ab2403b0..f599a099 100644
--- a/tutorial/README.md
+++ b/tutorial/README.md
@@ -57,7 +57,7 @@ Create a Maven `pom.xml`:
         <dependency>
             <groupId>com.arangodb</groupId>
             <artifactId>arangodb-spring-data</artifactId>
-            <version>4.6.0</version>
+            <version>4.7.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/tutorial/pom.xml b/tutorial/pom.xml
index 194d1b9f..3c2ca493 100644
--- a/tutorial/pom.xml
+++ b/tutorial/pom.xml
@@ -30,7 +30,7 @@
         <dependency>
             <groupId>com.arangodb</groupId>
             <artifactId>arangodb-spring-data</artifactId>
-            <version>4.6.0</version>
+            <version>4.7.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.assertj</groupId>

From 8272a008d6810f23c1fd5bc14caf248a761e41cd Mon Sep 17 00:00:00 2001
From: Michele Rastelli <michele@arangodb.com>
Date: Tue, 29 Jul 2025 20:59:13 +0200
Subject: [PATCH 2/2] maven flatten plugin

---
 .gitignore |  1 +
 pom.xml    | 52 ++++++++++++++++++++++++++--------------------------
 2 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9b90181b..6e6b15c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -248,3 +248,4 @@ fabric.properties
 .idea
 
 arangodb-spring-data.iml
+/.flattened-pom.xml
diff --git a/pom.xml b/pom.xml
index 274022bc..560d8cea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
     <repositories>
         <repository>
             <id>arangodb-snapshots</id>
-            <url>https://oss.sonatype.org/content/groups/staging</url>
+            <url>https://central.sonatype.com/repository/maven-snapshots/</url>
             <snapshots>
                 <enabled>true</enabled>
             </snapshots>
@@ -78,31 +78,6 @@
                 </executions>
             </plugin>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.4.1</version>
-                <executions>
-                    <execution>
-                        <id>assembly</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <finalName>
-                        ${project.artifactId}-${project.version}-standalone
-                    </finalName>
-                    <attach>false</attach>
-                    <appendAssemblyId>false</appendAssemblyId>
-                    <descriptorRefs>
-                        <descriptorRef>jar-with-dependencies</descriptorRef>
-                    </descriptorRefs>
-                </configuration>
-            </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -197,6 +172,31 @@
                 </executions>
             </plugin>
 
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>flatten-maven-plugin</artifactId>
+                <version>1.7.1</version>
+                <configuration>
+                    <flattenMode>oss</flattenMode>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>flatten</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>flatten</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>flatten.clean</id>
+                        <phase>clean</phase>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
         </plugins>
 
         <pluginManagement>