Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Use same maven-compiler-plugin version 2.5.1 in all poms.
[controller.git]
/
opendaylight
/
archetypes
/
odl-model-project
/
src
/
main
/
resources
/
archetype-resources
/
pom.xml
diff --git
a/opendaylight/archetypes/odl-model-project/src/main/resources/archetype-resources/pom.xml
b/opendaylight/archetypes/odl-model-project/src/main/resources/archetype-resources/pom.xml
index e592e6df8ef549a86f4bf2c994d2585082664bb6..00dacf7f6561cb3da882dd503733778d974f770a 100644
(file)
--- a/
opendaylight/archetypes/odl-model-project/src/main/resources/archetype-resources/pom.xml
+++ b/
opendaylight/archetypes/odl-model-project/src/main/resources/archetype-resources/pom.xml
@@
-9,7
+9,8
@@
<properties>
\r
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
\r
<nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
\r
<properties>
\r
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
\r
<nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
\r
- <yang.version>0.5.8-SNAPSHOT</yang.version>
\r
+ <yang.version>0.5.9-SNAPSHOT</yang.version>
\r
+ <yang.codegen.version>0.6.0-SNAPSHOT</yang.codegen.version>
\r
<bundle.plugin.version>2.3.7</bundle.plugin.version>
\r
</properties>
\r
<scm>
\r
<bundle.plugin.version>2.3.7</bundle.plugin.version>
\r
</properties>
\r
<scm>
\r
@@
-35,7
+36,7
@@
<plugin>
\r
<groupId>org.apache.maven.plugins</groupId>
\r
<artifactId>maven-compiler-plugin</artifactId>
\r
<plugin>
\r
<groupId>org.apache.maven.plugins</groupId>
\r
<artifactId>maven-compiler-plugin</artifactId>
\r
- <version>2.
0
</version>
\r
+ <version>2.
5.1
</version>
\r
<inherited>true</inherited>
\r
<configuration>
\r
<source>1.7</source>
\r
<inherited>true</inherited>
\r
<configuration>
\r
<source>1.7</source>
\r
@@
-84,7
+85,7
@@
<dependency>
\r
<groupId>org.opendaylight.yangtools</groupId>
\r
<artifactId>maven-sal-api-gen-plugin</artifactId>
\r
<dependency>
\r
<groupId>org.opendaylight.yangtools</groupId>
\r
<artifactId>maven-sal-api-gen-plugin</artifactId>
\r
- <version>${yang.version}</version>
\r
+ <version>${yang.
codegen.
version}</version>
\r
<type>jar</type>
\r
</dependency>
\r
</dependencies>
\r
<type>jar</type>
\r
</dependency>
\r
</dependencies>
\r
@@
-156,6
+157,11
@@
<name>opendaylight.snapshot</name>
\r
<url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
\r
</pluginRepository>
\r
<name>opendaylight.snapshot</name>
\r
<url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
\r
</pluginRepository>
\r
+ <pluginRepository>
\r
+ <id>opendaylight.release</id>
\r
+ <name>opendaylight.release</name>
\r
+ <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
\r
+ </pluginRepository>
\r
</pluginRepositories>
\r
\r
<repositories>
\r
</pluginRepositories>
\r
\r
<repositories>
\r
@@
-165,6
+171,13
@@
<id>ebr-bundles-release</id>
\r
<name>ebr-bundles-release</name>
\r
<url>${nexusproxy}/repositories/ebr-bundles-release/</url>
\r
<id>ebr-bundles-release</id>
\r
<name>ebr-bundles-release</name>
\r
<url>${nexusproxy}/repositories/ebr-bundles-release/</url>
\r
+ <snapshots>
\r
+ <enabled>false</enabled>
\r
+ </snapshots>
\r
+ <releases>
\r
+ <updatePolicy>never</updatePolicy>
\r
+ <enabled>true</enabled>
\r
+ </releases>
\r
</repository>
\r
<!-- EBR external -->
\r
<!-- http://repository.springsource.com/maven/bundles/external -->
\r
</repository>
\r
<!-- EBR external -->
\r
<!-- http://repository.springsource.com/maven/bundles/external -->
\r
@@
-172,6
+185,13
@@
<id>ebr-bundles-external</id>
\r
<name>ebr-bundles-external</name>
\r
<url>${nexusproxy}/repositories/ebr-bundles-external/</url>
\r
<id>ebr-bundles-external</id>
\r
<name>ebr-bundles-external</name>
\r
<url>${nexusproxy}/repositories/ebr-bundles-external/</url>
\r
+ <snapshots>
\r
+ <enabled>false</enabled>
\r
+ </snapshots>
\r
+ <releases>
\r
+ <updatePolicy>never</updatePolicy>
\r
+ <enabled>true</enabled>
\r
+ </releases>
\r
</repository>
\r
<repository>
\r
<id>central</id>
\r
</repository>
\r
<repository>
\r
<id>central</id>
\r
@@
-181,6
+201,7
@@
<enabled>false</enabled>
\r
</snapshots>
\r
<releases>
\r
<enabled>false</enabled>
\r
</snapshots>
\r
<releases>
\r
+ <updatePolicy>never</updatePolicy>
\r
<enabled>true</enabled>
\r
</releases>
\r
</repository>
\r
<enabled>true</enabled>
\r
</releases>
\r
</repository>
\r
@@
-190,6
+211,13
@@
<id>ops4j-releases</id>
\r
<name>ops4j-releases</name>
\r
<url>${nexusproxy}/repositories/ops4j-releases/</url>
\r
<id>ops4j-releases</id>
\r
<name>ops4j-releases</name>
\r
<url>${nexusproxy}/repositories/ops4j-releases/</url>
\r
+ <snapshots>
\r
+ <enabled>false</enabled>
\r
+ </snapshots>
\r
+ <releases>
\r
+ <updatePolicy>never</updatePolicy>
\r
+ <enabled>true</enabled>
\r
+ </releases>
\r
</repository>
\r
<!-- Third Packages hosted in local maven because not available in other
\r
places -->
\r
</repository>
\r
<!-- Third Packages hosted in local maven because not available in other
\r
places -->
\r
@@
-197,6
+225,13
@@
<id>thirdparty</id>
\r
<name>thirdparty</name>
\r
<url>${nexusproxy}/repositories/thirdparty/</url>
\r
<id>thirdparty</id>
\r
<name>thirdparty</name>
\r
<url>${nexusproxy}/repositories/thirdparty/</url>
\r
+ <snapshots>
\r
+ <enabled>false</enabled>
\r
+ </snapshots>
\r
+ <releases>
\r
+ <updatePolicy>never</updatePolicy>
\r
+ <enabled>true</enabled>
\r
+ </releases>
\r
</repository>
\r
<!-- Jboss mirror -->
\r
<!-- https://repository.jboss.org/nexus/content/repositories/releases -->
\r
</repository>
\r
<!-- Jboss mirror -->
\r
<!-- https://repository.jboss.org/nexus/content/repositories/releases -->
\r
@@
-208,6
+243,7
@@
<enabled>false</enabled>
\r
</snapshots>
\r
<releases>
\r
<enabled>false</enabled>
\r
</snapshots>
\r
<releases>
\r
+ <updatePolicy>never</updatePolicy>
\r
<enabled>true</enabled>
\r
</releases>
\r
</repository>
\r
<enabled>true</enabled>
\r
</releases>
\r
</repository>
\r