openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject svn commit: r1848613 - in /openwebbeans/meecrowave/trunk: integration-tests/app-groovy/pom.xml meecrowave-doc/src/main/java/org/apache/meecrowave/doc/generator/CliConfiguration.java pom.xml
Date Mon, 10 Dec 2018 17:51:48 GMT
Author: struberg
Date: Mon Dec 10 17:51:48 2018
New Revision: 1848613

URL: http://svn.apache.org/viewvc?rev=1848613&view=rev
Log:
MEECROWAVE-161 enable Java11

The groovy part is not yet done.
Still waiting for a the proper groovy parts to get released

Modified:
    openwebbeans/meecrowave/trunk/integration-tests/app-groovy/pom.xml
    openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/java/org/apache/meecrowave/doc/generator/CliConfiguration.java
    openwebbeans/meecrowave/trunk/pom.xml

Modified: openwebbeans/meecrowave/trunk/integration-tests/app-groovy/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/integration-tests/app-groovy/pom.xml?rev=1848613&r1=1848612&r2=1848613&view=diff
==============================================================================
--- openwebbeans/meecrowave/trunk/integration-tests/app-groovy/pom.xml (original)
+++ openwebbeans/meecrowave/trunk/integration-tests/app-groovy/pom.xml Mon Dec 10 17:51:48
2018
@@ -31,8 +31,8 @@
   <dependencies>
     <dependency>
       <groupId>org.codehaus.groovy</groupId>
-      <artifactId>groovy-all</artifactId>
-      <version>2.4.7</version>
+      <artifactId>groovy</artifactId>
+      <version>2.5.4</version>
     </dependency>
     <dependency>
       <groupId>org.apache.meecrowave</groupId>
@@ -52,7 +52,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.5.1</version>
+        <version>3.7.0</version>
         <configuration>
           <compilerId>groovy-eclipse-compiler</compilerId>
         </configuration>
@@ -60,12 +60,12 @@
           <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-eclipse-compiler</artifactId>
-            <version>2.9.1-01</version>
+            <version>2.9.2-01</version>
           </dependency>
           <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-eclipse-batch</artifactId>
-            <version>2.3.7-01</version>
+            <version>2.4.3-01</version>
           </dependency>
         </dependencies>
       </plugin>

Modified: openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/java/org/apache/meecrowave/doc/generator/CliConfiguration.java
URL: http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/java/org/apache/meecrowave/doc/generator/CliConfiguration.java?rev=1848613&r1=1848612&r2=1848613&view=diff
==============================================================================
--- openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/java/org/apache/meecrowave/doc/generator/CliConfiguration.java
(original)
+++ openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/java/org/apache/meecrowave/doc/generator/CliConfiguration.java
Mon Dec 10 17:51:48 2018
@@ -26,7 +26,6 @@ import java.lang.reflect.Field;
 import java.util.Comparator;
 import java.util.stream.Stream;
 
-import static java.util.function.Function.identity;
 import static java.util.stream.Collectors.joining;
 
 public class CliConfiguration extends BaseGenerator {
@@ -43,7 +42,7 @@ public class CliConfiguration extends Ba
                                 new DocCliOption("context", "The context to use to deploy
the webapp"),
                                 new DocCliOption("webapp", "Location of the webapp, if not
set the classpath will be deployed"),
                                 new DocCliOption("docbase", "Location of the docbase for
a classpath deployment")))
-                        .flatMap(identity())
+                        .flatMap(t -> t)
                         .map(opt -> "|--" + opt.name() + "|" + opt.description())
                         .collect(joining("\n")) + "\n|===\n";
     }

Modified: openwebbeans/meecrowave/trunk/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/pom.xml?rev=1848613&r1=1848612&r2=1848613&view=diff
==============================================================================
--- openwebbeans/meecrowave/trunk/pom.xml (original)
+++ openwebbeans/meecrowave/trunk/pom.xml Mon Dec 10 17:51:48 2018
@@ -63,6 +63,8 @@
     <dbcp2.version>2.5.0</dbcp2.version>
     <commons-cli.version>1.4</commons-cli.version>
     <xbean.version>4.12</xbean.version>
+
+    <java11.jaxb.version>2.3.0</java11.jaxb.version>
   </properties>
 
   <modules>
@@ -177,6 +179,42 @@
     </plugins>
   </build>
 
+  <profiles>
+    <profile>
+      <id>java11</id>
+      <activation>
+        <jdk>11</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.geronimo.specs</groupId>
+          <artifactId>geronimo-jaxws_2.2_spec</artifactId>
+          <version>1.1</version>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.geronimo.specs</groupId>
+          <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+          <version>1.1.3</version>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.geronimo.specs</groupId>
+          <artifactId>geronimo-activation_1.1_spec</artifactId>
+          <version>1.1</version>
+        </dependency>
+        <dependency>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+          <version>${java11.jaxb.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>com.sun.xml.bind</groupId>
+          <artifactId>jaxb-impl</artifactId>
+          <version>${java11.jaxb.version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
+
 <!-- only needed when under development
   <repositories>
     <repository>



Mime
View raw message