aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHOCKLA <ah999m@att.com>2019-12-18 08:57:22 -0600
committerPamela Dragosh <pdragosh@research.att.com>2020-01-14 01:01:37 +0000
commit3e87a45998d81b3f858bb170a7f1998d73cc6f79 (patch)
tree244ee07f9fbcd03343da4429218eca698c61c660
parentc73f78ef267ec0bb4552cdaf74f0a42e8078e2ee (diff)
JDK 11 upgrades
Pointed to upgraded policy/parent and policy/common Issue-ID: POLICY-1582 Change-Id: I66bb6e2c103147916b6b284e594db1c24434e0ba Signed-off-by: HOCKLA <ah999m@att.com>
-rw-r--r--pom.xml31
1 files changed, 27 insertions, 4 deletions
diff --git a/pom.xml b/pom.xml
index 50e2e33b..7fd1404a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.onap.policy.parent</groupId>
<artifactId>integration</artifactId>
- <version>3.1.0</version>
+ <version>3.1.1-SNAPSHOT</version>
<relativePath />
</parent>
@@ -47,8 +47,8 @@
<sonar.jacoco.itReportPath>${project.basedir}/../target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
- <policy.common.version>1.6.1</policy.common.version>
- <policy.models.version>2.2.0-SNAPSHOT</policy.models.version>
+ <policy.common.version>1.6.2-SNAPSHOT</policy.common.version>
+ <policy.models.version>2.2.1-SNAPSHOT</policy.models.version>
</properties>
<modules>
@@ -72,6 +72,29 @@
<artifactId>policy-endpoints</artifactId>
<version>${policy.common.version}</version>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-security</artifactId>
+ <version>9.4.25.v20191220</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jersey.containers</groupId>
+ <artifactId>jersey-container-servlet</artifactId>
+ <version>${version.jersey}</version>
+ </dependency>
</dependencies>
<distributionManagement>
@@ -123,7 +146,7 @@
with minor changes -->
<configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
<!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory -->
- <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+ <sourceDirectories>${project.build.sourceDirectory}</sourceDirectories>
<includeResources>true</includeResources>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<includeTestResources>true</includeTestResources>