Skip to content

Commit

Permalink
Remove maven.compiler.release in toolchain profile.
Browse files Browse the repository at this point in the history
Signed-off-by: Achim Kraus <achim.kraus@cloudcoap.net>
  • Loading branch information
boaks committed Mar 5, 2024
1 parent 1c0b369 commit 79f13aa
Showing 1 changed file with 40 additions and 2 deletions.
42 changes: 40 additions & 2 deletions pom.xml
Expand Up @@ -724,7 +724,7 @@
<id>java11-javadoc</id>
<activation>
<!-- jdk executing maven, not the jdk of the toolchain -->
<jdk>[11,)</jdk>
<jdk>[11,17)</jdk>
<property>
<name>createJavadoc</name>
</property>
Expand All @@ -742,6 +742,27 @@
</plugins>
</build>
</profile>
<profile>
<id>java17-javadoc</id>
<activation>
<!-- jdk executing maven, not the jdk of the toolchain -->
<jdk>[17,)</jdk>
<property>
<name>createJavadoc</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<doclint>${javadoc.doclint}</doclint>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<!-- This profile activate the usage of toolchain to compile using JDK
1.7 -->
Expand All @@ -751,8 +772,18 @@
<name>useToolchain</name>
</property>
</activation>
<properties>
<maven.compiler.release></maven.compiler.release>
</properties>
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>${project.build.javaVersion}</source>
<target>${project.build.javaVersion}</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-toolchains-plugin</artifactId>
</plugin>
Expand All @@ -771,11 +802,18 @@
<build>
<plugins>
<plugin>
<artifactId>maven-toolchains-plugin</artifactId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>${project.build.javaVersion}</source>
<target>${project.build.javaVersion}</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-toolchains-plugin</artifactId>
</plugin>
</plugins>
</build>
</profile>
Expand Down

0 comments on commit 79f13aa

Please sign in to comment.