diff options
| author |   Areli, Fuss (af732p) <af732p@intl.att.com> | 2018-05-17 19:53:13 +0300 |
|---|---|---|
| committer |   Areli, Fuss (af732p) <af732p@att.com> | 2018-05-17 19:56:01 +0300 |
| commit | d54cab94fbcd1d396382146c527f2b6141746613 (patch) | |
| tree | 51f12018e36546950a133d136cc661a23954e47b /pom.xml | |
| parent | e59dd9554fa32e702d23d8ee1531953758fa9a8d (diff) | |
pom fix
Change-Id: If3bbd9f8bf578a60a6a2bbd32125217e6ecb3941
Issue-ID: SDC-1339
Signed-off-by: Areli, Fuss (af732p) <af732p@att.com>
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 121 |
1 files changed, 60 insertions, 61 deletions
@@ -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> |