Code Review
/
vid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "removing unused ViewLog Controller and jsp"
[vid.git]
/
pom.xml
diff --git
a/pom.xml
b/pom.xml
index
9c49c14
..
e2e911a
100644
(file)
--- a/
pom.xml
+++ b/
pom.xml
@@
-3,14
+3,14
@@
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.vid</groupId>
<artifactId>vid-parent</artifactId>
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.vid</groupId>
<artifactId>vid-parent</artifactId>
- <version>
4
.0.0-SNAPSHOT</version>
+ <version>
5
.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>vid</name>
<parent>
<groupId>org.onap.oparent</groupId>
<artifactId>oparent</artifactId>
<packaging>pom</packaging>
<name>vid</name>
<parent>
<groupId>org.onap.oparent</groupId>
<artifactId>oparent</artifactId>
- <version>
1.2.3
</version>
+ <version>
2.0.0
</version>
<relativePath/>
</parent>
<relativePath/>
</parent>
@@
-66,7
+66,7
@@
<!-- added for javadoc -->
<site>
<id>ecomp-site</id>
<!-- added for javadoc -->
<site>
<id>ecomp-site</id>
- <url>dav:${nexusproxy}${sitePath}</url>
+ <url>dav:${nexusproxy}
/
${sitePath}</url>
</site>
</distributionManagement>
</site>
</distributionManagement>
@@
-86,12
+86,12
@@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <build.version>
4
.0.0-SNAPSHOT</build.version>
+ <build.version>
5
.0.0-SNAPSHOT</build.version>
<nexusproxy>https://nexus.onap.org</nexusproxy>
<nexusproxy>https://nexus.onap.org</nexusproxy>
- <snapshotNexusPath>
/
content/repositories/snapshots/</snapshotNexusPath>
- <releaseNexusPath>
/
content/repositories/releases/</releaseNexusPath>
- <stagingNexusPath>
/
content/repositories/staging/</stagingNexusPath>
- <sitePath>
/
content/sites/site/org/onap/vid/${project.version}</sitePath>
+ <snapshotNexusPath>content/repositories/snapshots/</snapshotNexusPath>
+ <releaseNexusPath>content/repositories/releases/</releaseNexusPath>
+ <stagingNexusPath>content/repositories/staging/</stagingNexusPath>
+ <sitePath>content/sites/site/org/onap/vid/${project.version}</sitePath>
</properties>
<build>
</properties>
<build>
@@
-99,20
+99,15
@@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
- <version>1.3.1</version>
- </plugin>
- <plugin>
- <groupId>org.sonatype.plugins</groupId>
- <artifactId>nexus-staging-maven-plugin</artifactId>
- <version>1.6.7</version>
- <extensions>true</extensions>
+ <version>2.7</version>
<configuration>
<configuration>
- <nexusUrl>${nexusproxy}</nexusUrl>
- <stagingProfileId>176c31dfe190a</stagingProfileId>
- <serverId>ecomp-staging</serverId>
+ <!--
+ Update all modules of aggregator
+ http://www.mojohaus.org/versions-maven-plugin/set-mojo.html#artifactId
+ -->
+ <artifactId>*</artifactId>
</configuration>
</plugin>
</configuration>
</plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
@@
-126,12
+121,6
@@
</dependencies>
</plugin>
</dependencies>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.8</version>
- </plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@
-144,7
+133,7
@@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>
2.3.2
</version>
+ <version>
3.5.1
</version>
<configuration>
<debug>true</debug>
<configuration>
<debug>true</debug>