Upversion to 1.4.0

Change-Id: I08c91e439a3fab27b52830ada216d57eed356dd9
Issue-ID: AAI-1852
Signed-off-by: Lee, Tian (tl5884) <tianl@amdocs.com>

diff --git a/pom.xml b/pom.xml
index 80e6328..2648b91 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -19,20 +19,21 @@
     limitations under the License.
     ============LICENSE_END=========================================================
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       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.2.0</version>
-               <relativePath/>
+               <version>1.2.1</version>
+               <relativePath />
        </parent>
 
        <groupId>org.onap.aai.model-loader</groupId>
        <artifactId>model-loader</artifactId>
        <name>aai-model-loader</name>
-       <version>1.3.1-SNAPSHOT</version>
+       <version>1.4.0-SNAPSHOT</version>
 
        <dependencyManagement>
                <dependencies>
@@ -54,24 +55,24 @@
                <apache.commons-text.version>1.1</apache.commons-text.version>
                <commons-compress.version>1.18</commons-compress.version>
                <hamcrest-all.version>1.3</hamcrest-all.version>
-               <babel.version>1.2.0</babel.version>
+               <babel.version>1.3.1</babel.version>
                <aai.rest.client.version>1.2.1</aai.rest.client.version>
                <sdc-distribution-client.version>1.3.0</sdc-distribution-client.version>
                <logback.version>1.2.3</logback.version>
        </properties>
 
-    <distributionManagement>
-        <repository>
-            <id>ecomp-releases</id>
-            <name>ECOMP Release Repository</name>
-            <url>${nexusproxy}/content/repositories/releases/</url>
-        </repository>
-        <snapshotRepository>
-            <id>ecomp-snapshots</id>
-            <name>ECOMP Snapshot Repository</name>
-            <url>${nexusproxy}/content/repositories/snapshots/</url>
-        </snapshotRepository>
-    </distributionManagement>
+       <distributionManagement>
+               <repository>
+                       <id>ecomp-releases</id>
+                       <name>ECOMP Release Repository</name>
+                       <url>${nexusproxy}/content/repositories/releases/</url>
+               </repository>
+               <snapshotRepository>
+                       <id>ecomp-snapshots</id>
+                       <name>ECOMP Snapshot Repository</name>
+                       <url>${nexusproxy}/content/repositories/snapshots/</url>
+               </snapshotRepository>
+       </distributionManagement>
 
        <dependencies>
                <dependency>
@@ -122,12 +123,12 @@
                <dependency>
                        <groupId>ch.qos.logback</groupId>
                        <artifactId>logback-classic</artifactId>
-                       <version>${logback.version}</version><!--$NO-MVN-MAN-VER$-->
+                       <version>${logback.version}</version><!--$NO-MVN-MAN-VER$ -->
                </dependency>
                <dependency>
                        <groupId>ch.qos.logback</groupId>
                        <artifactId>logback-core</artifactId>
-                       <version>${logback.version}</version><!--$NO-MVN-MAN-VER$-->
+                       <version>${logback.version}</version><!--$NO-MVN-MAN-VER$ -->
                </dependency>
                <dependency>
                        <groupId>org.onap.sdc.sdc-distribution-client</groupId>
@@ -164,65 +165,65 @@
                        <version>${apache.commons-text.version}</version>
                </dependency>
 
-        <!-- Test dependencies -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-all</artifactId>
-            <version>${hamcrest-all.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
+               <!-- Test dependencies -->
+               <dependency>
+                       <groupId>junit</groupId>
+                       <artifactId>junit</artifactId>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.hamcrest</groupId>
+                       <artifactId>hamcrest-all</artifactId>
+                       <version>${hamcrest-all.version}</version>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.mockito</groupId>
+                       <artifactId>mockito-core</artifactId>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.springframework.boot</groupId>
+                       <artifactId>spring-boot-starter-test</artifactId>
+                       <scope>test</scope>
+               </dependency>
        </dependencies>
 
-    <!-- Plugins and repositories -->
-    <pluginRepositories>
-        <pluginRepository>
-            <id>central</id>
-            <url>http://repo1.maven.org/maven2</url>
-        </pluginRepository>
-        <pluginRepository>
-            <id>EvoSuite</id>
-            <name>EvoSuite Repository</name>
-            <url>http://www.evosuite.org/m2</url>
-        </pluginRepository>
-    </pluginRepositories>
+       <!-- Plugins and repositories -->
+       <pluginRepositories>
+               <pluginRepository>
+                       <id>central</id>
+                       <url>http://repo1.maven.org/maven2</url>
+               </pluginRepository>
+               <pluginRepository>
+                       <id>EvoSuite</id>
+                       <name>EvoSuite Repository</name>
+                       <url>http://www.evosuite.org/m2</url>
+               </pluginRepository>
+       </pluginRepositories>
 
-    <repositories>
-        <repository>
-            <id>central</id>
-            <name>Maven 2 repository 2</name>
-            <url>http://repo2.maven.org/maven2/</url>
-        </repository>
-        <repository>
-            <id>ecomp-releases</id>
-            <name>ECOMP Release Repository</name>
-            <url>${nexusproxy}/content/repositories/releases/</url>
-        </repository>
-        <repository>
-            <id>ecomp-snapshots</id>
-            <name>ECOMP Snapshot Repository</name>
-            <url>${nexusproxy}/content/repositories/snapshots/</url>
-        </repository>
-        <repository>
-            <id>ecomp-staging</id>
-            <name>ECOMP Staging Repository</name>
-            <url>${nexusproxy}/content/repositories/staging/</url>
-        </repository>
-    </repositories>
+       <repositories>
+               <repository>
+                       <id>central</id>
+                       <name>Maven 2 repository 2</name>
+                       <url>http://repo2.maven.org/maven2/</url>
+               </repository>
+               <repository>
+                       <id>ecomp-releases</id>
+                       <name>ECOMP Release Repository</name>
+                       <url>${nexusproxy}/content/repositories/releases/</url>
+               </repository>
+               <repository>
+                       <id>ecomp-snapshots</id>
+                       <name>ECOMP Snapshot Repository</name>
+                       <url>${nexusproxy}/content/repositories/snapshots/</url>
+               </repository>
+               <repository>
+                       <id>ecomp-staging</id>
+                       <name>ECOMP Staging Repository</name>
+                       <url>${nexusproxy}/content/repositories/staging/</url>
+               </repository>
+       </repositories>
 
        <build>
                <finalName>model-loader</finalName>
@@ -272,30 +273,30 @@
                                        </execution>
                                </executions>
                        </plugin>
-            <plugin>
-                <groupId>com.mycila</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <version>3.0</version>
-                <configuration>
-                    <header>License.txt</header>
-                    <includes>
-                        <include>src/main/java/**</include>
-                        <include>src/test/java/**</include>
-                        <include>version/properties</include>
-                        <include>pom.xml</include>
-                    </includes>
-                    <skipExistingHeaders>true</skipExistingHeaders>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <!-- Set goal to "format" to auto update license headers -->
-                            <goal>check</goal>
-                        </goals>
-                        <phase>process-sources</phase>
-                    </execution>
-                </executions>
-            </plugin>
+                       <plugin>
+                               <groupId>com.mycila</groupId>
+                               <artifactId>license-maven-plugin</artifactId>
+                               <version>3.0</version>
+                               <configuration>
+                                       <header>License.txt</header>
+                                       <includes>
+                                               <include>src/main/java/**</include>
+                                               <include>src/test/java/**</include>
+                                               <include>version/properties</include>
+                                               <include>pom.xml</include>
+                                       </includes>
+                                       <skipExistingHeaders>true</skipExistingHeaders>
+                               </configuration>
+                               <executions>
+                                       <execution>
+                                               <goals>
+                                                       <!-- Set goal to "format" to auto update license headers -->
+                                                       <goal>check</goal>
+                                               </goals>
+                                               <phase>process-sources</phase>
+                                       </execution>
+                               </executions>
+                       </plugin>
                        <plugin>
                                <groupId>com.spotify</groupId>
                                <artifactId>docker-maven-plugin</artifactId>

diff --git a/version.properties b/version.properties
index 0680934..ee7bc79 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -24,8 +24,8 @@
 # because they are used in Jenkins, whose plug-in doesn't support
 
 major=1
-minor=3
-patch=1
+minor=4
+patch=0
 
 base_version=${major}.${minor}.${patch}