summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2018-12-21Exclude tomcat from web starter3.0.1-ONAP1.3.2casablancajimmy1-0/+10
Issue-ID: AAI-2035 Change-Id: I19e326fefcfb60fff707dfb807fa91938efa3710 Signed-off-by: jimmy <jf2512@att.com>
2018-12-17Update to springboot 1.5.18jimmy2-3/+3
Change-Id: Id6eb0bb763c13f853a37cb79f9328e34a3e1f07c Issue-ID: AAI-2011 Signed-off-by: jimmy <jf2512@att.com>
2018-11-09Upversion Spring Boot to 1.15.173.0.0-ONAP1.3.1Lee, Tian (tl5884)1-1/+1
To fix NexusIQ vulnerabilities Change-Id: If9e117cfea96e6520fba44d55bee05c7b5764661 Issue-ID: AAI-1891 Signed-off-by: Lee, Tian (tl5884) <tianl@amdocs.com> (cherry picked from commit 5209f42102348d19a389017c1717f0edc3733b36)
2018-10-10Upversion to 1.3.1Lee, Tian (tl5884)2-2/+2
Change-Id: I5e9615f6a3a5adf41fe63fdc024616500980880c Issue-ID: AAI-1733 Signed-off-by: Lee, Tian (tl5884) <tianl@amdocs.com>
2018-09-19Upversion commons-compress for NexusIQ1.3.0Lee, Tian (tl5884)1-1/+1
Change-Id: I3e591713c4cffabce2f0e31d5eb6793ed639d028 Issue-ID: AAI-1641 Signed-off-by: Lee, Tian (tl5884) <tianl@amdocs.com>
2018-09-18Remove unused system properties from unit testsLee, Tian (tl5884)2-4/+0
Change-Id: I5d56bf794c69381d03dda277afe4e110791b660a Issue-ID: AAI-1606 Signed-off-by: Lee, Tian (tl5884) <tianl@amdocs.com>
2018-09-12[Model Loader] Use Spring Boot 1.5.15mark.j.leonard1-1/+1
Upgrade from 1.5.14 to avoid known vulnerabilities. Change-Id: I0921d66b5e7f1ab973a8361ac04afd4679434a6c Issue-ID: AAI-1506 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-09-06Clean Sonar Project NameGildas Lanilis1-0/+1
add <name>aai-model-loader</name> Change-Id: I67a4afb13397e697026cbff05f5a5173ad2af184 Issue-ID: CIMAN-202 Signed-off-by: Gildas Lanilis <gildas.lanilis@huawei.com>
2018-08-27Use managed guava versionGary Wu1-5/+4
Use centrally managed guava version specified in oparent. Includes upgrade to oparent 1.2.0. This change was submitted by script and may include additional whitespace or formatting changes. Change-Id: I0883658bd90c6a794a686cc06a6fa2c0d400f0e4 Issue-ID: INT-619 Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
2018-08-17Explicitly initialise the EventCallback classmark.j.leonard4-6/+8
Remove the @Autowired annotation on the Babel Service Client and pass this as a parameter so that Spring will inject the value. This ensures that the EventCallback is not initialised with a null value. Issue-ID: AAI-1501 Change-Id: Ic1a66bf61afec4f707162acf323b83a8a48e8f28 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-08-13Fixing the docker jenkins jobArul.Nambi1-7/+0
Issue-ID: AAI-1449 Change-Id: I8eaa5ebe703b38fe8a2f30a6d3ff5ff527595810 Signed-off-by: Arul.Nambi <arul.nambi@amdocs.com>
2018-07-06Fix NexusIq security issue in CasablancaGilding, Joyce (jg640n)1-1/+1
Update Apache commons-compress to version 1.17 Change-Id: I1a8eac171b9c107c780e0aa5147ee58ca93c028f Issue-ID: AAI-1290 Signed-off-by: Gilding, Joyce (jg640n) <Joyce.Gilding@amdocs.com>
2018-07-03Fix NexusIQ Security vulnerability in CasablancaGilding, Joyce (jg640n)1-5/+1
Upgrade spring-boot-dependencies Change-Id: I9744fc676b59e021000a44593cc11f885f910b0f Issue-ID: AAI-1290 Signed-off-by: Gilding, Joyce (jg640n) <Joyce.Gilding@amdocs.com>
2018-06-07Add support for loading VNF Catalog XML filesmark.j.leonard23-230/+1339
Issue-ID: AAI-1214 Change-Id: I5d0eb3456916e6f3e5ba3a9b4e828feaff0cde4e Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-06-06Refactor for Sonar smells and code coveragemark.j.leonard66-954/+1739
Various code formatting and style fixes (to address Sonar code smells). Introduce a BabelServiceClientException to replace the use of the base Exception class. Make both the BabelServiceClient class and its Factory class use an interface, to allow for Spring injection (using annotations) and for simplified mocking. Refactor the Notification Publishing by making this the responsibility of the main Service classes and not the deployment manager. Issue-ID: AAI-1207 Change-Id: I6bf8a504fa7b98e9158c9976fd1d88c6c54027c1 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-06-06Remove deprecated AJSC configurationmark.j.leonard24-666/+0
Issue-ID: AAI-1206 Change-Id: Iffad6eb946bb8c63cf69bd2193d7518e733ea406 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-05-23Pin jnr-unixsocket for Docker plugin to 0.13Mohammed Naser1-0/+7
The current verison of jnr-unixsocket is 0.12 from the Docker plugin however in order to be able the images for ARM64, it needs the newer version which has support for it. There is work upstream to switch the version to 0.18[0] however it seems that this is still pending, so we can pin it for now until that merges. [0]: https://github.com/spotify/docker-maven-plugin/pull/379 Change-Id: Id863e5fccd4e89f7113b58f8c6b5be760a8797b7 Issue-ID: CIMAN-154 Signed-off-by: Mohammed Naser <mnaser@vexxhost.com>
2018-05-23Upversion for CasablancaJimmy Forsyth2-3/+3
Issue-ID: AAI-1169 Change-Id: Ideb567fb672738e0951110e77e6fc53a9a1e4613 Signed-off-by: Jimmy Forsyth <jf2512@att.com>
2018-05-22Bump to version 1.2.1 in the master branchv1.2.12.0.0-ONAPbeijing2.0.0-ONAPJimmy Forsyth2-2/+2
Issue-ID: AAI-1155 Change-Id: I66c58cd069561583ce237c0293091e75304a0610 Signed-off-by: Jimmy Forsyth <jf2512@att.com>
2018-05-17Fix issue with VNFImage rollbackLee, Tian (tl5884)1-7/+2
Fix issue where VNFImage data UUID is being overwritten, causing rollback failures. Change-Id: I66fd9125f7806c74d80ede6d2f0d4c04d0756cc0 Issue-ID: AAI-1148 Signed-off-by: Lee, Tian (tl5884) <tianl@amdocs.com>
2018-05-01Import Spring Boot Logging base resourcev1.2.0mark.j.leonard1-0/+1
Issue-ID: AAI-1110 Change-Id: Iab0ba2130e1131c938e0c9dbc7ba33cef8db75de Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-05-01Upgrade logback version to 1.2.3mark.j.leonard1-0/+7
Issue-ID: AAI-1107 Change-Id: I24260227dc9a695e8cf91f3fdf033353a4462bca Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-05-01Change Babel dependency by removing SNAPSHOTmark.j.leonard1-1/+1
Issue-ID: AAI-1053 Change-Id: Iaaee8ff11de401f3c0dfbd0524963ee26b409856 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-04-26Convert project from AJSC to Spring Bootmark.j.leonard91-4989/+2349
Remove all AJSC configuration and dependencies. Update the pom.xml to use oparent and to depend on Spring Boot. Refactor the main class to introduce a minimal set of Spring annotations. Note that the license text was corrected in this change. Issue-ID: AAI-1039 Change-Id: I16385db3216ec39bfd2881f2278e340ec3795199 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-04-18Remove dependency on org.powermock (PowerMockito)mark.j.leonard18-1338/+358
Replace use of PowerMockito packages with the standard Mockito. Create a BabelServiceClient Factory class to simplify mocking. Remove duplicated "no mock" test classes that were not in fact free of mocking. Add a dummy sample CSAR file for testing of artifact downloads. Change-Id: Ib86f560e514e1efab0e2f732e494a032d555c7c3 Issue-ID: AAI-1049 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-04-10Correct INFO.yaml to pass YAML LintEric Debeau1-24/+24
Change-Id: Id08e7b976bcecc760f1d9029d3706fa96915e6ce Issue-ID: AAI-1022 Signed-off-by: Eric Debeau <eric.debeau@orange.com>
2018-04-09Fixes for properties filesJimmy Forsyth3-22/+1
Issue-ID: AAI-1016 Change-Id: Ic640254cb0f81d9a9a5d34120431249c03878891 Signed-off-by: Jimmy Forsyth <jf2512@att.com>
2018-04-09Fix error in ajsc-override-web.xmlsblimkie1-4/+4
Change-Id: I5e0175ef88e1e3c8b7d683cd772d51058b97b83a Issue-ID: AAI-987 Signed-off-by: sblimkie <steven.blimkie@amdocs.com>
2018-04-05Problems with Jenkins Build JobsBlackwell, Ian (ib733q)1-1/+1
Change to refer to nexus host as nexus.onap.org rather than nexus.openecomp.org as suspicion that using openecomp is the cause of the build failure Issue-ID: AAI-996 Change-Id: I398e611ec146ed5d21ba235a83302ddd0c049216 Signed-off-by: Blackwell, Ian (ib733q) <IanB@amdocs.com>
2018-04-04Fix for build issuesBlackwell, Ian (ib733q)1-3/+26
Some missing repository configuration causes a build issue. Issue-ID: AAI-996 Change-Id: Iabbc5de6cf7fbd4bae9fae9de7bf1b651da76bcc Signed-off-by: Blackwell, Ian (ib733q) <IanB@amdocs.com>
2018-04-03Revisions made to the Model Loader to use BabelBlackwell, Ian (ib733q)105-7058/+7103
Change the Model Loader to use the Babel micro service. Responsibility for transformation of ASDC TOSCA models, the yaml files, has been moved from ASDC and placed into the Bable microservice. Model Loader will forward any CSAR received from ASDC and delegate transformation to Babel. Babel will return the transformed TOSCA models to Model Loader which will then ingest them into the A&AI Inventory. Issue-ID: AAI-987 Change-Id: I99594770b51b00cb7dcc0f30706060ae27cd94c5 Signed-off-by: Blackwell, Ian (ib733q) <IanB@amdocs.com>
2018-03-26Update license date and textSanchez, Gabriel (gs882h)40-392/+276
Update license data and disable license plugin Issue-ID: AAI-867 Change-Id: Ida91a4fc99b9d8ca65b15d6a7be1eaf097d0ae4f Signed-off-by: gabriel.sanchez <gabriel.sanchez@amdocs.com>
2018-02-27Fix GPL-2.0 license issuesLee, Tian (tl5884)1-25/+0
Remove maven-dependency-plugin which is copying powermock-module-javaagent into the target folder Change-Id: Ifd59f3d0af47e33783ac12d9d89cf40a1614d95a Issue-ID: AAI-809 Signed-off-by: Lee, Tian (tl5884) <tianl@amdocs.com>
2018-02-26Add INFO.yaml fileJessica Wagantall1-0/+51
Add INFO.yaml to list: - Project description - Properties - PTL information - Meeting information - Committer information Change-Id: Ie8c5800e37c2c941b532f267303657d5d9fced5c Issue-ID: CIMAN-134 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
2018-02-26Fix GPL-2.0 license issuesLee, Tian (tl5884)1-6/+6
Remove powermock-module-javaagent from dependency tree due to GPL-2.0 license Change-Id: I505a4463637385aa0e3f509b34e4ae3df2545386 Issue-ID: AAI-809 Signed-off-by: Lee, Tian (tl5884) <tianl@amdocs.com>
2018-01-17Merge "Sonar Major:Add the @Override annotation."Steven Blimkie1-1/+1
2018-01-17Merge "Sonar Major:Merge if statement."Steven Blimkie0-0/+0
2018-01-17Merge "Sonar Major:Add the @Override annotation."Steven Blimkie1-4/+4
2018-01-17Merge "Sonar Major:Replace with the diamond operator ."Steven Blimkie1-1/+1
2018-01-17Merge "Sonar Major:Replace the type specification."Steven Blimkie1-2/+2
2018-01-17Merge "Sonar Major:Annotate the IModelParser interface."Steven Blimkie1-0/+1
2018-01-17Merge "Sonar Major:Replace the type specification."Steven Blimkie1-1/+1
2018-01-15Sonar Major:Replace the type specification.aishkashyap1-2/+2
Replace the type specification with the diamond operator. Sonar Link: https://sonar.onap.org/component_issues/index?id=org.onap.aai.model-loader%3Amodel-loader#assignees=aishkashyap|resolved=false Location: src/mainn/java/org/onap/aai/modelloader/entity/model/ModelSorter.java Line No:136 Issue-ID: AAI-655 Change-Id: I1568a96c99992e38902ec7a53bb8b5f5a0acac5e Signed-off-by: aishkashyap <as00476394@techmahindra.com>
2018-01-15Sonar Major:Replace with the diamond operator .aishkashyap1-1/+1
Replace the type specification with the diamond operator. Sonar Link: https://sonar.onap.org/component_issues/index?id=org.onap.aai.model-loader%3Amodel-loader#assignees=__me__|resolved=false Location: src/main/java/org/onap/aai/modelloader/entity/model/ModelV8ArtifactParser.java Line No:57 Issue-ID: AAI-654 Change-Id: I07f671f845a535a542c0742b26ed085bc9f3db67 Signed-off-by: aishkashyap <as00476394@techmahindra.com>
2018-01-15Sonar Major:Add the @Override annotation.aishkashyap1-4/+4
Add the @Override annotation above this method signature. Sonar Link: https://sonar.onap.org/component_issues/index?id=org.onap.aai.model-loader%3Amodel-loader#assignees=__me__|resolved=false Location: src/main/java/org/onap/aai/modelloader/entity/model/ModelV8ArtifactParser.java Line No:55 Issue-ID: AAI-653 Change-Id: Iacf71ed6a80b986815c774ba057df727385f0745 Signed-off-by: aishkashyap <as00476394@techmahindra.com>
2018-01-15Sonar Major:Merge if statement.aishkashyap1-3/+3
Merge if statement with the enclosing one. Sonar Link: https://sonar.onap.org/component_issues/index?id=org.onap.aai.model-loader%3Amodel-loader#resolved=false|assigned=false Location: src/main/java/org/onap/aai/modelloader/entity/model/ModelV8ArtifactParser.java Line No:131 Issue-ID: AAI-648 Change-Id: I50ac1d612fb32b20a7520af44b7abe26b3d89399 Signed-off-by: aishkashyap <as00476394@techmahindra.com>
2018-01-15Sonar Major:Add the @Override annotation.aishkashyap1-1/+1
Sonar Link: https://sonar.onap.org/component_issues/index?id=org.onap.aai.model-loader%3Amodel-loader#resolved=false|assignees=aishkashyap Location: src/main/java/org/onap/aai/modelloader/entity/model/AbstractModelArtifact.java Line No:75 Issue-ID: AAI-647 Change-Id: I2da826e5c3d825abf79d6452e006ac6196c5f73a Signed-off-by: aishkashyap <as00476394@techmahindra.com>
2018-01-12Sonar Major:Replace the type specification.aishkashyap1-1/+1
Replace the type specification with the diamond operator. Sonar Link: https://sonar.onap.org/component_issues/index?id=org.onap.aai.model-loader%3Amodel-loader#resolved=false|assignees=aishkashyap Location: src/main/java/org/onap/aai/modelloader/entity/model/AbstractModelArtifact.java Line No:39 Issue-ID: AAI-646 Change-Id: I704dfd58340402982f4063e94e80b58ff158c8da Signed-off-by: aishkashyap <as00476394@techmahindra.com>
2018-01-12Sonar Major:Annotate the IModelParser interface.aishkashyap1-0/+1
Annotate the IModelParser interface with the @FunctionalInterface annotation. Sonar Link: https://sonar.onap.org/component_issues/index?id=org.onap.aai.model-loader%3Amodel-loader#resolved=false|assigned=false Location: src/main/java/org/onap/aai/modelloader/entity/model/IModelParser.java Line No:30 Issue-ID: AAI-645 Change-Id: I0c65379ecde9f6b103bf17515bd9071213462fea Signed-off-by: aishkashyap <as00476394@techmahindra.com>
2018-01-12Sonar Major: Replace the type specification.aishkashyap1-1/+1
Replace the type specification with the diamond operator. Sonar Link: https://sonar.onap.org/component_issues/index?id=org.onap.aai.model-loader%3Amodel-loader#resolved=false|assigned=false Location: src/main/java/org/onap/aai/modelloader/entity/model/ModelArtifactHandler.java Line No:60 Issue-ID: AAI-643 Change-Id: I231689bbf52153a0c806d8ee267d28fd9e6287f0 Signed-off-by: aishkashyap <as00476394@techmahindra.com>