build fixes

pcalouche · Aug 25, 2024 · 5c32003 · 5c32003
1 parent f468b5c
commit 5c32003
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 9 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -27,7 +27,7 @@ jobs:
           distribution: 'temurin'
           cache: maven
       - name: Run Maven
-        run: mvn -B -s ./.mvn/settings.xml clean verify
+        run: make mvn-verify-ci
         env:
           GITHUB_ACTOR: ${{ github.actor }}
           GITHUB_TOKEN: ${{ github.token }}
diff --git a/.mvn/settings.xml b/.mvn/settings.xml
@@ -10,11 +10,45 @@
       <username>${env.GITHUB_ACTOR}</username>
       <password>${env.GITHUB_TOKEN}</password>
     </server>
-    <server>
-      <id>github-pcalouche-spring-forge-skeleton</id>
-      <username>${env.GITHUB_ACTOR}</username>
-      <password>${env.GITHUB_TOKEN}</password>
-    </server>
   </servers>
 
+  <profiles>
+    <profile>
+      <id>additional-spring-repositories</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <repositories>
+        <repository>
+          <id>spring-milestones</id>
+          <name>Spring Milestones</name>
+          <url>https://repo.spring.io/milestone</url>
+        </repository>
+        <repository>
+          <id>spring-snapshots</id>
+          <name>Spring Snapshots</name>
+          <url>https://repo.spring.io/snapshot</url>
+          <snapshots>
+            <enabled>true</enabled>
+          </snapshots>
+        </repository>
+      </repositories>
+      <pluginRepositories>
+        <pluginRepository>
+          <id>spring-milestones</id>
+          <name>Spring Milestones</name>
+          <url>https://repo.spring.io/milestone</url>
+        </pluginRepository>
+        <pluginRepository>
+          <id>spring-snapshots</id>
+          <name>Spring Snapshots</name>
+          <url>https://repo.spring.io/snapshot</url>
+          <snapshots>
+            <enabled>true</enabled>
+          </snapshots>
+        </pluginRepository>
+      </pluginRepositories>
+    </profile>
+  </profiles>
+
 </settings>
diff --git a/Makefile b/Makefile
@@ -13,6 +13,10 @@ mvn-verify: format
 mvn-verify-skip-tests: format
 	mvn clean verify -DskipTests
 
+.PHONY: mvn-verify-ci
+mvn-verify-ci:
+	mvn -B -s ./.mvn/settings.xml verify
+
 # Run tests and install locally
 .PHONY: mvn-install
 mvn-install: format

diff --git a/pom.xml b/pom.xml
@@ -18,9 +18,9 @@
 
   <distributionManagement>
     <repository>
-      <id>github-pcalouche-spring-forge-skeleton</id>
-      <name>Spring Forge Skeleton</name>
-      <url>https://maven.pkg.github.com/pcalouche/spring-forge-skeleton</url>
+      <id>github-pcalouche-spring-forge-service-template</id>
+      <name>Spring Forge Service Template</name>
+      <url>https://maven.pkg.github.com/pcalouche/spring-forge-service-template</url>
     </repository>
   </distributionManagement>