From 4112fecf3d65f1d5dd1eb99334061b2b17c6ad43 Mon Sep 17 00:00:00 2001
From: jhh <jorge.hernandez-herrero@att.com>
Date: Mon, 9 Dec 2019 18:11:13 -0600
Subject: base changes to support offline pdpd

Issue-ID: POLICY-2191
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: I6f8029c1c771905357971331988a9b8408a93f10
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
---
 packages/base/src/files/etc/m2/settings.xml        | 209 +++++++++++----------
 .../base/src/files/etc/m2/standalone-settings.xml  |  31 +--
 packages/install/src/files/base.conf               |   1 +
 3 files changed, 111 insertions(+), 130 deletions(-)

(limited to 'packages')

diff --git a/packages/base/src/files/etc/m2/settings.xml b/packages/base/src/files/etc/m2/settings.xml
index 8530ae52..21212e0b 100644
--- a/packages/base/src/files/etc/m2/settings.xml
+++ b/packages/base/src/files/etc/m2/settings.xml
@@ -17,14 +17,16 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   ============LICENSE_END=========================================================
-  -->
+-->
 
 
 <settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
 
-  <profiles>
+    <offline>false</offline>
+
+    <profiles>
 
         <profile>
             <id>policy-local</id>
@@ -46,105 +48,104 @@
 
         </profile>
 
-    <profile>
-      <id>policy-releases</id>
-
-      <repositories>
-        <repository>
-          <id>${env.RELEASE_REPOSITORY_ID}</id>
-          <url>${env.RELEASE_REPOSITORY_URL}</url>
-          <releases>
-            <enabled>true</enabled>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </repository>
-      </repositories>
-
-    </profile>
-
-    <profile>
-      <id>policy-snapshots</id>
-
-      <repositories>
-        <repository>
-          <id>${env.SNAPSHOT_REPOSITORY_ID}</id>
-          <url>${env.SNAPSHOT_REPOSITORY_URL}</url>
-          <releases>
-            <enabled>false</enabled>
-          </releases>
-          <snapshots>
-            <enabled>true</enabled>
-            <updatePolicy>always</updatePolicy>
-          </snapshots>
-        </repository>
-      </repositories>
-
-    </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>
-
-    </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>
-            <updatePolicy>always</updatePolicy>
-          </snapshots>
-        </repository>
-      </repositories>
-
-    </profile>
-
-  </profiles>
-
-  <activeProfiles>
-    <activeProfile>policy-local</activeProfile>
-    <activeProfile>policy-releases</activeProfile>
-    <activeProfile>policy-snapshots</activeProfile>
-    <activeProfile>onap-releases</activeProfile>
-    <activeProfile>onap-snapshots</activeProfile>
-  </activeProfiles>
-
-  <servers>
-    <server>
-      <id>${env.SNAPSHOT_REPOSITORY_ID}</id>
-      <username>${env.REPOSITORY_USERNAME}</username>
-      <password>${env.REPOSITORY_PASSWORD}</password>
-    </server>
-    <server>
-      <id>${env.RELEASE_REPOSITORY_ID}</id>
-      <username>${env.REPOSITORY_USERNAME}</username>
-      <password>${env.REPOSITORY_PASSWORD}</password>
-    </server>
-  </servers>
+        <profile>
+            <id>policy-releases</id>
 
-</settings>
+            <repositories>
+                <repository>
+                    <id>${env.RELEASE_REPOSITORY_ID}</id>
+                    <url>${env.RELEASE_REPOSITORY_URL}</url>
+                    <releases>
+                        <enabled>true</enabled>
+                        <updatePolicy>always</updatePolicy>
+                    </releases>
+                    <snapshots>
+                        <enabled>false</enabled>
+                    </snapshots>
+                </repository>
+            </repositories>
+
+        </profile>
 
+        <profile>
+            <id>policy-snapshots</id>
+
+            <repositories>
+                <repository>
+                    <id>${env.SNAPSHOT_REPOSITORY_ID}</id>
+                    <url>${env.SNAPSHOT_REPOSITORY_URL}</url>
+                    <releases>
+                        <enabled>false</enabled>
+                    </releases>
+                    <snapshots>
+                        <enabled>true</enabled>
+                        <updatePolicy>always</updatePolicy>
+                    </snapshots>
+                </repository>
+            </repositories>
+
+        </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>
+
+        </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>
+
+        </profile>
+
+    </profiles>
+
+    <activeProfiles>
+        <activeProfile>policy-local</activeProfile>
+        <activeProfile>policy-releases</activeProfile>
+        <activeProfile>policy-snapshots</activeProfile>
+        <activeProfile>onap-releases</activeProfile>
+        <activeProfile>onap-snapshots</activeProfile>
+    </activeProfiles>
+
+    <servers>
+        <server>
+            <id>${env.SNAPSHOT_REPOSITORY_ID}</id>
+            <username>${env.REPOSITORY_USERNAME}</username>
+            <password>${env.REPOSITORY_PASSWORD}</password>
+        </server>
+        <server>
+            <id>${env.RELEASE_REPOSITORY_ID}</id>
+            <username>${env.REPOSITORY_USERNAME}</username>
+            <password>${env.REPOSITORY_PASSWORD}</password>
+        </server>
+    </servers>
+
+</settings>
diff --git a/packages/base/src/files/etc/m2/standalone-settings.xml b/packages/base/src/files/etc/m2/standalone-settings.xml
index 39e7751a..e19180e1 100644
--- a/packages/base/src/files/etc/m2/standalone-settings.xml
+++ b/packages/base/src/files/etc/m2/standalone-settings.xml
@@ -17,12 +17,14 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   ============LICENSE_END=========================================================
-  -->
+-->
 
 
 <settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+
+    <offline>false</offline>
 
     <profiles>
 
@@ -65,26 +67,6 @@
 
         </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>
-                        <updatePolicy>always</updatePolicy>
-                    </releases>
-                    <snapshots>
-                        <enabled>false</enabled>
-                    </snapshots>
-                </repository>
-            </repositories>
-
-        </profile>
-
         <profile>
             <id>onap-snapshots</id>
 
@@ -98,7 +80,6 @@
                     </releases>
                     <snapshots>
                         <enabled>true</enabled>
-                        <updatePolicy>always</updatePolicy>
                     </snapshots>
                 </repository>
             </repositories>
@@ -110,9 +91,7 @@
     <activeProfiles>
         <activeProfile>policy-local</activeProfile>
         <activeProfile>onap-releases</activeProfile>
-        <activeProfile>onap-staging</activeProfile>
         <activeProfile>onap-snapshots</activeProfile>
     </activeProfiles>
 
 </settings>
-
diff --git a/packages/install/src/files/base.conf b/packages/install/src/files/base.conf
index 1f5deece..28591d47 100644
--- a/packages/install/src/files/base.conf
+++ b/packages/install/src/files/base.conf
@@ -45,6 +45,7 @@ RELEASE_REPOSITORY_ID=
 RELEASE_REPOSITORY_URL=
 REPOSITORY_USERNAME=
 REPOSITORY_PASSWORD=
+REPOSITORY_OFFLINE=
 
 # Relational (SQL) DB access
 
-- 
cgit 1.2.3-korg