aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Smokowski <ss835w@att.com>2017-02-13 14:24:14 -0500
committerSteve Smokowski <ss835w@att.com>2017-02-13 14:24:23 -0500
commit7a31a9412827dac614aba492c504cb02a3dc6da0 (patch)
tree8dff8d511b14741925158bbbb635d3b6bcf5488c
parent4c790f64daf7822de00405140d17e08f296a642f (diff)
Modify pom files
Change-Id: I403d09ebd553266fa657520914a3f2ca942a931b Signed-off-by: Steve Smokowski <ss835w@att.com>
-rw-r--r--.gitreview4
-rw-r--r--aai-schema/pom.xml16
-rw-r--r--ajsc-aai/pom.xml40
-rw-r--r--annotations/pom.xml16
-rw-r--r--pom.xml49
5 files changed, 98 insertions, 27 deletions
diff --git a/.gitreview b/.gitreview
new file mode 100644
index 0000000..8cb2236
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,4 @@
+[gerrit]
+host=gerrit.openecomp.org
+port=29418
+project=aai/aai-service.git
diff --git a/aai-schema/pom.xml b/aai-schema/pom.xml
index e6afc4f..6a7b9bb 100644
--- a/aai-schema/pom.xml
+++ b/aai-schema/pom.xml
@@ -89,4 +89,20 @@
</plugin>
</plugins>
</build>
+ <distributionManagement>
+ <repository>
+ <id>ecomp-releases</id>
+ <name>ECOMP Release Repository</name>
+ <url>https://nexus.openecomp.org/content/repositories/releases/</url>
+ </repository>
+ <snapshotRepository>
+ <id>ecomp-snapshots</id>
+ <name>ECOMP Snapshot Repository</name>
+ <url>https://nexus.openecomp.org/content/repositories/snapshots/</url>
+ </snapshotRepository>
+ <site>
+ <id>ecomp-javadoc</id>
+ <url>dav:https://ecomp-nexus:8443/repository/aai/logging-service-javadoc/${project.version}</url>
+ </site>
+ </distributionManagement>
</project>
diff --git a/ajsc-aai/pom.xml b/ajsc-aai/pom.xml
index 950ce05..365260b 100644
--- a/ajsc-aai/pom.xml
+++ b/ajsc-aai/pom.xml
@@ -13,10 +13,7 @@
<properties>
<dockerLocation>${basedir}/target/swm/package/nix/dist_files/</dockerLocation>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <docker.login></docker.login>
- <docker.password></docker.password>
- <docker.registry>${docker_registry}</docker.registry>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
<dependencies>
<!-- AJSC related dependencies -->
@@ -32,9 +29,6 @@
<scope>provided</scope>
</dependency>
- <!-- For dom4j dependency ONLY! - If deploying to CSI env, remove "provided"
- scope. In CSI env, this jar MUST be included within service project's swm
- package -->
<dependency>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
@@ -47,8 +41,7 @@
<version>2.6</version>
</dependency>
- <!-- eelf dependency -->
-<dependency>
+ <dependency>
<groupId>com.att.eelf</groupId>
<artifactId>eelf-core</artifactId>
<version>0.0.1</version>
@@ -78,15 +71,12 @@
<version>1.1.7</version>
</dependency>
-
<dependency>
<groupId>org.codehaus.janino</groupId>
<artifactId>janino</artifactId>
<version>2.7.8</version>
</dependency>
-
-
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
@@ -96,13 +86,7 @@
<artifactId>commons-collections</artifactId>
</dependency>
- <dependency>
- <groupId>jdk.tools</groupId>
- <artifactId>jdk.tools</artifactId>
- <version>1.8.0_101</version>
- <scope>system</scope>
- <systemPath>${JAVA_HOME}/lib/tools.jar</systemPath>
- </dependency>
+
<dependency>
<groupId>junit</groupId>
@@ -402,15 +386,10 @@
<version>0.4.11</version>
<configuration>
<verbose>true</verbose>
- <registry>${docker.registry}</registry>
- <authConfig>
- <username>${docker.login}</username>
- <password>${docker.password}</password>
- </authConfig>
- <imageName>${docker.registry}/${project.artifactId}</imageName>
+
+ <imageName>${docker.push.registry}/${project.artifactId}</imageName>
<dockerDirectory>${dockerLocation}</dockerDirectory>
- <serverId>docker-hub</serverId>
- <registryUrl>http://${docker.registry}</registryUrl>
+ <serverId>docker-hub</serverId>
<imageTags>
<imageTag>${docker_imageversion}</imageTag>
<imageTag>latest</imageTag>
@@ -583,6 +562,13 @@
</systemPropertyVariables>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
<profiles>
diff --git a/annotations/pom.xml b/annotations/pom.xml
index 92cf2a0..32c9e62 100644
--- a/annotations/pom.xml
+++ b/annotations/pom.xml
@@ -80,4 +80,20 @@
</plugin>
</plugins>
</build>
+ <distributionManagement>
+ <repository>
+ <id>ecomp-releases</id>
+ <name>ECOMP Release Repository</name>
+ <url>https://nexus.openecomp.org/content/repositories/releases/</url>
+ </repository>
+ <snapshotRepository>
+ <id>ecomp-snapshots</id>
+ <name>ECOMP Snapshot Repository</name>
+ <url>https://nexus.openecomp.org/content/repositories/snapshots/</url>
+ </snapshotRepository>
+ <site>
+ <id>ecomp-javadoc</id>
+ <url>dav:https://ecomp-nexus:8443/repository/aai/logging-service-javadoc/${project.version}</url>
+ </site>
+ </distributionManagement>
</project>
diff --git a/pom.xml b/pom.xml
index 299fc03..0ddd05f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,6 +55,55 @@
<!-- For using CXF with Maven -->
<cxf.version>3.0.4</cxf.version>
</properties>
+
+ <!-- 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>AJSC</id>
+ <name>AJSC repository</name>
+ <url>https://mvnrepository.com/artifact/com.att.ajsc</url>
+ </repository>
+ <repository>
+ <id>restlet</id>
+ <name>maven reslet</name>
+ <url>https://maven.restlet.com/</url>
+ </repository>
+
+ <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>https://nexus.openecomp.org/content/repositories</url>
+ </repository>
+ <repository>
+ <id>ecomp-snapshots</id>
+ <name>ECOMP Snapshot Repository</name>
+ <url>https://nexus.openecomp.org/content/repositories/snapshots/</url>
+ <snapshots>
+ <updatePolicy>always</updatePolicy>
+ </snapshots>
+ <releases>
+ <updatePolicy>always</updatePolicy>
+ </releases>
+ </repository>
+
+ </repositories>
+
<!-- The standard build tasks for this project are inherited from the parent.
Please do not override the build tasks. However tasks and/or profiles can