Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/cd-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ jobs:
MAVEN_PASSWORD: ${{ secrets.CENTRAL_TOKEN_PASSWORD }}
MAVEN_GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
run: |
mvn --no-transfer-progress --batch-mode clean deploy -Dlombok.delombok.skip=true
mvn --no-transfer-progress --batch-mode clean deploy
5 changes: 3 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,11 @@ jobs:
distribution: "temurin"

- name: Compile
run: mvn compile --no-transfer-progress -Dlombok.delombok.skip=true
run: mvn compile --no-transfer-progress

- name: Run unit tests
run: mvn test --no-transfer-progress -Dtest="**/*Test" -DfailIfNoTests=false -Dlombok.delombok.skip=true
run: mvn test --no-transfer-progress -Dtest="**/*Test" -DfailIfNoTests=false


- name: Dependency review
if: github.event_name == 'pull_request'
Expand Down
29 changes: 19 additions & 10 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@
<configuration>
<source>1.8</source>
<doclint>none</doclint>
<sourcepath>${project.build.directory}/delombok</sourcepath>
<outputDirectory>${project.basedir}/docs</outputDirectory>
</configuration>
<executions>
Expand Down Expand Up @@ -163,20 +164,27 @@
</plugin>

<plugin>
<groupId>org.projectlombok</groupId>
<artifactId>lombok-maven-plugin</artifactId>
<version>1.18.20.0</version>
<configuration>
<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
<outputDirectory>${project.build.directory}/delombok</outputDirectory>
<addOutputDirectory>false</addOutputDirectory>
</configuration>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.4.1</version>
<executions>
<execution>
<id>delombok</id>
<phase>generate-sources</phase>
<goals>
<goal>delombok</goal>
<goal>exec</goal>
</goals>
<configuration>
<executable>java</executable>
<arguments>
<argument>-jar</argument>
<argument>${settings.localRepository}/org/projectlombok/lombok/${lombok.version}/lombok-${lombok.version}.jar</argument>
<argument>delombok</argument>
<argument>${project.basedir}/src/main/java</argument>
<argument>-d</argument>
<argument>${project.build.directory}/delombok</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
Expand All @@ -193,6 +201,7 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<lombok.version>1.18.46</lombok.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -260,7 +269,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.46</version>
<version>${lombok.version}</version>
<scope>provided</scope>
</dependency>

Expand Down
Loading