Skip to content

Commit cade569

Browse files
author
Sebastian Bär
authored
#19: Remove Lombok (#20)
* #19: Remove Lombok
1 parent 9c4dd18 commit cade569

13 files changed

Lines changed: 364 additions & 178 deletions

.github/workflows/ci-build.yml

Lines changed: 36 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,55 @@
11
name: CI Build
22

33
on:
4-
- push
4+
push:
5+
branches:
6+
- main
7+
pull_request:
58

69
jobs:
710
build:
811
runs-on: ubuntu-latest
12+
concurrency:
13+
group: ${{ github.workflow }}-${{ github.ref }}
14+
cancel-in-progress: true
915
steps:
1016
- name: Checkout the repository
11-
uses: actions/checkout@v2
17+
uses: actions/checkout@v3
1218
with:
1319
fetch-depth: 0
1420
- name: Set up JDK 11
15-
uses: actions/setup-java@v1
21+
uses: actions/setup-java@v3
1622
with:
23+
distribution: 'temurin'
1724
java-version: 11
18-
- name: Cache local Maven repository
19-
uses: actions/cache@v2
25+
cache: 'maven'
26+
- name: Cache SonarCloud packages
27+
uses: actions/cache@v3
2028
with:
21-
path: ~/.m2/repository
22-
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
23-
restore-keys: |
24-
${{ runner.os }}-maven-
29+
path: ~/.sonar/cache
30+
key: ${{ runner.os }}-sonar
31+
restore-keys: ${{ runner.os }}-sonar
32+
- name: Enable testcontainer reuse
33+
run: echo 'testcontainers.reuse.enable=true' > "$HOME/.testcontainers.properties"
2534
- name: Run tests and build with Maven
26-
run: mvn --batch-mode --update-snapshots clean verify sonar:sonar --file pom.xml -DtrimStackTrace=false -Dsonar.organization=exasol -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN
35+
run: |
36+
mvn --batch-mode clean verify \
37+
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
38+
-DtrimStackTrace=false
39+
- name: Publish Test Report
40+
uses: scacap/action-surefire-report@v1
41+
if: ${{ always() && github.event.pull_request.head.repo.full_name == github.repository && github.actor != 'dependabot[bot]' }}
42+
with:
43+
github_token: ${{ secrets.GITHUB_TOKEN }}
44+
- name: Sonar analysis
45+
if: ${{ env.SONAR_TOKEN != null }}
46+
run: |
47+
mvn --batch-mode org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \
48+
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
49+
-DtrimStackTrace=false \
50+
-Dsonar.organization=exasol \
51+
-Dsonar.host.url=https://sonarcloud.io \
52+
-Dsonar.login=$SONAR_TOKEN
2753
env:
28-
GITHUB_OAUTH: ${{ secrets.GITHUB_TOKEN }}
2954
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3055
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.github/workflows/release_droid_upload_github_release_assets.yml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,15 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Checkout the repository
15-
uses: actions/checkout@v2
15+
uses: actions/checkout@v3
1616
with:
1717
fetch-depth: 0
1818
- name: Set up JDK 11
19-
uses: actions/setup-java@v2
19+
uses: actions/setup-java@v3
2020
with:
2121
distribution: 'temurin'
2222
java-version: 11
23-
- name: Cache local Maven repository
24-
uses: actions/cache@v2
25-
with:
26-
path: ~/.m2/repository
27-
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
28-
restore-keys: |
29-
${{ runner.os }}-maven-
23+
cache: 'maven'
3024
- name: Build with Maven skipping tests
3125
run: mvn --batch-mode clean verify -DskipTests
3226
- name: Generate sha256sum files

.project-keeper.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,4 @@ sources:
33
path: pom.xml
44
modules:
55
- maven_central
6-
- lombok
7-
linkReplacements:
8-
- "https://anthonywhitford.com/lombok.maven/lombok-maven-plugin/|https://projectlombok.org/setup/maven"
9-
excludes:
10-
- "E-PK-CORE-18: Outdated content: '.github/workflows/ci-build.yml'"
11-
- "E-PK-CORE-18: Outdated content: '.github/workflows/release_droid_upload_github_release_assets.yml'"
12-
6+
excludes:

dependencies.md

Lines changed: 59 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -8,80 +8,75 @@
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][4] | [The MIT License][5] |
1211

1312
## Test Dependencies
1413

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] |
14+
| Dependency | License |
15+
| ---------------------------------------- | -------------------------------- |
16+
| [Hamcrest][4] | [BSD License 3][5] |
17+
| [EqualsVerifier | release normal jar][6] | [Apache License, Version 2.0][7] |
18+
| [JUnit Jupiter Engine][8] | [Eclipse Public License v2.0][9] |
19+
| [JUnit Jupiter (Aggregator)][8] | [Eclipse Public License v2.0][9] |
2120

2221
## Plugin Dependencies
2322

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

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

doc/changes/changes_2.1.1.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ In version 2.1.1 of the `error-code-model-java` we updated dependencies and fixe
99
## Features
1010

1111
* 17: Fixed broken links
12+
* 19: Removed Lombok from Project
1213

1314
## Dependency Updates
1415

@@ -26,6 +27,7 @@ In version 2.1.1 of the `error-code-model-java` we updated dependencies and fixe
2627
* Updated `org.apache.maven.plugins:maven-javadoc-plugin:3.3.1` to `3.4.0`
2728
* Updated `org.codehaus.mojo:versions-maven-plugin:2.8.1` to `2.10.0`
2829
* Updated `org.jacoco:jacoco-maven-plugin:0.8.7` to `0.8.8`
30+
* Removed `org.projectlombok:lombok-maven-plugin:1.18.20.0`
2931
* Added `org.sonarsource.scanner.maven:sonar-maven-plugin:3.9.1.2184`
3032
* Updated `org.sonatype.ossindex.maven:ossindex-maven-plugin:3.1.0` to `3.2.0`
3133
* Updated `org.sonatype.plugins:nexus-staging-maven-plugin:1.6.8` to `1.6.13`

lombok.config

Lines changed: 0 additions & 2 deletions
This file was deleted.

pk_generated_parent.pom

Lines changed: 1 addition & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,7 @@
3232
<developerConnection>scm:git:https://github.com/exasol/error-code-model-java.git</developerConnection>
3333
<url>https://github.com/exasol/error-code-model-java/</url>
3434
</scm>
35-
<dependencies>
36-
<dependency>
37-
<groupId>org.projectlombok</groupId>
38-
<artifactId>lombok</artifactId>
39-
<version>1.18.24</version>
40-
<scope>provided</scope>
41-
</dependency>
42-
</dependencies>
35+
<dependencies/>
4336
<build>
4437
<plugins>
4538
<plugin>
@@ -238,37 +231,6 @@
238231
</execution>
239232
</executions>
240233
</plugin>
241-
<plugin>
242-
<groupId>org.projectlombok</groupId>
243-
<artifactId>lombok-maven-plugin</artifactId>
244-
<version>1.18.20.0</version>
245-
<executions>
246-
<execution>
247-
<id>delombok-main</id>
248-
<phase>generate-sources</phase>
249-
<goals>
250-
<goal>delombok</goal>
251-
</goals>
252-
<configuration>
253-
<addOutputDirectory>false</addOutputDirectory>
254-
<sourceDirectory>src/main/java</sourceDirectory>
255-
<outputDirectory>target/delombok/main</outputDirectory>
256-
</configuration>
257-
</execution>
258-
<execution>
259-
<id>delombok-test</id>
260-
<phase>generate-test-sources</phase>
261-
<goals>
262-
<goal>testDelombok</goal>
263-
</goals>
264-
<configuration>
265-
<addOutputDirectory>false</addOutputDirectory>
266-
<sourceDirectory>src/test/java</sourceDirectory>
267-
<outputDirectory>target/delombok/test</outputDirectory>
268-
</configuration>
269-
</execution>
270-
</executions>
271-
</plugin>
272234
<plugin>
273235
<groupId>org.jacoco</groupId>
274236
<artifactId>jacoco-maven-plugin</artifactId>
@@ -322,12 +284,6 @@
322284
</goals>
323285
</execution>
324286
</executions>
325-
<configuration>
326-
<sourcePaths>
327-
<sourcePath>target/delombok/main</sourcePath>
328-
<sourcePath>target/delombok/test</sourcePath>
329-
</sourcePaths>
330-
</configuration>
331287
</plugin>
332288
</plugins>
333289
</build>

0 commit comments

Comments
 (0)