You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2020/03/06 12:33:44 UTC
[cxf] 03/07: Update to maven-enforcer-plugin 3.0.0-M3
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 5b1d5aedcf3fbc59175af0bb8a0fedb62567ebf3
Author: Alexey Markevich <bu...@gmail.com>
AuthorDate: Fri Feb 21 13:30:59 2020 +0300
Update to maven-enforcer-plugin 3.0.0-M3
(cherry picked from commit 88c383efb0b4d8e0aba4590f762676cb8b65d4aa)
---
.../src/it/jdk-cxf-with-toolchain/pom.xml | 40 +++-------------------
pom.xml | 2 +-
2 files changed, 5 insertions(+), 37 deletions(-)
diff --git a/maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml b/maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml
index 82d4685..165be4f 100644
--- a/maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml
+++ b/maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml
@@ -17,7 +17,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>3.0.0-M2</version>
+ <version>3.0.0-M3</version>
<executions>
<execution>
<id>enforce-jdk9-of-higher</id>
@@ -28,7 +28,7 @@
<configuration>
<rules>
<requireJavaVersion>
- <version>[1.9,)</version>
+ <version>[9,)</version>
</requireJavaVersion>
</rules>
</configuration>
@@ -80,41 +80,9 @@
</build>
<profiles>
<profile><!-- used to avoid integration test failures for devs that have no toolchain config -->
- <id>toolchain-java9</id>
- <activation>
- <jdk>9</jdk>
- <property><!-- Jenkins -->
- <name>env.BUILD_NUMBER</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-toolchains-plugin</artifactId>
- <version>1.1</version>
- <configuration>
- <toolchains>
- <jdk>
- <version>1.9</version>
- </jdk>
- </toolchains>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>toolchain</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile><!-- used to avoid integration test failures for devs that have no toolchain config -->
<id>toolchain</id>
<activation>
- <jdk>[10,)</jdk>
+ <jdk>[9,)</jdk>
<property><!-- Jenkins -->
<name>env.BUILD_NUMBER</name>
</property>
@@ -124,7 +92,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-toolchains-plugin</artifactId>
- <version>1.1</version>
+ <version>3.0.0</version>
<configuration>
<toolchains>
<jdk>
diff --git a/pom.xml b/pom.xml
index 40726e08..9ff9312 100644
--- a/pom.xml
+++ b/pom.xml
@@ -672,7 +672,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>3.0.0-M2</version>
+ <version>3.0.0-M3</version>
<configuration>
<rules>
<requireMavenVersion>