Merge pull request #76 from xdev-software/github-packages

Use new registry

Author: AB-xdev

.github/workflows/checkBuild.yml

@@ -31,15 +31,15 @@ jobs:
         java-version: ${{ matrix.java }}
         java-package: ${{ matrix.java-package }}
         cache: 'maven'
-        server-id: xdevjfrog
-        server-username: JFROG_ARTIFACTORY_USERNAME # env variable name for username of Artifactory server
-        server-password: JFROG_ARTIFACTORY_TOKEN # env variable name for Artifactory access token
+        server-id: proprietary-xdev-dependencies
+        server-username: GH_PACKAGES_READ_USERNAME # env variable name for username of Artifactory server
+        server-password: GH_PACKAGES_READ_TOKEN # env variable name for Artifactory access token
 
     - name: Build with Maven
       run: mvn -B clean verify
       env:
-        JFROG_ARTIFACTORY_USERNAME: ${{ secrets.JFROG_ARTIFACTORY_USERNAME }}
-        JFROG_ARTIFACTORY_TOKEN: ${{ secrets.JFROG_ARTIFACTORY_TOKEN }}
+        GH_PACKAGES_READ_USERNAME: ${{ secrets.GH_PACKAGES_READ_USERNAME }}
+        GH_PACKAGES_READ_TOKEN: ${{ secrets.GH_PACKAGES_READ_TOKEN }}
 
     - name: Check for uncommited changes
       run: |

.github/workflows/maven/m2-settings-release.xml

@@ -12,9 +12,9 @@
       <passphrase>${env.MAVEN_GPG_PASSPHRASE}</passphrase>
     </server>
     <server>
-      <id>xdevjfrog</id>
-      <username>${env.JFROG_ARTIFACTORY_USERNAME}</username>
-      <password>${env.JFROG_ARTIFACTORY_TOKEN}</password>
+      <id>proprietary-xdev-dependencies</id>
+      <username>${env.GH_PACKAGES_READ_USERNAME}</username>
+      <password>${env.GH_PACKAGES_READ_TOKEN}</password>
     </server>
   </servers>
-</settings>
+</settings>

.github/workflows/release.yml

@@ -20,15 +20,15 @@ jobs:
         distribution: 'temurin'
         java-version: '8'
         cache: 'maven'
-        server-id: xdevjfrog
-        server-username: JFROG_ARTIFACTORY_USERNAME # env variable name for username of Artifactory server
-        server-password: JFROG_ARTIFACTORY_TOKEN # env variable name for Artifactory access token
+        server-id: proprietary-xdev-dependencies
+        server-username: GH_PACKAGES_READ_USERNAME # env variable name for username of Artifactory server
+        server-password: GH_PACKAGES_READ_TOKEN # env variable name for Artifactory access token
 
     - name: Build with Maven
       run: mvn -B clean verify
       env:
-        JFROG_ARTIFACTORY_USERNAME: ${{ secrets.JFROG_ARTIFACTORY_USERNAME }}
-        JFROG_ARTIFACTORY_TOKEN: ${{ secrets.JFROG_ARTIFACTORY_TOKEN }}
+        GH_PACKAGES_READ_USERNAME: ${{ secrets.GH_PACKAGES_READ_USERNAME }}
+        GH_PACKAGES_READ_TOKEN: ${{ secrets.GH_PACKAGES_READ_TOKEN }}
 
     - name: Check for uncommited changes
       run: |
@@ -135,8 +135,8 @@ jobs:
     - name: Publish to OSSRH
       run: mvn -B deploy -Pxdev-build,ossrh
       env:
-        JFROG_ARTIFACTORY_USERNAME: ${{ secrets.JFROG_ARTIFACTORY_USERNAME }}
-        JFROG_ARTIFACTORY_TOKEN: ${{ secrets.JFROG_ARTIFACTORY_TOKEN }}
+        GH_PACKAGES_READ_USERNAME: ${{ secrets.GH_PACKAGES_READ_USERNAME }}
+        GH_PACKAGES_READ_TOKEN: ${{ secrets.GH_PACKAGES_READ_TOKEN }}
         MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
         MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
         MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
@@ -159,15 +159,15 @@ jobs:
       with:
         distribution: 'temurin'
         java-version: '8'
-        server-id: xdevjfrog
-        server-username: JFROG_ARTIFACTORY_USERNAME # env variable name for username of Artifactory server
-        server-password: JFROG_ARTIFACTORY_TOKEN # env variable name for Artifactory access token
+        server-id: proprietary-xdev-dependencies
+        server-username: GH_PACKAGES_READ_USERNAME # env variable name for username of Artifactory server
+        server-password: GH_PACKAGES_READ_TOKEN # env variable name for Artifactory access token
 
     - name: Build dependencies/licenses files
       run: mvn -B project-info-reports:dependencies
       env:
-        JFROG_ARTIFACTORY_USERNAME: ${{ secrets.JFROG_ARTIFACTORY_USERNAME }}
-        JFROG_ARTIFACTORY_TOKEN: ${{ secrets.JFROG_ARTIFACTORY_TOKEN }}
+        GH_PACKAGES_READ_USERNAME: ${{ secrets.GH_PACKAGES_READ_USERNAME }}
+        GH_PACKAGES_READ_TOKEN: ${{ secrets.GH_PACKAGES_READ_TOKEN }}
 
     - name: Upload licenses - Upload Artifact
       uses: actions/upload-artifact@v3

.github/workflows/test-deploy.yml

@@ -33,8 +33,8 @@ jobs:
     - name: Publish to OSSRH
       run: mvn -B deploy -Pxdev-build,ossrh
       env:
-        JFROG_ARTIFACTORY_USERNAME: ${{ secrets.JFROG_ARTIFACTORY_USERNAME }}
-        JFROG_ARTIFACTORY_TOKEN: ${{ secrets.JFROG_ARTIFACTORY_TOKEN }}
+        GH_PACKAGES_READ_USERNAME: ${{ secrets.GH_PACKAGES_READ_USERNAME }}
+        GH_PACKAGES_READ_TOKEN: ${{ secrets.GH_PACKAGES_READ_TOKEN }}
         MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
         MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
         MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}

pom.xml

@@ -265,8 +265,8 @@
                 </repository>
                 <repository>
                     <!-- This is required for JIDE components -->
-                    <id>xdevjfrog</id>
-                    <url>https://xdev.jfrog.io/artifactory/xdev5/</url>
+                    <id>proprietary-xdev-dependencies</id>
+                    <url>https://maven.pkg.github.com/xdev-software/xdev-dependencies</url>
                     <snapshots>
                         <enabled>false</enabled>
                     </snapshots>