summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwr148d <wr148d@att.com>2022-02-08 13:20:21 -0500
committerWilliam Reehil <william.reehil@att.com>2022-02-08 18:26:21 +0000
commitff0923c6fd2c3d2165ee8f2767cbea0f20c11b3c (patch)
treec646c604385fd2c8c69427604b1deff9cb374588
parent0a8b452be5f26205d961f12fa87eeab1d7d1bf0c (diff)
[AAI] Attempting to fix a compile run version mismatch in sparky
Issue-ID: AAI-3428 Signed-off-by: wr148d <wr148d@att.com> Change-Id: I0b2678c7bef13e264b323a48767c472494136348 (cherry picked from commit a302d9c89be7b5a879800979afa2fe53a9b988ae)
-rw-r--r--pom.xml3
-rw-r--r--sparkybe-onap-application/pom.xml8
-rw-r--r--sparkybe-onap-service/pom.xml9
-rw-r--r--version.properties2
4 files changed, 13 insertions, 9 deletions
diff --git a/pom.xml b/pom.xml
index b2e5343..0ffa314 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
<groupId>org.onap.aai</groupId>
<artifactId>sparky-be</artifactId>
- <version>2.0.4-SNAPSHOT</version>
+ <version>2.0.3-SNAPSHOT</version>
<packaging>pom</packaging>
<name>aai-sparky-be</name>
@@ -65,6 +65,7 @@
<version>${maven-compiler-plugin.version}</version>
<inherited>true</inherited>
<configuration>
+ <release>${maven-compiler-plugin.source}</release>
<source>${maven-compiler-plugin.source}</source>
<target>${maven-compiler-plugin.target}</target>
<testSource>${maven-compiler-plugin.test.source}</testSource>
diff --git a/sparkybe-onap-application/pom.xml b/sparkybe-onap-application/pom.xml
index 402b521..c115d1c 100644
--- a/sparkybe-onap-application/pom.xml
+++ b/sparkybe-onap-application/pom.xml
@@ -5,16 +5,16 @@
<parent>
<groupId>org.onap.aai</groupId>
<artifactId>sparky-be</artifactId>
- <version>2.0.4-SNAPSHOT</version>
+ <version>2.0.3-SNAPSHOT</version>
</parent>
<groupId>org.onap.aai.sparky-be</groupId>
<artifactId>sparkybe-onap-application</artifactId>
- <version>2.0.4-SNAPSHOT</version>
+ <version>2.0.3-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
- <java.version>1.11</java.version>
+ <java.version>11</java.version>
<frontEndGroupdId>org.onap.aai</frontEndGroupdId>
<frontEndArtifactId>sparky-fe</frontEndArtifactId>
<frontEndVersion>2.0.0</frontEndVersion>
@@ -485,6 +485,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.0</version>
<configuration>
<release>11</release>
</configuration>
@@ -496,6 +497,7 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
+ <version>${spring.boot.version}</version>
<configuration>
<folders>
<folder>
diff --git a/sparkybe-onap-service/pom.xml b/sparkybe-onap-service/pom.xml
index 9d1b311..ef1961e 100644
--- a/sparkybe-onap-service/pom.xml
+++ b/sparkybe-onap-service/pom.xml
@@ -4,16 +4,16 @@
<parent>
<groupId>org.onap.aai</groupId>
<artifactId>sparky-be</artifactId>
- <version>2.0.4-SNAPSHOT</version>
+ <version>2.0.3-SNAPSHOT</version>
</parent>
<groupId>org.onap.aai.sparky-be</groupId>
<artifactId>sparkybe-onap-service</artifactId>
- <version>2.0.4-SNAPSHOT</version>
+ <version>2.0.3-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
- <java.version>1.11</java.version>
+ <java.version>11</java.version>
<frontEndGroupdId>org.onap.aai</frontEndGroupdId>
<frontEndArtifactId>sparky-fe</frontEndArtifactId>
<frontEndVersion>2.0.0</frontEndVersion>
@@ -388,8 +388,9 @@ some of the depedencies should probably have a scope of provided so they don't a
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.0</version>
<configuration>
- <release>11</release>
+ <release>11</release> <!--or <release>10</release>-->
</configuration>
</plugin>
diff --git a/version.properties b/version.properties
index dd10411..9bb11f5 100644
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
major=2
minor=0
-patch=4
+patch=3
base_version=${major}.${minor}.${patch}