Fixed PAT auth.

metaschema-framework · Nov 8, 2024 · aa688a9 · aa688a9
1 parent 00570b1
commit aa688a9
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 18 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -44,14 +44,15 @@ jobs:
         submodules: recursive
         filter: tree:0
     - name: Checkout maven2 branch
-      if: github.ref == 'refs/heads/develop' && github.repository_owner == 'metaschema-framework'
+      if: (github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/heads/release/')) && github.repository_owner == 'metaschema-framework'
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       with:
-        repository: metaschema-framework/maven2
         path: maven2
         ref: main
+        repository: metaschema-framework/maven2
         token: ${{ secrets.ACCESS_TOKEN }}
-        filter: tree:0
+        fetch-depth: 0
+        persist-credentials: true
     # -------------------------
     # Java Environment Setup
     # -------------------------
@@ -77,7 +78,7 @@ jobs:
       run: |
         mvn -B -e -Prelease -Psnapshots -DaltDeploymentRepository=repo-snapshot::file://${GITHUB_WORKSPACE}/maven2/ -DaltSnapshotDeploymentRepository=repo-snapshot::file://${GITHUB_WORKSPACE}/maven2/ -DrepositoryId=repo -DskipTests deploy
     - name: Deploy Artifacts
-      if: github.ref == 'refs/heads/develop' && github.repository_owner == 'metaschema-framework'
+      if: (github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/heads/release/')) && github.repository_owner == 'metaschema-framework'
       run: |
         cd maven2
         git pull --ff-only

diff --git a/pom.xml b/pom.xml
@@ -95,7 +95,7 @@
 		</repository>
 		<snapshotRepository>
 			<id>repo-snapshot</id>
-			<url>https://raw.githubusercontent.com/david-waltermire/oscal-cli-enhanced/refs/heads/maven2/</url>
+			<url>https://raw.githubusercontent.com/metaschema-framework/maven2/refs/heads/main/</url>
 			<snapshots>
 				<enabled>true</enabled>
 			</snapshots>
@@ -518,16 +518,7 @@
 					<artifactId>maven-deploy-plugin</artifactId>
 					<version>${plugin.maven-deploy.version}</version>
 				</plugin>
-				<plugin>
-          <groupId>org.sonatype.central</groupId>
-          <artifactId>central-publishing-maven-plugin</artifactId>
-          <version>0.5.0</version>
-          <extensions>true</extensions>
-          <configuration>
-             <publishingServerId>central</publishingServerId>
-             <autoPublish>false</autoPublish>
-          </configuration>
-        </plugin>
+
 <!--
 				<plugin>
 					<groupId>org.sonatype.plugins</groupId>
@@ -781,9 +772,15 @@
 			<build>
 				<plugins>
 					<plugin>
-						<groupId>org.sonatype.central</groupId>
-						<artifactId>central-publishing-maven-plugin</artifactId>
-					</plugin>
+			          <groupId>org.sonatype.central</groupId>
+			          <artifactId>central-publishing-maven-plugin</artifactId>
+			          <version>0.5.0</version>
+			          <extensions>true</extensions>
+			          <configuration>
+			             <publishingServerId>central</publishingServerId>
+			             <autoPublish>false</autoPublish>
+			          </configuration>
+			        </plugin>
 				</plugins>
 			</build>
 		</profile>