Change configuration for Clamp integration

[clamp.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 99d6e13..c1ec0e2 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -9,9 +9,9 @@
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
- 
+
   http://www.apache.org/licenses/LICENSE-2.0
- 
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -53,7 +53,7 @@
                                - org.onap.clamp.config.files.cldsPolicyConfig=classpath:/clds/clds-policy-config.properties
                                - org.onap.clamp.config.files.cldsUsers=classpath:/clds/clds-users.json
                                - org.onap.clamp.config.files.globalClds=classpath:/clds/globalClds.properties
-           
+
     </description>
 
        <properties>
@@ -82,28 +82,22 @@
                <skip.docker.build>true</skip.docker.build>
                <skip.docker.push>true</skip.docker.push>
                <skip.staging.artifacts>false</skip.staging.artifacts>
-
-               <nexusproxy>https://nexus.onap.org</nexusproxy>
-               <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
-               <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
-               <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
-               <sitePath>/content/sites/site/org/onap/clamp/${project.version}</sitePath>
        </properties>
 
        <distributionManagement>
                <repository>
                        <id>ecomp-releases</id>
                        <name>Clamp Release Repository</name>
-                       <url>${nexusproxy}/${releaseNexusPath}</url>
+                       <url>https://nexus.onap.org/content/repositories/releases/</url>
                </repository>
                <snapshotRepository>
                        <id>ecomp-snapshots</id>
                        <name>Clamp Snapshot Repository</name>
-                       <url>${nexusproxy}/${snapshotNexusPath}</url>
+                       <url>https://nexus.onap.org/content/repositories/snapshots/</url>
                </snapshotRepository>
                <site>
                        <id>ecomp-site</id>
-                       <url>dav:${nexusproxy}${sitePath}</url>
+                       <url>dav:https://nexus.onap.org/content/sites/site/org/onap/clamp/${project.version}</url>
                </site>
        </distributionManagement>
 
@@ -116,17 +110,17 @@
                <repository>
                        <id>ecomp-releases</id>
                        <name>ONAP Release Repository</name>
-                       <url>${nexusproxy}/${releaseNexusPath}</url>
+                       <url>https://nexus.onap.org/content/repositories/releases/</url>
                </repository>
                <repository>
                        <id>ecomp-staging</id>
                        <name>ONAP Staging Repository</name>
-                       <url>${nexusproxy}/${stagingNexusPath}</url>
+                       <url>https://nexus.onap.org/content/repositories/staging/</url>
                </repository>
                <repository>
                        <id>ecomp-snapshots</id>
                        <name>ONAP Snapshot Repository</name>
-                       <url>${nexusproxy}/${snapshotNexusPath}</url>
+                       <url>https://nexus.onap.org/content/repositories/snapshots/</url>
                        <snapshots>
                                <enabled>true</enabled>
                        </snapshots>
@@ -578,7 +572,7 @@
                                <version>1.6.7</version>
                                <extensions>true</extensions>
                                <configuration>
-                                       <nexusUrl>${nexusproxy}</nexusUrl>
+                                       <nexusUrl>https://nexus.onap.org</nexusUrl>
                                        <stagingProfileId>176c31dfe190a</stagingProfileId>
                                        <serverId>ecomp-staging</serverId>
                                        <skipNexusStagingDeployMojo>${skip.staging.artifacts}</skipNexusStagingDeployMojo>
@@ -709,7 +703,7 @@
                                                                </volumes>
                                                                <wait>
                                                                        <log>socket: '/var/run/mysqld/mysqld.sock'  port: 3306  mariadb.org binary distribution</log>
-                                                                       <time>300000</time>
+                                                                       <time>600000</time>
                                                                </wait>
                                                                <ports>
                                                                        <port>${docker.mariadb.port.host}:3306</port>