sirona-aem & sirona-aem-york - Add & correct maven settings

diff --git a/customer/sirona-aem-york/common.yaml b/customer/sirona-aem-york/common.yaml
index 0ba5fd9394f183994d55afc092049377300faab8..adc45e3593cd1f0e8d31a40370562aa47d2037b8 100644 (file)
--- a/customer/sirona-aem-york/common.yaml
+++ b/customer/sirona-aem-york/common.yaml
@@ -49,7 +49,32 @@ accounts::users:
     apply: false
 
 aem::maven::mirrors:
-  - {id: pixelpark-nexus, url: 'https://nexus.pixelpark.com/content/groups/public/', mirrorof: '*'}
+  - {id: pixelpark-nexus, url: 'https://nexus.pixelpark.com/content/groups/public/', mirrorof: '*,!pixelpark-nexus,!sirona-releases,!sirona-snapshots'}
+aem::maven::repos:
+  - nexus-repo:
+    id: pixelpark-nexus
+    url: 'https://nexus.pixelpark.com/content/groups/public/'
+    releases:
+      enabled: true
+  - sirona-releases:
+    id: sirona-releases
+    url: 'https://nexus.pixelpark.com/content/repositories/releases-sirona/'
+    releases:
+      enabled: true
+  - sirona-snapshots:
+    id: sirona-snapshots
+    url: 'https://nexus.pixelpark.com/content/repositories/snapshots-sirona/'
+    snapshots:
+      enabled: true
+aem::maven::servers:
+  - sirona-releases:
+    id: sirona-releases
+    username: sirona
+    password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAWN6ky/ULCS114gcIPtMqRrSV+IHIhmCZORvhuwUDT0Kh2VQpD0g0qMjWLR85YVrKFx9e0dziSN8EgS0Ew1biJrSW1Q0U0hXBFAumWUHtKconumqTbEP09WziB4EctyUcjxb07Wd3t1TNXpFmjd8MO0uULcj+4PL3db71HX3vOmOnOSA/6t/z0kivJWGsoPZirH0pc/+op0TuVTbDYKwBYlOn0kLM3f0+eBj1AkeH4ZAS2u2byLY3yJC/qMsIJ8zwhyoUhh+0vJNLtGq6k2J0dyJdmnYxEfy1dMQ6OA1oSOJHQQhfh2nOONOXI/3pNvn0HBY+QwBgHvElvED2dBGaTDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBYKqaAMGI3oxuUPd4gF+JTgCA+d4GjLHa1ECpg4DayklrAdOwXWxWHhKN+rKdXFfTK2A==]
+  - sirona-snapshots:
+    id: sirona-snapshots
+    username: sirona
+    password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAWN6ky/ULCS114gcIPtMqRrSV+IHIhmCZORvhuwUDT0Kh2VQpD0g0qMjWLR85YVrKFx9e0dziSN8EgS0Ew1biJrSW1Q0U0hXBFAumWUHtKconumqTbEP09WziB4EctyUcjxb07Wd3t1TNXpFmjd8MO0uULcj+4PL3db71HX3vOmOnOSA/6t/z0kivJWGsoPZirH0pc/+op0TuVTbDYKwBYlOn0kLM3f0+eBj1AkeH4ZAS2u2byLY3yJC/qMsIJ8zwhyoUhh+0vJNLtGq6k2J0dyJdmnYxEfy1dMQ6OA1oSOJHQQhfh2nOONOXI/3pNvn0HBY+QwBgHvElvED2dBGaTDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBYKqaAMGI3oxuUPd4gF+JTgCA+d4GjLHa1ECpg4DayklrAdOwXWxWHhKN+rKdXFfTK2A==]
 
 sudo::configs:
   aem:

diff --git a/customer/sirona-aem/development.yaml b/customer/sirona-aem/development.yaml
index 585397ac71166d1c7821a04140b20415b9300c79..57983732cace8894bc98c6c31d6bb77422197d37 100644 (file)
--- a/customer/sirona-aem/development.yaml
+++ b/customer/sirona-aem/development.yaml
@@ -91,8 +91,6 @@ aem::maven::repos:
   - nexus-repo:
     id: pixelpark-nexus
     url: 'https://nexus.pixelpark.com/content/groups/public/'
-    snapshots:
-      enabled: true
     releases:
       enabled: true
   - sirona-releases:

diff --git a/customer/sirona-aem/test.yaml b/customer/sirona-aem/test.yaml
index 7ff093e8f3e1b470b5b3d34eba139680e00f0fb6..94995a83261754aa4685048ff078fee5bf57e4d9 100644 (file)
--- a/customer/sirona-aem/test.yaml
+++ b/customer/sirona-aem/test.yaml
@@ -86,15 +86,32 @@ site::profile::aem::publish::install_files:
 
 
 aem::maven::mirrors:
-  - {id: pixelpark-nexus, url: 'https://nexus.pixelpark.com/content/groups/public/', mirrorof: '*,!pixelpark-nexus'}
+  - {id: pixelpark-nexus, url: 'https://nexus.pixelpark.com/content/groups/public/', mirrorof: '*,!pixelpark-nexus,!sirona-releases,!sirona-snapshots'}
 aem::maven::repos:
   - nexus-repo:
     id: pixelpark-nexus
     url: 'https://nexus.pixelpark.com/content/groups/public/'
-    snapshots:
+    releases:
       enabled: true
+  - sirona-releases:
+    id: sirona-releases
+    url: 'https://nexus.pixelpark.com/content/repositories/releases-sirona/'
     releases:
       enabled: true
+  - sirona-snapshots:
+    id: sirona-snapshots
+    url: 'https://nexus.pixelpark.com/content/repositories/snapshots-sirona/'
+    snapshots:
+      enabled: true
+aem::maven::servers:
+  - sirona-releases:
+    id: sirona-releases
+    username: sirona
+    password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAWN6ky/ULCS114gcIPtMqRrSV+IHIhmCZORvhuwUDT0Kh2VQpD0g0qMjWLR85YVrKFx9e0dziSN8EgS0Ew1biJrSW1Q0U0hXBFAumWUHtKconumqTbEP09WziB4EctyUcjxb07Wd3t1TNXpFmjd8MO0uULcj+4PL3db71HX3vOmOnOSA/6t/z0kivJWGsoPZirH0pc/+op0TuVTbDYKwBYlOn0kLM3f0+eBj1AkeH4ZAS2u2byLY3yJC/qMsIJ8zwhyoUhh+0vJNLtGq6k2J0dyJdmnYxEfy1dMQ6OA1oSOJHQQhfh2nOONOXI/3pNvn0HBY+QwBgHvElvED2dBGaTDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBYKqaAMGI3oxuUPd4gF+JTgCA+d4GjLHa1ECpg4DayklrAdOwXWxWHhKN+rKdXFfTK2A==]
+  - sirona-snapshots:
+    id: sirona-snapshots
+    username: sirona
+    password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAWN6ky/ULCS114gcIPtMqRrSV+IHIhmCZORvhuwUDT0Kh2VQpD0g0qMjWLR85YVrKFx9e0dziSN8EgS0Ew1biJrSW1Q0U0hXBFAumWUHtKconumqTbEP09WziB4EctyUcjxb07Wd3t1TNXpFmjd8MO0uULcj+4PL3db71HX3vOmOnOSA/6t/z0kivJWGsoPZirH0pc/+op0TuVTbDYKwBYlOn0kLM3f0+eBj1AkeH4ZAS2u2byLY3yJC/qMsIJ8zwhyoUhh+0vJNLtGq6k2J0dyJdmnYxEfy1dMQ6OA1oSOJHQQhfh2nOONOXI/3pNvn0HBY+QwBgHvElvED2dBGaTDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBYKqaAMGI3oxuUPd4gF+JTgCA+d4GjLHa1ECpg4DayklrAdOwXWxWHhKN+rKdXFfTK2A==]
 
 aem::packages:
   cq-6.2.0-hotfix-10870: