diff options
author | liamfallon <liam.fallon@est.tech> | 2018-12-19 18:29:05 +0000 |
---|---|---|
committer | Liam Fallon <liam.fallon@est.tech> | 2019-01-07 15:38:38 +0000 |
commit | 30a5df05c5339288118e416abd5b9e4e2ee32515 (patch) | |
tree | 64a6b672f130ccf2a296391ce9a5b300ea3e560f | |
parent | 43037b6e94c063d8be0d3ebaa8bc729b30334ff1 (diff) |
Add SSL keystore/truststore to Apex package
Issue-ID: POLICY-1222
Change-Id: I4409b88d1a9439492f9aac6c3b971bae7dc04b19
Signed-off-by: liamfallon <liam.fallon@est.tech>
(cherry picked from commit 9684e03a94d352240424c8ff3f620b7fcaba7d76)
-rwxr-xr-x[-rw-r--r--] | docker_build.sh | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | docker_merge.sh | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | docker_verify.sh | 0 | ||||
-rw-r--r-- | packages/apex-pdp-package-full/pom.xml | 2 | ||||
-rw-r--r-- | packages/apex-pdp-package-full/src/main/package/tarball/assembly.xml | 2 | ||||
-rw-r--r-- | packages/apex-pdp-package-full/src/main/resources/ssl/ca-aaf.crt | 31 | ||||
-rw-r--r-- | packages/apex-pdp-package-full/src/main/resources/ssl/policy-keystore | bin | 0 -> 4223 bytes | |||
-rw-r--r-- | packages/apex-pdp-package-full/src/main/resources/ssl/policy-truststore | bin | 0 -> 124180 bytes |
8 files changed, 33 insertions, 2 deletions
diff --git a/docker_build.sh b/docker_build.sh index c2c7abdb0..c2c7abdb0 100644..100755 --- a/docker_build.sh +++ b/docker_build.sh diff --git a/docker_merge.sh b/docker_merge.sh index bc7aac1de..bc7aac1de 100644..100755 --- a/docker_merge.sh +++ b/docker_merge.sh diff --git a/docker_verify.sh b/docker_verify.sh index 0f77a61e7..0f77a61e7 100644..100755 --- a/docker_verify.sh +++ b/docker_verify.sh diff --git a/packages/apex-pdp-package-full/pom.xml b/packages/apex-pdp-package-full/pom.xml index dca6ad504..9f896fcf4 100644 --- a/packages/apex-pdp-package-full/pom.xml +++ b/packages/apex-pdp-package-full/pom.xml @@ -340,7 +340,7 @@ <type>jar</type> <overWrite>false</overWrite> <outputDirectory>${project.build.directory}/examples/models/DecisionMaker</outputDirectory> - <includes>DecisionMakerPolicyModel.json</includes> + <includes>*PolicyModel.json</includes> </artifactItem> <artifactItem> <groupId>org.onap.policy.apex-pdp.examples</groupId> diff --git a/packages/apex-pdp-package-full/src/main/package/tarball/assembly.xml b/packages/apex-pdp-package-full/src/main/package/tarball/assembly.xml index 6dd024f2d..5101821ed 100644 --- a/packages/apex-pdp-package-full/src/main/package/tarball/assembly.xml +++ b/packages/apex-pdp-package-full/src/main/package/tarball/assembly.xml @@ -62,7 +62,7 @@ <include>**/*</include> </includes> <outputDirectory>etc</outputDirectory> - <lineEnding>unix</lineEnding> + <lineEnding>keep</lineEnding> <excludes> <exclude>*.formatted</exclude> </excludes> diff --git a/packages/apex-pdp-package-full/src/main/resources/ssl/ca-aaf.crt b/packages/apex-pdp-package-full/src/main/resources/ssl/ca-aaf.crt new file mode 100644 index 000000000..e9a50d7ea --- /dev/null +++ b/packages/apex-pdp-package-full/src/main/resources/ssl/ca-aaf.crt @@ -0,0 +1,31 @@ +-----BEGIN CERTIFICATE----- +MIIFPjCCAyagAwIBAgIJAJ6u7cCnzrWdMA0GCSqGSIb3DQEBCwUAMCwxDjAMBgNV +BAsMBU9TQUFGMQ0wCwYDVQQKDARPTkFQMQswCQYDVQQGEwJVUzAeFw0xODA0MDUx +NDE1MjhaFw0zODAzMzExNDE1MjhaMCwxDjAMBgNVBAsMBU9TQUFGMQ0wCwYDVQQK +DARPTkFQMQswCQYDVQQGEwJVUzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC +ggIBAMA5pkgRs7NhGG4ew5JouhyYakgYUyFaG121+/h8qbSdt0hVQv56+EA41Yq7 +XGie7RYDQK9NmAFF3gruE+6X7wvJiChp+Cyd7sFMnb65uWhxEdxWTM2BJFrgfzUn +H8ZCxgaCo3XH4PzlKRy2LQQJEJECwl/RZmRCXijMt5e9h8XoZY/fKkKcZZUsWNCM +pTo266wjvA9MXLmdgReRj0+vrCjrNqy+htwJDztoiHWiYPqT6o8EvGcgjNqjlZx7 +NUNf8MfLDByqKF6+wRbHv1GKjn3/Vijd45Fv8riyRYROiFanvbV6jIfBkv8PZbXg +2VDWsYsgp8NAvMxK+iV8cO+Ck3lBI2GOPZbCEqpPVTYbLUz6sczAlCXwQoPzDIZY +wYa3eR/gYLY1gP2iEVHORag3bLPap9ZX5E8DZkzTNTjovvLk8KaCmfcaUMJsBtDd +ApcUitz10cnRyZc1sX3gE1f3DpzQM6t9C5sOVyRhDcSrKqqwb9m0Ss04XAS9FsqM +P3UWYQyqDXSxlUAYaX892u8mV1hxnt2gjb22RloXMM6TovM3sSrJS0wH+l1nznd6 +aFXftS/G4ZVIVZ/LfT1is4StoyPWZCwwwly1z8qJQ/zhip5NgZTxQw4mi7ww35DY +PdAQOCoajfSvFjqslQ/cPRi/MRCu079heVb5fQnnzVtnpFQRAgMBAAGjYzBhMB0G +A1UdDgQWBBRTVTPyS+vQUbHBeJrBKDF77+rtSTAfBgNVHSMEGDAWgBRTVTPyS+vQ +UbHBeJrBKDF77+rtSTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAN +BgkqhkiG9w0BAQsFAAOCAgEAPx/IaK94n02wPxpnYTy+LVLIxwdq/kawNd6IbiMz +L87zmNMDmHcGbfoRCj8OkhuggX9Lx1/CkhpXimuYsZOFQi5blr/u+v4mIbsgbmi9 +7j+cUHDP0zLycvSvxKHty51LwmaX9a4wkJl5zBU4O1sd/H9tWcEmwJ39ltKoBKBx +c94Zc3iMm5ytRWGj+0rKzLDAXEWpoZ5bE5PLJauA6UDCxDLfs3FwhbS7uDggxYvf +jySF5FCNET94oJ+m8s7VeHvoa8iPGKvXrIqdd7XDHnqJJlVKr7m9S0fMbyEB8ci2 +RtOXDt93ifY1uhoEtEykn4dqBSp8ezvNMnwoXdYPDvTd9uCAFeWFLVreBAWxd25h +PsBTkZA5hpa/rA+mKv6Af4VBViYr8cz4dZCsFChuioVebe9ighrfjB//qKepFjPF +CyjzKN1u0JKm/2x/ORqxkTONG8p3uDwoIOyimUcTtTMv42bfYD88RKakqSFXE9G+ +Z0LlaKABqfjK49o/tsAp+c5LoNlYllKhnetO3QAdraHwdmC36BhoghzR1jpX751A +cZn2VH3Q4XKyp01cJNCJIrua+A+bx6zh3RyW6zIIkbRCbET+UD+4mr8WIcSE3mtR +ZVlnhUDO4z9//WKMVzwS9Rh8/kuszrGFI1KQozXCHLrce3YP6RYZfOed79LXaRwX +dYY= +-----END CERTIFICATE----- diff --git a/packages/apex-pdp-package-full/src/main/resources/ssl/policy-keystore b/packages/apex-pdp-package-full/src/main/resources/ssl/policy-keystore Binary files differnew file mode 100644 index 000000000..abd5fe88c --- /dev/null +++ b/packages/apex-pdp-package-full/src/main/resources/ssl/policy-keystore diff --git a/packages/apex-pdp-package-full/src/main/resources/ssl/policy-truststore b/packages/apex-pdp-package-full/src/main/resources/ssl/policy-truststore Binary files differnew file mode 100644 index 000000000..8834ac257 --- /dev/null +++ b/packages/apex-pdp-package-full/src/main/resources/ssl/policy-truststore |