From 3c0c1b793a24310b3d4c9b4d1eb0d106a870e159 Mon Sep 17 00:00:00 2001
From: Victor Garcia <victor.garcia@dhis2.org>
Date: Tue, 24 Jun 2025 10:33:09 +0200
Subject: [PATCH 1/2] Adapt to Sonatype Central Publisher Portal

---
 .github/workflows/main.yml   |  4 ++--
 .idea/codeStyles/Project.xml |  3 +++
 .mvn/settings.xml            | 10 +++++-----
 pom.xml                      | 26 +++++++-------------------
 4 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 25ef5c1..03c965f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -26,8 +26,8 @@ jobs:
       - name: Publish
         if: github.event_name == 'push' && github.ref == 'refs/heads/main'
         env:
-          OSSRH_USERNAME: ${{ secrets.SONATYPE_OSSRH_USERNAME }}
-          OSSRH_PASSWORD: ${{ secrets.SONATYPE_OSSRH_PASSWORD }}
+          SONATYPE_PORTAL_USERNAME: ${{ secrets.SONATYPE_PORTAL_USERNAME }}
+          SONATYPE_PORTAL_PASSWORD: ${{ secrets.SONATYPE_PORTAL_PASSWORD }}
           GPG_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
           GPG_SECRET_KEYS: ${{ secrets.PGP_PRIVATE_KEY }}
         run: |
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 0cc3857..497ec7b 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -5,6 +5,9 @@
       <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
       <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
     </JavaCodeStyleSettings>
+    <ScalaCodeStyleSettings>
+      <option name="MULTILINE_STRING_CLOSING_QUOTES_ON_NEW_LINE" value="true" />
+    </ScalaCodeStyleSettings>
     <codeStyleSettings language="JAVA">
       <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
       <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
diff --git a/.mvn/settings.xml b/.mvn/settings.xml
index 2088155..c27552b 100644
--- a/.mvn/settings.xml
+++ b/.mvn/settings.xml
@@ -5,15 +5,15 @@
 
     <servers>
         <server>
-            <id>ossrh</id>
-            <username>${env.OSSRH_USERNAME}</username>
-            <password>${env.OSSRH_PASSWORD}</password>
+            <id>central</id>
+            <username>${env.SONATYPE_PORTAL_USERNAME}</username>
+            <password>${env.SONATYPE_PORTAL_PASSWORD}</password>
         </server>
     </servers>
 
     <profiles>
         <profile>
-            <id>ossrh</id>
+            <id>central</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
@@ -23,4 +23,4 @@
             </properties>
         </profile>
     </profiles>
-</settings>
\ No newline at end of file
+</settings>
diff --git a/pom.xml b/pom.xml
index b6d32fb..417d23e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     <packaging>jar</packaging>
     <name>DHIS JSON Tree</name>
     <url>https://github.com/dhis2/json-tree</url>
-    <version>1.9-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
 
     <developers>
         <developer>
@@ -77,17 +77,6 @@
         </dependency>
     </dependencies>
 
-    <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>
@@ -152,15 +141,14 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.sonatype.plugins</groupId>
-                <artifactId>nexus-staging-maven-plugin</artifactId>
-                <version>1.7.0</version>
+                <groupId>org.sonatype.central</groupId>
+                <artifactId>central-publishing-maven-plugin</artifactId>
+                <version>0.8.0</version>
                 <extensions>true</extensions>
                 <configuration>
-                    <serverId>ossrh</serverId>
-                    <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-                    <autoReleaseAfterClose>true</autoReleaseAfterClose>
-                    <stagingProgressTimeoutMinutes>15</stagingProgressTimeoutMinutes>
+                    <publishingServerId>central</publishingServerId>
+                    <autoPublish>true</autoPublish>
+                    <waitUntil>published</waitUntil>
                 </configuration>
             </plugin>
         </plugins>

From ac85c73882b95eaf80336bc153259a5b1af843be Mon Sep 17 00:00:00 2001
From: Victor Garcia <victor.garcia@dhis2.org>
Date: Tue, 24 Jun 2025 10:35:07 +0200
Subject: [PATCH 2/2] Remove modified style

---
 .idea/codeStyles/Project.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 497ec7b..e56c0a7 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -5,9 +5,6 @@
       <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
       <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
     </JavaCodeStyleSettings>
-    <ScalaCodeStyleSettings>
-      <option name="MULTILINE_STRING_CLOSING_QUOTES_ON_NEW_LINE" value="true" />
-    </ScalaCodeStyleSettings>
     <codeStyleSettings language="JAVA">
       <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
       <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
@@ -57,4 +54,4 @@
       <option name="RIGHT_MARGIN" value="80" />
     </codeStyleSettings>
   </code_scheme>
-</component>
\ No newline at end of file
+</component>