diff options
9 files changed, 63 insertions, 41 deletions
diff --git a/adapters/mso-requests-db-adapter/pom.xml b/adapters/mso-requests-db-adapter/pom.xml index 5d78f27ae2..066e3e6dc5 100644 --- a/adapters/mso-requests-db-adapter/pom.xml +++ b/adapters/mso-requests-db-adapter/pom.xml @@ -83,7 +83,7 @@ <pluginRepository> <id>apache.snapshots</id> <name>Maven Plugin Snapshots</name> - <url>http://repository.apache.org/snapshots/</url> + <url>https://repository.apache.org/snapshots/</url> <snapshots> <enabled>true</enabled> </snapshots> @@ -217,7 +217,7 @@ </plugins> <pluginManagement> <plugins> - <!--This plugin's configuration is used to store Eclipse m2e settings + <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself. --> <plugin> <groupId>org.eclipse.m2e</groupId> diff --git a/asdc-controller/pom.xml b/asdc-controller/pom.xml index e2b0322d58..a17d1b0748 100644 --- a/asdc-controller/pom.xml +++ b/asdc-controller/pom.xml @@ -224,6 +224,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> <version>1.15</version> diff --git a/bpmn/mso-infrastructure-bpmn/pom.xml b/bpmn/mso-infrastructure-bpmn/pom.xml index f225ea5afb..08e25c8786 100644 --- a/bpmn/mso-infrastructure-bpmn/pom.xml +++ b/bpmn/mso-infrastructure-bpmn/pom.xml @@ -80,6 +80,12 @@ </artifactItems> </configuration> </execution> + <execution> + <id>extract-docker-file</id> + <configuration> + <skip>false</skip> + </configuration> + </execution> </executions> </plugin> <plugin> @@ -150,18 +156,6 @@ </executions> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>extract-docker-file</id> - <configuration> - <skip>false</skip> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>io.fabric8</groupId> <artifactId>docker-maven-plugin</artifactId> <executions> @@ -280,6 +274,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>io.micrometer</groupId> <artifactId>micrometer-registry-prometheus</artifactId> </dependency> diff --git a/bpmn/mso-infrastructure-bpmn/src/test/java/org/onap/so/bpmn/infrastructure/pnf/delegate/CreateAndActivatePnfResourceTest.java b/bpmn/mso-infrastructure-bpmn/src/test/java/org/onap/so/bpmn/infrastructure/pnf/delegate/CreateAndActivatePnfResourceTest.java index 32ec69e5fa..5c3f72ea34 100644 --- a/bpmn/mso-infrastructure-bpmn/src/test/java/org/onap/so/bpmn/infrastructure/pnf/delegate/CreateAndActivatePnfResourceTest.java +++ b/bpmn/mso-infrastructure-bpmn/src/test/java/org/onap/so/bpmn/infrastructure/pnf/delegate/CreateAndActivatePnfResourceTest.java @@ -37,7 +37,13 @@ import org.onap.so.BaseIntegrationTest; import org.onap.so.bpmn.common.recipe.ResourceInput; import org.onap.so.bpmn.common.resource.ResourceRequestBuilder; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.context.TestPropertySource; + +@TestPropertySource(properties = {"pnf.kafka.topicListenerDelayInSeconds=3", + "pnf.kafka.kafkaBootstrapServers=localhost:9092", "pnf.kafka.pnfReadyTopicName=someTopic", + "pnf.kafka.pnfUpdateTopicName=someTopic2", "pnf.kafka.consumerGroup=someConsumerGroup", + "pnf.kafka.consumerId=someConsumerId", "pnf.kafka.consumerIdUpdate=someConsumerIdUpdate"}) public class CreateAndActivatePnfResourceTest extends BaseIntegrationTest { private static final String VALID_UUID = UUID.nameUUIDFromBytes("testUuid".getBytes()).toString(); diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/WaitForPnfReadyBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/WaitForPnfReadyBB.bpmn index 29e2f2bf11..d15de2f967 100644 --- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/WaitForPnfReadyBB.bpmn +++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/WaitForPnfReadyBB.bpmn @@ -3,15 +3,15 @@ <bpmn:collaboration id="Collaboration_1d0w8lf"> <bpmn:participant id="WaitForPnfReadyBB_ID" name="SO Wait For Pnf Ready" processRef="WaitForPnfReadyBB" /> <bpmn:participant id="WorkflowMessageServiceForDmaap" name="Workflow Message Service (communication with DMAAP) " /> - <bpmn:messageFlow id="MessageFlow_1vrcp2d" sourceRef="WorkflowMessageServiceForDmaap" targetRef="WaitForDmaapPnfReadyNotification" /> + <bpmn:messageFlow id="MessageFlow_1vrcp2d" sourceRef="WorkflowMessageServiceForDmaap" targetRef="WaitForKafkaPnfReadyNotification" /> <bpmn:messageFlow id="MessageFlow_0tg4hw9" sourceRef="RegisterForPnfReadyEvent" targetRef="WorkflowMessageServiceForDmaap" /> <bpmn:messageFlow id="MessageFlow_1py54jr" sourceRef="UnregisterfromPnfReadyEvent" targetRef="WorkflowMessageServiceForDmaap" /> </bpmn:collaboration> <bpmn:process id="WaitForPnfReadyBB" name="WaitForPnfReadyBB" isExecutable="true"> <bpmn:sequenceFlow id="SequenceFlow_17q5zqe" sourceRef="UpdatePnfOrchestrationStatusToRegistered" targetRef="AaiEntryUpdated" /> - <bpmn:sequenceFlow id="SequenceFlow_0m2r6ye" sourceRef="UpdatePnfOrchestrationStatusToRegister" targetRef="WaitForDmaapPnfReadyNotification" /> + <bpmn:sequenceFlow id="SequenceFlow_0m2r6ye" sourceRef="UpdatePnfOrchestrationStatusToRegister" targetRef="WaitForKafkaPnfReadyNotification" /> <bpmn:sequenceFlow id="SequenceFlow_1miyzfe" sourceRef="UnregisterfromPnfReadyEvent" targetRef="ThrowTimeoutException" /> - <bpmn:sequenceFlow id="SequenceFlow_0p09qgm" sourceRef="WaitForDmaapPnfReadyNotification" targetRef="UpdatePnfOrchestrationStatusToRegistered" /> + <bpmn:sequenceFlow id="SequenceFlow_0p09qgm" sourceRef="WaitForKafkaPnfReadyNotification" targetRef="UpdatePnfOrchestrationStatusToRegistered" /> <bpmn:sequenceFlow id="SequenceFlow_1o8od8e" sourceRef="RegisterForPnfReadyEvent" targetRef="UpdatePnfOrchestrationStatusToRegister" /> <bpmn:sequenceFlow id="SequenceFlow_1kc34bc" sourceRef="WaitForDmaapTimeout" targetRef="UnregisterfromPnfReadyEvent" /> <bpmn:sequenceFlow id="SequenceFlow_1jzs6dp" sourceRef="WaitForPnfReady_StartEvent" targetRef="RegisterForPnfReadyEvent" /> @@ -26,11 +26,11 @@ <bpmn:incoming>SequenceFlow_1o8od8e</bpmn:incoming> <bpmn:outgoing>SequenceFlow_0m2r6ye</bpmn:outgoing> </bpmn:serviceTask> - <bpmn:receiveTask id="WaitForDmaapPnfReadyNotification" name="Wait for DMAAP pnf-ready notification" messageRef="Message_13h1tlo"> + <bpmn:receiveTask id="WaitForKafkaPnfReadyNotification" name="Wait for DMAAP pnf-ready notification" messageRef="Message_13h1tlo"> <bpmn:incoming>SequenceFlow_0m2r6ye</bpmn:incoming> <bpmn:outgoing>SequenceFlow_0p09qgm</bpmn:outgoing> </bpmn:receiveTask> - <bpmn:boundaryEvent id="WaitForDmaapTimeout" name="Timeout" attachedToRef="WaitForDmaapPnfReadyNotification"> + <bpmn:boundaryEvent id="WaitForDmaapTimeout" name="Timeout" attachedToRef="WaitForKafkaPnfReadyNotification"> <bpmn:outgoing>SequenceFlow_1kc34bc</bpmn:outgoing> <bpmn:timerEventDefinition> <bpmn:timeDuration xsi:type="bpmn:tFormalExpression">#{timeoutForPnfEntryNotification}</bpmn:timeDuration> @@ -113,7 +113,7 @@ <dc:Bounds x="1028" y="309" width="90" height="10" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> - <bpmndi:BPMNShape id="ReceiveTask_1sfysua_di" bpmnElement="WaitForDmaapPnfReadyNotification"> + <bpmndi:BPMNShape id="ReceiveTask_1sfysua_di" bpmnElement="WaitForKafkaPnfReadyNotification"> <dc:Bounds x="720" y="167" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_0p09qgm_di" bpmnElement="SequenceFlow_0p09qgm"> diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateAndActivatePnfResource.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateAndActivatePnfResource.bpmn index 8ffa32e10d..a389afba7b 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateAndActivatePnfResource.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateAndActivatePnfResource.bpmn @@ -7,18 +7,18 @@ <bpmn:messageFlow id="MessageFlow_1h3xu88" sourceRef="CreatePnfEntryInAai" targetRef="Participant_0atuyq0" /> <bpmn:messageFlow id="MessageFlow_09ibv5a" sourceRef="CheckAiiForPnfCorrelationId" targetRef="Participant_0atuyq0" /> <bpmn:messageFlow id="MessageFlow_0vjul4t" sourceRef="Participant_0atuyq0" targetRef="CheckAiiForPnfCorrelationId" /> - <bpmn:messageFlow id="MessageFlow_1vrcp2d" sourceRef="Participant_19w87ws" targetRef="WaitForDmaapPnfReadyNotification" /> - <bpmn:messageFlow id="MessageFlow_0tg4hw9" sourceRef="InformDmaapClient" targetRef="Participant_19w87ws" /> + <bpmn:messageFlow id="MessageFlow_1vrcp2d" sourceRef="Participant_19w87ws" targetRef="WaitForKafkaPnfReadyNotification" /> + <bpmn:messageFlow id="MessageFlow_0tg4hw9" sourceRef="InformKafkaClient" targetRef="Participant_19w87ws" /> <bpmn:messageFlow id="MessageFlow_1py54jr" sourceRef="CancelDmaapClientSubscription" targetRef="Participant_19w87ws" /> </bpmn:collaboration> <bpmn:process id="CreateAndActivatePnfResource" name="CreateAndActivatePnfResource" isExecutable="true"> <bpmn:sequenceFlow id="SequenceFlow_1kc34bc" sourceRef="WaitForDmaapTimeout" targetRef="CancelDmaapClientSubscription" /> - <bpmn:sequenceFlow id="SequenceFlow_1o8od8e" sourceRef="InformDmaapClient" targetRef="WaitForDmaapPnfReadyNotification" /> + <bpmn:sequenceFlow id="SequenceFlow_1o8od8e" sourceRef="InformKafkaClient" targetRef="WaitForKafkaPnfReadyNotification" /> <bpmn:sequenceFlow id="SequenceFlow_0v5ffpe" name="No" sourceRef="DoesAaiContainInfoAboutPnf" targetRef="CreatePnfEntryInAai"> <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">#{!aaiContainsInfoAboutPnf}</bpmn:conditionExpression> </bpmn:sequenceFlow> - <bpmn:sequenceFlow id="SequenceFlow_0p09qgm" sourceRef="WaitForDmaapPnfReadyNotification" targetRef="CreateRelationId" /> - <bpmn:sequenceFlow id="SequenceFlow_17s9025" sourceRef="AaiEntryExists" targetRef="InformDmaapClient" /> + <bpmn:sequenceFlow id="SequenceFlow_0p09qgm" sourceRef="WaitForKafkaPnfReadyNotification" targetRef="CreateRelationId" /> + <bpmn:sequenceFlow id="SequenceFlow_17s9025" sourceRef="AaiEntryExists" targetRef="InformKafkaClient" /> <bpmn:sequenceFlow id="SequenceFlow_1qr6cmf" sourceRef="CreatePnfEntryInAai" targetRef="AaiEntryExists" /> <bpmn:sequenceFlow id="SequenceFlow_1j4r3zt" sourceRef="CheckAiiForPnfCorrelationId" targetRef="DoesAaiContainInfoAboutPnf" /> <bpmn:sequenceFlow id="SequenceFlow_0j5ksz1" sourceRef="CreateAndActivatePnf_StartEvent" targetRef="CheckInputs" /> @@ -35,7 +35,7 @@ <bpmn:incoming>SequenceFlow_1kc34bc</bpmn:incoming> <bpmn:outgoing>SequenceFlow_1miyzfe</bpmn:outgoing> </bpmn:serviceTask> - <bpmn:serviceTask id="InformDmaapClient" name="Register in Dmaap" camunda:delegateExpression="${InformDmaapClient}"> + <bpmn:serviceTask id="InformKafkaClient" name="Register in Dmaap" camunda:delegateExpression="${InformKafkaClient}"> <bpmn:incoming>SequenceFlow_17s9025</bpmn:incoming> <bpmn:outgoing>SequenceFlow_1o8od8e</bpmn:outgoing> </bpmn:serviceTask> @@ -59,11 +59,11 @@ <bpmn:incoming>SequenceFlow_1miyzfe</bpmn:incoming> <bpmn:errorEventDefinition errorRef="Error_1" /> </bpmn:endEvent> - <bpmn:receiveTask id="WaitForDmaapPnfReadyNotification" name="Wait for DMAAP pnf-ready notification" messageRef="Message_13h1tlo"> + <bpmn:receiveTask id="WaitForKafkaPnfReadyNotification" name="Wait for DMAAP pnf-ready notification" messageRef="Message_13h1tlo"> <bpmn:incoming>SequenceFlow_1o8od8e</bpmn:incoming> <bpmn:outgoing>SequenceFlow_0p09qgm</bpmn:outgoing> </bpmn:receiveTask> - <bpmn:boundaryEvent id="WaitForDmaapTimeout" name="Timeout" attachedToRef="WaitForDmaapPnfReadyNotification"> + <bpmn:boundaryEvent id="WaitForDmaapTimeout" name="Timeout" attachedToRef="WaitForKafkaPnfReadyNotification"> <bpmn:outgoing>SequenceFlow_1kc34bc</bpmn:outgoing> <bpmn:timerEventDefinition> <bpmn:timeDuration xsi:type="bpmn:tFormalExpression">#{timeoutForPnfEntryNotification}</bpmn:timeDuration> @@ -226,7 +226,7 @@ <dc:Bounds x="1028" y="309" width="90" height="10" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> - <bpmndi:BPMNShape id="ReceiveTask_1sfysua_di" bpmnElement="WaitForDmaapPnfReadyNotification"> + <bpmndi:BPMNShape id="ReceiveTask_1sfysua_di" bpmnElement="WaitForKafkaPnfReadyNotification"> <dc:Bounds x="1008" y="167" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_0p09qgm_di" bpmnElement="SequenceFlow_0p09qgm"> @@ -250,7 +250,7 @@ <dc:Bounds x="823" y="380" width="90" height="10" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> - <bpmndi:BPMNShape id="ServiceTask_1iax11n_di" bpmnElement="InformDmaapClient"> + <bpmndi:BPMNShape id="ServiceTask_1iax11n_di" bpmnElement="InformKafkaClient"> <dc:Bounds x="803" y="167" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_1miyzfe_di" bpmnElement="SequenceFlow_1miyzfe"> diff --git a/deployment-configs/pom.xml b/deployment-configs/pom.xml index f540e5a8a1..c3ee2bc005 100644 --- a/deployment-configs/pom.xml +++ b/deployment-configs/pom.xml @@ -9,7 +9,7 @@ </parent> <artifactId>deployment-configs</artifactId> <name>deployment-configs</name> - <url>http://maven.apache.org</url> + <url>https://maven.apache.org</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> diff --git a/mso-catalog-db/pom.xml b/mso-catalog-db/pom.xml index 0285deab21..89651ece46 100644 --- a/mso-catalog-db/pom.xml +++ b/mso-catalog-db/pom.xml @@ -62,6 +62,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>ch.vorburger.mariaDB4j</groupId> <artifactId>mariaDB4j</artifactId> <scope>test</scope> @@ -19,7 +19,7 @@ </description> <organization> <name>ONAP - SO</name> - <url>http://www.onap.org/</url> + <url>https://www.onap.org/</url> </organization> <modules> <module>deployment-configs</module> @@ -118,11 +118,11 @@ <pluginRepositories> <pluginRepository> <id>central</id> - <url>http://repo1.maven.org/maven2</url> + <url>https://repo1.maven.org/maven2</url> </pluginRepository> <pluginRepository> <id>restlet</id> - <url>http://maven.restlet.com</url> + <url>https://maven.restlet.com</url> </pluginRepository> <pluginRepository> <id>onap-public</id> @@ -279,7 +279,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>sonar-maven-plugin</artifactId> - <version>5.1</version> + <version>4.0.0.4121</version> </plugin> <plugin> <artifactId>maven-scm-plugin</artifactId> @@ -411,13 +411,13 @@ f = new File( p ); if( f.exists() ) { break; - } + } p = "../" + p; } } if( f != null ) { String basePath = f.getCanonicalPath(); - basePath = basePath.substring( 0, basePath.lastIndexOf( File.separator ) ); + basePath = basePath.substring( 0, basePath.lastIndexOf( File.separator ) ); project.properties['base-path'] = basePath.replace( '\\' , '/'); log.info(' - used base path = ' + project.properties['base-path'] ); } else { @@ -578,16 +578,16 @@ <skipBuild>${docker.skip.build}</skipBuild> <skipPush>${docker.skip.push}</skipPush> <dockerHost>${docker.newHost}</dockerHost> - <!-- 1. Update address to your local docker VM. 2. Add IP to + <!-- 1. Update address to your local docker VM. 2. Add IP to your NO_PROXY environment variable --> <certPath>${docker.host.cert.path}</certPath> - <!-- Add -Ddocker.host.cert.pat="path to your local certs directory" + <!-- Add -Ddocker.host.cert.pat="path to your local certs directory" to maven build command --> <pushRegistry>${dockerPushRepo}</pushRegistry> - <!-- Update .m2/settings.xml Add server id settings.dockerRepository, + <!-- Update .m2/settings.xml Add server id settings.dockerRepository, username, and password --> <pullRegistry>${dockerPullRepo}</pullRegistry> - <!-- If docker repo is not public. Update .m2/settings.xml Add + <!-- If docker repo is not public. Update .m2/settings.xml Add server id settings.dockerRepository, username, and password --> <images> <image> @@ -768,6 +768,7 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.hamcrest</groupId> @@ -855,6 +856,10 @@ <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </exclusion> + <exclusion> + <groupId>com.vaadin.external.google</groupId> + <artifactId>android-json</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -873,6 +878,7 @@ <groupId>com.googlecode.junit-toolbox</groupId> <artifactId>junit-toolbox</artifactId> <version>2.4</version> + <scope>test</scope> </dependency> </dependencies> <dependencyManagement> @@ -937,6 +943,7 @@ <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-test</artifactId> <version>${springboot.version}</version> + <scope>test</scope> <exclusions> <exclusion> <groupId>com.vaadin.external.google</groupId> |