summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichaelArrastia <MArrasti@amdocs.com>2018-03-23 10:28:15 +0000
committerMichaelArrastia <MArrasti@amdocs.com>2018-03-23 10:28:15 +0000
commitf20d0f04997dd07a94cab89dabec36b76f970e37 (patch)
treecd66b50f7b7254701d943ac3be3579e0354610a3
parent985b15821e37a82d90ca8939058f0a197558c3a1 (diff)
Add maven deploy and nexus staging plugins
Fix merge job which is failing with authorisation error. Issue-ID: AAI-927 Change-Id: Ibbf969de8d4d9d8238f8385a0c3d074887ef56dc Signed-off-by: MichaelArrastia <MArrasti@amdocs.com>
-rw-r--r--champ-lib/pom.xml56
-rw-r--r--champ-service/pom.xml13
2 files changed, 47 insertions, 22 deletions
diff --git a/champ-lib/pom.xml b/champ-lib/pom.xml
index e6dd2f3..18070dd 100644
--- a/champ-lib/pom.xml
+++ b/champ-lib/pom.xml
@@ -55,21 +55,21 @@ limitations under the License.
<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>
- <artifactId>event-client-dmaap</artifactId>
- <version>${event.client.version}</version>
- </dependency>
- <dependency>
- <groupId>org.onap.aai.event-client</groupId>
- <artifactId>event-client-kafka</artifactId>
- <version>${event.client.version}</version>
- </dependency>
+ <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>
+ <artifactId>event-client-dmaap</artifactId>
+ <version>${event.client.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.onap.aai.event-client</groupId>
+ <artifactId>event-client-kafka</artifactId>
+ <version>${event.client.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -271,7 +271,29 @@ limitations under the License.
</systemPropertyVariables>
</configuration>
</plugin>
- <!--
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>2.8.2</version>
+ <executions>
+ <execution>
+ <id>default-deploy</id>
+ <phase>none</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.sonatype.plugins</groupId>
+ <artifactId>nexus-staging-maven-plugin</artifactId>
+ <version>1.6.7</version>
+ <extensions>true</extensions>
+ <configuration>
+ <nexusUrl>${onap.nexus.url}</nexusUrl>
+ <stagingProfileId>176c31dfe190a</stagingProfileId>
+ <serverId>ecomp-staging</serverId>
+ </configuration>
+ </plugin>
+ <!--
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
@@ -302,7 +324,7 @@ limitations under the License.
</execution>
</executions>
</plugin>
- -->
+ -->
</plugins>
</build>
</project>
diff --git a/champ-service/pom.xml b/champ-service/pom.xml
index 1717648..6ca7d00 100644
--- a/champ-service/pom.xml
+++ b/champ-service/pom.xml
@@ -61,13 +61,13 @@ limitations under the License.
<version>1.18.6</version>
</dependency>
- <!-- AJSC Dependencies -->
<dependency>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
<version>1.6.1</version>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>com.att.aft</groupId>
<artifactId>dme2</artifactId>
@@ -75,7 +75,6 @@ limitations under the License.
<scope>provided</scope>
</dependency>
- <!--Adding this dependency explicit.-->
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
@@ -124,7 +123,6 @@ limitations under the License.
<version>${org.apache.httpcomponents.httpclient.version}</version>
</dependency>
- <!-- Champ graph database library. -->
<dependency>
<groupId>org.onap.aai</groupId>
<artifactId>champ-core</artifactId>
@@ -191,7 +189,13 @@ limitations under the License.
</execution>
</executions>
</plugin>
-
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
<!--
<plugin>
<groupId>com.mycila</groupId>
@@ -228,7 +232,6 @@ limitations under the License.
<forceTags>true</forceTags>
</configuration>
</plugin>
-
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>