Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bump to odlparent 3.1.0 and yangtools 2.0.3
[controller.git]
/
opendaylight
/
archetypes
/
opendaylight-startup
/
src
/
main
/
resources
/
archetype-resources
/
artifacts
/
pom.xml
diff --git
a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/artifacts/pom.xml
b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/artifacts/pom.xml
index f3381ceb55064d0985cc4c9e71abcb0925a92397..4146f73ca89e0cf4afa625e7697b0cd700dc7e3e 100644
(file)
--- a/
opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/artifacts/pom.xml
+++ b/
opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/artifacts/pom.xml
@@
-9,21
+9,23
@@
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v1.0 which accompanies this distribution,
and is available at http://www.eclipse.org/legal/epl-v10.html
-->
terms of the Eclipse Public License v1.0 which accompanies this distribution,
and is available at http://www.eclipse.org/legal/epl-v10.html
-->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>
1.6.0-SNAPSHOT
</version>
+ <version>
3.1.0
</version>
<relativePath/>
</parent>
<groupId>${groupId}</groupId>
<artifactId>${artifactId}-artifacts</artifactId>
<version>${version}</version>
<relativePath/>
</parent>
<groupId>${groupId}</groupId>
<artifactId>${artifactId}-artifacts</artifactId>
<version>${version}</version>
+ <!-- <name> formatting is used by autorelease to parse and notify projects on
+ build failure. Please do not modify this unless you have a good reason. -->
+ <name>ODL :: ${groupId} :: ${project.artifactId}</name>
<packaging>pom</packaging>
<dependencyManagement>
<packaging>pom</packaging>
<dependencyManagement>
@@
-40,7
+42,7
@@
and is available at http://www.eclipse.org/legal/epl-v10.html
</dependency>
<dependency>
<groupId>${symbol_dollar}{project.groupId}</groupId>
</dependency>
<dependency>
<groupId>${symbol_dollar}{project.groupId}</groupId>
- <artifactId>
${artifactId}-features
</artifactId>
+ <artifactId>
features-${artifactId}
</artifactId>
<version>${symbol_dollar}{project.version}</version>
<classifier>features</classifier>
<type>xml</type>
<version>${symbol_dollar}{project.version}</version>
<classifier>features</classifier>
<type>xml</type>