diff options
| -rw-r--r-- | dcaedt_be/pom.xml | 190 | ||||
| -rw-r--r-- | dcaedt_catalog/api/pom.xml | 23 | ||||
| -rw-r--r-- | dcaedt_catalog/asdc/pom.xml | 10 | ||||
| -rw-r--r-- | dcaedt_catalog/db/pom.xml | 177 | ||||
| -rw-r--r-- | dcaedt_catalog/pom.xml | 10 | ||||
| -rw-r--r-- | dcaedt_catalog/service/pom.xml | 30 | ||||
| -rw-r--r-- | dcaedt_tools/pom.xml | 12 | ||||
| -rw-r--r-- | dcaedt_validator/kwalify/pom.xml | 1 | ||||
| -rw-r--r-- | dcaedt_validator/pom.xml | 12 | ||||
| -rw-r--r-- | pom.xml | 121 | ||||
| -rw-r--r-- | version.properties | 4 |
11 files changed, 288 insertions, 302 deletions
diff --git a/dcaedt_be/pom.xml b/dcaedt_be/pom.xml index 2bd614a..61b4482 100644 --- a/dcaedt_be/pom.xml +++ b/dcaedt_be/pom.xml @@ -12,6 +12,11 @@ <artifactId>dcae_dt_be_main</artifactId> <version>1.2.0-SNAPSHOT</version> </parent> + + <properties> + <docker.staging.tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest</docker.staging.tag> + </properties> + <dependencies> <dependency> <groupId>org.springframework.boot</groupId> @@ -96,7 +101,6 @@ <version>6.9.10</version> <scope>test</scope> </dependency> - <!-- https://mvnrepository.com/artifact/com.googlecode.json-simple/json-simple --> <dependency> <groupId>com.googlecode.json-simple</groupId> <artifactId>json-simple</artifactId> @@ -114,6 +118,12 @@ <version>2.6.1</version> <scope>compile</scope> </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>4.0.0</version> + <scope>provided</scope> + </dependency> </dependencies> <profiles> <profile> @@ -141,105 +151,113 @@ </dependency> </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>--> + <!--</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> - </profile> - <profile> - <id>docker</id> + <id>docker</id> <build> - <plugins> - <plugin> + <plugins> + <plugin> <artifactId>maven-resources-plugin</artifactId> <version>3.0.2</version> <executions> - <execution> - <id>copy-dcae-be-war</id> - <phase>validate</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> - </execution> + <execution> + <id>copy-dcae-be-war</id> + <phase>verify</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> + </execution> </executions> - </plugin> - <plugin> + </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 backend image --> - <image> - <name>onap/dcae-be</name> - <alias>dcae-be</alias> - <build> - <cleanup>try</cleanup> - <dockerFileDir>${project.parent.basedir}/docker/docker_be</dockerFileDir> - <tags> - <tag>${docker.tag}</tag> - <tag>${docker.latest.tag}</tag> - <tag>${docker.staging.tag}</tag> - </tags> - </build> - </image> - </images> + <verbose>true</verbose> + <apiVersion>1.23</apiVersion> + <registry>nexus3.onap.org:10001</registry> + <authConfig> + <pull> + <username>docker</username> + <password>docker</password> + </pull> + </authConfig> + <images> + <!-- Build backend image --> + <image> + <name>onap/dcae-be</name> + <alias>dcae-be</alias> + <build> + <cleanup>try</cleanup> + <dockerFileDir>${project.parent.basedir}/docker/docker_be</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>package</phase> - <goals> - <goal>build</goal> - </goals> - </execution> - <execution> - <id>push-images</id> - <phase>deploy</phase> - <goals> - <goal>push</goal> - </goals> - <configuration> - <image>onap/dcae-be</image> - </configuration> - </execution> + <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>package</phase> + <goals> + <goal>build</goal> + </goals> + </execution> + <execution> + <id>push-images</id> + <phase>deploy</phase> + <goals> + <goal>push</goal> + </goals> + <configuration> + <image>onap/dcae-be</image> + </configuration> + </execution> </executions> - </plugin> + </plugin> </plugins> </build> - </profile> + </profile> </profiles> <build> @@ -261,8 +279,6 @@ </resource> </webResources> </configuration> - <!-- <executions><execution><goals><goal>repackage</goal></goals></execution></executions><configuration><jvmArguments> -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8096 - </jvmArguments></configuration> --> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/dcaedt_catalog/api/pom.xml b/dcaedt_catalog/api/pom.xml index 9f1ee46..ff51800 100644 --- a/dcaedt_catalog/api/pom.xml +++ b/dcaedt_catalog/api/pom.xml @@ -105,22 +105,19 @@ </manifestEntries> </archive> </configuration> - <!-- <executions> <execution> <id>make-assembly</id> this is used for - inheritance merges <phase>package</phase> bind to the packaging phase <goals> - <goal>single</goal> </goals> </execution> </executions> --> </plugin> </plugins> </build> - <repositories> - <repository> - <snapshots> - <enabled>false</enabled> - </snapshots> - <id>jcenter</id> - <name>Bintray JCenter</name> - <url>http://repo1.maven.org/maven2/</url> - </repository> - </repositories> + <!--<repositories>--> + <!--<repository>--> + <!--<snapshots>--> + <!--<enabled>false</enabled>--> + <!--</snapshots>--> + <!--<id>jcenter</id>--> + <!--<name>Bintray JCenter</name>--> + <!--<url>http://repo1.maven.org/maven2/</url>--> + <!--</repository>--> + <!--</repositories>--> <dependencies> <dependency> <groupId>commons-jxpath</groupId> diff --git a/dcaedt_catalog/asdc/pom.xml b/dcaedt_catalog/asdc/pom.xml index a140df8..abaff6a 100644 --- a/dcaedt_catalog/asdc/pom.xml +++ b/dcaedt_catalog/asdc/pom.xml @@ -41,14 +41,6 @@ </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> --> <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> @@ -73,8 +65,6 @@ <version>3.8.1</version> <scope>test</scope> </dependency> - <!-- <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.4.4</version> </dependency> --> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> diff --git a/dcaedt_catalog/db/pom.xml b/dcaedt_catalog/db/pom.xml index f44410d..152eb11 100644 --- a/dcaedt_catalog/db/pom.xml +++ b/dcaedt_catalog/db/pom.xml @@ -12,95 +12,94 @@ <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> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <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> - <executions> - <execution> - <id>make-assembly</id> <!-- this is used for inheritance merges --> - <phase>package</phase> <!-- bind to the packaging phase --> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - </plugin> + <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> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <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> + <executions> + <execution> + <id>make-assembly</id> <!-- this is used for inheritance merges --> + <phase>package</phase> <!-- bind to the packaging phase --> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> diff --git a/dcaedt_catalog/pom.xml b/dcaedt_catalog/pom.xml index 3bc2373..82bf7df 100644 --- a/dcaedt_catalog/pom.xml +++ b/dcaedt_catalog/pom.xml @@ -13,11 +13,11 @@ <version>1.2.0-SNAPSHOT</version> </parent> <modules> - <module>asdc</module> - <module>commons</module> - <module>db</module> - <module>api</module> - <module>service</module> + <module>commons</module> + <module>asdc</module> + <module>db</module> + <module>api</module> + <module>service</module> </modules> <scm> diff --git a/dcaedt_catalog/service/pom.xml b/dcaedt_catalog/service/pom.xml index 539e0cb..cd66d92 100644 --- a/dcaedt_catalog/service/pom.xml +++ b/dcaedt_catalog/service/pom.xml @@ -22,21 +22,21 @@ <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> - </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> + </plugin> </plugins> </build> <dependencies> diff --git a/dcaedt_tools/pom.xml b/dcaedt_tools/pom.xml index 4888fad..71009bd 100644 --- a/dcaedt_tools/pom.xml +++ b/dcaedt_tools/pom.xml @@ -10,6 +10,11 @@ <artifactId>dcae_dt_be_main</artifactId> <version>1.2.0-SNAPSHOT</version> </parent> + + <properties> + <docker.staging.tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest</docker.staging.tag> + </properties> + <profiles> <profile> <id>docker</id> @@ -232,11 +237,4 @@ <version>4.12</version> </dependency> </dependencies> - - <distributionManagement> - <site> - <id>onap-site</id> - <url>dav:${onap.nexus.url}${sitePath}</url> - </site> - </distributionManagement> </project> diff --git a/dcaedt_validator/kwalify/pom.xml b/dcaedt_validator/kwalify/pom.xml index 5eed50b..a80c19c 100644 --- a/dcaedt_validator/kwalify/pom.xml +++ b/dcaedt_validator/kwalify/pom.xml @@ -76,5 +76,4 @@ </plugin> </plugins> </build> - <dependencies></dependencies> </project> diff --git a/dcaedt_validator/pom.xml b/dcaedt_validator/pom.xml index 5937865..f2535f1 100644 --- a/dcaedt_validator/pom.xml +++ b/dcaedt_validator/pom.xml @@ -21,16 +21,4 @@ <tag>HEAD</tag> <url>https://github.research.att.com/ASC/ASC-Validator/</url> </scm> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.8</source> - <target>1.8</target> - </configuration> - </plugin> - </plugins> - </build> </project> @@ -16,6 +16,18 @@ <!-- lookup parent from repository --> </parent> + <properties> + <maven.build.timestamp.format>yyyyMMdd'T'HHmm</maven.build.timestamp.format> + <docker.tag>${project.version}-${maven.build.timestamp}</docker.tag> + <docker.latest.tag>${project.version}-latest</docker.latest.tag> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + <java.version>1.8</java.version> + <nexus.proxy>https://nexus.onap.org</nexus.proxy> + <staging.profile.id>176c31dfe190a</staging.profile.id> + <sitePath>/content/sites/site/org/openecomp/sdc/${project.version}</sitePath> + </properties> + <dependencies> <dependency> <groupId>org.onap.sdc.dcae-d.dt-be-property</groupId> @@ -34,13 +46,7 @@ </dependency> </dependencies> - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <java.version>1.8</java.version> - <nexus.proxy>https://nexus.onap.org</nexus.proxy> - <staging.profile.id>176c31dfe190a</staging.profile.id> - </properties> + <build> <plugins> <plugin> @@ -63,32 +69,54 @@ </executions> </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> - </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.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> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>1.8</version> + <executions> + <execution> + <id>parse-version</id> + <goals> + <goal>parse-version</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.8</source> + <target>1.8</target> + </configuration> + </plugin> </plugins> </build> + <profiles> <profile> <id>all</id> @@ -102,37 +130,8 @@ <module>dcaedt_tools</module> </modules> </profile> - <profile> - <id>docker</id> - <properties> - <!-- Docker tags --> - <maven.build.timestamp.format>yyyyMMdd'T'HHmm</maven.build.timestamp.format> - <docker.tag>${project.version}-${maven.build.timestamp}</docker.tag> - <docker.latest.tag>${project.version}-latest</docker.latest.tag> - <docker.staging.tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest</docker.staging.tag> - </properties> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.8</version> - <executions> - <execution> - <id>parse-version</id> - <goals> - <goal>parse-version</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> </profiles> + <repositories> <!-- LF repositories --> <repository> diff --git a/version.properties b/version.properties index a24b0ee..8471f55 100644 --- a/version.properties +++ b/version.properties @@ -4,8 +4,8 @@ # because they are used in Jenkins, whose plug-in doesn't support major=1 -minor=3 -patch=5 +minor=2 +patch=0 base_version=${major}.${minor}.${patch} |