Merge branch 'main' into dependabot/maven/main/net.logstash.logback-l…

…ogstash-logback-encoder-8.0

.github/dependabot.yml

@@ -3,16 +3,44 @@ registries:
   central:
     type: "maven-repository"
     url: "https://repo.maven.apache.org/maven2"
+#  github-pcalouche-spring-forge:
+#    type: "maven-repository"
+#    url: "https://maven.pkg.github.com/pcalouche/spring-forge"
+#    username: pcalouche
+#    password: "${{ secrets.PCALOUCHE_READ_PACKAGE_TOKEN }}"
 updates:
   - package-ecosystem: "maven"
     directory: "/"
-    registries: "*"
+    registries:
+      - central
+#      - github-pcalouche-spring-forge
     schedule:
       interval: "monthly"
     target-branch: "main"
     open-pull-requests-limit: 10
+    groups:
+      protos:
+        patterns:
+          - org.apache.maven.plugins*
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
       interval: "monthly"
-    target-branch: "main"
+    target-branch: "main"
+#  - package-ecosystem: "maven"
+#    directory: "/"
+#    registries:
+#      - central
+#    schedule:
+#      interval: "monthly"
+#    target-branch: "dependabot-staging-spring33x"
+#    open-pull-requests-limit: 10
+#    groups:
+#      protos:
+#        patterns:
+#          - org.apache.maven.plugins*
+#  - package-ecosystem: "github-actions"
+#    directory: "/"
+#    schedule:
+#      interval: "monthly"
+#    target-branch: "dependabot-staging-spring33x"

.github/workflows/continuous-delivery.yml

@@ -28,6 +28,7 @@ jobs:
           distribution: 'temurin'
           cache: maven
       - name: Run Maven
-        run: mvn -T 4 -B clean deploy
+        run: make mvn-deploy-cd
         env:
+          GITHUB_ACTOR: ${{ github.actor }}
           GITHUB_TOKEN: ${{ github.token }}

.github/workflows/continuous-integration.yml

@@ -28,4 +28,4 @@ jobs:
           distribution: 'temurin'
           cache: maven
       - name: Run Maven
-        run: mvn -T 4 -B clean verify
+        run: make mvn-verify-ci

.mvn/maven.config

@@ -1,2 +1,3 @@
 -T4
--Pspring-forge-flatten
+-Pspring-forge-flatten
+--fail-at-end

.mvn/settings.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<settings
+  xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.1.0 http://maven.apache.org/xsd/settings-1.1.0.xsd"
+  xmlns="http://maven.apache.org/SETTINGS/1.1.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+  <servers>
+    <server>
+      <id>github-pcalouche-spring-forge</id>
+      <username>${env.GITHUB_ACTOR}</username>
+      <password>${env.GITHUB_TOKEN}</password>
+    </server>
+  </servers>
+
+</settings>

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
@@ -23,10 +27,14 @@ mvn-install: format
 mvn-install-skip-tests: format
 	mvn clean install -DskipTests
 
+.PHONY: mvn-deploy-cd
+mvn-deploy-cd:
+	mvn -B -s ./.mvn/settings.xml deploy
+
 # Check if version is a SNAPSHOT
 .PHONY: check-if-snapshot-version
 check-if-snapshot-version:
-	version="$(shell mvn help:evaluate -Dexpression=spring-enzymes.version -q -DforceStdout)" ; \
+	version="$(shell mvn help:evaluate -Dexpression=spring-forge.version -q -DforceStdout)" ; \
 	echo "version is $$version" ; \
 	if [[ $$version == *-SNAPSHOT ]]; then \
 		echo "Release version is a SNAPSHOT, so manual deploy can proceed." ; \

README.md

@@ -1,5 +1,9 @@
 # Spring Forge
 
+Spring Forge is a template for how you can extend Spring Boot for your personal or company's needs. It does this by providing a layout for creating your own custom Spring Autoconfiguration and Spring Boot Starters.
+
+TODO below
+
 - Purpose job
 - Features
   - parent pom
@@ -8,5 +12,6 @@
 - Structure
 - Usage
 - Odds and ends - mvn.config , makefile
+- Multiple spring versions
 
 https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#Publishing-using-Apache-Maven

pom.xml

@@ -23,7 +23,7 @@
 
   <distributionManagement>
     <repository>
-      <id>github</id>
+      <id>github-pcalouche-spring-forge</id>
       <name>Spring Forge</name>
       <url>https://maven.pkg.github.com/pcalouche/spring-forge</url>
     </repository>
@@ -61,12 +61,12 @@
     <versions-maven-plugin.version>2.17.1</versions-maven-plugin.version>
 
     <!-- Third party plugin versions. Spring Boot Parent POM manages several already. -->
-    <exec-maven-plugin.version>3.3.0</exec-maven-plugin.version>
+    <exec-maven-plugin.version>3.4.1</exec-maven-plugin.version>
     <flatten-maven-plugin.version>1.6.0</flatten-maven-plugin.version>
     <git-build-hook-maven-plugin.version>3.5.0</git-build-hook-maven-plugin.version>
     <jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
     <spotless-maven-plugin.version>2.43.0</spotless-maven-plugin.version>
-    <spring-javaformat-maven-plugin.version>0.0.42</spring-javaformat-maven-plugin.version>
+    <spring-javaformat-maven-plugin.version>0.0.43</spring-javaformat-maven-plugin.version>
   </properties>
 
   <dependencyManagement>
@@ -105,20 +105,6 @@
     </dependencies>
   </dependencyManagement>
 
-  <repositories>
-    <repository>
-      <id>central</id>
-      <url>https://repo.maven.apache.org/maven2</url>
-    </repository>
-    <repository>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <id>github-pcalouche-spring-forge</id>
-      <url>https://maven.pkg.github.com/pcalouche/spring-forge</url>
-    </repository>
-  </repositories>
-
   <build>
     <!--
       Plugin management will not apply the plugin to a child POM. Rather it serves as a place to