Skip to content

Commit 26f08ac

Browse files
AB-xdevAB-xdev
committed
Merge remote-tracking branch 'origin/update-from-template' into develop
2 parents 6e4dd24 + 530ed04 commit 26f08ac

6 files changed

Lines changed: 105 additions & 23 deletions

File tree

‎.github/workflows/check-build.yml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,7 @@ jobs:
124124
name: pmd-report
125125
if-no-files-found: ignore
126126
path: |
127-
target/site/*.html
128-
target/site/css/**
129-
target/site/images/logos/maven-feather.png
130-
target/site/images/external.png
127+
target/reports/**
131128
132129
docs:
133130
runs-on: ubuntu-latest

‎.github/workflows/release.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
cache: 'maven'
2727

2828
- name: Build with Maven
29-
run: ./mvnw -B clean package
29+
run: ./mvnw -B clean package -T2C
3030

3131
- name: Check for uncommited changes
3232
run: |
@@ -64,7 +64,7 @@ jobs:
6464
run: |
6565
mvnwPath=$(readlink -f ./mvnw)
6666
modules=("") # root
67-
modules+=($(grep -ozP '(?<=module>)[^<]+' 'pom.xml' | tr -d '\0'))
67+
modules+=($(grep -oP '(?<=<module>)[^<]+' 'pom.xml'))
6868
for i in "${modules[@]}"
6969
do
7070
echo "Processing $i/pom.xml"
@@ -121,7 +121,7 @@ jobs:
121121
git config --global user.name "GitHub Actions"
122122
git pull
123123
124-
- name: Set up JDK Apache Maven Central
124+
- name: Set up JDK OSSRH
125125
uses: actions/setup-java@v4
126126
with: # running setup-java again overwrites the settings.xml
127127
java-version: '17'
@@ -132,7 +132,7 @@ jobs:
132132
gpg-passphrase: MAVEN_GPG_PASSPHRASE
133133
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
134134

135-
- name: Publish to Apache Maven Central
135+
- name: Publish to OSSRH
136136
run: ../mvnw -B deploy -Possrh -DskipTests
137137
env:
138138
MAVEN_CENTRAL_USERNAME: ${{ secrets.S01_OSS_SONATYPE_MAVEN_USERNAME }}
@@ -188,7 +188,7 @@ jobs:
188188
run: |
189189
mvnwPath=$(readlink -f ./mvnw)
190190
modules=("") # root
191-
modules+=($(grep -ozP '(?<=module>)[^<]+' 'pom.xml' | tr -d '\0'))
191+
modules+=($(grep -oP '(?<=<module>)[^<]+' 'pom.xml'))
192192
for i in "${modules[@]}"
193193
do
194194
echo "Processing $i/pom.xml"

‎.github/workflows/update-from-template.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ jobs:
202202
GH_TOKEN: ${{ secrets.UPDATE_FROM_TEMPLATE_PAT }}
203203
run: |
204204
not_failed_conclusion="skipped|neutral|success"
205-
not_relevant_app_slug="dependabot|github-pages|sonarcloud"
205+
not_relevant_app_slug="dependabot|github-pages|sonarqubecloud"
206206
207207
echo "Waiting for checks to start..."
208208
sleep 40s
@@ -212,7 +212,7 @@ jobs:
212212
213213
echo "Checking if update-branch-merged exists"
214214
git fetch
215-
if [[ $(git rev-parse origin/${{ env.UPDATE_BRANCH_MERGED }}) ]]; then
215+
if [[ $(git ls-remote --heads origin refs/heads/${{ env.UPDATE_BRANCH_MERGED }}) ]]; then
216216
echo "Branch still exists; Continuing..."
217217
else
218218
echo "Branch origin/${{ env.UPDATE_BRANCH_MERGED }} is missing"

‎pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
<licenses>
3939
<license>
40-
<name>Apache License, Version 2.0</name>
40+
<name>Apache-2.0</name>
4141
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
4242
<distribution>repo</distribution>
4343
</license>
@@ -107,7 +107,7 @@
107107
<dependency>
108108
<groupId>com.puppycrawl.tools</groupId>
109109
<artifactId>checkstyle</artifactId>
110-
<version>10.21.2</version>
110+
<version>10.21.4</version>
111111
</dependency>
112112
</dependencies>
113113
<configuration>
@@ -150,12 +150,12 @@
150150
<dependency>
151151
<groupId>net.sourceforge.pmd</groupId>
152152
<artifactId>pmd-core</artifactId>
153-
<version>7.10.0</version>
153+
<version>7.11.0</version>
154154
</dependency>
155155
<dependency>
156156
<groupId>net.sourceforge.pmd</groupId>
157157
<artifactId>pmd-java</artifactId>
158-
<version>7.10.0</version>
158+
<version>7.11.0</version>
159159
</dependency>
160160
</dependencies>
161161
</plugin>

‎spring-data-eclipse-store/pom.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
<licenses>
3737
<license>
38-
<name>Apache License, Version 2.0</name>
38+
<name>Apache-2.0</name>
3939
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
4040
<distribution>repo</distribution>
4141
</license>
@@ -275,15 +275,15 @@
275275
<plugin>
276276
<groupId>org.apache.maven.plugins</groupId>
277277
<artifactId>maven-project-info-reports-plugin</artifactId>
278-
<version>3.8.0</version>
278+
<version>3.9.0</version>
279279
</plugin>
280280
</plugins>
281281
</pluginManagement>
282282
<plugins>
283283
<plugin>
284284
<groupId>com.mycila</groupId>
285285
<artifactId>license-maven-plugin</artifactId>
286-
<version>4.6</version>
286+
<version>5.0.0</version>
287287
<configuration>
288288
<properties>
289289
<email>${project.organization.url}</email>
@@ -313,7 +313,7 @@
313313
<plugin>
314314
<groupId>org.apache.maven.plugins</groupId>
315315
<artifactId>maven-compiler-plugin</artifactId>
316-
<version>3.13.0</version>
316+
<version>3.14.0</version>
317317
<configuration>
318318
<source>${javaVersion}</source>
319319
<target>${javaVersion}</target>
@@ -378,7 +378,7 @@
378378
<plugin>
379379
<groupId>org.codehaus.mojo</groupId>
380380
<artifactId>flatten-maven-plugin</artifactId>
381-
<version>1.6.0</version>
381+
<version>1.7.0</version>
382382
<configuration>
383383
<flattenMode>ossrh</flattenMode>
384384
</configuration>
@@ -443,7 +443,7 @@
443443
<dependency>
444444
<groupId>com.puppycrawl.tools</groupId>
445445
<artifactId>checkstyle</artifactId>
446-
<version>10.21.2</version>
446+
<version>10.21.4</version>
447447
</dependency>
448448
</dependencies>
449449
<configuration>
@@ -485,12 +485,12 @@
485485
<dependency>
486486
<groupId>net.sourceforge.pmd</groupId>
487487
<artifactId>pmd-core</artifactId>
488-
<version>7.10.0</version>
488+
<version>7.11.0</version>
489489
</dependency>
490490
<dependency>
491491
<groupId>net.sourceforge.pmd</groupId>
492492
<artifactId>pmd-java</artifactId>
493-
<version>7.10.0</version>
493+
<version>7.11.0</version>
494494
</dependency>
495495
</dependencies>
496496
</plugin>

‎template-placeholder-demo/pom.xml‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
7+
<parent>
8+
<groupId>software.xdev</groupId>
9+
<artifactId>template-placeholder-root</artifactId>
10+
<version>1.0.0-SNAPSHOT</version>
11+
</parent>
12+
13+
<artifactId>template-placeholder-demo</artifactId>
14+
<version>1.0.0-SNAPSHOT</version>
15+
<packaging>jar</packaging>
16+
17+
<organization>
18+
<name>XDEV Software</name>
19+
<url>https://xdev.software</url>
20+
</organization>
21+
22+
<properties>
23+
<javaVersion>17</javaVersion>
24+
<maven.compiler.release>${javaVersion}</maven.compiler.release>
25+
26+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
27+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
28+
29+
<mainClass>software.xdev.Application</mainClass>
30+
</properties>
31+
32+
<dependencies>
33+
<dependency>
34+
<groupId>software.xdev</groupId>
35+
<artifactId>template-placeholder</artifactId>
36+
<version>${project.version}</version>
37+
</dependency>
38+
</dependencies>
39+
40+
<build>
41+
<finalName>${project.artifactId}</finalName>
42+
43+
<plugins>
44+
<plugin>
45+
<groupId>org.apache.maven.plugins</groupId>
46+
<artifactId>maven-compiler-plugin</artifactId>
47+
<version>3.14.0</version>
48+
<configuration>
49+
<release>${maven.compiler.release}</release>
50+
<compilerArgs>
51+
<arg>-proc:none</arg>
52+
</compilerArgs>
53+
</configuration>
54+
</plugin>
55+
<plugin>
56+
<groupId>org.apache.maven.plugins</groupId>
57+
<artifactId>maven-assembly-plugin</artifactId>
58+
<version>3.7.1</version>
59+
<configuration>
60+
<archive>
61+
<manifest>
62+
<mainClass>${mainClass}</mainClass>
63+
</manifest>
64+
<manifestEntries>
65+
<Multi-Release>true</Multi-Release>
66+
</manifestEntries>
67+
</archive>
68+
<descriptorRefs>
69+
<descriptorRef>jar-with-dependencies</descriptorRef>
70+
</descriptorRefs>
71+
<appendAssemblyId>false</appendAssemblyId>
72+
</configuration>
73+
<executions>
74+
<execution>
75+
<id>make-assembly</id> <!-- this is used for inheritance merges -->
76+
<phase>package</phase> <!-- bind to the packaging phase -->
77+
<goals>
78+
<goal>single</goal>
79+
</goals>
80+
</execution>
81+
</executions>
82+
</plugin>
83+
</plugins>
84+
</build>
85+
</project>

0 commit comments

Comments
 (0)