Merge "Remove broken not used code"

diff --git a/champ-lib/champ-core/pom.xml b/champ-lib/champ-core/pom.xml
index 459a1f3..7315c16 100644 (file)
--- a/champ-lib/champ-core/pom.xml
+++ b/champ-lib/champ-core/pom.xml
@@ -25,11 +25,12 @@ limitations under the License.
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.aai</groupId>
+        <groupId>org.onap.aai.champ</groupId>
         <artifactId>champ-lib</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
     </parent>
 
+    <groupId>org.onap.aai.champ.champ-lib</groupId>
     <artifactId>champ-core</artifactId>
 
     <dependencies>

diff --git a/champ-lib/champ-janus/pom.xml b/champ-lib/champ-janus/pom.xml
index b316c27..10f0d99 100644 (file)
--- a/champ-lib/champ-janus/pom.xml
+++ b/champ-lib/champ-janus/pom.xml
@@ -25,11 +25,12 @@ limitations under the License.
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.aai</groupId>
+        <groupId>org.onap.aai.champ</groupId>
         <artifactId>champ-lib</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
     </parent>
 
+    <groupId>org.onap.aai.champ.champ-lib</groupId>
     <artifactId>champ-janus</artifactId>
 
     <properties>
@@ -44,15 +45,15 @@ limitations under the License.
         </dependency>
 
         <dependency>
-            <groupId>org.onap.aai</groupId>
+            <groupId>org.onap.aai.champ.champ-lib</groupId>
             <artifactId>champ-core</artifactId>
-            <version>1.2.0-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.onap.aai</groupId>
+            <groupId>org.onap.aai.champ.champ-lib</groupId>
             <artifactId>champ-core</artifactId>
-            <version>1.2.0-SNAPSHOT</version>
+            <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>

diff --git a/champ-lib/champ-titan/pom.xml b/champ-lib/champ-titan/pom.xml
index 05d862c..80ca481 100644 (file)
--- a/champ-lib/champ-titan/pom.xml
+++ b/champ-lib/champ-titan/pom.xml
@@ -24,11 +24,12 @@ limitations under the License.
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
+        <groupId>org.onap.aai.champ</groupId>
         <artifactId>champ-lib</artifactId>
-        <groupId>org.onap.aai</groupId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
     </parent>
 
+    <groupId>org.onap.aai.champ.champ-lib</groupId>
     <artifactId>champ-titan</artifactId>
 
     <properties>
@@ -43,15 +44,15 @@ limitations under the License.
         </dependency>
 
         <dependency>
-            <groupId>org.onap.aai</groupId>
+            <groupId>org.onap.aai.champ.champ-lib</groupId>
             <artifactId>champ-core</artifactId>
-            <version>1.2.0-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.onap.aai</groupId>
+            <groupId>org.onap.aai.champ.champ-lib</groupId>
             <artifactId>champ-core</artifactId>
-            <version>1.2.0-SNAPSHOT</version>
+            <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>

diff --git a/champ-lib/pom.xml b/champ-lib/pom.xml
index d69f971..56e1f17 100644 (file)
--- a/champ-lib/pom.xml
+++ b/champ-lib/pom.xml
@@ -25,9 +25,10 @@ limitations under the License.
     <parent>
         <groupId>org.onap.aai</groupId>
         <artifactId>champ</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
     </parent>
 
+    <groupId>org.onap.aai.champ</groupId>
     <artifactId>champ-lib</artifactId>
     <packaging>pom</packaging>
 

diff --git a/champ-service-deps-janus/pom.xml b/champ-service-deps-janus/pom.xml
index 9b1dd5e..53c513d 100644 (file)
--- a/champ-service-deps-janus/pom.xml
+++ b/champ-service-deps-janus/pom.xml
@@ -25,17 +25,18 @@ limitations under the License.
     <parent>
         <groupId>org.onap.aai</groupId>
         <artifactId>champ</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
     </parent>
 
+    <groupId>org.onap.aai.champ</groupId>
     <artifactId>champ-service-deps-janus</artifactId>
     <packaging>pom</packaging>
 
     <dependencies>
         <dependency>
-            <groupId>org.onap.aai</groupId>
+            <groupId>org.onap.aai.champ.champ-lib</groupId>
             <artifactId>champ-janus</artifactId>
-            <version>1.2.0-SNAPSHOT</version>
+            <version>${project.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>ch.qos.logback</groupId>

diff --git a/champ-service-deps-titan/pom.xml b/champ-service-deps-titan/pom.xml
index 749425c..0ed7581 100644 (file)
--- a/champ-service-deps-titan/pom.xml
+++ b/champ-service-deps-titan/pom.xml
@@ -25,17 +25,18 @@ limitations under the License.
     <parent>
         <groupId>org.onap.aai</groupId>
         <artifactId>champ</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
     </parent>
 
+    <groupId>org.onap.aai.champ</groupId>
     <artifactId>champ-service-deps-titan</artifactId>
     <packaging>pom</packaging>
 
     <dependencies>
         <dependency>
-            <groupId>org.onap.aai</groupId>
+            <groupId>org.onap.aai.champ.champ-lib</groupId>
             <artifactId>champ-titan</artifactId>
-            <version>1.2.0-SNAPSHOT</version>
+            <version>${project.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>ch.qos.logback</groupId>
@@ -288,4 +289,4 @@ limitations under the License.
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>

diff --git a/champ-service/pom.xml b/champ-service/pom.xml
index b5294e3..7286874 100644 (file)
--- a/champ-service/pom.xml
+++ b/champ-service/pom.xml
@@ -24,18 +24,17 @@ limitations under the License.
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.oparent</groupId>
-        <artifactId>oparent</artifactId>
-        <version>1.1.0</version>
+        <groupId>org.onap.aai</groupId>
+        <artifactId>champ</artifactId>
+        <version>1.3.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.onap.aai</groupId>
+    <groupId>org.onap.aai.champ</groupId>
     <artifactId>champ-service</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
-    <name>champ</name>
 
     <properties>
         <docker.location>${basedir}/target</docker.location>
+        <docker.name>champ</docker.name>
         <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
         <common.logging.groupid>org.onap.aai.logging-service</common.logging.groupid>
         <common.logging.version>1.2.2</common.logging.version>
@@ -160,9 +159,9 @@ limitations under the License.
         </dependency>
 
         <dependency>
-            <groupId>org.onap.aai</groupId>
+            <groupId>org.onap.aai.champ.champ-lib</groupId>
             <artifactId>champ-core</artifactId>
-            <version>1.2.0-SNAPSHOT</version>
+            <version>${project.version}</version>
             <scope>compile</scope>
             <exclusions>
                 <exclusion>
@@ -290,22 +289,6 @@ limitations under the License.
                 </executions>
             </plugin>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                 <groupId>org.sonatype.plugins</groupId>
-                 <artifactId>nexus-staging-maven-plugin</artifactId>
-                 <configuration>
-                     <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
-                 </configuration>
-            </plugin>
-
             <plugin>
                 <groupId>com.mycila</groupId>
                 <artifactId>license-maven-plugin</artifactId>
@@ -337,7 +320,7 @@ limitations under the License.
                 <configuration>
                     <verbose>true</verbose>
                     <serverId>docker-hub</serverId>
-                    <imageName>${docker.push.registry}/onap/${project.name}</imageName>
+                    <imageName>${docker.push.registry}/onap/${docker.name}</imageName>
                     <dockerDirectory>${docker.location}</dockerDirectory>
                     <imageTags>
                         <imageTag>latest</imageTag>
@@ -345,6 +328,21 @@ limitations under the License.
                     <forceTags>true</forceTags>
                 </configuration>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <groupId>org.sonatype.plugins</groupId>
+                <artifactId>nexus-staging-maven-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-site-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>

diff --git a/pom.xml b/pom.xml
index 0b302ab..0cb6c58 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -22,11 +22,17 @@ limitations under the License.
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
+    <parent>
+        <groupId>org.onap.oparent</groupId>
+        <artifactId>oparent</artifactId>
+        <version>1.1.0</version>
+    </parent>
+
     <groupId>org.onap.aai</groupId>
     <artifactId>champ</artifactId>
     <name>aai-champ</name>
     <packaging>pom</packaging>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
 
     <properties>
         <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
@@ -40,13 +46,20 @@ limitations under the License.
         <module>champ-service</module>
     </modules>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>org.onap.aai.event-client</groupId>
-                <artifactId>event-client-api</artifactId>
-                <version>${event.client.version}</version>
-            </dependency>
 
             <dependency>
                 <groupId>org.onap.aai.event-client</groupId>
@@ -165,4 +178,4 @@ limitations under the License.
         </snapshotRepository>
     </distributionManagement>
 
-</project>
\ No newline at end of file
+</project>

diff --git a/version.properties b/version.properties
index 9c95207..51e1781 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
 # because they are used in Jenkins, whose plug-in doesn't support
 
 major_version=1
-minor_version=2
+minor_version=3
 patch_version=0
 
 base_version=${major_version}.${minor_version}.${patch_version}