Skip to content

Commit 9c4dd18

Browse files
Sebastian Bärckunki
andauthored
#17: Fix broken links (#18)
* #17:Added change log entry. * #17: Removed superfluous POM entries.error-code-model-java-17 * #17: Fixed Lombok link replacements. * Update doc/changes/changes_2.1.1.md Co-authored-by: Christoph Kuhnke <github@kuhnke.net>
1 parent 7f49dcb commit 9c4dd18

13 files changed

Lines changed: 163 additions & 138 deletions

.github/workflows/broken_links_checker.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Broken Links Checker
22

33
on:
44
schedule:
5-
- cron: "0 5 * * *"
5+
- cron: "0 5 * * 0"
66
push:
77
branches:
88
- main
@@ -19,7 +19,7 @@ jobs:
1919
- name: Configure broken links checker
2020
run: |
2121
mkdir -p ./target
22-
echo '{ "aliveStatusCodes": [429, 200] }' > ./target/broken_links_checker.json
22+
echo '{ "aliveStatusCodes": [429, 200], "ignorePatterns": [{"pattern": "^https?://(www.)?opensource.org"}] }' > ./target/broken_links_checker.json
2323
- uses: gaurav-nelson/github-action-markdown-link-check@v1
2424
with:
2525
use-quiet-mode: 'yes'

.github/workflows/ci-build-next-java.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,11 @@ jobs:
1818
with:
1919
fetch-depth: 0
2020
- name: Set up JDK 17
21-
uses: actions/setup-java@v2
21+
uses: actions/setup-java@v3
2222
with:
2323
distribution: 'temurin'
2424
java-version: 17
25-
- name: Cache local Maven repository
26-
uses: actions/cache@v3
27-
with:
28-
path: ~/.m2/repository
29-
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
30-
restore-keys: |
31-
${{ runner.os }}-maven-
25+
cache: 'maven'
3226
- name: Run tests and build with Maven
3327
run: |
3428
mvn --batch-mode --update-snapshots clean package -DtrimStackTrace=false \

.github/workflows/dependencies_check.yml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,10 @@ jobs:
1111
steps:
1212
- uses: actions/checkout@v3
1313
- name: Set up JDK 11
14-
uses: actions/setup-java@v2
14+
uses: actions/setup-java@v3
1515
with:
1616
distribution: 'temurin'
1717
java-version: 11
18-
- name: Cache local Maven repository
19-
uses: actions/cache@v3
20-
with:
21-
path: ~/.m2/repository
22-
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
23-
restore-keys: |
24-
${{ runner.os }}-maven-
18+
cache: 'maven'
2519
- name: Checking dependencies for vulnerabilities
26-
run: mvn org.sonatype.ossindex.maven:ossindex-maven-plugin:audit -f pom.xml
20+
run: mvn --batch-mode org.sonatype.ossindex.maven:ossindex-maven-plugin:audit -f pom.xml

.github/workflows/release_droid_prepare_original_checksum.yml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,19 @@ jobs:
1212
with:
1313
fetch-depth: 0
1414
- name: Set up JDK 11
15-
uses: actions/setup-java@v2
15+
uses: actions/setup-java@v3
1616
with:
1717
distribution: 'temurin'
1818
java-version: 11
19-
- name: Cache local Maven repository
20-
uses: actions/cache@v3
21-
with:
22-
path: ~/.m2/repository
23-
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
24-
restore-keys: |
25-
${{ runner.os }}-maven-
19+
cache: 'maven'
20+
- name: Enable testcontainer reuse
21+
run: echo 'testcontainers.reuse.enable=true' > "$HOME/.testcontainers.properties"
2622
- name: Run tests and build with Maven
2723
run: mvn --batch-mode clean verify --file pom.xml
2824
- name: Prepare checksum
2925
run: find target -maxdepth 1 -name *.jar -exec sha256sum "{}" + > original_checksum
3026
- name: Upload checksum to the artifactory
31-
uses: actions/upload-artifact@v2
27+
uses: actions/upload-artifact@v3
3228
with:
3329
name: original_checksum
3430
retention-days: 5

.github/workflows/release_droid_print_quick_checksum.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,11 @@ jobs:
1212
with:
1313
fetch-depth: 0
1414
- name: Set up JDK 11
15-
uses: actions/setup-java@v2
15+
uses: actions/setup-java@v3
1616
with:
1717
distribution: 'temurin'
1818
java-version: 11
19-
- name: Cache local Maven repository
20-
uses: actions/cache@v3
21-
with:
22-
path: ~/.m2/repository
23-
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
24-
restore-keys: |
25-
${{ runner.os }}-maven-
19+
cache: 'maven'
2620
- name: Build with Maven skipping tests
2721
run: mvn --batch-mode clean verify -DskipTests
2822
- name: Print checksum

.github/workflows/release_droid_release_on_maven_central.yml

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,25 +12,19 @@ jobs:
1212
with:
1313
fetch-depth: 0
1414
- name: Set up Maven Central Repository
15-
uses: actions/setup-java@v2
15+
uses: actions/setup-java@v3
1616
with:
1717
distribution: 'temurin'
1818
java-version: 11
19+
cache: 'maven'
1920
server-id: ossrh
2021
server-username: MAVEN_USERNAME
2122
server-password: MAVEN_PASSWORD
22-
- name: Import GPG Key
23-
run:
24-
gpg --import --batch <(echo "${{ secrets.OSSRH_GPG_SECRET_KEY }}")
25-
- name: Cache local Maven repository
26-
uses: actions/cache@v3
27-
with:
28-
path: ~/.m2/repository
29-
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
30-
restore-keys: |
31-
${{ runner.os }}-maven-
23+
gpg-private-key: ${{ secrets.OSSRH_GPG_SECRET_KEY }}
24+
gpg-passphrase: MAVEN_GPG_PASSPHRASE
3225
- name: Publish to Central Repository
26+
run: mvn --batch-mode -Dgpg.skip=false -DskipTests clean deploy
3327
env:
3428
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
3529
MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
36-
run: mvn clean -Dgpg.skip=false -Dgpg.passphrase=${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} -DskipTests deploy
30+
MAVEN_GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}

.project-keeper.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ sources:
55
- maven_central
66
- lombok
77
linkReplacements:
8-
- https://awhitford.github.com/lombok.maven/lombok-maven-plugin/|http://anthonywhitford.com/lombok.maven/lombok-maven-plugin/"
8+
- "https://anthonywhitford.com/lombok.maven/lombok-maven-plugin/|https://projectlombok.org/setup/maven"
99
excludes:
1010
- "E-PK-CORE-18: Outdated content: '.github/workflows/ci-build.yml'"
1111
- "E-PK-CORE-18: Outdated content: '.github/workflows/release_droid_upload_github_release_assets.yml'"

dependencies.md

Lines changed: 65 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -8,76 +8,80 @@
88
| [error-reporting-java][0] | [MIT][1] |
99
| [JSR 374 (JSON Processing) API][2] | [Dual license consisting of the CDDL v1.1 and GPL v2][3] |
1010
| [JSR 374 (JSON Processing) Default Provider][2] | [Dual license consisting of the CDDL v1.1 and GPL v2][3] |
11-
| [Project Lombok][6] | [The MIT License][7] |
11+
| [Project Lombok][4] | [The MIT License][5] |
1212

1313
## Test Dependencies
1414

15-
| Dependency | License |
16-
| ----------------------------------------- | --------------------------------- |
17-
| [Hamcrest][8] | [BSD License 3][9] |
18-
| [EqualsVerifier | release normal jar][10] | [Apache License, Version 2.0][11] |
19-
| [JUnit Jupiter Engine][12] | [Eclipse Public License v2.0][13] |
20-
| [JUnit Jupiter (Aggregator)][12] | [Eclipse Public License v2.0][13] |
15+
| Dependency | License |
16+
| ---------------------------------------- | --------------------------------- |
17+
| [Hamcrest][6] | [BSD License 3][7] |
18+
| [EqualsVerifier | release normal jar][8] | [Apache License, Version 2.0][9] |
19+
| [JUnit Jupiter Engine][10] | [Eclipse Public License v2.0][11] |
20+
| [JUnit Jupiter (Aggregator)][10] | [Eclipse Public License v2.0][11] |
2121

2222
## Plugin Dependencies
2323

2424
| Dependency | License |
2525
| ------------------------------------------------------- | ---------------------------------------------- |
26-
| [Apache Maven Compiler Plugin][16] | [Apache License, Version 2.0][11] |
27-
| [Apache Maven Enforcer Plugin][18] | [Apache License, Version 2.0][11] |
28-
| [Maven Flatten Plugin][20] | [Apache Software Licenese][21] |
29-
| [org.sonatype.ossindex.maven:ossindex-maven-plugin][22] | [ASL2][21] |
30-
| [Reproducible Build Maven Plugin][24] | [Apache 2.0][21] |
31-
| [Maven Surefire Plugin][26] | [Apache License, Version 2.0][11] |
32-
| [Versions Maven Plugin][28] | [Apache License, Version 2.0][11] |
33-
| [Apache Maven Deploy Plugin][30] | [Apache License, Version 2.0][11] |
34-
| [Apache Maven GPG Plugin][32] | [Apache License, Version 2.0][11] |
35-
| [Apache Maven Source Plugin][34] | [Apache License, Version 2.0][11] |
36-
| [Apache Maven Javadoc Plugin][36] | [Apache License, Version 2.0][11] |
37-
| [Nexus Staging Maven Plugin][38] | [Eclipse Public License][39] |
38-
| [Lombok Maven Plugin][40] | [The MIT License][1] |
39-
| [JaCoCo :: Maven Plugin][42] | [Eclipse Public License 2.0][43] |
40-
| [error-code-crawler-maven-plugin][44] | [MIT][1] |
41-
| [Project keeper maven plugin][46] | [MIT][1] |
42-
| [Maven Clean Plugin][48] | [The Apache Software License, Version 2.0][21] |
43-
| [Maven Resources Plugin][50] | [The Apache Software License, Version 2.0][21] |
44-
| [Maven JAR Plugin][52] | [The Apache Software License, Version 2.0][21] |
45-
| [Maven Install Plugin][54] | [The Apache Software License, Version 2.0][21] |
46-
| [Maven Site Plugin 3][56] | [The Apache Software License, Version 2.0][21] |
26+
| [SonarQube Scanner for Maven][12] | [GNU LGPL 3][13] |
27+
| [Apache Maven Compiler Plugin][14] | [Apache License, Version 2.0][9] |
28+
| [Apache Maven Enforcer Plugin][15] | [Apache License, Version 2.0][9] |
29+
| [Maven Flatten Plugin][16] | [Apache Software Licenese][17] |
30+
| [org.sonatype.ossindex.maven:ossindex-maven-plugin][18] | [ASL2][17] |
31+
| [Reproducible Build Maven Plugin][19] | [Apache 2.0][17] |
32+
| [Maven Surefire Plugin][20] | [Apache License, Version 2.0][9] |
33+
| [Versions Maven Plugin][21] | [Apache License, Version 2.0][9] |
34+
| [Apache Maven Deploy Plugin][22] | [Apache License, Version 2.0][9] |
35+
| [Apache Maven GPG Plugin][23] | [Apache License, Version 2.0][9] |
36+
| [Apache Maven Source Plugin][24] | [Apache License, Version 2.0][9] |
37+
| [Apache Maven Javadoc Plugin][25] | [Apache License, Version 2.0][9] |
38+
| [Nexus Staging Maven Plugin][26] | [Eclipse Public License][27] |
39+
| [Lombok Maven Plugin][28] | [The MIT License][1] |
40+
| [JaCoCo :: Maven Plugin][29] | [Eclipse Public License 2.0][30] |
41+
| [error-code-crawler-maven-plugin][31] | [MIT][1] |
42+
| [Project keeper maven plugin][32] | [The MIT License][33] |
43+
| [Maven Clean Plugin][34] | [The Apache Software License, Version 2.0][17] |
44+
| [Maven Resources Plugin][35] | [The Apache Software License, Version 2.0][17] |
45+
| [Maven JAR Plugin][36] | [The Apache Software License, Version 2.0][17] |
46+
| [Maven Install Plugin][37] | [The Apache Software License, Version 2.0][17] |
47+
| [Maven Site Plugin 3][38] | [The Apache Software License, Version 2.0][17] |
4748

48-
[46]: https://github.com/exasol/project-keeper
4949
[0]: https://github.com/exasol/error-reporting-java
50-
[2]: https://javaee.github.io/jsonp
51-
[21]: http://www.apache.org/licenses/LICENSE-2.0.txt
52-
[6]: https://projectlombok.org
53-
[26]: https://maven.apache.org/surefire/maven-surefire-plugin/
54-
[38]: http://www.sonatype.com/public-parent/nexus-maven-plugins/nexus-staging/nexus-staging-maven-plugin/
55-
[48]: http://maven.apache.org/plugins/maven-clean-plugin/
5650
[1]: https://opensource.org/licenses/MIT
57-
[28]: http://www.mojohaus.org/versions-maven-plugin/
58-
[9]: http://opensource.org/licenses/BSD-3-Clause
59-
[16]: https://maven.apache.org/plugins/maven-compiler-plugin/
51+
[2]: https://javaee.github.io/jsonp
6052
[3]: https://oss.oracle.com/licenses/CDDL+GPL-1.1
61-
[43]: https://www.eclipse.org/legal/epl-2.0/
62-
[30]: https://maven.apache.org/plugins/maven-deploy-plugin/
63-
[39]: http://www.eclipse.org/legal/epl-v10.html
64-
[42]: https://www.jacoco.org/jacoco/trunk/doc/maven.html
65-
[7]: https://projectlombok.org/LICENSE
66-
[24]: http://zlika.github.io/reproducible-build-maven-plugin
67-
[52]: http://maven.apache.org/plugins/maven-jar-plugin/
68-
[11]: https://www.apache.org/licenses/LICENSE-2.0.txt
69-
[10]: https://www.jqno.nl/equalsverifier
70-
[18]: https://maven.apache.org/enforcer/maven-enforcer-plugin/
71-
[13]: https://www.eclipse.org/legal/epl-v20.html
72-
[54]: http://maven.apache.org/plugins/maven-install-plugin/
73-
[12]: https://junit.org/junit5/
74-
[22]: https://sonatype.github.io/ossindex-maven/maven-plugin/
75-
[32]: https://maven.apache.org/plugins/maven-gpg-plugin/
76-
[20]: https://www.mojohaus.org/flatten-maven-plugin/flatten-maven-plugin
77-
[34]: https://maven.apache.org/plugins/maven-source-plugin/
78-
[8]: http://hamcrest.org/JavaHamcrest/
79-
[40]: http://anthonywhitford.com/lombok.maven/lombok-maven-plugin/"
80-
[56]: http://maven.apache.org/plugins/maven-site-plugin/
81-
[50]: http://maven.apache.org/plugins/maven-resources-plugin/
82-
[36]: https://maven.apache.org/plugins/maven-javadoc-plugin/
83-
[44]: https://github.com/exasol/error-code-crawler-maven-plugin
53+
[4]: https://projectlombok.org
54+
[5]: https://projectlombok.org/LICENSE
55+
[6]: http://hamcrest.org/JavaHamcrest/
56+
[7]: http://opensource.org/licenses/BSD-3-Clause
57+
[8]: https://www.jqno.nl/equalsverifier
58+
[9]: https://www.apache.org/licenses/LICENSE-2.0.txt
59+
[10]: https://junit.org/junit5/
60+
[11]: https://www.eclipse.org/legal/epl-v20.html
61+
[12]: http://sonarsource.github.io/sonar-scanner-maven/
62+
[13]: http://www.gnu.org/licenses/lgpl.txt
63+
[14]: https://maven.apache.org/plugins/maven-compiler-plugin/
64+
[15]: https://maven.apache.org/enforcer/maven-enforcer-plugin/
65+
[16]: https://www.mojohaus.org/flatten-maven-plugin/
66+
[17]: http://www.apache.org/licenses/LICENSE-2.0.txt
67+
[18]: https://sonatype.github.io/ossindex-maven/maven-plugin/
68+
[19]: http://zlika.github.io/reproducible-build-maven-plugin
69+
[20]: https://maven.apache.org/surefire/maven-surefire-plugin/
70+
[21]: http://www.mojohaus.org/versions-maven-plugin/
71+
[22]: https://maven.apache.org/plugins/maven-deploy-plugin/
72+
[23]: https://maven.apache.org/plugins/maven-gpg-plugin/
73+
[24]: https://maven.apache.org/plugins/maven-source-plugin/
74+
[25]: https://maven.apache.org/plugins/maven-javadoc-plugin/
75+
[26]: http://www.sonatype.com/public-parent/nexus-maven-plugins/nexus-staging/nexus-staging-maven-plugin/
76+
[27]: http://www.eclipse.org/legal/epl-v10.html
77+
[28]: https://anthonywhitford.com/lombok.maven/lombok-maven-plugin/
78+
[29]: https://www.jacoco.org/jacoco/trunk/doc/maven.html
79+
[30]: https://www.eclipse.org/legal/epl-2.0/
80+
[31]: https://github.com/exasol/error-code-crawler-maven-plugin
81+
[32]: https://github.com/exasol/project-keeper/
82+
[33]: https://github.com/exasol/project-keeper/blob/main/LICENSE
83+
[34]: http://maven.apache.org/plugins/maven-clean-plugin/
84+
[35]: http://maven.apache.org/plugins/maven-resources-plugin/
85+
[36]: http://maven.apache.org/plugins/maven-jar-plugin/
86+
[37]: http://maven.apache.org/plugins/maven-install-plugin/
87+
[38]: http://maven.apache.org/plugins/maven-site-plugin/

doc/changes/changelog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Changes
22

3+
* [2.1.1](changes_2.1.1.md)
34
* [2.1.0](changes_2.1.0.md)
45
* [2.0.1](changes_2.0.1.md)
56
* [2.0.0](changes_2.0.0.md)

doc/changes/changes_2.1.1.md

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# Error Code Model Java 2.1.1, released 2022-08-01
2+
3+
Code name: Dependency update and fix for broken links
4+
5+
## Summary
6+
7+
In version 2.1.1 of the `error-code-model-java` we updated dependencies and fixed broken links and removed [Lombok](https://projectlombok.org/) from the project.
8+
9+
## Features
10+
11+
* 17: Fixed broken links
12+
13+
## Dependency Updates
14+
15+
### Test Dependency Updates
16+
17+
* Updated `nl.jqno.equalsverifier:equalsverifier:3.10` to `3.10.1`
18+
* Updated `org.junit.jupiter:junit-jupiter-engine:5.8.2` to `5.9.0`
19+
* Updated `org.junit.jupiter:junit-jupiter:5.8.2` to `5.9.0`
20+
21+
### Plugin Dependency Updates
22+
23+
* Updated `com.exasol:error-code-crawler-maven-plugin:0.7.1` to `1.1.1`
24+
* Updated `com.exasol:project-keeper-maven-plugin:2.2.0` to `2.5.0`
25+
* Updated `org.apache.maven.plugins:maven-compiler-plugin:3.9.0` to `3.10.1`
26+
* Updated `org.apache.maven.plugins:maven-javadoc-plugin:3.3.1` to `3.4.0`
27+
* Updated `org.codehaus.mojo:versions-maven-plugin:2.8.1` to `2.10.0`
28+
* Updated `org.jacoco:jacoco-maven-plugin:0.8.7` to `0.8.8`
29+
* Added `org.sonarsource.scanner.maven:sonar-maven-plugin:3.9.1.2184`
30+
* Updated `org.sonatype.ossindex.maven:ossindex-maven-plugin:3.1.0` to `3.2.0`
31+
* Updated `org.sonatype.plugins:nexus-staging-maven-plugin:1.6.8` to `1.6.13`

0 commit comments

Comments
 (0)