Merge branch 'develop'

nbbrd · Apr 23, 2021 · adf83b0 · adf83b0
2 parents 96dd943 + a380ff9
commit adf83b0
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 15 deletions.
diff --git a/.github/workflows/java8-maven.yml b/.github/workflows/java8-maven.yml
@@ -72,7 +72,7 @@ jobs:
           restore-keys: ${{ runner.os }}-m2
 
       - name: Deploy snapshot with Maven if settings defined
-        run: test -f ci.settings.xml && mvn -B -ntp deploy -DskipTests=true -s ci.settings.xml -P base-deploy,snapshot-deploy,!non-deployable-modules
+        run: test ! -f ci.settings.xml || mvn -B -ntp deploy -DskipTests=true -s ci.settings.xml -P base-deploy,snapshot-deploy,!non-deployable-modules
         env:
           OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
@@ -109,12 +109,14 @@ jobs:
           restore-keys: ${{ runner.os }}-m2
 
       - name: Deploy with Maven if settings defined
-        run: test -f ci.settings.xml && mvn -B -ntp deploy -DskipTests=true -s ci.settings.xml -P base-deploy,release-deploy,!non-deployable-modules
+        run: test ! -f ci.settings.xml || mvn -B -ntp deploy -DskipTests=true -s ci.settings.xml -P base-deploy,release-deploy,!non-deployable-modules
         env:
           OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
           SIGN_KEY: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
           SIGN_KEY_PASS: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_ACTOR: ${{ secrets.GITHUB_ACTOR }}
 
       - name: Build assets with Maven
         run: mvn -B -ntp install -DskipTests=true -P base-deploy

diff --git a/ci.settings.xml b/ci.settings.xml
@@ -2,9 +2,9 @@
           xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
     <servers>
         <server>
-            <id>ossrh</id>
-            <username>${env.OSSRH_USERNAME}</username>
-            <password>${env.OSSRH_TOKEN}</password>
+            <id>github</id>
+            <username>${env.GITHUB_ACTOR}</username>
+            <password>${env.GITHUB_TOKEN}</password>
         </server>
     </servers>
 </settings>
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.github.nbbrd.sandbox</groupId>
     <artifactId>sandbox-parent</artifactId>
-    <version>1.14.0</version>
+    <version>1.15.0</version>
     <packaging>pom</packaging>
 
     <name>sandbox</name>
@@ -165,7 +165,7 @@
                             <dependency>
                                 <groupId>org.kordamp.maven</groupId>
                                 <artifactId>pomchecker-enforcer-rules</artifactId>
-                                <version>1.1.0</version>
+                                <version>1.2.0</version>
                             </dependency>
                         </dependencies>
                         <executions>
@@ -294,8 +294,9 @@
             <id>release-deploy</id>
             <distributionManagement>
                 <repository>
-                    <id>local-folder</id>
-                    <url>file:${basedir}/../releases</url>
+                    <id>github</id>
+                    <name>GitHub Packages</name>
+                    <url>https://maven.pkg.github.com/nbbrd/sandbox</url>
                 </repository>
             </distributionManagement>
             <build>

diff --git a/sandbox-api/pom.xml b/sandbox-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sandbox-parent</artifactId>
         <groupId>com.github.nbbrd.sandbox</groupId>
-        <version>1.14.0</version>
+        <version>1.15.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sandbox-cli/pom.xml b/sandbox-cli/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sandbox-parent</artifactId>
         <groupId>com.github.nbbrd.sandbox</groupId>
-        <version>1.14.0</version>
+        <version>1.15.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -25,12 +25,12 @@
         <dependency>
             <groupId>com.github.nbbrd.sandbox</groupId>
             <artifactId>sandbox-api</artifactId>
-            <version>1.14.0</version>
+            <version>1.15.0</version>
         </dependency>
         <dependency>
             <groupId>com.github.nbbrd.sandbox</groupId>
             <artifactId>sandbox-impl</artifactId>
-            <version>1.14.0</version>
+            <version>1.15.0</version>
         </dependency>
         <dependency>
             <groupId>info.picocli</groupId>

diff --git a/sandbox-impl/pom.xml b/sandbox-impl/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sandbox-parent</artifactId>
         <groupId>com.github.nbbrd.sandbox</groupId>
-        <version>1.14.0</version>
+        <version>1.15.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -19,7 +19,7 @@
         <dependency>
             <groupId>com.github.nbbrd.sandbox</groupId>
             <artifactId>sandbox-api</artifactId>
-            <version>1.14.0</version>
+            <version>1.15.0</version>
         </dependency>
         <dependency>
             <groupId>com.github.lalyos</groupId>