Adjusted POM metadata and deployment settings to allow for artifact d…

…eployment as GitHub packages.
david-waltermire · May 27, 2024 · 4729a0b · 4729a0b
1 parent de18cc3
commit 4729a0b
Show file tree

Hide file tree

Showing 13 changed files with 155 additions and 93 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -23,10 +23,12 @@ jobs:
       actions: read
       contents: read
       security-events: write
+      packages: write
     env:
       # BUILD_SNAPSHOT: ${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch') &&
       #                    (github.ref_name == 'develop' || startsWith(github.ref_name, 'release-')) }}
-      BUILD_SNAPSHOT: false
+      BUILD_SNAPSHOT: true
+      DEPLOY_MAVEN_CENTRAL: false
     steps:
     - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29
       with:
@@ -47,11 +49,8 @@ jobs:
         java-version: 11
         distribution: 'temurin'
         cache: 'maven'
-        server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml
-        server-username: MAVEN_USERNAME # env variable for username in deploy
-        server-password: MAVEN_CENTRAL_TOKEN # env variable for token in deploy
-        gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} # Value of the GPG private key to import
-        gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
+        # gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} # Value of the GPG private key to import
+        # gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
     - name: Set up JDK 11 (build only)
       if:  ${{ steps.setup-java-deploy.outcome == 'skipped' }}
       uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9
@@ -67,17 +66,17 @@ jobs:
     # -------------------------
     # Maven Build
     # -------------------------
-    - id: build-test-deploy
+    - id: build-test-deploy-github
       name: Build, Test and DEPLOY SNAPSHOT Code
       if: ${{ env.BUILD_SNAPSHOT == 'true' }}
       run: |
-        mvn -B -e -Pgpg -Prelease -Preporting deploy -Dmaven.deploy.skip=releases
+        # mvn -B -e -Pgpg -Prelease -Preporting deploy -Dmaven.deploy.skip=releases
+        mvn -B -e -Prelease -Preporting deploy -Dmaven.deploy.skip=releases
       env:
-        MAVEN_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
-        MAVEN_CENTRAL_TOKEN: ${{ secrets.SONATYPE_PASSWORD }}
-        MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        # MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
     - name: Build and Test Code
-      if: ${{ steps.build-test-deploy.outcome == 'skipped' }}
+      if: ${{ steps.build-test-deploy-github.outcome == 'skipped' }}
       run: |
         mvn -B -e -Prelease -Preporting install
     - name: Perform CodeQL Analysis
@@ -89,3 +88,25 @@ jobs:
       run: |
         # this needs to be run as a second build to ensure source is fully generated by the previous step
         mvn -B -e -Prelease -Preporting install site site:stage
+    - id: setup-java-deploy-maven-central
+      name: Set up JDK 11 (deploy)
+      if: ${{ env.BUILD_SNAPSHOT == 'true' && env.DEPLOY_MAVEN_CENTRAL == 'true' }}
+      uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9
+      with:
+        java-version: 11
+        distribution: 'temurin'
+        cache: 'maven'
+        server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml
+        server-username: MAVEN_USERNAME # env variable for username in deploy
+        server-password: MAVEN_CENTRAL_TOKEN # env variable for token in deploy
+        gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} # Value of the GPG private key to import
+        gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
+    - id: build-test-deploy-maven-central
+      name: Build, Test and DEPLOY SNAPSHOT Code
+      if: ${{ env.BUILD_SNAPSHOT == 'true' && env.DEPLOY_MAVEN_CENTRAL == 'true' }}
+      run: |
+        mvn -B -e -Pgpg -Prelease -Preporting deploy -Dmaven.deploy.skip=releases
+      env:
+        MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+        MAVEN_CENTRAL_TOKEN: ${{ secrets.OSSRH_TOKEN }}
+        MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
diff --git a/cli-processor/pom.xml b/cli-processor/pom.xml
@@ -1,16 +1,25 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>gov.nist.secauto.metaschema</groupId>
-		<artifactId>metaschema-framework</artifactId>
+		<groupId>dev.metaschema</groupId>
+		<artifactId>metaschema-java-parent</artifactId>
 		<version>1.0.0-M2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>cli-processor</artifactId>
 	<packaging>jar</packaging>
 
 	<name>Metaschema CLI Framework</name>
-	<url>http://maven.apache.org</url>
+
+    <url>${site.url}${project.artifactId}/</url>
+    <distributionManagement>
+        <site>
+            <id>website</id>
+            <url>${site.url}${project.artifactId}/</url>
+        </site>
+    </distributionManagement>
+
+	<description>Provides command line interface (CLI) functionality used to provide CLI-based tools.</description>
 
 	<properties>
 		<timestamp>${maven.build.timestamp}</timestamp>
@@ -19,7 +28,7 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>gov.nist.secauto.metaschema</groupId>
+			<groupId>${project.groupId}</groupId>
 			<artifactId>metaschema-core</artifactId>
 		</dependency>
 		<dependency>

diff --git a/core/pom.xml b/core/pom.xml
@@ -4,8 +4,8 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>gov.nist.secauto.metaschema</groupId>
-        <artifactId>metaschema-framework</artifactId>
+		<groupId>dev.metaschema</groupId>
+		<artifactId>metaschema-java-parent</artifactId>
         <version>1.0.0-M2-SNAPSHOT</version>
     </parent>
 
@@ -16,7 +16,7 @@
     <url>${site.url}${project.artifactId}/</url>
     <distributionManagement>
         <site>
-            <id>nist-pages</id>
+            <id>website</id>
             <url>${site.url}${project.artifactId}/</url>
         </site>
     </distributionManagement>

diff --git a/databind-metaschema/pom.xml b/databind-metaschema/pom.xml
@@ -2,8 +2,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>gov.nist.secauto.metaschema</groupId>
-		<artifactId>metaschema-framework</artifactId>
+		<groupId>dev.metaschema</groupId>
+		<artifactId>metaschema-java-parent</artifactId>
 		<version>1.0.0-M2-SNAPSHOT</version>
 	</parent>
 
@@ -14,7 +14,7 @@
 	<url>${site.url}${project.artifactId}/</url>
 	<distributionManagement>
 		<site>
-			<id>nist-pages</id>
+			<id>website</id>
 			<url>${site.url}${project.artifactId}/</url>
 		</site>
 	</distributionManagement>
@@ -79,7 +79,7 @@
 		</pluginManagement>
 		<plugins>
 			<plugin>
-				<groupId>gov.nist.secauto.metaschema</groupId>
+				<groupId>${project.groupId}</groupId>
 				<artifactId>metaschema-maven-plugin</artifactId>
 				<version>${project.version}</version>
 				<executions>

diff --git a/databind/pom.xml b/databind/pom.xml
@@ -2,8 +2,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>gov.nist.secauto.metaschema</groupId>
-		<artifactId>metaschema-framework</artifactId>
+		<groupId>dev.metaschema</groupId>
+		<artifactId>metaschema-java-parent</artifactId>
 		<version>1.0.0-M2-SNAPSHOT</version>
 	</parent>
 
@@ -17,7 +17,7 @@
 	<url>${site.url}${project.artifactId}/</url>
 	<distributionManagement>
 		<site>
-			<id>nist-pages</id>
+			<id>website</id>
 			<url>${site.url}${project.artifactId}/</url>
 		</site>
 	</distributionManagement>

diff --git a/metaschema-cli/pom.xml b/metaschema-cli/pom.xml
@@ -2,8 +2,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>gov.nist.secauto.metaschema</groupId>
-		<artifactId>metaschema-framework</artifactId>
+		<groupId>dev.metaschema</groupId>
+		<artifactId>metaschema-java-parent</artifactId>
 		<version>1.0.0-M2-SNAPSHOT</version>
 	</parent>
 
@@ -14,7 +14,7 @@
 	<url>${site.url}${project.artifactId}/</url>
 	<distributionManagement>
 		<site>
-			<id>nist-pages</id>
+			<id>website</id>
 			<url>${site.url}${project.artifactId}/</url>
 		</site>
 	</distributionManagement>

diff --git a/metaschema-documentation-generator/pom.xml b/metaschema-documentation-generator/pom.xml
@@ -1,8 +1,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>gov.nist.secauto.metaschema</groupId>
-		<artifactId>metaschema-framework</artifactId>
+		<groupId>dev.metaschema</groupId>
+		<artifactId>metaschema-java-parent</artifactId>
 		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>metaschema-documentation-generator</artifactId>
@@ -12,7 +12,7 @@
 	<url>${site.url}${project.artifactId}/</url>
 	<distributionManagement>
 		<site>
-			<id>nist-pages</id>
+			<id>website</id>
 			<url>${site.url}${project.artifactId}/</url>
 		</site>
 	</distributionManagement>

diff --git a/metaschema-freemarker-support/pom.xml b/metaschema-freemarker-support/pom.xml
@@ -2,8 +2,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>gov.nist.secauto.metaschema</groupId>
-		<artifactId>metaschema-framework</artifactId>
+		<groupId>dev.metaschema</groupId>
+		<artifactId>metaschema-java-parent</artifactId>
 		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 
@@ -16,7 +16,7 @@
 	<url>${site.url}${project.artifactId}/</url>
 	<distributionManagement>
 		<site>
-			<id>nist-pages</id>
+			<id>website</id>
 			<url>${site.url}${project.artifactId}/</url>
 		</site>
 	</distributionManagement>

diff --git a/metaschema-maven-plugin/pom.xml b/metaschema-maven-plugin/pom.xml
@@ -4,8 +4,8 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>gov.nist.secauto.metaschema</groupId>
-        <artifactId>metaschema-framework</artifactId>
+		<groupId>dev.metaschema</groupId>
+		<artifactId>metaschema-java-parent</artifactId>
         <version>1.0.0-M2-SNAPSHOT</version>
     </parent>
 
@@ -18,7 +18,7 @@
     <url>${site.url}${project.artifactId}/</url>
     <distributionManagement>
         <site>
-            <id>nist-pages</id>
+            <id>website</id>
             <url>${site.url}${project.artifactId}/</url>
         </site>
     </distributionManagement>

diff --git a/metaschema-maven-plugin/src/it/generate-sources/pom.xml b/metaschema-maven-plugin/src/it/generate-sources/pom.xml
@@ -4,7 +4,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>gov.nist.secauto.metaschema.it</groupId>
+    <groupId>@project.groupId@.it</groupId>
     <artifactId>generate-sources-test</artifactId>
     <version>@project.version@</version>
 

diff --git a/metaschema-testing/pom.xml b/metaschema-testing/pom.xml
@@ -1,18 +1,17 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>gov.nist.secauto.metaschema</groupId>
-		<artifactId>metaschema-framework</artifactId>
+		<groupId>dev.metaschema</groupId>
+		<artifactId>metaschema-java-parent</artifactId>
 		<version>1.0.0-M2-SNAPSHOT</version>
 	</parent>
 	<artifactId>metaschema-testing</artifactId>
 	<name>Metaschema Unit Testing Support</name>
 
-
 	<url>${site.url}${project.artifactId}/</url>
 	<distributionManagement>
 		<site>
-			<id>nist-pages</id>
+			<id>website</id>
 			<url>${site.url}${project.artifactId}/</url>
 		</site>
 	</distributionManagement>