summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHelen Chen <helen.chen@huawei.com>2018-09-14 16:22:31 +0000
committerGerrit Code Review <gerrit@onap.org>2018-09-14 16:22:31 +0000
commit18cf4e3cbda5c08c4ba3d5be005b959d54af3e71 (patch)
tree00accd59dd36a26dd5cefa39442f4c182a7152b6
parentdf9b15a5caab9a64665df22cd017f36ccd9c98be (diff)
parent87895565e98350f1ea0cca872432a253b7c4ad79 (diff)
Merge "Support building against local nexus repos"
-rw-r--r--.gitignore2
-rw-r--r--pom.xml36
-rw-r--r--settings.xml57
3 files changed, 55 insertions, 40 deletions
diff --git a/.gitignore b/.gitignore
index 2ef78d4..32edeae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,4 @@ target
.project
.settings
.classpath
-
+cia/
diff --git a/pom.xml b/pom.xml
index f1ce155..09d5edc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2016-2017 Huawei Technologies Co., Ltd.
+ Copyright (c) 2016-2018 Huawei Technologies Co., Ltd.
Modifications copyright (C) 2017 AT&T Intellectual Property
Licensed under the Apache License, Version 2.0 (the "License");
@@ -36,18 +36,22 @@
<maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
<!-- sitePath may be overridden in the inheriting POM if desired -->
<sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>
- <!-- properties for Nexus raw repo -->
+
+ <!--
+ The following properties should be defined in your own ~/.m2/settings.xml based on your own build infastructure setup.
+ See the settings.xml in this directory for default settings based on the Linux Foundation ONAP infrastructure.
+
+ <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
<onap.nexus.rawrepo.baseurl.upload>https://nexus.onap.org/content/sites/raw</onap.nexus.rawrepo.baseurl.upload>
- <onap.nexus.rawrepo.baseurl.download>
- https://nexus.onap.org/service/local/repositories/raw/content
- </onap.nexus.rawrepo.baseurl.download>
+ <onap.nexus.rawrepo.baseurl.download>https://nexus.onap.org/service/local/repositories/raw/content</onap.nexus.rawrepo.baseurl.download>
<onap.nexus.rawrepo.serverid>ecomp-raw</onap.nexus.rawrepo.serverid>
- <!-- properties for Nexus Docker registry -->
<onap.nexus.dockerregistry.daily>nexus3.onap.org:10003</onap.nexus.dockerregistry.daily>
<onap.nexus.dockerregistry.release>nexus3.onap.org:10002</onap.nexus.dockerregistry.release>
+ <docker.pull.registry>nexus3.onap.org:10001</docker.pull.registry>
+ <docker.push.registry>nexus3.onap.org:10003</docker.push.registry>
+ -->
</properties>
<distributionManagement>
<repository>
@@ -97,9 +101,24 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>3.0.0-M1</version>
+ <version>3.0.0-M2</version>
<executions>
<execution>
+ <id>enforce-property</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireProperty>
+ <property>onap.nexus.url</property>
+ <message>You must set a onap.nexus.url property in your ~/.m2/settings.xml. See oparent/settings.xml for an example.</message>
+ </requireProperty>
+ </rules>
+ <fail>true</fail>
+ </configuration>
+ </execution>
+ <execution>
<id>enforce-no-snapshots</id>
<goals>
<goal>enforce</goal>
@@ -142,5 +161,6 @@
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
</plugins>
+
</build>
</project>
diff --git a/settings.xml b/settings.xml
index 71dfb7f..edfbba7 100644
--- a/settings.xml
+++ b/settings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2016 Huawei Technologies Co., Ltd. and others. All rights reserved.
+ Copyright (c) 2016-2018 Huawei Technologies Co., Ltd. and others. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -20,6 +20,21 @@
<profiles>
<profile>
+ <id>onap-settings</id>
+ <properties>
+ <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
+ <onap.nexus.rawrepo.baseurl.upload>https://nexus.onap.org/content/sites/raw</onap.nexus.rawrepo.baseurl.upload>
+ <onap.nexus.rawrepo.baseurl.download>https://nexus.onap.org/service/local/repositories/raw/content</onap.nexus.rawrepo.baseurl.download>
+ <onap.nexus.rawrepo.serverid>ecomp-raw</onap.nexus.rawrepo.serverid>
+
+ <!-- properties for Nexus Docker registry -->
+ <onap.nexus.dockerregistry.daily>nexus3.onap.org:10003</onap.nexus.dockerregistry.daily>
+ <onap.nexus.dockerregistry.release>nexus3.onap.org:10002</onap.nexus.dockerregistry.release>
+ <docker.pull.registry>nexus3.onap.org:10001</docker.pull.registry>
+ <docker.push.registry>nexus3.onap.org:10003</docker.push.registry>
+ </properties>
+ </profile>
+ <profile>
<id>onap-snapshots</id>
<repositories>
<repository>
@@ -49,35 +64,6 @@
</pluginRepositories>
</profile>
<profile>
- <id>onap-staging</id>
- <repositories>
- <repository>
- <id>onap-staging</id>
- <name>onap-staging</name>
- <url>https://nexus.onap.org/content/repositories/staging/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>onap-staging</id>
- <name>onap-staging</name>
- <url>https://nexus.onap.org/content/repositories/staging/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
- </profile>
- <profile>
<id>onap-releases</id>
<repositories>
<repository>
@@ -110,6 +96,10 @@
<id>onap-public</id>
<repositories>
<repository>
+ <id>central</id>
+ <url>http://repo1.maven.org/maven2/</url>
+ </repository>
+ <repository>
<id>onap-public</id>
<name>onap-public</name>
<url>https://nexus.onap.org/content/repositories/public/</url>
@@ -123,6 +113,10 @@
</repositories>
<pluginRepositories>
<pluginRepository>
+ <id>central</id>
+ <url>http://repo1.maven.org/maven2/</url>
+ </pluginRepository>
+ <pluginRepository>
<id>onap-public</id>
<name>onap-public</name>
<url>https://nexus.onap.org/content/repositories/public/</url>
@@ -136,6 +130,7 @@
</pluginRepositories>
</profile>
<profile>
+ <!-- Configure this profile if you have a local nexus cache -->
<id>local-public</id>
<repositories>
<repository>
@@ -167,8 +162,8 @@
</profiles>
<activeProfiles>
+ <activeProfile>onap-settings</activeProfile>
<activeProfile>onap-snapshots</activeProfile>
- <!-- <activeProfile>onap-staging</activeProfile> -->
<activeProfile>onap-releases</activeProfile>
<activeProfile>onap-public</activeProfile>
<!-- <activeProfile>local-public</activeProfile> -->