Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add release/snapshot property to repositories in 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 b84346514f17c85a3b4d24c2f1f1878747bcd623..33880da4ac461929d623edc99ce15a6d7dd901a3 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,16
+9,22
@@
<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.7-SNAPSHOT</yang.version>
\r
- <maven.bundle.version>2.4.0</maven.bundle.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
</properties>
\r
+ <scm>
\r
+ <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
\r
+ <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
\r
+ <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
\r
+ </scm>
\r
\r
<build>
\r
<plugins>
\r
<plugin>
\r
<groupId>org.apache.felix</groupId>
\r
<artifactId>maven-bundle-plugin</artifactId>
\r
\r
<build>
\r
<plugins>
\r
<plugin>
\r
<groupId>org.apache.felix</groupId>
\r
<artifactId>maven-bundle-plugin</artifactId>
\r
- <version>${
maven.bundle
.version}</version>
\r
+ <version>${
bundle.plugin
.version}</version>
\r
<extensions>true</extensions>
\r
<configuration>
\r
<instructions>
\r
<extensions>true</extensions>
\r
<configuration>
\r
<instructions>
\r
@@
-56,7
+62,7
@@
<plugin>
\r
<groupId>org.opendaylight.yangtools</groupId>
\r
<artifactId>yang-maven-plugin</artifactId>
\r
<plugin>
\r
<groupId>org.opendaylight.yangtools</groupId>
\r
<artifactId>yang-maven-plugin</artifactId>
\r
- <version>
0.5.7-SNAPSHOT
</version>
\r
+ <version>
${yang.version}
</version>
\r
<executions>
\r
<execution>
\r
<goals>
\r
<executions>
\r
<execution>
\r
<goals>
\r
@@
-79,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>
0.5.7-SNAPSHOT
</version>
\r
+ <version>
${yang.codegen.version}
</version>
\r
<type>jar</type>
\r
</dependency>
\r
</dependencies>
\r
<type>jar</type>
\r
</dependency>
\r
</dependencies>
\r
@@
-136,9
+142,9
@@
</build>
\r
<pluginRepositories>
\r
<pluginRepository>
\r
</build>
\r
<pluginRepositories>
\r
<pluginRepository>
\r
- <id>central
2
</id>
\r
- <name>
central2
</name>
\r
- <url>http://repo
2
.maven.org/maven2</url>
\r
+ <id>central</id>
\r
+ <name>
maven repo1
</name>
\r
+ <url>http://repo
1
.maven.org/maven2</url>
\r
<snapshots>
\r
<enabled>false</enabled>
\r
</snapshots>
\r
<snapshots>
\r
<enabled>false</enabled>
\r
</snapshots>
\r
@@
-151,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
@@
-160,6
+171,12
@@
<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
+ <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
@@
-168,17
+185,6
@@
<name>ebr-bundles-external</name>
\r
<url>${nexusproxy}/repositories/ebr-bundles-external/</url>
\r
</repository>
\r
<name>ebr-bundles-external</name>
\r
<url>${nexusproxy}/repositories/ebr-bundles-external/</url>
\r
</repository>
\r
- <repository>
\r
- <id>central2</id>
\r
- <name>central2</name>
\r
- <url>http://repo2.maven.org/maven2</url>
\r
- <snapshots>
\r
- <enabled>false</enabled>
\r
- </snapshots>
\r
- <releases>
\r
- <enabled>true</enabled>
\r
- </releases>
\r
- </repository>
\r
<repository>
\r
<id>central</id>
\r
<name>central</name>
\r
<repository>
\r
<id>central</id>
\r
<name>central</name>
\r
@@
-210,6
+216,12
@@
<id>jboss.releases</id>
\r
<name>jboss.releases</name>
\r
<url>${nexusproxy}/repositories/jboss.releases/</url>
\r
<id>jboss.releases</id>
\r
<name>jboss.releases</name>
\r
<url>${nexusproxy}/repositories/jboss.releases/</url>
\r
+ <snapshots>
\r
+ <enabled>false</enabled>
\r
+ </snapshots>
\r
+ <releases>
\r
+ <enabled>true</enabled>
\r
+ </releases>
\r
</repository>
\r
<!-- OpenDayLight Released artifact -->
\r
<repository>
\r
</repository>
\r
<!-- OpenDayLight Released artifact -->
\r
<repository>
\r