diff options
30 files changed, 108 insertions, 107 deletions
diff --git a/adapters/mso-adapter-utils/pom.xml b/adapters/mso-adapter-utils/pom.xml index f958bd1bc7..959358761d 100644 --- a/adapters/mso-adapter-utils/pom.xml +++ b/adapters/mso-adapter-utils/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.openecomp.mso</groupId> <artifactId>adapters</artifactId> - <version>0.0.4-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> </parent> <groupId>org.openecomp.mso.adapters</groupId> <artifactId>mso-adapter-utils</artifactId> @@ -15,7 +15,7 @@ <finalName>${project.artifactId}</finalName> <sourceDirectory>src/main/java</sourceDirectory> <plugins> - + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> @@ -39,7 +39,7 @@ </execution> </executions> </plugin> - + <plugin> <artifactId>maven-war-plugin</artifactId> <version>2.3</version> @@ -55,22 +55,22 @@ <dependency> <groupId>org.openecomp.mso.libs.openstack-java-sdk</groupId> <artifactId>keystone-client</artifactId> - <version>1.0.0</version> + <version>1.1.0</version> </dependency> <dependency> <groupId>org.openecomp.mso.libs.openstack-java-sdk</groupId> <artifactId>heat-client</artifactId> - <version>1.0.0</version> + <version>1.1.0</version> </dependency> <dependency> <groupId>org.openecomp.mso.libs.openstack-java-sdk</groupId> <artifactId>quantum-client</artifactId> - <version>1.0.0</version> + <version>1.1.0</version> </dependency> <dependency> <groupId>org.openecomp.mso.libs.openstack-java-sdk.client-connectors</groupId> <artifactId>http-connector</artifactId> - <version>1.0.0</version> + <version>1.1.0</version> </dependency> <dependency> <groupId>org.openecomp.mso</groupId> @@ -108,13 +108,13 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>1.10.19</version> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <version>1.10.19</version> <scope>test</scope> </dependency> - + <dependency> <groupId>org.jboss.spec.javax.ejb</groupId> <artifactId>jboss-ejb-api_3.2_spec</artifactId> @@ -132,6 +132,6 @@ <artifactId>snakeyaml</artifactId> <version>1.15</version> </dependency> - + </dependencies> </project> diff --git a/adapters/mso-adapters-rest-interface/pom.xml b/adapters/mso-adapters-rest-interface/pom.xml index f48514123f..0080d1b6a1 100644 --- a/adapters/mso-adapters-rest-interface/pom.xml +++ b/adapters/mso-adapters-rest-interface/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.openecomp.mso</groupId> <artifactId>adapters</artifactId> - <version>0.0.4-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> </parent> <groupId>org.openecomp.mso.adapters</groupId> <artifactId>mso-adapters-rest-interface</artifactId> diff --git a/adapters/mso-network-adapter-async-client/pom.xml b/adapters/mso-network-adapter-async-client/pom.xml index 3b2cd4273d..a8b96154af 100644 --- a/adapters/mso-network-adapter-async-client/pom.xml +++ b/adapters/mso-network-adapter-async-client/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.openecomp.mso</groupId> <artifactId>adapters</artifactId> - <version>0.0.4-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> </parent> <groupId>org.openecomp.mso.adapters</groupId> <artifactId>mso-network-adapter-async-client</artifactId> @@ -52,7 +52,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/adapters/mso-network-adapter/pom.xml b/adapters/mso-network-adapter/pom.xml index 3991bf3118..207d58abdf 100644 --- a/adapters/mso-network-adapter/pom.xml +++ b/adapters/mso-network-adapter/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.openecomp.mso</groupId> <artifactId>adapters</artifactId> - <version>0.0.4-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> </parent> <groupId>org.openecomp.mso.adapters</groupId> <artifactId>mso-network-adapter</artifactId> @@ -62,7 +62,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/adapters/mso-requests-db-adapter/pom.xml b/adapters/mso-requests-db-adapter/pom.xml index b14cde1657..c1f78488ad 100644 --- a/adapters/mso-requests-db-adapter/pom.xml +++ b/adapters/mso-requests-db-adapter/pom.xml @@ -4,16 +4,16 @@ <parent> <groupId>org.openecomp.mso</groupId> <artifactId>adapters</artifactId> - <version>0.0.4-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> </parent> <groupId>org.openecomp.mso.adapters</groupId> <artifactId>mso-requests-db-adapter</artifactId> <packaging>war</packaging> - - + + <dependencies> - + <dependency> <groupId>org.openecomp.mso</groupId> <artifactId>mso-requests-db</artifactId> @@ -50,7 +50,7 @@ <build> <finalName>${project.artifactId}-${project.version}</finalName> <plugins> - + <plugin> <artifactId>maven-war-plugin</artifactId> <version>2.4</version> diff --git a/adapters/mso-sdnc-adapter/pom.xml b/adapters/mso-sdnc-adapter/pom.xml index 11648aa4dc..5e6c5c6b36 100644 --- a/adapters/mso-sdnc-adapter/pom.xml +++ b/adapters/mso-sdnc-adapter/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.openecomp.mso</groupId> <artifactId>adapters</artifactId> - <version>0.0.4-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> </parent> <groupId>org.openecomp.mso.adapters</groupId> <artifactId>mso-sdnc-adapter</artifactId> @@ -15,7 +15,7 @@ <build> <finalName>${project.artifactId}-${project.version}</finalName> <plugins> - + <plugin> <artifactId>maven-war-plugin</artifactId> <version>2.4</version> @@ -70,7 +70,7 @@ <groupId>org.openecomp.mso.adapters</groupId> <artifactId>mso-adapter-utils</artifactId> <version>${project.version}</version> - + </dependency> <dependency> <groupId>javax</groupId> diff --git a/adapters/mso-tenant-adapter/pom.xml b/adapters/mso-tenant-adapter/pom.xml index c649e9eb69..d57529cb43 100644 --- a/adapters/mso-tenant-adapter/pom.xml +++ b/adapters/mso-tenant-adapter/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.openecomp.mso</groupId> <artifactId>adapters</artifactId> - <version>0.0.4-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> </parent> <groupId>org.openecomp.mso.adapters</groupId> <artifactId>mso-tenant-adapter</artifactId> @@ -82,7 +82,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/adapters/mso-vnf-adapter-async-client/pom.xml b/adapters/mso-vnf-adapter-async-client/pom.xml index fc10f1c492..1ae4b16e05 100644 --- a/adapters/mso-vnf-adapter-async-client/pom.xml +++ b/adapters/mso-vnf-adapter-async-client/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.openecomp.mso</groupId> <artifactId>adapters</artifactId> - <version>0.0.4-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> </parent> <groupId>org.openecomp.mso.adapters</groupId> <artifactId>mso-vnf-adapter-async-client</artifactId> @@ -52,7 +52,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/adapters/mso-vnf-adapter/pom.xml b/adapters/mso-vnf-adapter/pom.xml index 1914eb14f8..bc32498b20 100644 --- a/adapters/mso-vnf-adapter/pom.xml +++ b/adapters/mso-vnf-adapter/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.openecomp.mso</groupId> <artifactId>adapters</artifactId> - <version>0.0.4-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> </parent> <groupId>org.openecomp.mso.adapters</groupId> <artifactId>mso-vnf-adapter</artifactId> diff --git a/adapters/pom.xml b/adapters/pom.xml index d75fd57931..8ccd8cdc71 100644 --- a/adapters/pom.xml +++ b/adapters/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.openecomp</groupId> <artifactId>mso</artifactId> - <version>0.0.4-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> </parent> <groupId>org.openecomp.mso</groupId> @@ -25,7 +25,7 @@ <module>mso-vnf-adapter-async-client</module> <module>mso-requests-db-adapter</module> </modules> - + <dependencies> <dependency> <groupId>org.apache.httpcomponents</groupId> diff --git a/asdc-controller/pom.xml b/asdc-controller/pom.xml index 75665bc01d..2db751841a 100644 --- a/asdc-controller/pom.xml +++ b/asdc-controller/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.openecomp</groupId> <artifactId>mso</artifactId> - <version>0.0.4-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> </parent> <groupId>org.openecomp.mso</groupId> @@ -12,7 +12,7 @@ <name>asdc-controller</name> <description>ASDC CLient and Controller</description> <packaging>war</packaging> - + <build> <finalName>${project.artifactId}-${project.version}</finalName> <plugins> @@ -70,7 +70,7 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </exclusion> - </exclusions> + </exclusions> </dependency> <dependency> diff --git a/bpmn/MSOCockpit/pom.xml b/bpmn/MSOCockpit/pom.xml index cc5ecd7bc9..939c185950 100644 --- a/bpmn/MSOCockpit/pom.xml +++ b/bpmn/MSOCockpit/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.openecomp.mso</groupId> <artifactId>bpmn</artifactId> - <version>0.0.4-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -36,16 +36,16 @@ </plugin> </plugins> </build> - + <dependencies> - + <dependency> <groupId>org.camunda.bpm.webapp</groupId> <artifactId>camunda-webapp-jboss-standalone</artifactId> <version>${camunda.version}</version> <type>war</type> </dependency> - + <dependency> <groupId>org.openecomp.mso</groupId> <artifactId>common</artifactId> @@ -62,5 +62,5 @@ <version>${project.version}</version> </dependency> </dependencies> - + </project> diff --git a/bpmn/MSOCoreBPMN/pom.xml b/bpmn/MSOCoreBPMN/pom.xml index db0f7cf30a..9decd590e3 100644 --- a/bpmn/MSOCoreBPMN/pom.xml +++ b/bpmn/MSOCoreBPMN/pom.xml @@ -4,13 +4,13 @@ <parent> <groupId>org.openecomp.mso</groupId> <artifactId>bpmn</artifactId> - <version>0.0.4-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.openecomp.mso</groupId> <artifactId>MSOCoreBPMN</artifactId> <packaging>jar</packaging> - + <build> <plugins> <!-- Note: test utilities really ought to exist only in the test scope but --> diff --git a/bpmn/MSOGammaBPMN/pom.xml b/bpmn/MSOGammaBPMN/pom.xml index fa2055c01a..26ea278c53 100644 --- a/bpmn/MSOGammaBPMN/pom.xml +++ b/bpmn/MSOGammaBPMN/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.openecomp.mso</groupId> <artifactId>bpmn</artifactId> - <version>0.0.4-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.openecomp.mso</groupId> diff --git a/bpmn/MSORESTClient/pom.xml b/bpmn/MSORESTClient/pom.xml index 97d9971769..3c2ea83bb6 100644 --- a/bpmn/MSORESTClient/pom.xml +++ b/bpmn/MSORESTClient/pom.xml @@ -2,20 +2,20 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - + <parent> <groupId>org.openecomp.mso</groupId> <artifactId>bpmn</artifactId> - <version>0.0.4-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> </parent> - + <groupId>org.openecomp.mso</groupId> <artifactId>MSORESTClient</artifactId> - + <packaging>jar</packaging> - + <name>MSO REST Client API</name> - + <dependencies> <dependency> <groupId>org.apache.httpcomponents</groupId> @@ -54,6 +54,6 @@ </configuration> </plugin> </plugins> - + </build> </project> diff --git a/bpmn/MSOURN-plugin/pom.xml b/bpmn/MSOURN-plugin/pom.xml index e94a1f7233..5ad57a6096 100644 --- a/bpmn/MSOURN-plugin/pom.xml +++ b/bpmn/MSOURN-plugin/pom.xml @@ -1,18 +1,18 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - + <parent> <groupId>org.openecomp.mso</groupId> <artifactId>bpmn</artifactId> - <version>0.0.4-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> </parent> - + <groupId>org.openecomp.mso</groupId> <artifactId>cockpit-urnmap-plugin</artifactId> - + <packaging>jar</packaging> - + <name>MSO URN Mapping Cockpit Plugin</name> <dependencies> diff --git a/bpmn/pom.xml b/bpmn/pom.xml index ebcce1d8fe..ca9d69c5bc 100644 --- a/bpmn/pom.xml +++ b/bpmn/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.openecomp</groupId> <artifactId>mso</artifactId> - <version>0.0.4-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> </parent> <groupId>org.openecomp.mso</groupId> @@ -13,7 +13,7 @@ <name>BPMN Subsystem</name> <description>BPMN Subsystem for MSO</description> <packaging>pom</packaging> - + <properties> <camunda.version>7.3.0</camunda.version> <camunda.bpm.assert.version>1.2</camunda.bpm.assert.version> @@ -22,10 +22,10 @@ <saxon.version>9.5.1-8</saxon.version> <junit.version>4.11</junit.version> <xmlunit.version>1.6</xmlunit.version> - + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - + </properties> <modules> @@ -36,7 +36,7 @@ <module>MSOCockpit</module> </modules> - + <!-- Define artifact versions for child modules --> <dependencyManagement> <dependencies> @@ -90,7 +90,7 @@ </dependency> </dependencies> </dependencyManagement> - + <dependencies> <dependency> <groupId>org.apache.httpcomponents</groupId> @@ -101,10 +101,10 @@ <artifactId>httpclient</artifactId> </dependency> </dependencies> - + <build> <plugins> - + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> @@ -152,7 +152,7 @@ </lifecycleMappingMetadata> </configuration> </plugin> - + </plugins> </pluginManagement> </build> diff --git a/common/pom.xml b/common/pom.xml index f9ea6df44b..4809c954df 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.openecomp</groupId> <artifactId>mso</artifactId> - <version>0.0.4-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> </parent> <groupId>org.openecomp.mso</groupId> diff --git a/mso-api-handlers/mso-api-handler-common/pom.xml b/mso-api-handlers/mso-api-handler-common/pom.xml index b9d622d08c..859155a1b7 100644 --- a/mso-api-handlers/mso-api-handler-common/pom.xml +++ b/mso-api-handlers/mso-api-handler-common/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.openecomp.mso</groupId> <artifactId>mso-api-handlers</artifactId> - <version>0.0.4-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> </parent> @@ -40,17 +40,17 @@ </exclusion> </exclusions> </dependency> - + <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> </dependency> - + <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> </dependency> - + <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> @@ -81,7 +81,7 @@ <artifactId>jackson-mapper-asl</artifactId> <version>1.9.13</version> </dependency> - + <dependency> <groupId>org.openecomp.mso</groupId> <artifactId>mso-catalog-db</artifactId> diff --git a/mso-api-handlers/mso-api-handler-infra/pom.xml b/mso-api-handlers/mso-api-handler-infra/pom.xml index 74ec57dbc7..0cce04ae19 100644 --- a/mso-api-handlers/mso-api-handler-infra/pom.xml +++ b/mso-api-handlers/mso-api-handler-infra/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.openecomp.mso</groupId> <artifactId>mso-api-handlers</artifactId> - <version>0.0.4-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> </parent> @@ -58,7 +58,7 @@ <artifactId>jboss-ejb3-ext-api</artifactId> <version>2.2.0.Final</version> <scope>provided</scope> - </dependency> + </dependency> <dependency> <groupId>javax.activation</groupId> @@ -67,11 +67,11 @@ <scope>provided</scope> </dependency> - <dependency> + <dependency> <groupId>org.openecomp.mso</groupId> <artifactId>mso-catalog-db</artifactId> <version>${project.version}</version> - </dependency> + </dependency> <dependency> <groupId>org.openecomp.mso</groupId> <artifactId>mso-requests-db</artifactId> @@ -92,7 +92,7 @@ <build> <finalName>${project.artifactId}-${project.version}</finalName> <plugins> - + <plugin> <artifactId>maven-war-plugin</artifactId> <version>2.3</version> diff --git a/mso-api-handlers/mso-requests-db/pom.xml b/mso-api-handlers/mso-requests-db/pom.xml index fc09305ea9..2d9cc89216 100644 --- a/mso-api-handlers/mso-requests-db/pom.xml +++ b/mso-api-handlers/mso-requests-db/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.openecomp.mso</groupId> <artifactId>mso-api-handlers</artifactId> - <version>0.0.4-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> </parent> <artifactId>mso-requests-db</artifactId> @@ -96,7 +96,7 @@ <artifactId>hibernate-jpa-2.1-api</artifactId> <version>1.0.0.Final</version> </dependency> - + <dependency> <groupId>org.openecomp.mso</groupId> <artifactId>common</artifactId> @@ -107,7 +107,7 @@ <build> <finalName>${project.artifactId}</finalName> <plugins> - + <plugin> <artifactId>maven-war-plugin</artifactId> <version>2.3</version> @@ -143,7 +143,7 @@ <artifactId>maven-resources-plugin</artifactId> <version>3.0.1</version> <executions> - + <execution> <id>copy-sql-file</id> <phase>install</phase> @@ -152,9 +152,9 @@ </goals> <configuration> <overwrite>true</overwrite> - + <outputDirectory>${project.basedir}/../../packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/main-schemas</outputDirectory> - + <resources> <resource> <directory>${project.build.directory}</directory> @@ -163,7 +163,7 @@ <include>*.sql</include> </includes> </resource> - </resources> + </resources> </configuration> </execution> </executions> diff --git a/mso-api-handlers/pom.xml b/mso-api-handlers/pom.xml index 87d6453fb7..6b9448e63d 100644 --- a/mso-api-handlers/pom.xml +++ b/mso-api-handlers/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.openecomp</groupId> <artifactId>mso</artifactId> - <version>0.0.4-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> </parent> <groupId>org.openecomp.mso</groupId> @@ -18,7 +18,7 @@ <module>mso-api-handler-common</module> <module>mso-api-handler-infra</module> </modules> - + <dependencies> <dependency> <groupId>org.apache.httpcomponents</groupId> diff --git a/mso-catalog-db/pom.xml b/mso-catalog-db/pom.xml index fdb6cc17e3..6b9e55cc79 100644 --- a/mso-catalog-db/pom.xml +++ b/mso-catalog-db/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.openecomp</groupId> <artifactId>mso</artifactId> - <version>0.0.4-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> </parent> <groupId>org.openecomp.mso</groupId> @@ -49,7 +49,7 @@ <artifactId>maven-resources-plugin</artifactId> <version>3.0.1</version> <executions> - + <execution> <id>copy-sql-file</id> <phase>install</phase> @@ -58,9 +58,9 @@ </goals> <configuration> <overwrite>true</overwrite> - + <outputDirectory>${project.basedir}/../packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/main-schemas</outputDirectory> - + <resources> <resource> <directory>${project.build.directory}</directory> @@ -69,7 +69,7 @@ <include>*.sql</include> </includes> </resource> - </resources> + </resources> </configuration> </execution> </executions> @@ -147,7 +147,7 @@ </exclusion> </exclusions> </dependency> - + <dependency> <groupId>org.openecomp.mso</groupId> <artifactId>common</artifactId> diff --git a/packages/arquillian-unit-tests/pom.xml b/packages/arquillian-unit-tests/pom.xml index 4ca15fbefd..f90ca550ab 100644 --- a/packages/arquillian-unit-tests/pom.xml +++ b/packages/arquillian-unit-tests/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.openecomp.mso</groupId> <artifactId>packages</artifactId> - <version>0.0.4-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> </parent> <groupId>org.openecomp.mso.packages</groupId> diff --git a/packages/deliveries/pom.xml b/packages/deliveries/pom.xml index 29c398f6a8..d3332ec385 100644 --- a/packages/deliveries/pom.xml +++ b/packages/deliveries/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.openecomp.mso</groupId> <artifactId>packages</artifactId> - <version>0.0.4-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> </parent> <groupId>org.openecomp.mso.packages</groupId> @@ -29,7 +29,7 @@ <artifactId>maven-assembly-plugin</artifactId> <version>2.6</version> <executions> - + <!-- MSO DB PACKS --> <execution> <configuration> @@ -68,7 +68,7 @@ <goal>single</goal> </goals> </execution> - + </executions> </plugin> diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml index 4bad970d70..c31a775290 100644 --- a/packages/docker/pom.xml +++ b/packages/docker/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.openecomp.mso</groupId> <artifactId>packages</artifactId> - <version>0.0.4-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> </parent> <packaging>pom</packaging> diff --git a/packages/pom.xml b/packages/pom.xml index beb7251320..92d8c3e6c2 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -4,7 +4,7 @@ <parent>
<artifactId>mso</artifactId>
<groupId>org.openecomp</groupId>
- <version>0.0.4-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<groupId>org.openecomp.mso</groupId>
@@ -12,7 +12,7 @@ <packaging>pom</packaging>
<name>MSO Packages</name>
-
+
<profiles>
<!-- DO NOT CHANGE THE *ORDER* IN WHICH THESE PROFILES ARE DEFINED! -->
@@ -42,6 +42,6 @@ <module>arquillian-unit-tests</module>
</modules>
</profile>
-
+
</profiles>
</project>
@@ -4,7 +4,7 @@ <groupId>org.openecomp</groupId> <artifactId>mso</artifactId> <packaging>pom</packaging> - <version>0.0.4-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <name>MSO main project</name> <description>This Maven project is responsible to build and package all child projects - contributions in the MSO project. This build can be configured to run Functional tests and to start/stop a jboss server + Mysql DB. @@ -42,6 +42,7 @@ <nexusproxy>https://nexus.openecomp.org</nexusproxy> <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath> <releaseNexusPath>/content/repositories/releases/</releaseNexusPath> + <sitePath>/content/sites/site/org/openecomp/mso/${project.version}</sitePath> <maven.build.timestamp.format>yyyyMMdd'T'HHmm</maven.build.timestamp.format> </properties> <distributionManagement> @@ -56,8 +57,8 @@ <url>${nexusproxy}/${snapshotNexusPath}</url> </snapshotRepository> <site> - <id>ecomp-javadoc</id> - <url>dav:https://ecomp-nexus:8443/repository/mso-javadoc/${project.version}</url> + <id>ecomp-site</id> + <url>dav:${nexusproxy}${sitePath}</url> </site> </distributionManagement> <reporting> diff --git a/status-control/pom.xml b/status-control/pom.xml index 169c2ba131..458a399f3a 100644 --- a/status-control/pom.xml +++ b/status-control/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.openecomp</groupId> <artifactId>mso</artifactId> - <version>0.0.4-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> </parent> <groupId>org.openecomp.mso</groupId> @@ -62,16 +62,16 @@ <version>1.10.19</version> <scope>test</scope> </dependency> - + <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> </dependency> - + <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> </dependency> - + </dependencies> </project>
\ No newline at end of file diff --git a/version.properties b/version.properties index cdcd1e9ec1..e2595ba14c 100644 --- a/version.properties +++ b/version.properties @@ -3,7 +3,7 @@ # because they are used in Jenkins, whose plug-in doesn't support
major=1
-minor=0
+minor=1
patch=0
base_version=${major}.${minor}.${patch}
|