Build su Java 11

consiglionazionaledellericerche · Dec 9, 2019 · 3d89460 · 3d89460
1 parent 82be407
commit 3d89460
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -338,6 +338,19 @@
             <artifactId>thymeleaf-spring4</artifactId>
             <version>3.0.6.RELEASE</version>
         </dependency>
+
+        <!-- EE dependencies for Java11 -->
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.xml.ws</groupId>
+            <artifactId>jaxws-api</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+
     </dependencies>
 
     <build>
@@ -408,6 +421,12 @@
             </plugins>
         </pluginManagement>
         <plugins>
+            <plugin>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <source>8</source>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>com.github.ekryd.sortpom</groupId>
                 <artifactId>sortpom-maven-plugin</artifactId>
@@ -749,7 +768,7 @@
                                 </goals>
                                 <configuration>
                                     <nodeVersion>v6.17.1</nodeVersion>
-                                    <npmVersion>3.10.5</npmVersion>
+                                    <npmVersion>3.10.10</npmVersion>
                                 </configuration>
                             </execution>
                             <execution>

diff --git a/run.sh b/run.sh
@@ -1,11 +1,8 @@
 #!/usr/bin/env bash
 
-mvn clean compile package -Pprod -DskipTests -Dspring.profiles.active=native,showcase,test,swagger
-
-cp ./target/*.war ./target/app.war
-
-docker build --file src/main/docker/showcase/Dockerfile -t docker.si.cnr.it/sprint-flows-showcase .
-
+mvn clean compile package -Pprod -DskipTests -Dspring.profiles.active=native,showcase,test,swagger && \
+cp ./target/*.war ./target/app.war && \
+docker build --file src/main/docker/showcase/Dockerfile -t docker.si.cnr.it/sprint-flows-showcase . && \
 docker run -p 8080:8080 docker.si.cnr.it/sprint-flows-showcase
 
 
diff --git a/src/main/java/it/cnr/si/flows/ng/service/FlowsProcessInstanceService.java b/src/main/java/it/cnr/si/flows/ng/service/FlowsProcessInstanceService.java
@@ -426,6 +426,7 @@ public List<HistoricProcessInstance> getPIForExternalServices(String processDefi
 
 
 	private void processDate(HistoricProcessInstanceQuery processQuery, String key, String value) {
+		// TODO remove deprecated api javax.xml
 		Calendar calendar = javax.xml.bind.DatatypeConverter.parseDateTime(value);
 
 		if (key.contains("Less"))