Skip to content
Snippets Groups Projects
Commit e54bb0eb authored by Tor-Einar Skog's avatar Tor-Einar Skog
Browse files

Last sync before branching

parent 177a6437
No related branches found
No related tags found
1 merge request!17Develop
This commit is part of merge request !17. Comments created here will be created in the context of that merge request.
...@@ -25,6 +25,5 @@ Any value defined here will override the pom.xml file value but is only applicab ...@@ -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-css-prep.less_2e_compiler_2e_options/>
<org-netbeans-modules-projectapi.jsf_2e_language>Facelets</org-netbeans-modules-projectapi.jsf_2e_language> <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.compile.on.save>none</netbeans.compile.on.save>
<netbeans.hint.jdkPlatform>JDK_1.8_SUN</netbeans.hint.jdkPlatform>
</properties> </properties>
</project-shared-configuration> </project-shared-configuration>
...@@ -31,6 +31,13 @@ ...@@ -31,6 +31,13 @@
</repository> </repository>
</repositories> </repositories>
<dependencies> <dependencies>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.1</version>
<scope>compile</scope>
</dependency>
<dependency> <dependency>
<groupId>edu.ucar</groupId> <groupId>edu.ucar</groupId>
<artifactId>cdm</artifactId> <artifactId>cdm</artifactId>
...@@ -254,13 +261,13 @@ ...@@ -254,13 +261,13 @@
<dependency> <dependency>
<groupId>com.webcohesion.enunciate</groupId> <groupId>com.webcohesion.enunciate</groupId>
<artifactId>enunciate-core-annotations</artifactId> <artifactId>enunciate-core-annotations</artifactId>
<version>2.10.1</version> <version>2.11.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.webcohesion.enunciate</groupId> <groupId>com.webcohesion.enunciate</groupId>
<artifactId>enunciate-rt-util</artifactId> <artifactId>enunciate-rt-util</artifactId>
<version>2.10.1</version> <version>2.11.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.bedatadriven</groupId> <groupId>com.bedatadriven</groupId>
...@@ -276,8 +283,8 @@ ...@@ -276,8 +283,8 @@
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>2.0.2</version> <version>2.0.2</version>
<configuration> <configuration>
<source>1.8</source> <source>10</source>
<target>1.8</target> <target>10</target>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
...@@ -316,7 +323,7 @@ ...@@ -316,7 +323,7 @@
<plugin> <plugin>
<groupId>com.webcohesion.enunciate</groupId> <groupId>com.webcohesion.enunciate</groupId>
<artifactId>enunciate-maven-plugin</artifactId> <artifactId>enunciate-maven-plugin</artifactId>
<version>2.10.1</version> <version>2.11.1</version>
<executions> <executions>
<execution> <execution>
<goals> <goals>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment