From 9868f1749ac413b5b7df287d35983bf24ce517ea Mon Sep 17 00:00:00 2001 From: "Benjamin, Max" Date: Mon, 18 May 2020 16:37:51 -0400 Subject: Prepare for java 11 final changes for java11 groovy compatibility removed unnecessary dependencies and cleaned up poms added missing jaxws-api dependency to pom.xml java8 profile is now active by default in parent pom update beans to have RemoteResource annotation always use the compiler plugin from parent pom Update external task timeout to longer value to hold lock update remote resource annotation to match catalog db client add remote resource annotation to bean for bowman completely remove bowman from requests db client Issue-ID: SO-2059 Signed-off-by: Benjamin, Max (mb388a) Change-Id: If6f0df36e8077ccd703abce9f64290daed63955b --- adapters/etsi-sol002-adapter/pom.xml | 6 -- adapters/etsi-sol003-adapter/pom.xml | 4 +- adapters/mso-adapter-utils/pom.xml | 6 -- adapters/mso-adapters-rest-interface/pom.xml | 3 +- adapters/mso-catalog-db-adapter/pom.xml | 21 ++----- .../org/onap/so/adapters/tasks/TaskServices.java | 6 +- adapters/mso-requests-db-adapter/.gitignore | 1 + adapters/mso-requests-db-adapter/pom.xml | 44 +++++++++++++-- adapters/mso-sdnc-adapter/.gitignore | 1 + adapters/mso-sdnc-adapter/pom.xml | 20 +++++++ .../org/onap/so/adapters/sdnc/impl/UtilsTest.java | 64 ---------------------- adapters/pom.xml | 6 ++ adapters/so-appc-orchestrator/pom.xml | 14 ----- 13 files changed, 81 insertions(+), 115 deletions(-) create mode 100644 adapters/mso-sdnc-adapter/.gitignore delete mode 100644 adapters/mso-sdnc-adapter/src/test/java/org/onap/so/adapters/sdnc/impl/UtilsTest.java (limited to 'adapters') diff --git a/adapters/etsi-sol002-adapter/pom.xml b/adapters/etsi-sol002-adapter/pom.xml index b419d8806b..81e35d896d 100644 --- a/adapters/etsi-sol002-adapter/pom.xml +++ b/adapters/etsi-sol002-adapter/pom.xml @@ -17,12 +17,6 @@ ETSI SOL002 Application Jar - - 1.8 - ${java.version} - ${java.version} - - org.springframework.boot diff --git a/adapters/etsi-sol003-adapter/pom.xml b/adapters/etsi-sol003-adapter/pom.xml index 6c3a1f5b1c..fe34ff47c3 100644 --- a/adapters/etsi-sol003-adapter/pom.xml +++ b/adapters/etsi-sol003-adapter/pom.xml @@ -19,7 +19,7 @@ 2.3.0 1.3.5 1.0.1 - 1.5.15 + 1.5.21 3.14.0 2.7.5 1.13.0 @@ -32,4 +32,4 @@ etsi-sol003-lcm etsi-sol003-adapter-application - \ No newline at end of file + diff --git a/adapters/mso-adapter-utils/pom.xml b/adapters/mso-adapter-utils/pom.xml index a121d2d89b..0168d2bde5 100644 --- a/adapters/mso-adapter-utils/pom.xml +++ b/adapters/mso-adapter-utils/pom.xml @@ -112,12 +112,6 @@ javax.servlet-api provided - - org.jmockit - jmockit - 1.8 - test - org.yaml snakeyaml diff --git a/adapters/mso-adapters-rest-interface/pom.xml b/adapters/mso-adapters-rest-interface/pom.xml index 584c47fea6..3b762413ae 100644 --- a/adapters/mso-adapters-rest-interface/pom.xml +++ b/adapters/mso-adapters-rest-interface/pom.xml @@ -18,7 +18,8 @@ maven-jar-plugin - 2.6 + + 3.0.2 target/classes diff --git a/adapters/mso-catalog-db-adapter/pom.xml b/adapters/mso-catalog-db-adapter/pom.xml index 5b3038fac7..0201dd6776 100644 --- a/adapters/mso-catalog-db-adapter/pom.xml +++ b/adapters/mso-catalog-db-adapter/pom.xml @@ -13,7 +13,6 @@ UTF-8 UTF-8 - 1.8 2.0.8 @@ -54,19 +53,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - 3.3 - - 1.8 - 1.8 - true - - -parameters - - - org.apache.maven.plugins maven-surefire-plugin @@ -189,7 +175,12 @@ uk.co.blackpepper.bowman bowman-client - 0.3.0 + ${bowman.client.version} + + + org.javassist + javassist + 3.25.0-GA ch.vorburger.mariaDB4j diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/tasks/TaskServices.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/tasks/TaskServices.java index d282046b3f..db9a7cefae 100644 --- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/tasks/TaskServices.java +++ b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/tasks/TaskServices.java @@ -22,7 +22,6 @@ package org.onap.so.adapters.tasks; import javax.annotation.PostConstruct; import org.camunda.bpm.client.ExternalTaskClient; -import org.onap.so.utils.ExternalTaskServiceUtils; import org.onap.so.adapters.tasks.audit.AuditCreateStackService; import org.onap.so.adapters.tasks.audit.AuditDeleteStackService; import org.onap.so.adapters.tasks.audit.AuditQueryStackService; @@ -30,6 +29,7 @@ import org.onap.so.adapters.tasks.inventory.CreateInventoryTask; import org.onap.so.adapters.tasks.orchestration.PollService; import org.onap.so.adapters.tasks.orchestration.RollbackService; import org.onap.so.adapters.tasks.orchestration.StackService; +import org.onap.so.utils.ExternalTaskServiceUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -94,10 +94,10 @@ public class TaskServices { } @PostConstruct - public void auditAAIInventory() throws Exception { + public void createtAAIInventory() throws Exception { for (int i = 0; i < externalTaskServiceUtils.getMaxClients(); i++) { ExternalTaskClient client = externalTaskServiceUtils.createExternalTaskClient(); - client.subscribe("InventoryCreate").lockDuration(externalTaskServiceUtils.getLockDuration()) + client.subscribe("InventoryCreate").lockDuration(externalTaskServiceUtils.getLongLockDuration()) .handler(createInventory::executeExternalTask).open(); } } diff --git a/adapters/mso-requests-db-adapter/.gitignore b/adapters/mso-requests-db-adapter/.gitignore index ae3c172604..9920c72893 100644 --- a/adapters/mso-requests-db-adapter/.gitignore +++ b/adapters/mso-requests-db-adapter/.gitignore @@ -1 +1,2 @@ /bin/ +/.apt_generated_tests/ diff --git a/adapters/mso-requests-db-adapter/pom.xml b/adapters/mso-requests-db-adapter/pom.xml index 3463642382..ba179b6717 100644 --- a/adapters/mso-requests-db-adapter/pom.xml +++ b/adapters/mso-requests-db-adapter/pom.xml @@ -108,25 +108,58 @@ cxf-logging ${project.version} - + + + + + apache.snapshots + Maven Plugin Snapshots + http://repository.apache.org/snapshots/ + + true + + + ${project.artifactId}-${project.version} org.apache.cxf cxf-java2ws-plugin - ${cxf.version} + 3.3.3 org.apache.cxf cxf-rt-frontend-jaxws - ${cxf.version} + 3.3.3 org.apache.cxf cxf-rt-frontend-simple - ${cxf.version} + 3.3.3 + + + + com.sun.xml.ws + jaxws-ri + 2.3.0 + pom + + + javax.annotation + javax.annotation-api + 1.3.2 + + + javax.xml.bind + jaxb-api + 2.4.0-b180725.0427 + + + org.glassfish.jaxb + jaxb-runtime + 2.4.0-b180725.0644 @@ -137,6 +170,9 @@ org.onap.so.adapters.requestsdb.MsoRequestsDbAdapter true true + + com.sun.xml.bind:jaxb-impl + java2ws diff --git a/adapters/mso-sdnc-adapter/.gitignore b/adapters/mso-sdnc-adapter/.gitignore new file mode 100644 index 0000000000..da7560e07f --- /dev/null +++ b/adapters/mso-sdnc-adapter/.gitignore @@ -0,0 +1 @@ +/.apt_generated_tests/ diff --git a/adapters/mso-sdnc-adapter/pom.xml b/adapters/mso-sdnc-adapter/pom.xml index 3b76c23ae6..0c320faf8a 100644 --- a/adapters/mso-sdnc-adapter/pom.xml +++ b/adapters/mso-sdnc-adapter/pom.xml @@ -133,6 +133,26 @@ + + com.sun.activation + javax.activation + 1.2.0 + + + javax.xml.bind + jaxb-api + 2.3.0 + + + com.sun.xml.bind + jaxb-core + 2.3.0 + + + com.sun.xml.bind + jaxb-impl + 2.3.0 + org.springframework.boot spring-boot-starter-web diff --git a/adapters/mso-sdnc-adapter/src/test/java/org/onap/so/adapters/sdnc/impl/UtilsTest.java b/adapters/mso-sdnc-adapter/src/test/java/org/onap/so/adapters/sdnc/impl/UtilsTest.java deleted file mode 100644 index 4a3db26443..0000000000 --- a/adapters/mso-sdnc-adapter/src/test/java/org/onap/so/adapters/sdnc/impl/UtilsTest.java +++ /dev/null @@ -1,64 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP - SO - * ================================================================================ - * Copyright (C) 2017 - 2018 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.onap.so.adapters.sdnc.impl; - -import static org.junit.Assert.assertEquals; -import java.io.File; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; -import org.junit.Test; -import org.onap.so.adapters.sdnc.SDNCAdapterRequest; -import org.w3c.dom.Document; -import org.w3c.dom.Node; - -public class UtilsTest { - - @Test - public final void testUnmarshal() { - - String expectedXml = - "FIREWALL-LITEmtjnj40evbc0ecebSHARED/restconf/config/Firewall-API:feature-model/feature-list/FIREWALL-LITE/mtjnj40evbc0eceb/ "; - - try { - - File file = new File("src/test/resources/sdncBpmnAdiodFirewallRequest.xml"); - JAXBContext jaxbContext = JAXBContext.newInstance(SDNCAdapterRequest.class); - - Unmarshaller jaxbUnmarshaller = jaxbContext.createUnmarshaller(); - SDNCAdapterRequest request = (SDNCAdapterRequest) jaxbUnmarshaller.unmarshal(file); - - RequestTunables rt = new RequestTunables("0460ba40-60c8-4b07-8878-c8e8d87cde04-1527983610512", "", - "/L3SDN-API:services/layer3-service-list/MIS%2F1806%2F25057%2FSW_INTERNET/service-data/feature-list/FIREWALL-LITE/", - "put"); - - Node node = (Node) request.getRequestData(); - Document reqDoc = node.getOwnerDocument(); - String sdncReqBody = Utils.genSdncPutReq(reqDoc, rt); - assertEquals(sdncReqBody.replaceAll("[\\t\\n\\r]+", ""), expectedXml); - - } catch (JAXBException e) { - e.printStackTrace(); - } - - } - -} diff --git a/adapters/pom.xml b/adapters/pom.xml index 76b4a58af6..9e703b9dab 100644 --- a/adapters/pom.xml +++ b/adapters/pom.xml @@ -46,5 +46,11 @@ aai-client ${project.version} + + com.sun.xml.ws + jaxws-ri + 2.3.0 + pom + diff --git a/adapters/so-appc-orchestrator/pom.xml b/adapters/so-appc-orchestrator/pom.xml index f7fc0bca4e..4d1a471ee8 100644 --- a/adapters/so-appc-orchestrator/pom.xml +++ b/adapters/so-appc-orchestrator/pom.xml @@ -13,7 +13,6 @@ UTF-8 UTF-8 - 1.8 so-appc-orchestrator MSO APPC-C Orchestrator @@ -55,19 +54,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - 3.3 - - 1.8 - 1.8 - true - - -parameters - - - org.apache.maven.plugins maven-surefire-plugin -- cgit 1.2.3-korg