Merge remote-tracking branch 'origin/update-from-template' into develop

Author: AB-xdev

.github/dependabot.yml

@@ -72,6 +72,7 @@ jobs:
 
   code-style:
     runs-on: ubuntu-latest
+    if: ${{ github.event_name != 'pull_request' || !startsWith(github.head_ref, 'renovate/') }}
 
     strategy:
       matrix:

.github/workflows/checkBuild.yml

@@ -60,12 +60,13 @@ jobs:
   
     - name: Un-SNAP 
       run: |
+        mvnwPath=$(readlink -f ./mvnw)
         modules=("") # root
         modules+=($(grep -ozP '(?<=module>)[^<]+' 'pom.xml' | tr -d '\0'))
         for i in "${modules[@]}"
         do
             echo "Processing $i/pom.xml"
-            (cd "$i" && ../mvnw -B versions:set -DremoveSnapshot -DgenerateBackupPoms=false)
+            (cd "$i" && $mvnwPath -B versions:set -DremoveSnapshot -DgenerateBackupPoms=false)
         done
   
     - name: Get version
@@ -137,7 +138,6 @@ jobs:
       working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
 
   publish-pages:
-    name: Publish dependencies and licenses to github pages
     runs-on: ubuntu-latest
     needs: [prepare_release]
     steps:
@@ -156,40 +156,15 @@ jobs:
         distribution: 'temurin'
         cache: 'maven'
 
-    - name: Build dependencies/licenses files
-      run: mvn -B project-info-reports:dependencies
+    - name: Build site
+      run: ../mvnw -B site
       working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
 
-    - name: Upload licenses - Upload Artifact
-      uses: actions/upload-artifact@v4
-      with:
-        name: dependencies-licenses
-        path: ${{ env.PRIMARY_MAVEN_MODULE }}/target/site
-
-    - name: Generate docs/dependencies dir
-      run: mkdir -p docs/dependencies
-
-    - name: Move built files into docs/dependencies
-      run: mv ${{ env.PRIMARY_MAVEN_MODULE }}/target/site/* docs/dependencies
-
-    - name: Rename dependencies.html to index.html
-      working-directory: docs/dependencies
-      run: mv dependencies.html index.html
-
-    - name: Copy Readme into docs (as index.md)
-      run: cp README.md docs/index.md
-
-    - name: Configure Pages
-      working-directory: docs
-      run: |-
-        echo "theme: jekyll-theme-tactile" > _config.yml
-
     - name: Deploy to Github pages
-      uses: peaceiris/actions-gh-pages@v3
+      uses: peaceiris/actions-gh-pages@v4
       with:
         github_token: ${{ secrets.GITHUB_TOKEN }}
-        publish_dir: ./docs
-        enable_jekyll: true
+        publish_dir: ./${{ env.PRIMARY_MAVEN_MODULE }}/target/site
 
   after_release:
     runs-on: ubuntu-latest
@@ -205,12 +180,13 @@ jobs:
 
     - name: Inc Version and SNAP 
       run: |
+        mvnwPath=$(readlink -f ./mvnw)
         modules=("") # root
         modules+=($(grep -ozP '(?<=module>)[^<]+' 'pom.xml' | tr -d '\0'))
         for i in "${modules[@]}"
         do
             echo "Processing $i/pom.xml"
-            (cd "$i" && ../mvnw -B build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion} -DgenerateBackupPoms=false -DnextSnapshot=true)
+            (cd "$i" && $mvnwPath -B build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion} -DgenerateBackupPoms=false -DnextSnapshot=true)
         done
 
     - name: Git Commit and Push

.github/workflows/release.yml

@@ -27,8 +27,7 @@ jobs:
   sonar:
     name: SonarCloud Scan
     runs-on: ubuntu-latest
-    # Dependabot PRs have no access to secrets (SONAR_TOKEN) -> Ignore them
-    if: ${{ github.event_name != 'pull_request' || !startsWith(github.head_ref, 'dependabot/') }}
+    if: ${{ github.event_name != 'pull_request' || !startsWith(github.head_ref, 'renovate/') }}
     steps:
       - uses: actions/checkout@v4
         with:

.github/workflows/sonar.yml

@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar

.idea/checkstyle-idea.xml

@@ -81,4 +81,4 @@ use [our support](https://xdev.software/en/services/support).
 See the [contributing guide](./CONTRIBUTING.md) for detailed instructions on how to get started with our project.
 
 ## Dependencies and Licenses
-View the [license of the current project](LICENSE) or the [summary including all dependencies](https://xdev-software.github.io/spring-data-eclipse-store/dependencies/)
+View the [license of the current project](LICENSE) or the [summary including all dependencies](https://xdev-software.github.io/spring-data-eclipse-store/dependencies)

.mvn/wrapper/maven-wrapper.properties

@@ -0,0 +1,4 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "rebaseWhen": "behind-base-branch"
+}

README.md

@@ -103,7 +103,7 @@
 							<dependency>
 								<groupId>com.puppycrawl.tools</groupId>
 								<artifactId>checkstyle</artifactId>
-								<version>10.14.2</version>
+								<version>10.15.0</version>
 							</dependency>
 						</dependencies>
 						<configuration>

renovate.json5

@@ -15,7 +15,7 @@
 
 	<scm>
 		<url>https://github.com/xdev-software/spring-data-eclipse-store</url>
-		<connection>https://github.com/xdev-software/spring-data-eclipse-store.git</connection>
+		<connection>scm:git:https://github.com/xdev-software/spring-data-eclipse-store.git</connection>
 	</scm>
 
 	<inceptionYear>2023</inceptionYear>
@@ -192,6 +192,20 @@
 	</distributionManagement>
 
 	<build>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-site-plugin</artifactId>
+					<version>4.0.0-M13</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-project-info-reports-plugin</artifactId>
+					<version>3.5.0</version>
+				</plugin>
+			</plugins>
+		</pluginManagement>
 		<plugins>
 			<plugin>
 				<groupId>com.mycila</groupId>
@@ -270,7 +284,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
-				<version>3.3.0</version>
+				<version>3.3.1</version>
 				<executions>
 					<execution>
 						<id>attach-sources</id>
@@ -291,7 +305,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-gpg-plugin</artifactId>
-						<version>3.2.1</version>
+						<version>3.2.3</version>
 						<executions>
 							<execution>
 								<id>sign-artifacts</id>
@@ -339,7 +353,7 @@
 							<dependency>
 								<groupId>com.puppycrawl.tools</groupId>
 								<artifactId>checkstyle</artifactId>
-								<version>10.14.2</version>
+								<version>10.15.0</version>
 							</dependency>
 						</dependencies>
 						<configuration>