This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/master by this push:
     new 8f57b02  Attempt to fix toolchain JDK version for Jenkins builds 
(JDK10 is OK, JDK9 still failing)
8f57b02 is described below

commit 8f57b02777451a2554b1fa720ab507d32da9f2b8
Author: reta <drr...@gmail.com>
AuthorDate: Fri Sep 21 14:54:20 2018 -0400

    Attempt to fix toolchain JDK version for Jenkins builds (JDK10 is OK, JDK9 
still failing)
---
 .../src/it/jdk-cxf-with-toolchain/pom.xml          | 34 +++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

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 3d92bba..eedef2c 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
@@ -80,9 +80,41 @@
   </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>[9,)</jdk>
+        <jdk>[10,)</jdk>
         <property><!-- Jenkins -->
           <name>env.BUILD_NUMBER</name>
         </property>

Reply via email to