<?xml version="1.0" encoding="UTF-8"?>
<!--
- ============LICENSE_START======================================================
- org.onap.aai
- ===============================================================================
- Copyright © 2019 AT&T Intellectual Property. All rights reserved.
- ===============================================================================
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+============LICENSE_START======================================================
+org.onap.aai
+===============================================================================
+Copyright © 2019 AT&T Intellectual Property. All rights reserved.
+===============================================================================
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
===========LICENSE_END=========================================================
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.onap.aai.aai-common</groupId>
<artifactId>aai-common</artifactId>
- <version>1.6.10-SNAPSHOT</version>
+ <version>1.8.2</version>
</parent>
<artifactId>aai-parent</artifactId>
<name>aai-parent</name>
<aai.release.version>${aai.common.version}</aai.release.version>
<aai.common.logging.version>1.5.1</aai.common.logging.version>
<aai.rest.client.version>1.5.1</aai.rest.client.version>
- <aai.schema.service.version>1.6.4</aai.schema.service.version>
+ <aai.schema.service.version>1.7.3</aai.schema.service.version>
<aaf.version>2.1.15</aaf.version>
<antlr.version>4.7.2</antlr.version>
<jackson.bom.version>2.10.1</jackson.bom.version>
<janusgraph.version>0.2.3</janusgraph.version>
<javatuples.version>1.2</javatuples.version>
- <jaxb.version>2.2.12</jaxb.version>
+ <jaxb.version>2.3.1</jaxb.version>
+ <old.jaxb.version>2.3.0.1</old.jaxb.version>
<jaxrs.version>2.0.1</jaxrs.version>
<jcommander.version>1.78</jcommander.version>
<jersey.version>1.19.4</jersey.version>
<slf4j.version>1.7.25</slf4j.version>
<log4j.version>1.2.17</log4j.version>
<mockito.all.version>1.10.19</mockito.all.version>
- <mockito.core.version>2.15.0</mockito.core.version>
+ <mockito.core.version>1.10.19</mockito.core.version>
<netty.handler.version>4.1.43.Final</netty.handler.version>
<netty.version>4.0.56.Final</netty.version>
<opencsv.version>3.1</opencsv.version>
<reflections.version>0.9.10</reflections.version>
<snakeyaml.version>1.25</snakeyaml.version>
- <spring.boot.version>1.5.22.RELEASE</spring.boot.version>
+ <spring.boot.version>2.1.12.RELEASE</spring.boot.version>
<javax.servlet.version>3.1.0</javax.servlet.version>
<javax.annotation.version>1.2</javax.annotation.version>
- <sonar.jacoco.reportPath />
+ <sonar.jacoco.reportPath />
<sonar.jacoco.itReportPath />
<sonar.jacoco.reportMissing.force.zero />
<sonar.scanner.version>3.7.0.1746</sonar.scanner.version>
- <spring.version>4.3.25.RELEASE</spring.version>
- <spring.jms.version>4.3.25.RELEASE</spring.jms.version>
- <spring.test.version>4.3.25.RELEASE</spring.test.version>
+ <spring.version>5.1.13.RELEASE</spring.version>
+ <spring.jms.version>5.1.13.RELEASE</spring.jms.version>
+ <spring.test.version>5.1.13.RELEASE</spring.test.version>
<spring.security.rsa.version>1.0.8.RELEASE</spring.security.rsa.version>
<json.simple.version>1.1.1</json.simple.version>
<powermock.api.mockito2.version>2.0.4</powermock.api.mockito2.version>
<profiles>
<profile>
<id>spring-boot-2-1</id>
+ <properties>
+ <spring.boot.version>2.1.12.RELEASE</spring.boot.version>
+ </properties>
+ </profile>
+ <profile>
+ <id>spring-boot-1-5</id>
<properties>
<spring.boot.version>1.5.22.RELEASE</spring.boot.version>
</properties>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>${javax.annotation.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-xjc</artifactId>
- <version>${jaxb.version}</version>
+ <version>${old.jaxb.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${old.jaxb.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-core</artifactId>
+ <version>${old.jaxb.version}</version>
</dependency>
<dependency>
Code Review / aai / aai-common.git / blobdiff