Code Review / ccsdk / parent.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Remove staging plugin
[ccsdk/parent.git] / odlparent / client-parent / pom.xml
diff --git a/odlparent/client-parent/pom.xml b/odlparent/client-parent/pom.xml
index c55b8e6..b9de916 100644 (file)
--- a/odlparent/client-parent/pom.xml
+++ b/odlparent/client-parent/pom.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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/maven-v4_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/maven-v4_0_0.xsd">
 
 
        <modelVersion>4.0.0</modelVersion>
        <packaging>pom</packaging>
        <groupId>org.onap.ccsdk.parent</groupId>
        <artifactId>client-parent</artifactId>
-       <version>1.1.0-SNAPSHOT</version>
+       <version>1.3.1-SNAPSHOT</version>
 
        <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
        <url>http://wiki.onap.org</url>
@@ -55,7 +53,7 @@
                <checkstyle.skip>true</checkstyle.skip>
 
                <org.json.version>20170516</org.json.version>
-               <jackson.version>2.8.5</jackson.version>
+               <jackson.version>2.8.9</jackson.version>
                <!-- Need to stick to JUnit 4.11 until https://github.com/jayway/powermock/issues/560 
                        is fixed (either in PowerMock or with a new JUnit release) -->
                <!-- Used everywhere -->
@@ -67,6 +65,17 @@
                <javax.validation.version>2.0.0.Final</javax.validation.version>
                <swagger.version>1.5.16</swagger.version>
 
+               <!-- ONAP repositories -->
+               <onap.nexus.host>nexus.onap.org</onap.nexus.host>
+               <onap.nexus.port>443</onap.nexus.port>
+               <onap.nexus.protocol>https</onap.nexus.protocol>
+               <onap.nexus.public-url>https://nexus.onap.org/content/groups/public</onap.nexus.public-url>
+               <onap.nexus.staging-url>https://nexus.onap.org/content/groups/staging</onap.nexus.staging-url>
+               <onap.nexus.release-url>https://nexus.onap.org/content/repositories/releases</onap.nexus.release-url>
+               <onap.nexus.snapshot-url>https://nexus.onap.org/content/repositories/snapshots</onap.nexus.snapshot-url>
+               <onap.nexus.staging.server-id>ecomp-staging</onap.nexus.staging.server-id>
+               <onap.nexus.staging.profile-id>176c31dfe190a</onap.nexus.staging.profile-id>
+
        </properties>
 
        <dependencies>
@@ -83,10 +92,10 @@
                        <scope>provided</scope>
                </dependency>
                <dependency>
-                   <groupId>com.openpojo</groupId>
-                   <artifactId>openpojo</artifactId>
-                   <version>${openpojo.version}</version>
-                   <scope>test</scope>
+                       <groupId>com.openpojo</groupId>
+                       <artifactId>openpojo</artifactId>
+                       <version>${openpojo.version}</version>
+                       <scope>test</scope>
                </dependency>
                <dependency>
                        <groupId>junit</groupId>
@@ -233,7 +242,7 @@
                        <url>http://maven.restlet.com</url>
                </pluginRepository>
 
-               <pluginRepository>              
+               <pluginRepository>
                        <id>onap-bintray</id>
                        <name>onap-bintray</name>
                        <url>https://nexus.onap.org/content/repositories/bintray/</url>
@@ -325,14 +334,15 @@
        <distributionManagement>
                <repository>
                        <id>ecomp-releases</id>
-                       <url>http://nexus.onap.org/content/repositories/releases</url>
+                       <url>https://nexus.onap.org/content/repositories/releases</url>
                </repository>
                <snapshotRepository>
                        <id>ecomp-snapshots</id>
-                       <url>http://nexus.onap.org/content/repositories/snapshots</url>
+                       <url>https://nexus.onap.org/content/repositories/snapshots</url>
                </snapshotRepository>
        </distributionManagement>
 
+
        <build>
                <pluginManagement>
                        <plugins>
@@ -383,37 +393,37 @@
                                                </execution>
                                        </executions>
                                </plugin>
-                       <plugin>
-                           <artifactId>maven-antrun-plugin</artifactId>
-                           <version>1.8</version>
-                           <executions>
-                               <execution>
-                                   <phase>initialize</phase>
-                                   <goals>
-                                       <goal>run</goal>
-                                   </goals>
-                               </execution>
-                           </executions>
-                           <configuration>
-                               <tasks>
-                                       <!-- flatten out structure -->
-                                   <move todir="${project.build.directory}/dependency" failonerror="false">
-                                       <fileset dir="${project.build.directory}/dependency" />
-                                       <mapper type="flatten"/>
-                                   </move>
-                                   <!-- move to yang folder -->
-                                   <copy todir="${project.build.directory}/yang" failonerror="false">
-                                       <fileset dir="${project.build.directory}/dependency" includes="**/*.yang"/>
-                                       <mapper type="flatten"/>
-                                   </copy>
-                                   <!-- add in hard coded items from src/main/yang -->
-                                   <copy todir="${project.build.directory}/yang" failonerror="false">
-                                       <fileset dir="${project.basedir}/src/main/yang" includes="**/*.yang"/>
-                                       <mapper type="flatten"/>
-                                   </copy>
-                               </tasks>
-                           </configuration>
-                       </plugin>
+                               <plugin>
+                                       <artifactId>maven-antrun-plugin</artifactId>
+                                       <version>1.8</version>
+                                       <executions>
+                                               <execution>
+                                                       <phase>initialize</phase>
+                                                       <goals>
+                                                               <goal>run</goal>
+                                                       </goals>
+                                               </execution>
+                                       </executions>
+                                       <configuration>
+                                               <tasks>
+                                                       <!-- flatten out structure -->
+                                                       <move todir="${project.build.directory}/dependency" failonerror="false">
+                                                               <fileset dir="${project.build.directory}/dependency"/>
+                                                               <mapper type="flatten"/>
+                                                       </move>
+                                                       <!-- move to yang folder -->
+                                                       <copy todir="${project.build.directory}/yang" failonerror="false">
+                                                               <fileset dir="${project.build.directory}/dependency" includes="**/*.yang"/>
+                                                               <mapper type="flatten"/>
+                                                       </copy>
+                                                       <!-- add in hard coded items from src/main/yang -->
+                                                       <copy todir="${project.build.directory}/yang" failonerror="false">
+                                                               <fileset dir="${project.basedir}/src/main/yang" includes="**/*.yang"/>
+                                                               <mapper type="flatten"/>
+                                                       </copy>
+                                               </tasks>
+                                       </configuration>
+                               </plugin>
                                <plugin>
                                        <groupId>org.opendaylight.yangtools</groupId>
                                        <artifactId>yang-maven-plugin</artifactId>
@@ -507,6 +517,23 @@
                        </plugins>
 
                </pluginManagement>
+               <plugins>
+                       <plugin>
+                               <groupId>org.codehaus.mojo</groupId>
+                               <artifactId>versions-maven-plugin</artifactId>
+                               <version>2.5</version>
+                               <configuration>
+                                       <processAllModules>true</processAllModules>
+                               </configuration>
+                       </plugin>
+                       <plugin>
+                               <artifactId>maven-scm-plugin</artifactId>
+                               <version>1.8.1</version>
+                               <configuration>
+                                       <tag>${project.artifactId}-${project.version}</tag>
+                               </configuration>
+                       </plugin>
+               </plugins>
        </build>
        <organization>
                <name>ONAP</name>
Parent POMs to be used by CCSDK clients