From 4112fecf3d65f1d5dd1eb99334061b2b17c6ad43 Mon Sep 17 00:00:00 2001 From: jhh Date: Mon, 9 Dec 2019 18:11:13 -0600 Subject: base changes to support offline pdpd Issue-ID: POLICY-2191 Signed-off-by: jhh Change-Id: I6f8029c1c771905357971331988a9b8408a93f10 Signed-off-by: jhh --- packages/base/src/files/etc/m2/settings.xml | 209 +++++++++++---------- .../base/src/files/etc/m2/standalone-settings.xml | 31 +-- 2 files changed, 110 insertions(+), 130 deletions(-) (limited to 'packages/base/src/files/etc') 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========================================================= - --> +--> + 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"> - + false + + policy-local @@ -46,105 +48,104 @@ - - policy-releases - - - - ${env.RELEASE_REPOSITORY_ID} - ${env.RELEASE_REPOSITORY_URL} - - true - - - false - - - - - - - - policy-snapshots - - - - ${env.SNAPSHOT_REPOSITORY_ID} - ${env.SNAPSHOT_REPOSITORY_URL} - - false - - - true - always - - - - - - - - onap-releases - - - - onap-releases - onap-releases - https://nexus.onap.org/content/repositories/releases/ - - true - - - false - - - - - - - - - onap-snapshots - - - - onap-snapshots - onap-snapshots - https://nexus.onap.org/content/repositories/snapshots/ - - false - - - true - always - - - - - - - - - - policy-local - policy-releases - policy-snapshots - onap-releases - onap-snapshots - - - - - ${env.SNAPSHOT_REPOSITORY_ID} - ${env.REPOSITORY_USERNAME} - ${env.REPOSITORY_PASSWORD} - - - ${env.RELEASE_REPOSITORY_ID} - ${env.REPOSITORY_USERNAME} - ${env.REPOSITORY_PASSWORD} - - + + policy-releases - + + + ${env.RELEASE_REPOSITORY_ID} + ${env.RELEASE_REPOSITORY_URL} + + true + always + + + false + + + + + + + policy-snapshots + + + + ${env.SNAPSHOT_REPOSITORY_ID} + ${env.SNAPSHOT_REPOSITORY_URL} + + false + + + true + always + + + + + + + + onap-releases + + + + onap-releases + onap-releases + https://nexus.onap.org/content/repositories/releases/ + + true + + + false + + + + + + + + + onap-snapshots + + + + onap-snapshots + onap-snapshots + https://nexus.onap.org/content/repositories/snapshots/ + + false + + + true + + + + + + + + + + policy-local + policy-releases + policy-snapshots + onap-releases + onap-snapshots + + + + + ${env.SNAPSHOT_REPOSITORY_ID} + ${env.REPOSITORY_USERNAME} + ${env.REPOSITORY_PASSWORD} + + + ${env.RELEASE_REPOSITORY_ID} + ${env.REPOSITORY_USERNAME} + ${env.REPOSITORY_PASSWORD} + + + + 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========================================================= - --> +--> + 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"> + + false @@ -65,26 +67,6 @@ - - onap-staging - - - - onap-staging - onap-staging - https://nexus.onap.org/content/repositories/staging/ - - true - always - - - false - - - - - - onap-snapshots @@ -98,7 +80,6 @@ true - always @@ -110,9 +91,7 @@ policy-local onap-releases - onap-staging onap-snapshots - -- cgit 1.2.3-korg