Skip to content
This repository has been archived by the owner on Nov 16, 2023. It is now read-only.

Commit

Permalink
fix: javadoc generation with mapstruct update
Browse files Browse the repository at this point in the history
  • Loading branch information
@lmoesle
lmoesle committed Nov 15, 2023
1 parent ec77184 commit 7913101
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 68 deletions.
15 changes: 8 additions & 7 deletions bpm-server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,19 +279,20 @@
<configuration>
<annotationProcessorPaths>
<path>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct-processor</artifactId>
<version>1.4.2.Final</version>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<!-- Version muss mit der durch Spring-Boot-Starter bereitgestellten Version übereinstimmen -->
<version>${lombok.version}</version>
</path>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok-mapstruct-binding</artifactId>
<version>0.2.0</version>
<version>${lombok.mapstruct.binding.version}</version>
</path>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.20</version>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct-processor</artifactId>
<version>${org.mapstruct.version}</version>
</path>
</annotationProcessorPaths>
<compilerArgs>
Expand Down
42 changes: 0 additions & 42 deletions core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,46 +63,4 @@
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
<annotationProcessorPaths>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<!-- Version muss mit der durch Spring-Boot-Starter bereitgestellten Version übereinstimmen -->
<version>${lombok.version}</version>
</path>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok-mapstruct-binding</artifactId>
<version>${lombok.mapstruct.binding.version}</version>
</path>
<path>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct-processor</artifactId>
<version>${org.mapstruct.version}</version>
</path>
<!-- other annotation processors -->
</annotationProcessorPaths>
<compilerArgs>
<compilerArg>
-Amapstruct.defaultComponentModel=spring
</compilerArg>
</compilerArgs>
</configuration>
</plugin>
</plugins>
</build>

</project>
41 changes: 22 additions & 19 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<spring.cloud.version>2021.0.0</spring.cloud.version>
<lombok.version>1.18.30</lombok.version>
<lombok.mapstruct.binding.version>0.2.0</lombok.mapstruct.binding.version>
<org.mapstruct.version>1.4.2.Final</org.mapstruct.version>
<org.mapstruct.version>1.5.5.Final</org.mapstruct.version>
<flyway.version>6.5.1</flyway.version>
</properties>

Expand Down Expand Up @@ -117,6 +117,27 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.2</version>
</plugin>

<!-- Javadoc plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.5.0</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
<configuration>
<doclint>none</doclint>
<sourceFileIncludes>
<sourceFileInclude>**/*.java</sourceFileInclude>
</sourceFileIncludes>
</configuration>
</plugin>
</plugins>
</build>

Expand All @@ -141,24 +162,6 @@
</executions>
</plugin>

<!-- Javadoc plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.5.0</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
<configuration>
<doclint>none</doclint>
</configuration>
</plugin>

<!-- GPG plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down

0 comments on commit 7913101

Please sign in to comment.