diff options
| -rw-r--r-- | dcaedt_catalog/api/pom.xml | 22 | ||||
| -rw-r--r-- | dcaedt_catalog/asdc/pom.xml | 6 | ||||
| -rw-r--r-- | dcaedt_catalog/commons/pom.xml | 173 | ||||
| -rw-r--r-- | dcaedt_catalog/db/pom.xml | 153 | ||||
| -rw-r--r-- | dcaedt_catalog/service/pom.xml | 95 | ||||
| -rw-r--r-- | dcaedt_tools/pom.xml | 2 | ||||
| -rw-r--r-- | dcaedt_validator/checker/pom.xml | 11 | ||||
| -rw-r--r-- | dcaedt_validator/kwalify/pom.xml | 5 |
8 files changed, 234 insertions, 233 deletions
diff --git a/dcaedt_catalog/api/pom.xml b/dcaedt_catalog/api/pom.xml index a0d8200..f6925db 100644 --- a/dcaedt_catalog/api/pom.xml +++ b/dcaedt_catalog/api/pom.xml @@ -1,10 +1,10 @@ -<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> <parent> <groupId>org.onap.sdc.dcae-d.dt-be-main</groupId> <artifactId>DCAE-DT-Catalog</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> </parent> <artifactId>DCAE-DT-Catalog-API</artifactId> <packaging>jar</packaging> @@ -109,14 +109,14 @@ </plugins> </build> <!--<repositories>--> - <!--<repository>--> - <!--<snapshots>--> - <!--<enabled>false</enabled>--> - <!--</snapshots>--> - <!--<id>jcenter</id>--> - <!--<name>Bintray JCenter</name>--> - <!--<url>http://repo1.maven.org/maven2/</url>--> - <!--</repository>--> + <!--<repository>--> + <!--<snapshots>--> + <!--<enabled>false</enabled>--> + <!--</snapshots>--> + <!--<id>jcenter</id>--> + <!--<name>Bintray JCenter</name>--> + <!--<url>http://repo1.maven.org/maven2/</url>--> + <!--</repository>--> <!--</repositories>--> <dependencies> <dependency> diff --git a/dcaedt_catalog/asdc/pom.xml b/dcaedt_catalog/asdc/pom.xml index 5d9a4f5..69fe2e1 100644 --- a/dcaedt_catalog/asdc/pom.xml +++ b/dcaedt_catalog/asdc/pom.xml @@ -1,10 +1,10 @@ -<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> <parent> <groupId>org.onap.sdc.dcae-d.dt-be-main</groupId> <artifactId>DCAE-DT-Catalog</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> </parent> <artifactId>DCAE-DT-Catalog-ASDC</artifactId> <packaging>jar</packaging> diff --git a/dcaedt_catalog/commons/pom.xml b/dcaedt_catalog/commons/pom.xml index 6a619b2..a50b287 100644 --- a/dcaedt_catalog/commons/pom.xml +++ b/dcaedt_catalog/commons/pom.xml @@ -1,84 +1,85 @@ -<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.onap.sdc.dcae-d.dt-be-main</groupId> - <artifactId>DCAE-DT-Catalog</artifactId> - <version>1.2.0-SNAPSHOT</version> - </parent> - <artifactId>DCAE-DT-Catalog-Commons</artifactId> - <packaging>jar</packaging> - <name>DCAE DT Catalog Commons</name> +<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.onap.sdc.dcae-d.dt-be-main</groupId> + <artifactId>DCAE-DT-Catalog</artifactId> + <version>1.3.0-SNAPSHOT</version> + </parent> + <artifactId>DCAE-DT-Catalog-Commons</artifactId> + <packaging>jar</packaging> + <name>DCAE DT Catalog Commons</name> <build> - <sourceDirectory>src/main/java</sourceDirectory> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.1</version> - <configuration> - <source>1.8</source> - <target>1.8</target> - <encoding>${project.build.sourceEncoding}</encoding> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.10</version> - <executions> - <execution> - <id>copy-dependencies</id> - <phase>package</phase> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <outputDirectory>${project.build.directory}/deps</outputDirectory> - <overWriteReleases>false</overWriteReleases> - <overWriteSnapshots>false</overWriteSnapshots> - <overWriteIfNewer>true</overWriteIfNewer> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>buildnumber-maven-plugin</artifactId> - <version>1.4</version> - <executions> - <execution> - <phase>validate</phase> - <goals> - <goal>create</goal> - </goals> - </execution> - </executions> - <configuration> - <doCheck>false</doCheck> - <doUpdate>false</doUpdate> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>2.1</version> - <configuration> - <archive> - <manifest> - <addDefaultImplementationEntries>true</addDefaultImplementationEntries> - </manifest> - <manifestEntries> - <Implementation-Build>${buildNumber}</Implementation-Build> - </manifestEntries> - </archive> - </configuration> - </plugin> + <sourceDirectory>src/main/java</sourceDirectory> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.1</version> + <configuration> + <source>1.8</source> + <target>1.8</target> + <encoding>${project.build.sourceEncoding}</encoding> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.10</version> + <executions> + <execution> + <id>copy-dependencies</id> + <phase>package</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}/deps</outputDirectory> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>false</overWriteSnapshots> + <overWriteIfNewer>true</overWriteIfNewer> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>buildnumber-maven-plugin</artifactId> + <version>1.4</version> + <executions> + <execution> + <phase>validate</phase> + <goals> + <goal>create</goal> + </goals> + </execution> + </executions> + <configuration> + <doCheck>false</doCheck> + <doUpdate>false</doUpdate> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>2.1</version> + <configuration> + <archive> + <manifest> + <addDefaultImplementationEntries>true</addDefaultImplementationEntries> + </manifest> + <manifestEntries> + <Implementation-Build>${buildNumber}</Implementation-Build> + </manifestEntries> + </archive> + </configuration> + </plugin> </plugins> - </build> - <dependencies> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpasyncclient</artifactId> + </build> + <dependencies> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpasyncclient</artifactId> <version>4.1</version> </dependency> <dependency> @@ -92,9 +93,9 @@ <version>1.3</version> </dependency> <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>1.9.3</version> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.9.3</version> </dependency> <dependency> <groupId>commons-jxpath</groupId> @@ -122,17 +123,17 @@ <version>2.7.8</version> </dependency> <dependency> - <groupId>com.github.wnameless</groupId> - <artifactId>json-flattener</artifactId> - <version>0.2.2</version> + <groupId>com.github.wnameless</groupId> + <artifactId>json-flattener</artifactId> + <version>0.2.2</version> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-web</artifactId> <version>4.3.17.RELEASE</version> </dependency> - </dependencies> - <properties> + </dependencies> + <properties> <sonar.skip>true</sonar.skip> </properties> </project> diff --git a/dcaedt_catalog/db/pom.xml b/dcaedt_catalog/db/pom.xml index 454d8bf..2870d04 100644 --- a/dcaedt_catalog/db/pom.xml +++ b/dcaedt_catalog/db/pom.xml @@ -1,61 +1,62 @@ -<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.onap.sdc.dcae-d.dt-be-main</groupId> - <artifactId>DCAE-DT-Catalog</artifactId> - <version>1.2.0-SNAPSHOT</version> - </parent> - <artifactId>DCAE-DT-Catalog-DB</artifactId> - <packaging>jar</packaging> - <name>DCAE DT Catalog database</name> +<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.onap.sdc.dcae-d.dt-be-main</groupId> + <artifactId>DCAE-DT-Catalog</artifactId> + <version>1.3.0-SNAPSHOT</version> + </parent> + <artifactId>DCAE-DT-Catalog-DB</artifactId> + <packaging>jar</packaging> + <name>DCAE DT Catalog database</name> <build> - <sourceDirectory>src/main/java</sourceDirectory> - <plugins> - <plugin> + <sourceDirectory>src/main/java</sourceDirectory> + <plugins> + <plugin> <artifactId>maven-compiler-plugin</artifactId> <version>3.1</version> <configuration> - <source>1.8</source> - <target>1.8</target> - <encoding>${project.build.sourceEncoding}</encoding> + <source>1.8</source> + <target>1.8</target> + <encoding>${project.build.sourceEncoding}</encoding> </configuration> - </plugin> - <plugin> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <version>2.10</version> <executions> - <execution> - <id>copy-dependencies</id> - <phase>package</phase> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <outputDirectory>${project.build.directory}/deps</outputDirectory> - <overWriteReleases>false</overWriteReleases> - <overWriteSnapshots>false</overWriteSnapshots> - <overWriteIfNewer>true</overWriteIfNewer> - </configuration> - </execution> + <execution> + <id>copy-dependencies</id> + <phase>package</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}/deps</outputDirectory> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>false</overWriteSnapshots> + <overWriteIfNewer>true</overWriteIfNewer> + </configuration> + </execution> </executions> - </plugin> + </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>buildnumber-maven-plugin</artifactId> - <version>1.4</version> + <version>1.4</version> <executions> - <execution> - <phase>validate</phase> - <goals> - <goal>create</goal> - </goals> - </execution> - </executions> + <execution> + <phase>validate</phase> + <goals> + <goal>create</goal> + </goals> + </execution> + </executions> <configuration> - <doCheck>false</doCheck> - <doUpdate>false</doUpdate> + <doCheck>false</doCheck> + <doUpdate>false</doUpdate> </configuration> </plugin> <plugin> @@ -63,14 +64,14 @@ <artifactId>maven-jar-plugin</artifactId> <version>2.1</version> <configuration> - <archive> - <manifest> - <addDefaultImplementationEntries>true</addDefaultImplementationEntries> - </manifest> - <manifestEntries> - <Implementation-Build>${buildNumber}</Implementation-Build> - </manifestEntries> - </archive> + <archive> + <manifest> + <addDefaultImplementationEntries>true</addDefaultImplementationEntries> + </manifest> + <manifestEntries> + <Implementation-Build>${buildNumber}</Implementation-Build> + </manifestEntries> + </archive> </configuration> </plugin> <plugin> @@ -78,35 +79,35 @@ <artifactId>maven-assembly-plugin</artifactId> <version>2.6</version> <configuration> - <descriptorRefs> - <descriptorRef>jar-with-dependencies</descriptorRef> - </descriptorRefs> - <archive> - <manifest> - <mainClass>org.onap.sdc.dcae.db.neo4j.Modeled</mainClass> - </manifest> - <manifestEntries> - <Implementation-Build>${buildNumber}</Implementation-Build> - </manifestEntries> - </archive> - </configuration> + <descriptorRefs> + <descriptorRef>jar-with-dependencies</descriptorRef> + </descriptorRefs> + <archive> + <manifest> + <mainClass>org.onap.sdc.dcae.db.neo4j.Modeled</mainClass> + </manifest> + <manifestEntries> + <Implementation-Build>${buildNumber}</Implementation-Build> + </manifestEntries> + </archive> + </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> + <goal>single</goal> </goals> </execution> </executions> </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpasyncclient</artifactId> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpasyncclient</artifactId> <version>4.1</version> </dependency> <dependency> @@ -140,12 +141,12 @@ <version>20160212</version> </dependency> <dependency> - <groupId>com.github.wnameless</groupId> - <artifactId>json-flattener</artifactId> - <version>0.2.2</version> + <groupId>com.github.wnameless</groupId> + <artifactId>json-flattener</artifactId> + <version>0.2.2</version> </dependency> - </dependencies> - <properties> + </dependencies> + <properties> <sonar.skip>true</sonar.skip> </properties> </project> diff --git a/dcaedt_catalog/service/pom.xml b/dcaedt_catalog/service/pom.xml index 21db070..8358859 100644 --- a/dcaedt_catalog/service/pom.xml +++ b/dcaedt_catalog/service/pom.xml @@ -1,51 +1,52 @@ -<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> +<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.onap.sdc.dcae-d.dt-be-main</groupId> - <artifactId>DCAE-DT-Catalog</artifactId> - <version>1.2.0-SNAPSHOT</version> - </parent> - <artifactId>DCAE-DT-Catalog-Service</artifactId> - <packaging>jar</packaging> - <name>DCAE-DT Catalog Service</name> + <parent> + <groupId>org.onap.sdc.dcae-d.dt-be-main</groupId> + <artifactId>DCAE-DT-Catalog</artifactId> + <version>1.3.0-SNAPSHOT</version> + </parent> + <artifactId>DCAE-DT-Catalog-Service</artifactId> + <packaging>jar</packaging> + <name>DCAE-DT Catalog Service</name> <build> - <sourceDirectory>src/main/java</sourceDirectory> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.1</version> - <configuration> - <source>1.8</source> - <target>1.8</target> - <encoding>${project.build.sourceEncoding}</encoding> - </configuration> - </plugin> + <sourceDirectory>src/main/java</sourceDirectory> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.1</version> + <configuration> + <source>1.8</source> + <target>1.8</target> + <encoding>${project.build.sourceEncoding}</encoding> + </configuration> + </plugin> <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> <version>1.3.3.RELEASE</version> - <configuration> - <mainClass>org.onap.sdc.dcae.catalog.engine.CatalogEngine</mainClass> - </configuration> - <executions> - <execution> - <goals> - <goal>repackage</goal> - </goals> - </execution> - </executions> + <configuration> + <mainClass>org.onap.sdc.dcae.catalog.engine.CatalogEngine</mainClass> + </configuration> + <executions> + <execution> + <goals> + <goal>repackage</goal> + </goals> + </execution> + </executions> </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> @@ -71,13 +72,13 @@ <artifactId>spring-boot-autoconfigure</artifactId> <version>1.4.1.RELEASE</version> </dependency> - <dependency> - <groupId>org.onap.sdc.dcae-d.dt-be-main</groupId> - <artifactId>DCAE-DT-Catalog-API</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - <properties> + <dependency> + <groupId>org.onap.sdc.dcae-d.dt-be-main</groupId> + <artifactId>DCAE-DT-Catalog-API</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + <properties> <sonar.skip>true</sonar.skip> </properties> </project> diff --git a/dcaedt_tools/pom.xml b/dcaedt_tools/pom.xml index 265a150..f888b71 100644 --- a/dcaedt_tools/pom.xml +++ b/dcaedt_tools/pom.xml @@ -211,7 +211,7 @@ <dependency> <groupId>org.onap.sdc.dcae-d.dt-be-property</groupId> <artifactId>DCAE-DT-PROPERTY</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.powermock</groupId> diff --git a/dcaedt_validator/checker/pom.xml b/dcaedt_validator/checker/pom.xml index 9c639e0..2639b43 100644 --- a/dcaedt_validator/checker/pom.xml +++ b/dcaedt_validator/checker/pom.xml @@ -1,11 +1,10 @@ -<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> <parent> <groupId>org.onap.sdc.dcae-d.dt-be-main</groupId> <artifactId>DCAE-DT-Validator</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> </parent> <artifactId>DCAE-DT-Validator-Checker</artifactId> <packaging>jar</packaging> @@ -89,9 +88,9 @@ </goals> <configuration> <!--<archive>--> - <!--<manifest>--> - <!--<mainClass>org.onap.sdc.dcae.checker.Checker</mainClass>--> - <!--</manifest>--> + <!--<manifest>--> + <!--<mainClass>org.onap.sdc.dcae.checker.Checker</mainClass>--> + <!--</manifest>--> <!--</archive>--> <descriptorRefs> <descriptorRef>jar-with-dependencies</descriptorRef> diff --git a/dcaedt_validator/kwalify/pom.xml b/dcaedt_validator/kwalify/pom.xml index a80c19c..f8364d7 100644 --- a/dcaedt_validator/kwalify/pom.xml +++ b/dcaedt_validator/kwalify/pom.xml @@ -1,11 +1,10 @@ -<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> <parent> <groupId>org.onap.sdc.dcae-d.dt-be-main</groupId> <artifactId>DCAE-DT-Validator</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> </parent> <artifactId>kwalify</artifactId> <packaging>jar</packaging> |