Skip to content

Commit b370b3b

Browse files
authored
Merge pull request #57 from Huluvu424242/feature/mavenupgrade
Feature/mavenupgrade
2 parents 999b292 + 7a1761a commit b370b3b

File tree

5 files changed

+19
-9
lines changed

5 files changed

+19
-9
lines changed

.github/workflows/maven.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Build with Maven
2222
run: |
2323
chmod +x etc/devscripts/*.sh
24-
./mvnw.sh -PpruefeVersionen,headless clean install
24+
./mvnw.sh -PpruefeVersionen -Pheadless clean install
2525
2626
strategy:
2727
matrix:

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
cache: 'maven'
2525
server-id: github
2626
- name: Publish to Github Package Registry
27-
run: ./mvnw.sh -U -Pheadless,publish-github deploy
27+
run: ./mvnw.sh -U -Pheadless -Ppublish-github deploy
2828
env:
2929
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3030

@@ -39,7 +39,7 @@ jobs:
3939
server-username: MAVEN_USERNAME
4040
server-password: MAVEN_PASSWORD
4141
- name: Publish to the Maven Central Registry
42-
run: ./mvnw.sh -U -Pheadless,publish-central deploy
42+
run: ./mvnw.sh -U -Pheadless -Ppublish-central deploy
4343
env:
4444
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
4545
MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}

.github/workflows/website.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
java-package: jdk
2323
cache: 'maven'
2424
- name: Build with Maven
25-
run: ./mvnw.sh -PpruefeVersionen,headless clean site clover:setup verify clover:aggregate clover:clover clover:reset install
25+
run: ./mvnw.sh -PpruefeVersionen -Pheadless clean site clover:setup verify clover:aggregate clover:clover clover:reset install
2626

2727
- uses: EndBug/add-and-commit@v9 # You can change this to use a specific version.
2828
with:
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.2/apache-maven-3.6.2-bin.zip
1+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.7/apache-maven-3.8.7-bin.zip

CHANGELOG.adoc

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,24 @@ Die Versionierung erfolgt nach http://semver.org/lang/de/[Semantic Versioning].
2020
*
2121

2222

23-
== [0.1.3] fertiggestellt 2023-xx-xx
23+
== [0.1.3] published at 2023-xx-xx (maintainance release for infrastructure)
24+
25+
=== On Hold
26+
27+
* maven-install-plugin and maven-deploy-plugin versions on hold because build problems with new versions
28+
2429
=== Added
2530

2631
=== Changed
2732

28-
* compiled with jdk11
29-
* jar name with jdk version in name
30-
* dependencies version upgrade
33+
* build with java 11,17,19
34+
* jar name with jdk version in the name
35+
* dependencies versions upgrade
36+
* maven upgrade to 3.8.7
37+
* maven plugins upgrade
38+
* clover report and website build fixed
39+
* automatic deploy to github
40+
* maven wrapper scripts moved into project root
3141

3242
=== Removed
3343

0 commit comments

Comments
 (0)