summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthieuGeerebaert <matthieu.geerebaert@orange.com>2019-03-21 16:19:09 +0100
committerMatthieuGeerebaert <matthieu.geerebaert@orange.com>2019-03-21 16:25:28 +0100
commit726031bf80339a3c23cc52f89a403e86afa301f4 (patch)
tree2abd4d71b71cb1e89883f75e3cc42cd259ac74db
parent8587d7ef29ee305da685d98b396856c0ac115fa4 (diff)
Reverse oparent to snapshot
Add profiles from oparent Change-Id: I42660228eaad14a275043be26424ae88e9bf8d69 Issue-ID: EXTAPI-223 Signed-off-by: MatthieuGeerebaert <matthieu.geerebaert@orange.com>
-rw-r--r--pom.xml173
1 files changed, 146 insertions, 27 deletions
diff --git a/pom.xml b/pom.xml
index 30d19d5..09cc6b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,8 +7,8 @@
OR CONDITIONS OF ANY KIND, either express or implied. See the License for
the specific language governing permissions and limitations under the License. -->
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://maven.apache.org/POM/4.0.0"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ 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>
<groupId>org.onap.externalapi-nbi</groupId>
@@ -21,7 +21,7 @@
<parent>
<groupId>org.onap.oparent</groupId>
<artifactId>oparent</artifactId>
- <version>2.0.0</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<properties>
@@ -30,6 +30,7 @@
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<start-class>org.onap.nbi.Application</start-class>
+ <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
<nexusproxy>https://nexus.onap.org</nexusproxy>
<snapshotNexusPath>content/repositories/snapshots/</snapshotNexusPath>
<releaseNexusPath>content/repositories/releases/</releaseNexusPath>
@@ -56,24 +57,29 @@
<sonar.coverage.exclusions>**/model/**/*</sonar.coverage.exclusions>
</properties>
- <repositories>
- <repository>
- <id>maven2-repository.java.net</id>
- <name>Java.net Repository for Maven</name>
- <url>http://download.java.net/maven/2/</url>
- <layout>default</layout>
- </repository>
- <repository>
- <id>ecomp-snapshots</id>
- <name>Snapshot Repository</name>
- <url>https://nexus.onap.org/content/repositories/releases/</url>
- </repository>
- <repository>
- <id>ecomp-staging</id>
- <name>Staging Repository</name>
- <url>https://nexus.onap.org/content/repositories/staging/</url>
- </repository>
- </repositories>
+ <!--<repositories>-->
+ <!--<repository>-->
+ <!--<id>maven2-repository.java.net</id>-->
+ <!--<name>Java.net Repository for Maven</name>-->
+ <!--<url>http://download.java.net/maven/2/</url>-->
+ <!--<layout>default</layout>-->
+ <!--</repository>-->
+ <!--<repository>-->
+ <!--<id>ecomp-release</id>-->
+ <!--<name>Snapshot Repository</name>-->
+ <!--<url>https://nexus.onap.org/content/repositories/releases/</url>-->
+ <!--</repository>-->
+ <!--<repository>-->
+ <!--<id>ecomp-staging</id>-->
+ <!--<name>Staging Repository</name>-->
+ <!--<url>https://nexus.onap.org/content/repositories/staging/</url>-->
+ <!--</repository>-->
+ <!--<repository>-->
+ <!--<id>ecomp-snapshots</id>-->
+ <!--<name>Snapshot Repository</name>-->
+ <!--<url>https://nexus.onap.org/content/repositories/snapshots/</url>-->
+ <!--</repository>-->
+ <!--</repositories>-->
<distributionManagement>
<repository>
@@ -193,7 +199,7 @@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
- </exclusions>
+ </exclusions>
</dependency>
<!-- jolt -->
@@ -283,18 +289,18 @@
<dependency>
<groupId>org.onap.msb.java-sdk</groupId>
<artifactId>msb-java-sdk</artifactId>
- <version>1.2.0</version>
+ <version>1.1.1</version>
<exclusions>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
- </exclusions>
+ </exclusions>
</dependency>
-
+
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
<!-- karate -->
@@ -547,6 +553,119 @@
</plugins>
</build>
</profile>
+ <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>
+ <id>onap-snapshots</id>
+ <name>onap-snapshots</name>
+ <url>https://nexus.onap.org/content/repositories/snapshots/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>onap-snapshots</id>
+ <name>onap-snapshots</name>
+ <url>https://nexus.onap.org/content/repositories/snapshots/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+ <profile>
+ <id>onap-releases</id>
+ <repositories>
+ <repository>
+ <id>onap-releases</id>
+ <name>onap-releases</name>
+ <url>https://nexus.onap.org/content/repositories/releases/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>onap-releases</id>
+ <name>onap-releases</name>
+ <url>https://nexus.onap.org/content/repositories/releases/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+ <profile>
+ <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>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </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>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
</profiles>
</project>