diff options
Diffstat (limited to 'artifactbroker')
17 files changed, 73 insertions, 183 deletions
diff --git a/artifactbroker/forwarding/pom.xml b/artifactbroker/forwarding/pom.xml index 81ae4ce..2a675ff 100644 --- a/artifactbroker/forwarding/pom.xml +++ b/artifactbroker/forwarding/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.multicloud.framework</groupId> <artifactId>multicloud-framework-artifactbroker</artifactId> - <version>1.8.3-SNAPSHOT</version> + <version>1.9.0-SNAPSHOT</version> </parent> <artifactId>multicloud-framework-artifactbroker-forwarding</artifactId> @@ -39,13 +39,6 @@ <dependency> <groupId>org.onap.sdc.sdc-distribution-client</groupId> <artifactId>sdc-distribution-client</artifactId> - <version>1.4.5</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> </dependency> </dependencies> </project> diff --git a/artifactbroker/main/pom.xml b/artifactbroker/main/pom.xml index 6c8fc71..2135245 100644 --- a/artifactbroker/main/pom.xml +++ b/artifactbroker/main/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.onap.multicloud.framework</groupId> <artifactId>multicloud-framework-artifactbroker</artifactId> - <version>1.8.3-SNAPSHOT</version> + <version>1.9.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>multicloud-framework-artifactbroker-main</artifactId> diff --git a/artifactbroker/model/pom.xml b/artifactbroker/model/pom.xml index 0f08d40..6400c0f 100644 --- a/artifactbroker/model/pom.xml +++ b/artifactbroker/model/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.multicloud.framework</groupId> <artifactId>multicloud-framework-artifactbroker</artifactId> - <version>1.8.3-SNAPSHOT</version> + <version>1.9.0-SNAPSHOT</version> </parent> <artifactId>multicloud-framework-artifactbroker-model</artifactId> @@ -33,13 +33,6 @@ <dependency> <groupId>org.onap.sdc.sdc-distribution-client</groupId> <artifactId>sdc-distribution-client</artifactId> - <version>1.4.5</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> </dependency> </dependencies> </project> diff --git a/artifactbroker/packages/docker/build_image.sh b/artifactbroker/packages/docker/build_image.sh index f9a635e..4635f5c 100755 --- a/artifactbroker/packages/docker/build_image.sh +++ b/artifactbroker/packages/docker/build_image.sh @@ -17,8 +17,8 @@ cd ${DOCKER_BUILD_DIR} BUILD_ARGS="--no-cache" ORG="onap" -VERSION="1.8.3-SNAPSHOT" -STAGING_VERSION="1.8.3-STAGING" +VERSION="1.9.0-SNAPSHOT" +STAGING_VERSION="1.9.0-STAGING" PROJECT="multicloud" IMAGE="framework-artifactbroker" DOCKER_REPOSITORY="nexus3.onap.org:10003" diff --git a/artifactbroker/packages/pom.xml b/artifactbroker/packages/pom.xml index 940e980..60dbebd 100644 --- a/artifactbroker/packages/pom.xml +++ b/artifactbroker/packages/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.multicloud.framework</groupId> <artifactId>multicloud-framework-artifactbroker</artifactId> - <version>1.8.3-SNAPSHOT</version> + <version>1.9.0-SNAPSHOT</version> </parent> <artifactId>multicloud-framework-artifactbroker-package</artifactId> diff --git a/artifactbroker/packages/src/main/resources/etc/defaultConfig.json b/artifactbroker/packages/src/main/resources/etc/defaultConfig.json index 3497a5f..adfcdac 100644 --- a/artifactbroker/packages/src/main/resources/etc/defaultConfig.json +++ b/artifactbroker/packages/src/main/resources/etc/defaultConfig.json @@ -27,10 +27,7 @@ "sdcConfiguration":{ "parameterClassName":"org.onap.policy.distribution.reception.handling.sdc.SdcReceptionHandlerConfigurationParameterGroup", "parameters":{ - "asdcAddress": "sdc-be.onap:8443", - "messageBusAddress": [ - "message-router.onap" - ], + "sdcAddress": "sdc-be.onap:8443", "user": "policy", "password": "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U", "pollingInterval":20, @@ -49,7 +46,6 @@ "keystorePassword": "null", "activeserverTlsAuth": false, "isFilterinEmptyResources": true, - "isUseHttpsWithDmaap": false, "isUseHttpsWithSDC": true, "httpsproxyHost": "null", "httpproxyHost": "null", diff --git a/artifactbroker/plugins/forwarding-plugins/pom.xml b/artifactbroker/plugins/forwarding-plugins/pom.xml index 9c88f8f..ceeac00 100644 --- a/artifactbroker/plugins/forwarding-plugins/pom.xml +++ b/artifactbroker/plugins/forwarding-plugins/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.multicloud.framework</groupId> <artifactId>multicloud-framework-artifactbroker-plugins</artifactId> - <version>1.8.3-SNAPSHOT</version> + <version>1.9.0-SNAPSHOT</version> </parent> <artifactId>multicloud-framework-artifactbroker-forwarding-plugins</artifactId> diff --git a/artifactbroker/plugins/pom.xml b/artifactbroker/plugins/pom.xml index afafbf7..010cff3 100644 --- a/artifactbroker/plugins/pom.xml +++ b/artifactbroker/plugins/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.multicloud.framework</groupId> <artifactId>multicloud-framework-artifactbroker</artifactId> - <version>1.8.3-SNAPSHOT</version> + <version>1.9.0-SNAPSHOT</version> </parent> <artifactId>multicloud-framework-artifactbroker-plugins</artifactId> diff --git a/artifactbroker/plugins/reception-plugins/pom.xml b/artifactbroker/plugins/reception-plugins/pom.xml index 79da5e4..9fb2633 100644 --- a/artifactbroker/plugins/reception-plugins/pom.xml +++ b/artifactbroker/plugins/reception-plugins/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.multicloud.framework</groupId> <artifactId>multicloud-framework-artifactbroker-plugins</artifactId> - <version>1.8.3-SNAPSHOT</version> + <version>1.9.0-SNAPSHOT</version> </parent> <artifactId>multicloud-framework-artifactbroker-reception-plugins</artifactId> @@ -38,13 +38,6 @@ <dependency> <groupId>org.onap.sdc.sdc-distribution-client</groupId> <artifactId>sdc-distribution-client</artifactId> - <version>1.4.5</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> </dependency> </dependencies> </project> diff --git a/artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcConfiguration.java b/artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcConfiguration.java index d65f9d6..cc30f40 100644 --- a/artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcConfiguration.java +++ b/artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcConfiguration.java @@ -41,13 +41,8 @@ public class SdcConfiguration implements IConfiguration { } @Override - public String getAsdcAddress() { - return configParameters.getAsdcAddress(); - } - - @Override - public List<String> getMsgBusAddress() { - return configParameters.getMessageBusAddress(); + public String getSdcAddress() { + return configParameters.getSdcAddress(); } @Override @@ -111,11 +106,6 @@ public class SdcConfiguration implements IConfiguration { } @Override - public Boolean isUseHttpsWithDmaap() { - return configParameters.isUseHttpsWithDmaap(); - } - - @Override public Boolean isUseHttpsWithSDC() { return configParameters.isUseHttpsWithSDC(); } diff --git a/artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcReceptionHandlerConfigurationParameterBuilder.java b/artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcReceptionHandlerConfigurationParameterBuilder.java index 2476b07..24a27c9 100644 --- a/artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcReceptionHandlerConfigurationParameterBuilder.java +++ b/artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcReceptionHandlerConfigurationParameterBuilder.java @@ -31,7 +31,6 @@ public class SdcReceptionHandlerConfigurationParameterBuilder { private boolean activeserverTlsAuth; private boolean filterinEmptyResources; - private boolean useHttpsWithDmaap; private boolean useHttpsWithSDC; private int pollingTimeout; private int pollingInterval; @@ -39,7 +38,7 @@ public class SdcReceptionHandlerConfigurationParameterBuilder { private String password; private String consumerId; private String consumerGroup; - private String asdcAddress; + private String sdcAddress; private String environmentName; private String keystorePath; private String keystorePassword; @@ -47,7 +46,6 @@ public class SdcReceptionHandlerConfigurationParameterBuilder { private int httpproxyPort; private String httpsproxyHost; private String httpproxyHost; - private List<String> messageBusAddress; private List<String> artifactTypes; private int retryDelay; @@ -73,16 +71,6 @@ public class SdcReceptionHandlerConfigurationParameterBuilder { } /** - * Set useHttpsWithDmaap to this {@link SdcReceptionHandlerConfigurationParameterBuilder} instance. - * - * @param useHttpsWithDmaap the useHttpsWithDmaap - */ - public SdcReceptionHandlerConfigurationParameterBuilder setUseHttpsWithDmaap(final Boolean useHttpsWithDmaap) { - this.useHttpsWithDmaap = useHttpsWithDmaap; - return this; - } - - /** * Set pollingInterval to this {@link SdcReceptionHandlerConfigurationParameterBuilder} instance. * * @param pollingInterval the pollingInterval @@ -103,12 +91,12 @@ public class SdcReceptionHandlerConfigurationParameterBuilder { } /** - * Set asdcAddress to this {@link SdcReceptionHandlerConfigurationParameterBuilder} instance. + * Set sdcAddress to this {@link SdcReceptionHandlerConfigurationParameterBuilder} instance. * - * @param asdcAddress the asdcAddress + * @param sdcAddress the sdcAddress */ - public SdcReceptionHandlerConfigurationParameterBuilder setAsdcAddress(final String asdcAddress) { - this.asdcAddress = asdcAddress; + public SdcReceptionHandlerConfigurationParameterBuilder setSdcAddress(final String sdcAddress) { + this.sdcAddress = sdcAddress; return this; } @@ -183,16 +171,6 @@ public class SdcReceptionHandlerConfigurationParameterBuilder { } /** - * Set messageBusAddress to this {@link SdcReceptionHandlerConfigurationParameterBuilder} instance. - * - * @param messageBusAddress the messageBusAddress - */ - public SdcReceptionHandlerConfigurationParameterBuilder setMessageBusAddress(final List<String> messageBusAddress) { - this.messageBusAddress = messageBusAddress; - return this; - } - - /** * Set artifactTypes to this {@link SdcReceptionHandlerConfigurationParameterBuilder} instance. * * @param artifactTypes the artifactTypes @@ -232,15 +210,6 @@ public class SdcReceptionHandlerConfigurationParameterBuilder { } /** - * Returns the isUseHttpsWithDmaap flag of this {@link SdcReceptionHandlerConfigurationParameterBuilder} instance. - * - * @return the isUseHttpsWithDmaap - */ - public Boolean getIsUseHttpsWithDmaap() { - return useHttpsWithDmaap; - } - - /** * Returns the isUseHttpsWithSDC flag of this {@link SdcReceptionHandlerConfigurationParameterBuilder} instance. * * @return the isUseHttpsWithSDC @@ -270,10 +239,10 @@ public class SdcReceptionHandlerConfigurationParameterBuilder { /** * Returns the asdc address of this {@link SdcReceptionHandlerConfigurationParameterBuilder} instance. * - * @return the asdcAddress + * @return the sdcAddress */ - public String getAsdcAddress() { - return asdcAddress; + public String getSdcAddress() { + return sdcAddress; } /** @@ -340,15 +309,6 @@ public class SdcReceptionHandlerConfigurationParameterBuilder { } /** - * Returns the message bus address of this {@link SdcReceptionHandlerConfigurationParameterBuilder} instance. - * - * @return the messageBusAddress - */ - public List<String> getMessageBusAddress() { - return messageBusAddress; - } - - /** * Returns the artifact types of this {@link SdcReceptionHandlerConfigurationParameterBuilder} instance. * * @return the artifactTypes diff --git a/artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcReceptionHandlerConfigurationParameterGroup.java b/artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcReceptionHandlerConfigurationParameterGroup.java index c204d75..16cb612 100644 --- a/artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcReceptionHandlerConfigurationParameterGroup.java +++ b/artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcReceptionHandlerConfigurationParameterGroup.java @@ -33,27 +33,25 @@ import org.onap.policy.distribution.reception.parameters.ReceptionHandlerConfigu */ public class SdcReceptionHandlerConfigurationParameterGroup extends ReceptionHandlerConfigurationParameterGroup { - private String asdcAddress; - private List<String> messageBusAddress; - private String user; - private String password; - private int pollingInterval; - private int pollingTimeout; - private int retryDelay; - private int httpsProxyPort; - private int httpProxyPort; - private String httpsProxyHost; - private String httpProxyHost; - private String consumerId; - private List<String> artifactTypes; - private String consumerGroup; - private String environmentName; - private String keyStorePath; - private String keyStorePassword; - private boolean activeServerTlsAuth; - private boolean isFilterInEmptyResources; - private boolean isUseHttpsWithDmaap; - private boolean isUseHttpsWithSDC; + private final String sdcAddress; + private final String user; + private final String password; + private final int pollingInterval; + private final int pollingTimeout; + private final int retryDelay; + private final int httpsProxyPort; + private final int httpProxyPort; + private final String httpsProxyHost; + private final String httpProxyHost; + private final String consumerId; + private final List<String> artifactTypes; + private final String consumerGroup; + private final String environmentName; + private final String keyStorePath; + private final String keyStorePassword; + private final boolean activeServerTlsAuth; + private final boolean isFilterInEmptyResources; + private final boolean isUseHttpsWithSDC; /** * The constructor for instantiating {@link SdcReceptionHandlerConfigurationParameterGroup} class. @@ -62,8 +60,7 @@ public class SdcReceptionHandlerConfigurationParameterGroup extends ReceptionHan */ public SdcReceptionHandlerConfigurationParameterGroup( final SdcReceptionHandlerConfigurationParameterBuilder builder) { - asdcAddress = builder.getAsdcAddress(); - messageBusAddress = builder.getMessageBusAddress(); + sdcAddress = builder.getSdcAddress(); user = builder.getUser(); password = builder.getPassword(); pollingInterval = builder.getPollingInterval(); @@ -81,17 +78,12 @@ public class SdcReceptionHandlerConfigurationParameterGroup extends ReceptionHan keyStorePassword = builder.getKeystorePassword(); activeServerTlsAuth = builder.isActiveserverTlsAuth(); isFilterInEmptyResources = builder.isFilterinEmptyResources(); - isUseHttpsWithDmaap = builder.getIsUseHttpsWithDmaap(); isUseHttpsWithSDC = builder.getIsUseHttpsWithSDC(); } - public String getAsdcAddress() { - return asdcAddress; - } - - public List<String> getMessageBusAddress() { - return messageBusAddress; + public String getSdcAddress() { + return sdcAddress; } public String getUser() { @@ -146,10 +138,6 @@ public class SdcReceptionHandlerConfigurationParameterGroup extends ReceptionHan return isFilterInEmptyResources; } - public boolean isUseHttpsWithDmaap() { - return isUseHttpsWithDmaap; - } - public boolean isUseHttpsWithSDC() { return isUseHttpsWithSDC; } @@ -176,7 +164,7 @@ public class SdcReceptionHandlerConfigurationParameterGroup extends ReceptionHan @Override public GroupValidationResult validate() { final GroupValidationResult validationResult = new GroupValidationResult(this); - validateStringElement(validationResult, asdcAddress, "asdcAddress"); + validateStringElement(validationResult, sdcAddress, "sdcAddress"); validateStringElement(validationResult, user, "user"); validateStringElement(validationResult, consumerId, "consumerId"); validateStringElement(validationResult, consumerGroup, "consumerGroup"); @@ -185,7 +173,6 @@ public class SdcReceptionHandlerConfigurationParameterGroup extends ReceptionHan validateIntElement(validationResult, pollingInterval, "pollingInterval"); validateIntElement(validationResult, pollingTimeout, "pollingTimeout"); validateIntElement(validationResult, retryDelay, "retryDelay"); - validateStringListElement(validationResult, messageBusAddress, "messageBusAddress"); validateStringListElement(validationResult, artifactTypes, "artifactTypes"); return validationResult; } diff --git a/artifactbroker/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/TestSdcReceptionHandlerConfigurationParameterGroup.java b/artifactbroker/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/TestSdcReceptionHandlerConfigurationParameterGroup.java index 8f16708..d4f029f 100644 --- a/artifactbroker/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/TestSdcReceptionHandlerConfigurationParameterGroup.java +++ b/artifactbroker/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/TestSdcReceptionHandlerConfigurationParameterGroup.java @@ -54,9 +54,8 @@ public class TestSdcReceptionHandlerConfigurationParameterGroup { final GroupValidationResult validationResult = configParameters.validate(); assertTrue(validationResult.isValid()); final SdcConfiguration config = new SdcConfiguration(configParameters); - assertEquals(Arrays.asList("a.com", "b.com", "c.com"), config.getMsgBusAddress()); assertEquals(Arrays.asList("TOSCA_CSAR", "HEAT", "HELM"), config.getRelevantArtifactTypes()); - assertEquals("localhost", config.getAsdcAddress()); + assertEquals("localhost", config.getSdcAddress()); assertEquals("policy", config.getUser()); assertEquals("policy", config.getPassword()); assertEquals(20, config.getPollingInterval()); @@ -68,7 +67,6 @@ public class TestSdcReceptionHandlerConfigurationParameterGroup { assertEquals("null", config.getKeyStorePassword()); assertEquals(false, config.activateServerTLSAuth()); assertEquals(true, config.isFilterInEmptyResources()); - assertEquals(false, config.isUseHttpsWithDmaap()); } @Test @@ -89,19 +87,18 @@ public class TestSdcReceptionHandlerConfigurationParameterGroup { public void testSdcConfigurationBuilder() { final SdcReceptionHandlerConfigurationParameterBuilder builder = - new SdcReceptionHandlerConfigurationParameterBuilder().setAsdcAddress("localhost") + new SdcReceptionHandlerConfigurationParameterBuilder().setSdcAddress("localhost") .setConsumerGroup("policy-group").setConsumerId("policy-id").setEnvironmentName("TEST") .setKeystorePassword("password").setKeystorePath("dummyPath").setPassword("policy") .setPollingInterval(10).setPollingTimeout(20).setRetryDelay(30).setUser("policy") - .setUseHttpsWithDmaap(false).setActiveserverTlsAuth(false).setFilterinEmptyResources(true) - .setArtifactTypes(Arrays.asList("TOSCA_CSAR")).setMessageBusAddress(Arrays.asList("localhost")); + .setActiveserverTlsAuth(false).setFilterinEmptyResources(true) + .setArtifactTypes(Arrays.asList("TOSCA_CSAR")); final SdcReceptionHandlerConfigurationParameterGroup configParameters = new SdcReceptionHandlerConfigurationParameterGroup(builder); configParameters.setName("SDCConfiguration"); - assertEquals(Arrays.asList("localhost"), configParameters.getMessageBusAddress()); assertEquals(Arrays.asList("TOSCA_CSAR"), configParameters.getArtifactTypes()); - assertEquals("localhost", configParameters.getAsdcAddress()); + assertEquals("localhost", configParameters.getSdcAddress()); assertEquals("policy", configParameters.getUser()); assertEquals("policy", configParameters.getPassword()); assertEquals(10, configParameters.getPollingInterval()); @@ -114,41 +111,18 @@ public class TestSdcReceptionHandlerConfigurationParameterGroup { assertEquals("password", configParameters.getKeyStorePassword()); assertEquals(false, configParameters.isActiveServerTlsAuth()); assertEquals(true, configParameters.isFilterInEmptyResources()); - assertEquals(false, configParameters.isUseHttpsWithDmaap()); - } - - @Test - public void testSdcConfigurationWithNullList() { - - final SdcReceptionHandlerConfigurationParameterBuilder builder = - new SdcReceptionHandlerConfigurationParameterBuilder().setAsdcAddress("localhost") - .setConsumerGroup("policy-group").setConsumerId("policy-id").setEnvironmentName("TEST") - .setKeystorePassword("password").setKeystorePath("dummyPath").setPassword("policy") - .setPollingInterval(10).setPollingTimeout(20).setUser("policy").setUseHttpsWithDmaap(false) - .setActiveserverTlsAuth(false).setFilterinEmptyResources(true) - .setArtifactTypes(Arrays.asList("TOSCA_CSAR")).setMessageBusAddress(null); - final SdcReceptionHandlerConfigurationParameterGroup configParameters = - new SdcReceptionHandlerConfigurationParameterGroup(builder); - configParameters.setName("SDCConfiguration"); - - try { - configParameters.validate(); - fail("Test must throw an exception"); - } catch (final Exception exp) { - assertTrue(exp.getMessage().contains("collection parameter \"messageBusAddress\" is null")); - } } @Test public void testSdcConfigurationWithEmptyStringList() { final SdcReceptionHandlerConfigurationParameterBuilder builder = - new SdcReceptionHandlerConfigurationParameterBuilder().setAsdcAddress("localhost") + new SdcReceptionHandlerConfigurationParameterBuilder().setSdcAddress("localhost") .setConsumerGroup("policy-group").setConsumerId("policy-id").setEnvironmentName("TEST") .setKeystorePassword("password").setKeystorePath("dummyPath").setPassword("policy") - .setPollingInterval(10).setPollingTimeout(20).setUser("policy").setUseHttpsWithDmaap(false) + .setPollingInterval(10).setPollingTimeout(20).setUser("policy") .setActiveserverTlsAuth(false).setFilterinEmptyResources(true) - .setArtifactTypes(Arrays.asList("")).setMessageBusAddress(Arrays.asList("localhost")); + .setArtifactTypes(Arrays.asList("")); final SdcReceptionHandlerConfigurationParameterGroup configParameters = new SdcReceptionHandlerConfigurationParameterGroup(builder); configParameters.setName("SDCConfiguration"); diff --git a/artifactbroker/plugins/reception-plugins/src/test/resources/handling-sdc.json b/artifactbroker/plugins/reception-plugins/src/test/resources/handling-sdc.json index aa548e4..6f0d050 100644 --- a/artifactbroker/plugins/reception-plugins/src/test/resources/handling-sdc.json +++ b/artifactbroker/plugins/reception-plugins/src/test/resources/handling-sdc.json @@ -1,11 +1,6 @@ { "name" : "parameterConfig1", - "asdcAddress": "localhost", - "messageBusAddress": [ - "a.com", - "b.com", - "c.com" - ], + "sdcAddress": "localhost", "user": "policy", "password": "policy", "pollingInterval":20, @@ -22,7 +17,6 @@ "keyStorePath": "null", "keyStorePassword": "null", "activeServerTlsAuth": false, - "isFilterInEmptyResources": true, - "isUseHttpsWithDmaap": false + "isFilterInEmptyResources": true } diff --git a/artifactbroker/plugins/reception-plugins/src/test/resources/handling-sdcInvalid.json b/artifactbroker/plugins/reception-plugins/src/test/resources/handling-sdcInvalid.json index 65201d1..2e41017 100644 --- a/artifactbroker/plugins/reception-plugins/src/test/resources/handling-sdcInvalid.json +++ b/artifactbroker/plugins/reception-plugins/src/test/resources/handling-sdcInvalid.json @@ -1,11 +1,6 @@ { "name" : "parameterConfig1", - "asdcAddress": "", - "messageBusAddress": [ - "a.com", - "b.com", - "c.com" - ], + "sdcAddress": "", "user": "tbdsdc-1480", "password": "tbdsdc-1480", "pollingInterval":-1, @@ -21,7 +16,6 @@ "keyStorePath": "null", "keyStorePassword": "null", "activeserverTlsAuth": false, - "isFilterInEmptyResources": true, - "isUseHttpsWithDmaap": false + "isFilterInEmptyResources": true } diff --git a/artifactbroker/pom.xml b/artifactbroker/pom.xml index 4123057..6f9ea2e 100644 --- a/artifactbroker/pom.xml +++ b/artifactbroker/pom.xml @@ -22,7 +22,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.onap.multicloud.framework</groupId> <artifactId>multicloud-framework-artifactbroker</artifactId> - <version>1.8.3-SNAPSHOT</version> + <version>1.9.0-SNAPSHOT</version> <packaging>pom</packaging> <name>multicloud-framework-artifactbroker</name> <description>artifact broker</description> @@ -38,6 +38,7 @@ <sonar.coverage.jacoco.xmlReportPaths> ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml </sonar.coverage.jacoco.xmlReportPaths> + <sdc-dist-client-version>2.0.0</sdc-dist-client-version> </properties> <modules> <module>model</module> @@ -47,6 +48,21 @@ <module>plugins</module> <module>packages</module> </modules> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.onap.sdc.sdc-distribution-client</groupId> + <artifactId>sdc-distribution-client</artifactId> + <version>${sdc-dist-client-version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + </dependencyManagement> <dependencies> <dependency> <groupId>junit</groupId> diff --git a/artifactbroker/reception/pom.xml b/artifactbroker/reception/pom.xml index 30f7e59..804c17d 100644 --- a/artifactbroker/reception/pom.xml +++ b/artifactbroker/reception/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.multicloud.framework</groupId> <artifactId>multicloud-framework-artifactbroker</artifactId> - <version>1.8.3-SNAPSHOT</version> + <version>1.9.0-SNAPSHOT</version> </parent> <artifactId>multicloud-framework-artifactbroker-reception</artifactId> |