From e54bb0eb1c33364bea3e90d20e207cbc6ffebdec Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Thu, 7 Mar 2019 12:53:17 +0100
Subject: [PATCH] Last sync before branching
---
nb-configuration.xml | 1 -
pom.xml | 17 ++++++++++++-----
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/nb-configuration.xml b/nb-configuration.xml
index 9da91a87..03617286 100755
--- a/nb-configuration.xml
+++ b/nb-configuration.xml
@@ -25,6 +25,5 @@ Any value defined here will override the pom.xml file value but is only applicab
<org-netbeans-modules-css-prep.less_2e_compiler_2e_options/>
<org-netbeans-modules-projectapi.jsf_2e_language>Facelets</org-netbeans-modules-projectapi.jsf_2e_language>
<netbeans.compile.on.save>none</netbeans.compile.on.save>
- <netbeans.hint.jdkPlatform>JDK_1.8_SUN</netbeans.hint.jdkPlatform>
</properties>
</project-shared-configuration>
diff --git a/pom.xml b/pom.xml
index 5a57294a..d0da06ed 100755
--- a/pom.xml
+++ b/pom.xml
@@ -31,6 +31,13 @@
</repository>
</repositories>
<dependencies>
+
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.3.1</version>
+ <scope>compile</scope>
+ </dependency>
<dependency>
<groupId>edu.ucar</groupId>
<artifactId>cdm</artifactId>
@@ -254,13 +261,13 @@
<dependency>
<groupId>com.webcohesion.enunciate</groupId>
<artifactId>enunciate-core-annotations</artifactId>
- <version>2.10.1</version>
+ <version>2.11.1</version>
</dependency>
<dependency>
<groupId>com.webcohesion.enunciate</groupId>
<artifactId>enunciate-rt-util</artifactId>
- <version>2.10.1</version>
+ <version>2.11.1</version>
</dependency>
<dependency>
<groupId>com.bedatadriven</groupId>
@@ -276,8 +283,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.0.2</version>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>10</source>
+ <target>10</target>
</configuration>
</plugin>
<plugin>
@@ -316,7 +323,7 @@
<plugin>
<groupId>com.webcohesion.enunciate</groupId>
<artifactId>enunciate-maven-plugin</artifactId>
- <version>2.10.1</version>
+ <version>2.11.1</version>
<executions>
<execution>
<goals>
--
GitLab