summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJimmy Forsyth <jf2512@att.com>2019-05-31 14:08:12 -0400
committerJimmy Forsyth <jf2512@att.com>2019-05-31 17:06:50 -0400
commit2f81c9e500cc5d260a66ea70de8397d0c824f67e (patch)
tree82202935e9eea73334719e6aa2dea9d22fc457ba
parent5084077a52ad93e7a0e4463d0c4fd81a036ccb3c (diff)
Move to oparent and upversion to 1.5.01.5.0
Issue-ID: AAI-2464 Change-Id: I961491c316ad0bc135eff43b8c5ed8ff0686ca5c Signed-off-by: Jimmy Forsyth <jf2512@att.com>
-rw-r--r--aai-annotations/pom.xml4
-rw-r--r--aai-auth/pom.xml4
-rw-r--r--aai-core/pom.xml45
-rw-r--r--aai-rest/pom.xml4
-rw-r--r--aai-schema-ingest/pom.xml27
-rw-r--r--aai-utils/pom.xml4
-rw-r--r--pom.xml4
-rw-r--r--version.properties4
8 files changed, 65 insertions, 31 deletions
diff --git a/aai-annotations/pom.xml b/aai-annotations/pom.xml
index 9c66f60b..60911057 100644
--- a/aai-annotations/pom.xml
+++ b/aai-annotations/pom.xml
@@ -27,12 +27,12 @@
<parent>
<groupId>org.onap.aai.aai-common</groupId>
<artifactId>aai-common</artifactId>
- <version>1.4.4-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<artifactId>aai-annotations</artifactId>
<name>aai-annotations</name>
<packaging>jar</packaging>
- <version>1.4.4-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
<properties>
<onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
</properties>
diff --git a/aai-auth/pom.xml b/aai-auth/pom.xml
index 72e9fd6d..79b9c25f 100644
--- a/aai-auth/pom.xml
+++ b/aai-auth/pom.xml
@@ -26,11 +26,11 @@
<parent>
<groupId>org.onap.aai.aai-common</groupId>
<artifactId>aai-common</artifactId>
- <version>1.4.4-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<artifactId>aai-auth</artifactId>
<name>aai-auth</name>
- <version>1.4.4-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
<properties>
<onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
diff --git a/aai-core/pom.xml b/aai-core/pom.xml
index 3f65e277..3e5151de 100644
--- a/aai-core/pom.xml
+++ b/aai-core/pom.xml
@@ -27,13 +27,14 @@
<parent>
<groupId>org.onap.aai.aai-common</groupId>
<artifactId>aai-common</artifactId>
- <version>1.4.4-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<artifactId>aai-core</artifactId>
<name>aai-core</name>
- <version>1.4.4-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
+ <springframework.version>4.3.24.RELEASE</springframework.version>
<sonar.language>java</sonar.language>
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
<sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
@@ -74,6 +75,7 @@
<profile>
<id>onap</id>
<properties>
+ <springframework.version>4.3.24.RELEASE</springframework.version>
<aai.release>onap</aai.release>
<schema.configuration.location>N/A</schema.configuration.location>
<schema.nodes.location>aai-schema/src/main/resources/${aai.release}/oxm</schema.nodes.location>
@@ -288,16 +290,6 @@
<version>1.1.1</version>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- <version>4.3.21.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>4.3.21.RELEASE</version>
- </dependency>
- <dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.2.11</version>
@@ -443,10 +435,35 @@
<version>${groovy.version}</version>
<classifier>indy</classifier>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${springframework.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>${springframework.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>${springframework.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-expression</artifactId>
+ <version>${springframework.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ <version>${springframework.version}</version>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
- <version>4.3.21.RELEASE</version>
+ <version>${springframework.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -486,7 +503,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jms</artifactId>
- <version>4.3.21.RELEASE</version>
+ <version>${springframework.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
diff --git a/aai-rest/pom.xml b/aai-rest/pom.xml
index 16430ec8..7f0c06bc 100644
--- a/aai-rest/pom.xml
+++ b/aai-rest/pom.xml
@@ -29,11 +29,11 @@
<parent>
<groupId>org.onap.aai.aai-common</groupId>
<artifactId>aai-common</artifactId>
- <version>1.4.4-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<artifactId>aai-rest</artifactId>
<name>aai-rest</name>
- <version>1.4.4-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
<properties>
<onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
diff --git a/aai-schema-ingest/pom.xml b/aai-schema-ingest/pom.xml
index 749b5c0d..7b1c2165 100644
--- a/aai-schema-ingest/pom.xml
+++ b/aai-schema-ingest/pom.xml
@@ -25,16 +25,17 @@
<parent>
<groupId>org.onap.aai.aai-common</groupId>
<artifactId>aai-common</artifactId>
- <version>1.4.4-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<artifactId>aai-schema-ingest</artifactId>
<name>aai-schema-ingest</name>
- <version>1.4.4-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
<eelf.core.version>1.0.1-oss</eelf.core.version>
<httpclient.version>4.5.5</httpclient.version>
+ <springframework.version>4.3.24.RELEASE</springframework.version>
</properties>
<build>
<plugins>
@@ -57,6 +58,7 @@
</plugin>
</plugins>
</build>
+
<dependencies>
<dependency>
<groupId>org.eclipse.persistence</groupId>
@@ -103,12 +105,27 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>4.3.21.RELEASE</version>
+ <version>${springframework.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>4.3.21.RELEASE</version>
+ <version>${springframework.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>${springframework.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-expression</artifactId>
+ <version>${springframework.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ <version>${springframework.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -123,7 +140,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
- <version>4.3.21.RELEASE</version>
+ <version>${springframework.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/aai-utils/pom.xml b/aai-utils/pom.xml
index 0be87e9b..c7872ebf 100644
--- a/aai-utils/pom.xml
+++ b/aai-utils/pom.xml
@@ -29,11 +29,11 @@
<parent>
<groupId>org.onap.aai.aai-common</groupId>
<artifactId>aai-common</artifactId>
- <version>1.4.4-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<artifactId>aai-utils</artifactId>
<name>aai-utils</name>
- <version>1.4.4-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
<properties>
<onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
diff --git a/pom.xml b/pom.xml
index 3bd33bc9..2378d3de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,12 +25,12 @@
<parent>
<groupId>org.onap.oparent</groupId>
<artifactId>oparent</artifactId>
- <version>1.1.0</version>
+ <version>2.0.0</version>
</parent>
<groupId>org.onap.aai.aai-common</groupId>
<artifactId>aai-common</artifactId>
- <version>1.4.4-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>aai-aai-common</name>
<description>Contains all of the common code for resources and traversal repos</description>
diff --git a/version.properties b/version.properties
index afb781d9..b11eaff1 100644
--- a/version.properties
+++ b/version.properties
@@ -4,8 +4,8 @@
# because they are used in Jenkins, whose plug-in doesn't support
major_version=1
-minor_version=4
-patch_version=4
+minor_version=5
+patch_version=0
base_version=${major_version}.${minor_version}.${patch_version}