Skip to content

Commit 91770e9

Browse files
Merge pull request #43 from xdev-software/update-from-template
Update from template
2 parents d90c6cb + fbc1129 commit 91770e9

File tree

8 files changed

+544
-14
lines changed

8 files changed

+544
-14
lines changed

.github/workflows/checkBuild.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
cache: 'maven'
4444

4545
- name: Build with Maven
46-
run: mvn -B clean package
46+
run: ./mvnw -B clean package
4747

4848
- name: Check for uncommited changes
4949
run: |
@@ -59,7 +59,7 @@ jobs:
5959
echo ----------------------------------------
6060
echo Troubleshooting
6161
echo ----------------------------------------
62-
echo "::error::Unstaged changes detected. Locally try running: git clean -ffdx && mvn -B clean package"
62+
echo "::error::Unstaged changes detected. Locally try running: git clean -ffdx && ./mvnw -B clean package"
6363
exit 1
6464
fi
6565
@@ -89,7 +89,7 @@ jobs:
8989
cache: 'maven'
9090

9191
- name: Run Checkstyle
92-
run: mvn -B checkstyle:check -P checkstyle -T2C
92+
run: ./mvnw -B checkstyle:check -P checkstyle -T2C
9393

9494
docs:
9595
runs-on: ubuntu-latest
@@ -106,5 +106,4 @@ jobs:
106106
run: npm i antora @antora/lunr-extension
107107

108108
- name: Generate Site
109-
run: npx antora docs/antora-playbook.yml
110-
109+
run: npx antora docs/antora-playbook.yml

.github/workflows/release.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
cache: 'maven'
2626

2727
- name: Build with Maven
28-
run: mvn -B clean package
28+
run: ./mvnw -B clean package
2929

3030
- name: Check for uncommited changes
3131
run: |
@@ -41,7 +41,7 @@ jobs:
4141
echo ----------------------------------------
4242
echo Troubleshooting
4343
echo ----------------------------------------
44-
echo "::error::Unstaged changes detected. Locally try running: git clean -ffdx && mvn -B clean package"
44+
echo "::error::Unstaged changes detected. Locally try running: git clean -ffdx && ./mvnw -B clean package"
4545
exit 1
4646
fi
4747
@@ -65,13 +65,13 @@ jobs:
6565
for i in "${modules[@]}"
6666
do
6767
echo "Processing $i/pom.xml"
68-
(cd "$i" && mvn -B versions:set -DremoveSnapshot -DgenerateBackupPoms=false)
68+
(cd "$i" && ../mvnw -B versions:set -DremoveSnapshot -DgenerateBackupPoms=false)
6969
done
7070
7171
- name: Get version
7272
id: version
7373
run: |
74-
version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
74+
version=$(../mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)
7575
echo "release=$version" >> $GITHUB_OUTPUT
7676
echo "releasenumber=${version//[!0-9]/}" >> $GITHUB_OUTPUT
7777
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
@@ -129,7 +129,7 @@ jobs:
129129
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
130130

131131
- name: Publish to Apache Maven Central
132-
run: mvn -B deploy -Possrh
132+
run: ../mvnw -B deploy -Possrh
133133
env:
134134
MAVEN_CENTRAL_USERNAME: ${{ secrets.S01_OSS_SONATYPE_MAVEN_USERNAME }}
135135
MAVEN_CENTRAL_TOKEN: ${{ secrets.S01_OSS_SONATYPE_MAVEN_TOKEN }}
@@ -210,7 +210,7 @@ jobs:
210210
for i in "${modules[@]}"
211211
do
212212
echo "Processing $i/pom.xml"
213-
(cd "$i" && mvn -B build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion} -DgenerateBackupPoms=false -DnextSnapshot=true)
213+
(cd "$i" && ../mvnw -B build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion} -DgenerateBackupPoms=false -DnextSnapshot=true)
214214
done
215215
216216
- name: Git Commit and Push

.github/workflows/sonar.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656

5757
- name: Build with Maven
5858
run: |
59-
mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \
59+
./mvnw -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \
6060
-DskipTests \
6161
-Dsonar.projectKey=${{ env.SONARCLOUD_ORG }}_${{ github.event.repository.name }} \
6262
-Dsonar.organization=${{ env.SONARCLOUD_ORG }} \

.github/workflows/test-deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
2525

2626
- name: Publish to OSSRH
27-
run: mvn -B deploy -Possrh
27+
run: ../mvnw -B deploy -Possrh
2828
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
2929
env:
3030
MAVEN_CENTRAL_USERNAME: ${{ secrets.S01_OSS_SONATYPE_MAVEN_USERNAME }}

.mvn/wrapper/maven-wrapper.properties

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip
18+
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ We also encourage you to read the [contribution instructions by GitHub](https://
2020
You should have the following things installed:
2121
* Git
2222
* Java 21 - should be as unmodified as possible (Recommended: [Eclipse Adoptium](https://adoptium.net/temurin/releases/))
23-
* Maven
23+
* Maven (Note that the [Maven Wrapper](https://maven.apache.org/wrapper/) is shipped with the repo)
2424

2525
### Recommended setup
2626
* Install ``IntelliJ`` (Community Edition is sufficient)

0 commit comments

Comments
 (0)