Skip to content

Commit c6123ca

Browse files
committed
Merge remote-tracking branch 'origin/update-from-template'
2 parents e5e26ad + 530ed04 commit c6123ca

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

.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 -Pproduction
29+
run: ./mvnw -B clean package -Pproduction -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"
@@ -124,7 +124,7 @@ jobs:
124124
git config --global user.name "GitHub Actions"
125125
git pull
126126
127-
- name: Set up JDK Apache Maven Central
127+
- name: Set up JDK OSSRH
128128
uses: actions/setup-java@v4
129129
with: # running setup-java again overwrites the settings.xml
130130
java-version: '17'
@@ -135,7 +135,7 @@ jobs:
135135
gpg-passphrase: MAVEN_GPG_PASSPHRASE
136136
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
137137

138-
- name: Publish to Apache Maven Central
138+
- name: Publish to OSSRH
139139
run: ../mvnw -B deploy -Possrh -DskipTests
140140
env:
141141
MAVEN_CENTRAL_USERNAME: ${{ secrets.S01_OSS_SONATYPE_MAVEN_USERNAME }}
@@ -191,7 +191,7 @@ jobs:
191191
run: |
192192
mvnwPath=$(readlink -f ./mvnw)
193193
modules=("") # root
194-
modules+=($(grep -ozP '(?<=module>)[^<]+' 'pom.xml' | tr -d '\0'))
194+
modules+=($(grep -oP '(?<=<module>)[^<]+' 'pom.xml'))
195195
for i in "${modules[@]}"
196196
do
197197
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
<licenses>
2828
<license>
29-
<name>Apache License, Version 2.0</name>
29+
<name>Apache-2.0</name>
3030
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
3131
<distribution>repo</distribution>
3232
</license>

template-placeholder/pom.xml

Lines changed: 2 additions & 2 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>
@@ -125,7 +125,7 @@
125125
<plugin>
126126
<groupId>com.mycila</groupId>
127127
<artifactId>license-maven-plugin</artifactId>
128-
<version>4.6</version>
128+
<version>5.0.0</version>
129129
<configuration>
130130
<properties>
131131
<email>${project.organization.url}</email>

0 commit comments

Comments
 (0)