Update to use released 1.2.2 parent

Update to use released 1.2.2 version of parent poms.

Change-Id: Ieb0d6c5235b9784976b216641f2f51ac0fc867c2
Issue-ID: CCSDK-1222
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>

diff --git a/ms/neng/.classpath b/ms/neng/.classpath
index 760fe4a..5b4ecf9 100644 (file)
--- a/ms/neng/.classpath
+++ b/ms/neng/.classpath
@@ -1,30 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry kind="src" output="target-ide/classes" path="src/main/java">
+       <classpathentry kind="src" output="target/classes" path="src/main/java">
                <attributes>
                        <attribute name="optional" value="true"/>
                        <attribute name="maven.pomderived" value="true"/>
                </attributes>
        </classpathentry>
-       <classpathentry excluding="**" kind="src" output="target-ide/classes" path="opt/etc/config">
+       <classpathentry excluding="**" kind="src" output="target/classes" path="opt/etc/config">
                <attributes>
                        <attribute name="maven.pomderived" value="true"/>
                </attributes>
        </classpathentry>
-       <classpathentry excluding="**" kind="src" output="target-ide/classes" path="src/main/resources">
+       <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
                <attributes>
                        <attribute name="maven.pomderived" value="true"/>
                </attributes>
        </classpathentry>
-       <classpathentry kind="src" output="target-ide/test-classes" path="src/test/java">
+       <classpathentry kind="src" output="target/test-classes" path="src/test/java">
                <attributes>
                        <attribute name="optional" value="true"/>
                        <attribute name="maven.pomderived" value="true"/>
+                       <attribute name="test" value="true"/>
                </attributes>
        </classpathentry>
-       <classpathentry excluding="**" kind="src" output="target-ide/test-classes" path="src/test/resources">
+       <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
                <attributes>
                        <attribute name="maven.pomderived" value="true"/>
+                       <attribute name="test" value="true"/>
                </attributes>
        </classpathentry>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
@@ -42,5 +44,11 @@
                        <attribute name="optional" value="true"/>
                </attributes>
        </classpathentry>
-       <classpathentry kind="output" path="target-ide/classes"/>
+       <classpathentry kind="src" output="target/test-classes" path=".apt_generated_tests">
+               <attributes>
+                       <attribute name="optional" value="true"/>
+                       <attribute name="test" value="true"/>
+               </attributes>
+       </classpathentry>
+       <classpathentry kind="output" path="target/classes"/>
 </classpath>

diff --git a/ms/neng/.settings/org.eclipse.jdt.core.prefs b/ms/neng/.settings/org.eclipse.jdt.core.prefs
index 78b2bfc..21227d9 100644 (file)
--- a/ms/neng/.settings/org.eclipse.jdt.core.prefs
+++ b/ms/neng/.settings/org.eclipse.jdt.core.prefs
@@ -3,4 +3,5 @@ org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.processAnnotations=enabled
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8

diff --git a/ms/neng/pom.xml b/ms/neng/pom.xml
index 30376e5..0efcc3c 100644 (file)
--- a/ms/neng/pom.xml
+++ b/ms/neng/pom.xml
@@ -243,7 +243,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>spring-boot-1-starter-parent</artifactId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.2.2</version>
         <relativePath/>
     </parent>
 

diff --git a/ms/vlantag-api/pom.xml b/ms/vlantag-api/pom.xml
index ea18424..05e1965 100644 (file)
--- a/ms/vlantag-api/pom.xml
+++ b/ms/vlantag-api/pom.xml
@@ -40,7 +40,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.2.2</version>
         <relativePath/>
     </parent>
 

diff --git a/pom.xml b/pom.xml
index 692259b..5288cc1 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.2.2</version>
         <relativePath/>
     </parent>