Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Tagging Helium release
[controller.git]
/
third-party
/
commons
/
thirdparty
/
pom.xml
diff --git
a/third-party/commons/thirdparty/pom.xml
b/third-party/commons/thirdparty/pom.xml
index ccd07865a8d2b0e67ee22e8b3f13e5fec2081d75..344288b3a45e49f9ebabf3d6cc65f698dc784a96 100644
(file)
--- a/
third-party/commons/thirdparty/pom.xml
+++ b/
third-party/commons/thirdparty/pom.xml
@@
-6,7
+6,7
@@
</prerequisites>
<groupId>org.opendaylight.controller</groupId>
<artifactId>commons.thirdparty</artifactId>
</prerequisites>
<groupId>org.opendaylight.controller</groupId>
<artifactId>commons.thirdparty</artifactId>
- <version>1.1.2-
SNAPSHOT
</version>
+ <version>1.1.2-
Helium
</version>
<packaging>pom</packaging>
<scm>
<connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
<packaging>pom</packaging>
<scm>
<connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
@@
-18,6
+18,8
@@
<properties>
<sonar.host.url>https://sonar.opendaylight.org/</sonar.host.url>
<nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
<properties>
<sonar.host.url>https://sonar.opendaylight.org/</sonar.host.url>
<nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
+ <nexus.repository.release>opendaylight.release</nexus.repository.release>
+ <nexus.repository.snapshot>opendaylight.snapshot</nexus.repository.snapshot>
<sitedeploy>dav:http://nexus.opendaylight.org/content/sites/site</sitedeploy>
<siteplugin>3.2</siteplugin>
<projectinfo>2.6</projectinfo>
<sitedeploy>dav:http://nexus.opendaylight.org/content/sites/site</sitedeploy>
<siteplugin>3.2</siteplugin>
<projectinfo>2.6</projectinfo>
@@
-26,10
+28,11
@@
<surefire.version>2.13</surefire.version>
<releaseplugin.version>2.3.2</releaseplugin.version>
<enforcer.version>1.3.1</enforcer.version>
<surefire.version>2.13</surefire.version>
<releaseplugin.version>2.3.2</releaseplugin.version>
<enforcer.version>1.3.1</enforcer.version>
+ <bundle.plugin.version>2.3.7</bundle.plugin.version>
</properties>
<pluginRepositories>
</properties>
<pluginRepositories>
- <pluginRepository>
+ <pluginRepository>
<id>central2</id>
<name>central2</name>
<url>http://repo2.maven.org/maven2</url>
<id>central2</id>
<name>central2</name>
<url>http://repo2.maven.org/maven2</url>
@@
-91,6
+94,12
@@
<artifactId>maven-release-plugin</artifactId>
<version>${releaseplugin.version}</version>
</plugin>
<artifactId>maven-release-plugin</artifactId>
<version>${releaseplugin.version}</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>${bundle.plugin.version}</version>
+ <extensions>true</extensions>
+ </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>
@@
-205,12
+214,12
@@
<!-- OpenDayLight Released artifact -->
<repository>
<id>opendaylight-release</id>
<!-- OpenDayLight Released artifact -->
<repository>
<id>opendaylight-release</id>
- <url>${nexusproxy}/repositories/
opendaylight.release
/</url>
+ <url>${nexusproxy}/repositories/
${nexus.repository.release}
/</url>
</repository>
<!-- OpenDayLight Snapshot artifact -->
<snapshotRepository>
<id>opendaylight-snapshot</id>
</repository>
<!-- OpenDayLight Snapshot artifact -->
<snapshotRepository>
<id>opendaylight-snapshot</id>
- <url>${nexusproxy}/repositories/
opendaylight.snapshot
/</url>
+ <url>${nexusproxy}/repositories/
${nexus.repository.snapshot}
/</url>
</snapshotRepository>
<!-- Site deployment -->
<site>
</snapshotRepository>
<!-- Site deployment -->
<site>