|
@@ -15,12 +15,12 @@
|
|
|
|
|
|
<properties>
|
|
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
|
|
- <maven.compiler.source>1.8</maven.compiler.source>
|
|
|
- <maven.compiler.target>1.8</maven.compiler.target>
|
|
|
+ <maven.compiler.source>11</maven.compiler.source>
|
|
|
+ <maven.compiler.target>11</maven.compiler.target>
|
|
|
<activation.version>1.1.1</activation.version>
|
|
|
<commons-cli.version>1.4</commons-cli.version>
|
|
|
<grizzly.version>2.4.4</grizzly.version>
|
|
|
- <hibernate.version>4.3.11.Final</hibernate.version>
|
|
|
+ <hibernate.version>5.4.2.Final</hibernate.version>
|
|
|
<hibernate-jpa-api.version>1.0.0.Final</hibernate-jpa-api.version>
|
|
|
<jackson.version>2.9.8</jackson.version>
|
|
|
<jaxb.version>2.3.0</jaxb.version>
|
|
@@ -36,6 +36,7 @@
|
|
|
<groupId>javax.ws.rs</groupId>
|
|
|
<artifactId>javax.ws.rs-api</artifactId>
|
|
|
<version>2.1</version>
|
|
|
+ <scope>provided</scope>
|
|
|
</dependency>
|
|
|
|
|
|
<dependency>
|
|
@@ -91,7 +92,6 @@
|
|
|
<artifactId>slf4j-simple</artifactId>
|
|
|
<version>1.8.0-beta2</version>
|
|
|
</dependency>
|
|
|
-
|
|
|
<dependency>
|
|
|
<groupId>com.github.spullara.mustache.java</groupId>
|
|
|
<artifactId>compiler</artifactId>
|
|
@@ -126,6 +126,7 @@
|
|
|
<groupId>org.hibernate.javax.persistence</groupId>
|
|
|
<artifactId>hibernate-jpa-2.1-api</artifactId>
|
|
|
<version>${hibernate-jpa-api.version}</version>
|
|
|
+ <scope>provided</scope>
|
|
|
</dependency>
|
|
|
<dependency>
|
|
|
<groupId>mysql</groupId>
|
|
@@ -146,11 +147,32 @@
|
|
|
<groupId>javax.activation</groupId>
|
|
|
<artifactId>activation</artifactId>
|
|
|
<version>${activation.version}</version>
|
|
|
+ <!-- See https://github.com/eclipse-ee4j/jaf/issues/18 for details -->
|
|
|
+ <scope>provided</scope>
|
|
|
</dependency>
|
|
|
</dependencies>
|
|
|
|
|
|
<build>
|
|
|
<finalName>${project.artifactId}</finalName>
|
|
|
+<directory>target</directory>
|
|
|
+<!-- Clean up this before commit -->
|
|
|
+<!-- <outputDirectory>target/classes</outputDirectory>
|
|
|
+ <testOutputDirectory>target/test-classes</testOutputDirectory>
|
|
|
+ <sourceDirectory>src-jersey/main/java</sourceDirectory>
|
|
|
+ <scriptSourceDirectory>src-jersey/main/scripts</scriptSourceDirectory>
|
|
|
+ <testSourceDirectory>src-jersey/test/java</testSourceDirectory>
|
|
|
+ <resources>
|
|
|
+ <resource>
|
|
|
+ <directory>src-jersey/main/resources</directory>
|
|
|
+ </resource>
|
|
|
+ </resources>
|
|
|
+ <testResources>
|
|
|
+ <testResource>
|
|
|
+ <directory>src-jersey/test/resources</directory>
|
|
|
+ </testResource>
|
|
|
+ </testResources> -->
|
|
|
+<!-- Clean up this before commit -->
|
|
|
+
|
|
|
<plugins>
|
|
|
<plugin>
|
|
|
<inherited>true</inherited>
|
|
@@ -188,4 +210,4 @@
|
|
|
</plugin>
|
|
|
</plugins>
|
|
|
</build>
|
|
|
-</project>
|
|
|
+</project>
|