diff options
| -rw-r--r-- | dcaedt_be/pom.xml | 71 | ||||
| -rw-r--r-- | dcaedt_catalog/pom.xml | 49 | ||||
| -rw-r--r-- | dcaedt_tools/pom.xml | 248 | ||||
| -rw-r--r-- | dcaedt_validator/pom.xml | 9 | ||||
| -rw-r--r-- | pom.xml | 51 |
5 files changed, 212 insertions, 216 deletions
diff --git a/dcaedt_be/pom.xml b/dcaedt_be/pom.xml index ca5f8dd..15753cc 100644 --- a/dcaedt_be/pom.xml +++ b/dcaedt_be/pom.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project - xmlns="http://maven.apache.org/POM/4.0.0" +<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> <groupId>org.onap.sdc.dcae-d.dt-be-main</groupId> @@ -10,7 +9,7 @@ <parent> <groupId>org.onap.sdc.dcae-d.dt-be-main</groupId> <artifactId>dcae_dt_be_main</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> </parent> <properties> @@ -124,7 +123,7 @@ <version>4.0.0</version> <scope>provided</scope> </dependency> - </dependencies> + </dependencies> <profiles> <profile> <id>local</id> @@ -152,23 +151,23 @@ </dependencies> </profile> <!--<profile>--> - <!--<id>server</id>--> - <!--<activation>--> - <!--<activeByDefault>true</activeByDefault>--> - <!--</activation>--> - <!--<dependencies>--> - <!--<dependency>--> - <!--<groupId>javax.servlet</groupId>--> - <!--<artifactId>javax.servlet-api</artifactId>--> - <!--<version>4.0.0</version>--> - <!--</dependency>--> - <!--</dependencies>--> + <!--<id>server</id>--> + <!--<activation>--> + <!--<activeByDefault>true</activeByDefault>--> + <!--</activation>--> + <!--<dependencies>--> + <!--<dependency>--> + <!--<groupId>javax.servlet</groupId>--> + <!--<artifactId>javax.servlet-api</artifactId>--> + <!--<version>4.0.0</version>--> + <!--</dependency>--> + <!--</dependencies>--> <!--</profile>--> <profile> - <id>docker</id> + <id>docker</id> <build> - <plugins> + <plugins> <plugin> <artifactId>maven-clean-plugin</artifactId> <executions> @@ -192,27 +191,27 @@ </execution> </executions> </plugin> - <plugin> + <plugin> <artifactId>maven-resources-plugin</artifactId> <version>3.0.2</version> <executions> <execution> <id>copy-dcae-be-war</id> <phase>install</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${project.parent.basedir}/docker/docker_be/target</outputDirectory> - <resources> - <resource> - <directory>${project.basedir}/target</directory> - <includes> - <include>dcae.war</include> - </includes> - </resource> - </resources> - </configuration> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${project.parent.basedir}/docker/docker_be/target</outputDirectory> + <resources> + <resource> + <directory>${project.basedir}/target</directory> + <includes> + <include>dcae.war</include> + </includes> + </resource> + </resources> + </configuration> </execution> </executions> </plugin> @@ -228,7 +227,7 @@ <pull> <username>docker</username> <password>docker</password> - </pull> + </pull> </authConfig> <images> <!-- Build backend image --> @@ -278,9 +277,9 @@ </execution> </executions> </plugin> - </plugins> - </build> - </profile> + </plugins> + </build> + </profile> </profiles> <build> diff --git a/dcaedt_catalog/pom.xml b/dcaedt_catalog/pom.xml index 82bf7df..2e8b142 100644 --- a/dcaedt_catalog/pom.xml +++ b/dcaedt_catalog/pom.xml @@ -1,29 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> -<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 +<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> - <artifactId>DCAE-DT-Catalog</artifactId> - <packaging>pom</packaging> - <name>DCAE DT Catalog</name> - <parent> - <groupId>org.onap.sdc.dcae-d.dt-be-main</groupId> - <artifactId>dcae_dt_be_main</artifactId> - <version>1.2.0-SNAPSHOT</version> -</parent> - <modules> - <module>commons</module> - <module>asdc</module> - <module>db</module> - <module>api</module> - <module>service</module> - </modules> + <modelVersion>4.0.0</modelVersion> + <artifactId>DCAE-DT-Catalog</artifactId> + <packaging>pom</packaging> + <name>DCAE DT Catalog</name> + <parent> + <groupId>org.onap.sdc.dcae-d.dt-be-main</groupId> + <artifactId>dcae_dt_be_main</artifactId> + <version>1.3.0-SNAPSHOT</version> + </parent> + <modules> + <module>commons</module> + <module>asdc</module> + <module>db</module> + <module>api</module> + <module>service</module> + </modules> - <scm> - <connection>scm:git:https://github.research.att.com/ASC/ASC-Catalog/</connection> - <developerConnection>scm:git:https://github.research.att.com/ASC/ASC-Catalog/</developerConnection> - <tag>HEAD</tag> - <url>https://github.research.att.com/ASC/ASC-Catalog/</url> - </scm> + <scm> + <connection>scm:git:https://github.research.att.com/ASC/ASC-Catalog/</connection> + <developerConnection>scm:git:https://github.research.att.com/ASC/ASC-Catalog/</developerConnection> + <tag>HEAD</tag> + <url>https://github.research.att.com/ASC/ASC-Catalog/</url> + </scm> </project> diff --git a/dcaedt_tools/pom.xml b/dcaedt_tools/pom.xml index f888b71..40cf990 100644 --- a/dcaedt_tools/pom.xml +++ b/dcaedt_tools/pom.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<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"> +<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> <groupId>org.onap.sdc.dcae-d.dt-be-main</groupId> <artifactId>dcaedt_tools</artifactId> @@ -8,7 +8,7 @@ <parent> <groupId>org.onap.sdc.dcae-d.dt-be-main</groupId> <artifactId>dcae_dt_be_main</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> </parent> <properties> @@ -21,127 +21,127 @@ <build> <plugins> <plugin> - <artifactId>maven-clean-plugin</artifactId> - <executions> - <execution> - <id>delete dcae tools jar</id> - <phase>clean</phase> - <goals> - <goal>clean</goal> - </goals> - <configuration> - <filesets> - <fileset> - <directory>${project.parent.basedir}/docker/docker_tools/target</directory> - <followSymlinks>false</followSymlinks> - <includes> - <include>*.jar</include> - </includes> - </fileset> - </filesets> - </configuration> - </execution> - </executions> + <artifactId>maven-clean-plugin</artifactId> + <executions> + <execution> + <id>delete dcae tools jar</id> + <phase>clean</phase> + <goals> + <goal>clean</goal> + </goals> + <configuration> + <filesets> + <fileset> + <directory>${project.parent.basedir}/docker/docker_tools/target</directory> + <followSymlinks>false</followSymlinks> + <includes> + <include>*.jar</include> + </includes> + </fileset> + </filesets> + </configuration> + </execution> + </executions> </plugin> <plugin> - <artifactId>maven-resources-plugin</artifactId> - <version>3.0.2</version> - <executions> - <execution> - <id>copy-dcae-tools-jar</id> - <phase>install</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${project.parent.basedir}/docker/docker_tools/target</outputDirectory> - <resources> - <resource> - <directory>${project.basedir}/target</directory> - <includes> - <include>dcaedt_tools-${project.version}-jar-with-dependencies.jar</include> - </includes> - </resource> - </resources> - </configuration> - </execution> - <execution> - <id>copy-dcae-config-json</id> - <phase>validate</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${project.parent.basedir}/docker/docker_tools/chef-solo/cookbooks/Deploy-DCAE/files/default</outputDirectory> - <resources> - <resource> - <directory>${project.basedir}/src/main/resources/conf</directory> - <includes> - <include>config.json</include> - </includes> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>io.fabric8</groupId> - <artifactId>docker-maven-plugin</artifactId> - <version>0.23.0</version> - <configuration> - <verbose>true</verbose> - <apiVersion>1.23</apiVersion> - <images> - <!-- Build tools image --> - <image> - <name>onap/dcae-tools</name> - <alias>dcae-tools</alias> - <build> - <cleanup>try</cleanup> - <dockerFileDir>${project.parent.basedir}/docker/docker_tools</dockerFileDir> - <tags> - <tag>${docker.tag}</tag> - <tag>${docker.latest.tag}</tag> - <tag>${docker.staging.tag}</tag> - </tags> - </build> - </image> - </images> - </configuration> - <executions> - <execution> - <id>clean-images</id> - <phase>pre-clean</phase> - <goals> - <goal>remove</goal> - </goals> - <configuration> - <removeAll>true</removeAll> - <image>onap/dcae-be</image> - </configuration> - </execution> - <execution> - <id>generate-images</id> - <phase>install</phase> - <goals> - <goal>build</goal> - </goals> - </execution> - <execution> - <id>push-images</id> - <phase>deploy</phase> - <goals> - <goal>push</goal> - </goals> - <configuration> - <image>onap/dcae-tools</image> - </configuration> - </execution> - </executions> - </plugin> - </plugins> + <artifactId>maven-resources-plugin</artifactId> + <version>3.0.2</version> + <executions> + <execution> + <id>copy-dcae-tools-jar</id> + <phase>install</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${project.parent.basedir}/docker/docker_tools/target</outputDirectory> + <resources> + <resource> + <directory>${project.basedir}/target</directory> + <includes> + <include>dcaedt_tools-${project.version}-jar-with-dependencies.jar</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + <execution> + <id>copy-dcae-config-json</id> + <phase>validate</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${project.parent.basedir}/docker/docker_tools/chef-solo/cookbooks/Deploy-DCAE/files/default</outputDirectory> + <resources> + <resource> + <directory>${project.basedir}/src/main/resources/conf</directory> + <includes> + <include>config.json</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>io.fabric8</groupId> + <artifactId>docker-maven-plugin</artifactId> + <version>0.23.0</version> + <configuration> + <verbose>true</verbose> + <apiVersion>1.23</apiVersion> + <images> + <!-- Build tools image --> + <image> + <name>onap/dcae-tools</name> + <alias>dcae-tools</alias> + <build> + <cleanup>try</cleanup> + <dockerFileDir>${project.parent.basedir}/docker/docker_tools</dockerFileDir> + <tags> + <tag>${docker.tag}</tag> + <tag>${docker.latest.tag}</tag> + <tag>${docker.staging.tag}</tag> + </tags> + </build> + </image> + </images> + </configuration> + <executions> + <execution> + <id>clean-images</id> + <phase>pre-clean</phase> + <goals> + <goal>remove</goal> + </goals> + <configuration> + <removeAll>true</removeAll> + <image>onap/dcae-be</image> + </configuration> + </execution> + <execution> + <id>generate-images</id> + <phase>install</phase> + <goals> + <goal>build</goal> + </goals> + </execution> + <execution> + <id>push-images</id> + <phase>deploy</phase> + <goals> + <goal>push</goal> + </goals> + <configuration> + <image>onap/dcae-tools</image> + </configuration> + </execution> + </executions> + </plugin> + </plugins> </build> </profile> </profiles> @@ -192,8 +192,8 @@ </configuration> <executions> <execution> - <id>make-assembly</id> <!-- this is used for inheritance merges --> - <phase>package</phase> <!-- bind to the packaging phase --> + <id>make-assembly</id> <!-- this is used for inheritance merges --> + <phase>package</phase> <!-- bind to the packaging phase --> <goals> <goal>single</goal> </goals> @@ -211,7 +211,7 @@ <dependency> <groupId>org.onap.sdc.dcae-d.dt-be-property</groupId> <artifactId>DCAE-DT-PROPERTY</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.powermock</groupId> diff --git a/dcaedt_validator/pom.xml b/dcaedt_validator/pom.xml index fd95317..5f62852 100644 --- a/dcaedt_validator/pom.xml +++ b/dcaedt_validator/pom.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project - xmlns="http://maven.apache.org/POM/4.0.0" +<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> <artifactId>DCAE-DT-Validator</artifactId> @@ -9,7 +8,7 @@ <parent> <groupId>org.onap.sdc.dcae-d.dt-be-main</groupId> <artifactId>dcae_dt_be_main</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> </parent> <modules> <module>kwalify</module> @@ -22,6 +21,6 @@ <url>https://github.research.att.com/ASC/ASC-Validator/</url> </scm> <properties> - <sonar.skip>true</sonar.skip> - </properties> + <sonar.skip>true</sonar.skip> + </properties> </project> @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project - xmlns="http://maven.apache.org/POM/4.0.0" +<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> <groupId>org.onap.sdc.dcae-d.dt-be-main</groupId> <artifactId>dcae_dt_be_main</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> <packaging>pom</packaging> <name>dcae-d dt-be-main</name> @@ -34,7 +33,7 @@ <dependency> <groupId>org.onap.sdc.dcae-d.dt-be-property</groupId> <artifactId>DCAE-DT-PROPERTY</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>${project.version}</version> <exclusions> <exclusion> <groupId>org.slf4j</groupId> @@ -72,29 +71,29 @@ </plugin> <!-- Site Plugin --> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <version>3.4</version> - <dependencies> - <dependency> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-webdav-jackrabbit</artifactId> - <version>2.10</version> - </dependency> - </dependencies> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-site-plugin</artifactId> + <version>3.4</version> + <dependencies> + <dependency> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-webdav-jackrabbit</artifactId> + <version>2.10</version> + </dependency> + </dependencies> + </plugin> + <!-- Staging Plugin --> + <plugin> + <groupId>org.sonatype.plugins</groupId> + <artifactId>nexus-staging-maven-plugin</artifactId> + <version>1.6.7</version> + <extensions>true</extensions> + <configuration> + <nexusUrl>${nexus.proxy}</nexusUrl> + <stagingProfileId>${staging.profile.id}</stagingProfileId> + <serverId>ecomp-staging</serverId> + </configuration> </plugin> - <!-- Staging Plugin --> - <plugin> - <groupId>org.sonatype.plugins</groupId> - <artifactId>nexus-staging-maven-plugin</artifactId> - <version>1.6.7</version> - <extensions>true</extensions> - <configuration> - <nexusUrl>${nexus.proxy}</nexusUrl> - <stagingProfileId>${staging.profile.id}</stagingProfileId> - <serverId>ecomp-staging</serverId> - </configuration> - </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> |