summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJimmy Forsyth <jf2512@att.com>2019-11-22 12:29:41 -0500
committerJimmy Forsyth <jf2512@att.com>2019-11-22 12:29:46 -0500
commitde562b2460f6ce3a935b5c2201a4cd85bed4fc93 (patch)
treeec76aec7fcf8e484f1f84742f7d8e2314f49c233
parente10ce53d4045218e9109c7daaef3b157eac3cb28 (diff)
Explicitly set common release version
Issue-ID: AAI-2724 Signed-off-by: Jimmy Forsyth <jf2512@att.com> Change-Id: I17552f6d1aaed35ae398d743e38e04fef95492f2
-rw-r--r--aai-parent/pom.xml49
1 files changed, 27 insertions, 22 deletions
diff --git a/aai-parent/pom.xml b/aai-parent/pom.xml
index 767d3110..5f9788dc 100644
--- a/aai-parent/pom.xml
+++ b/aai-parent/pom.xml
@@ -24,6 +24,11 @@
</modules>
<properties>
+ <!-- update this just prior to release or figure out something with version.properties -->
+ <aai.release.version>1.6.1-SNAPSHOT</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.0</aai.schema.service.version>
<aaf.version>2.1.15</aaf.version>
<antlr.version>4.7.2</antlr.version>
@@ -76,14 +81,30 @@
<spring.jms.version>4.3.25.RELEASE</spring.jms.version>
<spring.test.version>4.3.25.RELEASE</spring.test.version>
<spring.security.rsa.version>1.0.8.RELEASE</spring.security.rsa.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.0</aai.schema.service.version>
+
</properties>
<dependencyManagement>
<dependencies>
<dependency>
+ <groupId>org.onap.aai.aai-common</groupId>
+ <artifactId>aai-schema-ingest</artifactId>
+ <version>${aai.release.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.onap.aai.aai-common</groupId>
+ <artifactId>aai-core</artifactId>
+ <version>${aai.release.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.onap.aai.aai-common</groupId>
+ <artifactId>aai-annotations</artifactId>
+ <version>${aai.release.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>${jackson.bom.version}</version>
@@ -364,19 +385,7 @@
<version>${gson.version}</version>
</dependency>
- <dependency>
- <groupId>org.onap.aai.aai-common</groupId>
- <artifactId>aai-schema-ingest</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.onap.aai.aai-common</groupId>
- <artifactId>aai-core</artifactId>
- <version>${project.version}</version>
- </dependency>
-
-
+
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
@@ -384,12 +393,6 @@
</dependency>
<dependency>
- <groupId>org.onap.aai.aai-common</groupId>
- <artifactId>aai-annotations</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
<version>${codehaus.jackson.version}</version>
@@ -400,11 +403,13 @@
<artifactId>jersey-core</artifactId>
<version>${jersey.version}</version>
</dependency>
+
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-client</artifactId>
<version>${jersey.version}</version>
</dependency>
+
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-json</artifactId>