From: vasraz Date: Tue, 11 Jan 2022 18:02:46 +0000 (+0000) Subject: Remove test-jar generation X-Git-Tag: 1.10.1~31 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=33a4259fb3abbb2ccd8509b9e7288e61f1807b15;p=sdc.git Remove test-jar generation Signed-off-by: Vasyl Razinkov Change-Id: Icc9f423b93a01fbcca3f45c4e8783d40aa6d6936 Issue-ID: SDC-3840 --- diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml index f6bb4f0933..7f776a301c 100644 --- a/catalog-be/pom.xml +++ b/catalog-be/pom.xml @@ -136,9 +136,8 @@ org.openecomp.sdc.be - common-be + common-be-tests-utils ${project.version} - test-jar test diff --git a/common-be-tests-utils/pom.xml b/common-be-tests-utils/pom.xml new file mode 100644 index 0000000000..e62e686142 --- /dev/null +++ b/common-be-tests-utils/pom.xml @@ -0,0 +1,258 @@ + + 4.0.0 + + org.openecomp.sdc.be + common-be-tests-utils + + + org.openecomp.sdc + sdc-main + 1.10.0-SNAPSHOT + + + + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + + + io.minio + minio + 8.3.4 + + + + + org.openecomp.sdc + common-app-api + ${project.version} + + + com.fasterxml.jackson.core + jackson-core + + + commons-codec + commons-codec + + + org.apache.httpcomponents + httpcore + + + + + + org.apache.commons + commons-lang3 + ${lang3.version} + provided + + + + ch.qos.logback + logback-classic + ${logback.version} + provided + + + + com.google.guava + guava + ${guava.version} + provided + + + org.functionaljava + functionaljava + ${functionaljava.version} + provided + + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + provided + + + com.fasterxml.jackson.core + jackson-core + + + + + + org.bouncycastle + bcpkix-jdk15on + ${bouncycastle.version} + compile + + + + org.hamcrest + hamcrest + ${hamcrest.version} + test + + + org.hamcrest + hamcrest-library + ${hamcrest.version} + test + + + org.junit.jupiter + junit-jupiter + ${junitJupiter.version} + test + + + org.mockito + mockito-junit-jupiter + ${mockitoJupiter.version} + test + + + org.onap.sdc.common + onap-tosca-datatype + ${tosca.datatype.version} + + + com.fasterxml.jackson.core + jackson-core + + + + + org.projectlombok + lombok + ${lombok.version} + + + com.google.code.bean-matchers + bean-matchers + ${bean-matchers.version} + test + + + + + org.togglz + togglz-core + ${togglz.version} + + + + + org.togglz + togglz-servlet + ${togglz.version} + + + + + org.togglz + togglz-console + ${togglz.version} + + + + + org.togglz + togglz-testing + ${togglz.version} + test + + + org.springframework + spring-context + ${spring.version} + compile + + + org.springframework + spring-expression + + + org.springframework + spring-core + + + + + org.springframework + spring-core + ${spring.version} + + + org.apache.cxf + cxf-rt-frontend-jaxrs + ${cxf.version} + + + org.jboss.spec.javax.rmi + jboss-rmi-api_1.0_spec + + + + + org.openecomp.sdc.core + openecomp-common-lib + ${project.version} + + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + default-jar + package + + jar + + + + + + com.github.sylvainlaurent.maven + yaml-json-validator-maven-plugin + + + validate + validate + + validate + + + + + + src/main/resources/**/*.y*ml + src/test/resources/**/*.y*ml + + + + + src/main/resources/**/*.json + src/test/resources/**/*.json + + + + ${skipYamlJsonValidator} + + + + + + + + diff --git a/common-be/src/test/java/org/openecomp/sdc/be/test/util/TestResourcesHandler.java b/common-be-tests-utils/src/main/java/org/openecomp/sdc/be/test/util/TestResourcesHandler.java similarity index 100% rename from common-be/src/test/java/org/openecomp/sdc/be/test/util/TestResourcesHandler.java rename to common-be-tests-utils/src/main/java/org/openecomp/sdc/be/test/util/TestResourcesHandler.java diff --git a/common-be-tests-utils/src/main/resources/artifacts/pnfSoftwareInformation/pnf-sw-information.yaml b/common-be-tests-utils/src/main/resources/artifacts/pnfSoftwareInformation/pnf-sw-information.yaml new file mode 100644 index 0000000000..31f4bc6173 --- /dev/null +++ b/common-be-tests-utils/src/main/resources/artifacts/pnfSoftwareInformation/pnf-sw-information.yaml @@ -0,0 +1,8 @@ +description: "pnf software information" +provider: "Ericsson" +version: "1.0" +pnf_software_information: + - description: "first software version of PNF" + pnf_software_version: "version1" + - description: "second software version of PNF" + pnf_software_version: "version2" diff --git a/common-be-tests-utils/src/main/resources/certificateManager/fakeCert1.cert b/common-be-tests-utils/src/main/resources/certificateManager/fakeCert1.cert new file mode 100644 index 0000000000..e69de29bb2 diff --git a/common-be-tests-utils/src/main/resources/certificateManager/fakeCert1.key b/common-be-tests-utils/src/main/resources/certificateManager/fakeCert1.key new file mode 100644 index 0000000000..e69de29bb2 diff --git a/common-be-tests-utils/src/main/resources/certificateManager/fakeCert2.cert b/common-be-tests-utils/src/main/resources/certificateManager/fakeCert2.cert new file mode 100644 index 0000000000..e69de29bb2 diff --git a/common-be-tests-utils/src/main/resources/certificateManager/fakeCert3.key b/common-be-tests-utils/src/main/resources/certificateManager/fakeCert3.key new file mode 100644 index 0000000000..e69de29bb2 diff --git a/common-be-tests-utils/src/main/resources/certificateManager/realCert/realCert1.cert b/common-be-tests-utils/src/main/resources/certificateManager/realCert/realCert1.cert new file mode 100644 index 0000000000..ae7d518ab0 --- /dev/null +++ b/common-be-tests-utils/src/main/resources/certificateManager/realCert/realCert1.cert @@ -0,0 +1,24 @@ +-----BEGIN CERTIFICATE----- +MIIEAzCCAuugAwIBAgIUZqdsy8mtirp4AGnTopg9rb3NXcEwDQYJKoZIhvcNAQEL +BQAwgY8xCzAJBgNVBAYTAkVVMRAwDgYDVQQIDAdOb3doZXJlMRIwEAYDVQQHDAlT +b21ld2hlcmUxDTALBgNVBAoMBEFDTUUxDDAKBgNVBAsMA1NEQzEVMBMGA1UEAwwM +c2RjLm9uYXAub3JnMSYwJAYJKoZIhvcNAQkBFhdvbmFwLXNkY0BsaXN0cy5vbmFw +Lm9yZzAgFw0yMTAyMTYxNDQ2NThaGA8yMDcxMDIwNDE0NDY1OFowgY8xCzAJBgNV +BAYTAkVVMRAwDgYDVQQIDAdOb3doZXJlMRIwEAYDVQQHDAlTb21ld2hlcmUxDTAL +BgNVBAoMBEFDTUUxDDAKBgNVBAsMA1NEQzEVMBMGA1UEAwwMc2RjLm9uYXAub3Jn +MSYwJAYJKoZIhvcNAQkBFhdvbmFwLXNkY0BsaXN0cy5vbmFwLm9yZzCCASIwDQYJ +KoZIhvcNAQEBBQADggEPADCCAQoCggEBANAWK6fjuOq6Wgxwh6QqK0YB9ahjPRj0 +ik/l86AokwyawpgY/iC2xXw+9Etq91C6plYy8BlbYIcv/+KoiteL4YgME9Hk1lwK +GEceNGwvLKzU5/fTX1BP4qpVi3aB5zCAWa9MhCk+UI/aIeERKFP9XHAx/wuAUq/x +OP4HLxgLuX/A7Trld3RjjaMYOLjbfJjPFN3lrvfQ02fy5DlJfWG3ASTOOEfdHt1g +wfOLuzl2l5R34p+zwQKid+2cyKXYs0owZu7Dz9OTWLVxZcLiYEGz8Y3gmmHVhXy+ +TPpvl5wPEajOQBUMksdOric0dIfKjJCMJqFzILv1dfZCr3843MYN3oMCAwEAAaNT +MFEwHQYDVR0OBBYEFJ6mFarA/5ISm7nZimLshzCH/0F8MB8GA1UdIwQYMBaAFJ6m +FarA/5ISm7nZimLshzCH/0F8MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEL +BQADggEBAGUzF4W1vHfksW9qSYqtc8xuM+lV1WrdOW7pX7JkIihUv3Z4jMqysrU4 +nj2iVBG5dPNm9v5GtaeK1ESnVilcdMSYTj/F34/MXJ0iZy1UR0j0IBSrR7JjbTAD +aYH1sx00hH13U8GMZInnmenmwziOQgBwhhCjLMblUY2vQ4O5MGwZG0VW2e3mUcq1 +HBC69yRMx9jQ+Iof6+rHnCLZXTjcl+65IxXSbKhofvpPJMVXFlmV3TdDdONuvKpS +051z/ISD6/SEWEvF9ZwAnZvJ/5yPqGzKgyC7rp8zJL+N3VLfr+la1D1w7qgoyFTi +drptEMCzLOk4OuM8PX8l2kY0G+gQD1o= +-----END CERTIFICATE----- diff --git a/common-be-tests-utils/src/main/resources/certificateManager/realCert/realCert1.key b/common-be-tests-utils/src/main/resources/certificateManager/realCert/realCert1.key new file mode 100644 index 0000000000..a31579a407 --- /dev/null +++ b/common-be-tests-utils/src/main/resources/certificateManager/realCert/realCert1.key @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDQFiun47jquloM +cIekKitGAfWoYz0Y9IpP5fOgKJMMmsKYGP4gtsV8PvRLavdQuqZWMvAZW2CHL//i +qIrXi+GIDBPR5NZcChhHHjRsLyys1Of3019QT+KqVYt2gecwgFmvTIQpPlCP2iHh +EShT/VxwMf8LgFKv8Tj+By8YC7l/wO065Xd0Y42jGDi423yYzxTd5a730NNn8uQ5 +SX1htwEkzjhH3R7dYMHzi7s5dpeUd+Kfs8EConftnMil2LNKMGbuw8/Tk1i1cWXC +4mBBs/GN4Jph1YV8vkz6b5ecDxGozkAVDJLHTq4nNHSHyoyQjCahcyC79XX2Qq9/ +ONzGDd6DAgMBAAECggEANLj5VK+JIcgXmsFETN72WeWTNZf3WgRTqwzLXpAJOg9Y +MKtccDN+9A0LXrR6dzTjgkGjvfj+CyKpReeITja97PeKagr+GRHhtts7UxHc0uma +4JrosnObLadBD8S4K/zJPHY5oi2MwfX10Y3EVwuByVeRlHtt9/A5jXuKfiAyXuCw +42AT6GUFxntwcKhJSQEcy2B9FwvnF5BDDQKyRVD1McrIj/g7+fiyOpqBXGxk+VYX +6GjYb0kWR+lVexPBP4fgSs6Yx9EroDqzXAolH94NQfb93sOJuawtNVhkEgjE9hec +NumdpHMXhXGP0WI/jhicz4gaBDGyEwuSqUxMnfqNyQKBgQDyFx715F3iz2yfnsUQ +xU7KheUjN0g/vhrcir31L9NuhRpWoBJyRUDeXekuCaDF2ElUXJAdUTMGWDwXxlLx +aa5b8LPBL4pGvNRakfT1TJrViUm3A9wC4EO8l0IIpoYAEt8nstaw4pMEWLOSSKH/ +O2wG+v1h1/Xfd+ruTbmcBn6yLwKBgQDcCuSQoheMZrb6Hq+i+99LF3ZHVqJKUUCI +XRnH3fhwhnMrsR9EshOVRtex0aAdl1GUWCAoVt4ZNom5m7b2qRji0gx8npwA0jxD +CSDUw68Jy3MzQxDMPWNRI38P2r46CslNqCkEGlebbgHEJ0qzp2tIfN25pO6EXfjx +wk9afY5n7QKBgQCG0Wtzgn7qfZs/dTrHsSnEzTYjG3lHzkXFRhqtfbngVY2qajB7 +pKeQbnoaIlB/fYiwy2+SdBLXWLH2h4LPYIwyNWTVk/UMmcIkwh3JsaSUgIUlv6d5 +jo0KbK3ghWQgjGHsCMNY9ITtKbyvHXXh3qS1andLUuphTbXuiihwhIlwDwKBgD9P +QwP6HxxeUTcVrSMPpOdOENHlszv+tLqHTuuaieiWRnzDsWNqeQfyIg0faxoYd3hf +AqGYnL5UWrv0eWfuryJTnRQd7nSuCHihH7kXtDz1NGgDW8nnv7OQqvY80Y6Rm+mk +AGkVyy8FL6zoQS3/dXadto27ToT3JLEqXvqCNX7hAoGAPfNcJtXJXrXh9P3JZqkM +pa8nRqUW0MeRt3v8rLqi4D7J6kW1Rkz5AhjiKkp1EwtE0IbGRI1EPhxT5DCMKlIy +UX7VfP8nf+wb6dLHQ0s4oB20y5J6T7FAkD+50dE6Q/6fAl/2MkE+/R0npKRVhOlc +eXIeBGzSc7p92K1p/vRMOZg= +-----END PRIVATE KEY----- diff --git a/common-be-tests-utils/src/main/resources/certificateManager/signerTest/fileToSign.txt b/common-be-tests-utils/src/main/resources/certificateManager/signerTest/fileToSign.txt new file mode 100644 index 0000000000..cf3472103d --- /dev/null +++ b/common-be-tests-utils/src/main/resources/certificateManager/signerTest/fileToSign.txt @@ -0,0 +1 @@ +This is a file to be signed. diff --git a/common-be-tests-utils/src/main/resources/csarSizeReducer/dummyToNotReduce.csar b/common-be-tests-utils/src/main/resources/csarSizeReducer/dummyToNotReduce.csar new file mode 100644 index 0000000000..d44041382e Binary files /dev/null and b/common-be-tests-utils/src/main/resources/csarSizeReducer/dummyToNotReduce.csar differ diff --git a/common-be-tests-utils/src/main/resources/csarSizeReducer/dummyToReduce-2-files.zip b/common-be-tests-utils/src/main/resources/csarSizeReducer/dummyToReduce-2-files.zip new file mode 100644 index 0000000000..be48e8a674 Binary files /dev/null and b/common-be-tests-utils/src/main/resources/csarSizeReducer/dummyToReduce-2-files.zip differ diff --git a/common-be-tests-utils/src/main/resources/csarSizeReducer/dummyToReduce-3-files.zip b/common-be-tests-utils/src/main/resources/csarSizeReducer/dummyToReduce-3-files.zip new file mode 100644 index 0000000000..fecb45aaaf Binary files /dev/null and b/common-be-tests-utils/src/main/resources/csarSizeReducer/dummyToReduce-3-files.zip differ diff --git a/common-be-tests-utils/src/main/resources/csarSizeReducer/dummyToReduce.csar b/common-be-tests-utils/src/main/resources/csarSizeReducer/dummyToReduce.csar new file mode 100644 index 0000000000..73b28f52fd Binary files /dev/null and b/common-be-tests-utils/src/main/resources/csarSizeReducer/dummyToReduce.csar differ diff --git a/common-be-tests-utils/src/main/resources/mockito-extensions/org.mockito.plugins.MockMaker b/common-be-tests-utils/src/main/resources/mockito-extensions/org.mockito.plugins.MockMaker new file mode 100644 index 0000000000..ca6ee9cea8 --- /dev/null +++ b/common-be-tests-utils/src/main/resources/mockito-extensions/org.mockito.plugins.MockMaker @@ -0,0 +1 @@ +mock-maker-inline \ No newline at end of file diff --git a/common-be-tests-utils/src/main/resources/persistentVolumeArtifactStorageManager/dummy.csar b/common-be-tests-utils/src/main/resources/persistentVolumeArtifactStorageManager/dummy.csar new file mode 100644 index 0000000000..73b28f52fd Binary files /dev/null and b/common-be-tests-utils/src/main/resources/persistentVolumeArtifactStorageManager/dummy.csar differ diff --git a/common-be-tests-utils/src/main/resources/s3StoreArtifactStorageManager/dummy.csar b/common-be-tests-utils/src/main/resources/s3StoreArtifactStorageManager/dummy.csar new file mode 100644 index 0000000000..73b28f52fd Binary files /dev/null and b/common-be-tests-utils/src/main/resources/s3StoreArtifactStorageManager/dummy.csar differ diff --git a/common-be/pom.xml b/common-be/pom.xml index 1fc89df6b6..d498df4c86 100644 --- a/common-be/pom.xml +++ b/common-be/pom.xml @@ -205,6 +205,12 @@ openecomp-common-lib ${project.version} + + org.openecomp.sdc.be + common-be-tests-utils + ${project.version} + test + @@ -218,7 +224,6 @@ package jar - test-jar diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/pom.xml b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/pom.xml index 94778bb9e3..508561251b 100644 --- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/pom.xml +++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/pom.xml @@ -218,9 +218,8 @@ org.openecomp.sdc.be - common-be + common-be-tests-utils ${project.version} - test-jar test diff --git a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/pom.xml b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/pom.xml index b48ff2923a..79280aceb8 100644 --- a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/pom.xml +++ b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/pom.xml @@ -16,9 +16,8 @@ org.openecomp.sdc.be - common-be + common-be-tests-utils ${project.version} - test-jar test diff --git a/pom.xml b/pom.xml index c903d06db0..7bd8d3b28c 100644 --- a/pom.xml +++ b/pom.xml @@ -608,6 +608,7 @@ Modifications copyright (c) 2018-2019 Nokia common-app-logging common-app-api common-be + common-be-tests-utils catalog-dao catalog-model catalog-be @@ -631,6 +632,7 @@ Modifications copyright (c) 2018-2019 Nokia common-app-logging common-app-api common-be + common-be-tests-utils catalog-dao catalog-model catalog-be @@ -659,6 +661,7 @@ Modifications copyright (c) 2018-2019 Nokia common-app-logging common-app-api common-be + common-be-tests-utils catalog-dao catalog-model catalog-be @@ -686,6 +689,7 @@ Modifications copyright (c) 2018-2019 Nokia common-app-logging common-app-api common-be + common-be-tests-utils catalog-dao catalog-model catalog-be @@ -715,6 +719,7 @@ Modifications copyright (c) 2018-2019 Nokia common-app-logging common-app-api common-be + common-be-tests-utils catalog-dao catalog-model catalog-be