Merge "JJB alignment across DCAE components - DCAE tca-gen2"

15 files changed, 24 insertions, 24 deletions

diff --git a/dcae-analytics/dcae-analytics-model/pom.xml b/dcae-analytics/dcae-analytics-model/pom.xml
index c227580..b16958a 100644
--- a/dcae-analytics/dcae-analytics-model/pom.xml
+++ b/dcae-analytics/dcae-analytics-model/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
         <artifactId>dcae-analytics</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>dcae-analytics-model</artifactId>
diff --git a/dcae-analytics/dcae-analytics-tca-core/pom.xml b/dcae-analytics/dcae-analytics-tca-core/pom.xml
index a909a67..2099656 100644
--- a/dcae-analytics/dcae-analytics-tca-core/pom.xml
+++ b/dcae-analytics/dcae-analytics-tca-core/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
         <artifactId>dcae-analytics</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>dcae-analytics-tca-core</artifactId>
diff --git a/dcae-analytics/dcae-analytics-tca-model/pom.xml b/dcae-analytics/dcae-analytics-tca-model/pom.xml
index c7e729e..ff5a121 100644
--- a/dcae-analytics/dcae-analytics-tca-model/pom.xml
+++ b/dcae-analytics/dcae-analytics-tca-model/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
         <artifactId>dcae-analytics</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>dcae-analytics-tca-model</artifactId>
diff --git a/dcae-analytics/dcae-analytics-tca-web/pom.xml b/dcae-analytics/dcae-analytics-tca-web/pom.xml
index f511100..5cdfa4a 100644
--- a/dcae-analytics/dcae-analytics-tca-web/pom.xml
+++ b/dcae-analytics/dcae-analytics-tca-web/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
         <artifactId>dcae-analytics</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>dcae-analytics-tca-web</artifactId>
@@ -67,7 +67,7 @@
                     <artifactId>undertow-core</artifactId>
               </exclusion>
             </exclusions>
-            
+
         </dependency>
         <dependency>
             <groupId>io.micrometer</groupId>
@@ -132,7 +132,7 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-    
+
     <build>
         <resources>
             <resource>
diff --git a/dcae-analytics/dcae-analytics-test/pom.xml b/dcae-analytics/dcae-analytics-test/pom.xml
index a66be8d..92f7ff1 100644
--- a/dcae-analytics/dcae-analytics-test/pom.xml
+++ b/dcae-analytics/dcae-analytics-test/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
         <artifactId>dcae-analytics</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>dcae-analytics-test</artifactId>
diff --git a/dcae-analytics/dcae-analytics-web/pom.xml b/dcae-analytics/dcae-analytics-web/pom.xml
index b160604..d331f45 100644
--- a/dcae-analytics/dcae-analytics-web/pom.xml
+++ b/dcae-analytics/dcae-analytics-web/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
         <artifactId>dcae-analytics</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>dcae-analytics-web</artifactId>
diff --git a/dcae-analytics/pom.xml b/dcae-analytics/pom.xml
index 659d099..f332a42 100644
--- a/dcae-analytics/pom.xml
+++ b/dcae-analytics/pom.xml
@@ -23,15 +23,15 @@
          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.dcaegen2.analytics.tca-gen2</groupId>
 		<artifactId>tca-gen2-parent</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 
     <artifactId>dcae-analytics</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>DCAE Analytics Parent</name>
@@ -125,7 +125,7 @@
 
     </properties>
 
-  
+
 
     <dependencyManagement>
 
@@ -248,7 +248,7 @@
                 <artifactId>spring-boot-dependencies</artifactId>
                 <version>${spring.boot.version}</version>
               <exclusions>
-                <exclusion> 
+                <exclusion>
                   <groupId>org.springframework</groupId>
                   <artifactId>spring-web</artifactId>
                 </exclusion>
diff --git a/dcae-analytics/version.properties b/dcae-analytics/version.properties
index 96df429..a449462 100644
--- a/dcae-analytics/version.properties
+++ b/dcae-analytics/version.properties
@@ -16,7 +16,7 @@
 # ============LICENSE_END=========================================================
 #
 #
-major=3
+major=1
 minor=0
 patch=0
 base_version=${major}.${minor}.${patch}
diff --git a/eelf-logger/eelf-logger-api/pom.xml b/eelf-logger/eelf-logger-api/pom.xml
index c7a11ba..e2b923d 100644
--- a/eelf-logger/eelf-logger-api/pom.xml
+++ b/eelf-logger/eelf-logger-api/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
         <artifactId>eelf-logger</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>eelf-logger-api</artifactId>
diff --git a/eelf-logger/eelf-logger-logback-impl/pom.xml b/eelf-logger/eelf-logger-logback-impl/pom.xml
index 0f5f076..4ad669d 100644
--- a/eelf-logger/eelf-logger-logback-impl/pom.xml
+++ b/eelf-logger/eelf-logger-logback-impl/pom.xml
@@ -27,7 +27,7 @@
     <parent>
 		<groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
         <artifactId>eelf-logger</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>eelf-logger-logback-impl</artifactId>
diff --git a/eelf-logger/eelf-logger-model/pom.xml b/eelf-logger/eelf-logger-model/pom.xml
index 991e3b6..8d0faf6 100644
--- a/eelf-logger/eelf-logger-model/pom.xml
+++ b/eelf-logger/eelf-logger-model/pom.xml
@@ -27,7 +27,7 @@
     <parent>
 		<groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
         <artifactId>eelf-logger</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>eelf-logger-model</artifactId>
diff --git a/eelf-logger/pom.xml b/eelf-logger/pom.xml
index 5f09219..8dac573 100644
--- a/eelf-logger/pom.xml
+++ b/eelf-logger/pom.xml
@@ -26,15 +26,15 @@
 	<parent>
 		<groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
 		<artifactId>tca-gen2-parent</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 
     <artifactId>eelf-logger</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
 
     <name>EELF Logger Parent</name>
     <packaging>pom</packaging>
-    
+
     <modules>
         <module>eelf-logger-api</module>
         <module>eelf-logger-model</module>
diff --git a/eelf-logger/version.properties b/eelf-logger/version.properties
index 2e2ac47..f6887cd 100644
--- a/eelf-logger/version.properties
+++ b/eelf-logger/version.properties
@@ -15,7 +15,7 @@
 # ============LICENSE_END=========================================================
 #
 
-major=3
+major=1
 minor=0
 patch=0
 base_version=${major}.${minor}.${patch}
diff --git a/pom.xml b/pom.xml
index 872b6bf..01fe343 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,12 +23,12 @@
     <parent>
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
-        <version>1.2.0</version>
+        <version>2.0.0</version>
     </parent>
 
     <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
     <artifactId>tca-gen2-parent</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
 
     <name>dcaegen2-analytics-tca-gen2</name>
     <packaging>pom</packaging>
diff --git a/version.properties b/version.properties
index 081a54a..2ddebb3 100644
--- a/version.properties
+++ b/version.properties
@@ -1,4 +1,4 @@
-major=3
+major=1
 minor=0
 patch=0
 base_version=${major}.${minor}.${patch}