diff --git a/nb-configuration.xml b/nb-configuration.xml index 00dea3e61d563b10c9cd00a3ba3dda34e9871fc4..e9e56b52729f6bef68a0435ec98b924804cf7522 100755 --- a/nb-configuration.xml +++ b/nb-configuration.xml @@ -18,6 +18,5 @@ Any value defined here will override the pom.xml file value but is only applicab <netbeans.hint.license>nibio_open_source_license.ftl</netbeans.hint.license> <org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_deploy_2e_server>WildFly</org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_deploy_2e_server> <org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_j2eeVersion>1.7-web</org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_j2eeVersion> - <netbeans.hint.jdkPlatform>JDK_1.8_SUN</netbeans.hint.jdkPlatform> </properties> </project-shared-configuration> diff --git a/pom.xml b/pom.xml index f9381552152b89657eed2f04c35e19cceecad9e2..2db1fe0e62b43bccaba8547548f096785b1ca8ee 100755 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ <groupId>no.nibio</groupId> <artifactId>VIPSCore</artifactId> <packaging>war</packaging> - <version>1.0-SNAPSHOT</version> + <version>2022.1</version> <name>VIPSCore</name> <url>http://maven.apache.org</url> @@ -24,12 +24,12 @@ <dependency> <groupId>org.reflections</groupId> <artifactId>reflections</artifactId> - <version>0.9.11</version> + <version>0.10.2</version> </dependency> <dependency> <groupId>com.thetransactioncompany</groupId> <artifactId>cors-filter</artifactId> - <version>1.7.1</version> + <version>2.10</version> </dependency> <dependency> @@ -40,7 +40,7 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> - <version>2.9.8</version> + <version>2.13.1</version> <type>jar</type> </dependency> <dependency> @@ -52,18 +52,18 @@ <dependency> <groupId>com.fasterxml.jackson.datatype</groupId> <artifactId>jackson-datatype-jsr310</artifactId> - <version>2.9.8</version> + <version>2.13.1</version> <type>jar</type> </dependency> <dependency> <groupId>no.nibio.vips.common</groupId> <artifactId>VIPSCommon</artifactId> - <version>1.0-SNAPSHOT</version> + <version>2022.1</version> </dependency> <dependency> <groupId>javax</groupId> <artifactId>javaee-web-api</artifactId> - <version>7.0</version> + <version>8.0.1</version> <type>jar</type> </dependency> <dependency> @@ -80,7 +80,7 @@ <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - <version>1.0.4</version> + <version>1.2</version> <scope>provided</scope> </dependency> <dependency> @@ -92,19 +92,19 @@ <dependency> <groupId>javax.servlet.jsp</groupId> <artifactId>jsp-api</artifactId> - <version>2.1</version> + <version>2.2</version> <scope>provided</scope> </dependency> <dependency> <groupId>commons-validator</groupId> <artifactId>commons-validator</artifactId> - <version>1.2.0</version> + <version>1.7</version> <type>jar</type> </dependency> <dependency> <groupId>javax</groupId> <artifactId>javaee-api</artifactId> - <version>6.0</version> + <version>8.0.1</version> <scope>provided</scope> </dependency> <dependency> @@ -116,13 +116,13 @@ <dependency> <groupId>commons-net</groupId> <artifactId>commons-net</artifactId> - <version>1.4.1</version> + <version>3.8.0</version> <scope>provided</scope> </dependency> <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>1.6</version> + <version>1.15</version> <scope>provided</scope> </dependency> <dependency> @@ -137,16 +137,16 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> + <version>3.8.1</version> <configuration> - <source>1.8</source> - <target>1.8</target> + <source>11</source> + <target>11</target> </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>2.9.1</version> + <version>3.3.1</version> <configuration> <tags> <tag> diff --git a/src/main/java/no/nibio/vips/core/VIPSCoreApplication.java b/src/main/java/no/nibio/vips/core/VIPSCoreApplication.java index 52f93d819f72e2923c3eadb005b727137d57d0b6..a459b2ed5078d0c3210dc131fbaebc5b010d7eb4 100755 --- a/src/main/java/no/nibio/vips/core/VIPSCoreApplication.java +++ b/src/main/java/no/nibio/vips/core/VIPSCoreApplication.java @@ -52,6 +52,5 @@ public class VIPSCoreApplication extends Application private void addRestResourceClasses(Set<Class<?>> resources) { resources.add(no.nibio.vips.core.config.JacksonConfig.class); - resources.add(no.nibio.vips.core.service.ModelResourceImpl.class); } } \ No newline at end of file