Code Review
/
yangtools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bump odlparent to 3.0.0-SNAPSHOT and fix breakages
[yangtools.git]
/
common
/
util
/
pom.xml
diff --git
a/common/util/pom.xml
b/common/util/pom.xml
index 538c31b1a0cc077aa8dfd455cf16a62995dc6d62..5b713de7afc3b047f9dc05f833f6b9cbcdc39f54 100644
(file)
--- a/
common/util/pom.xml
+++ b/
common/util/pom.xml
@@
-12,14
+12,14
@@
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>bundle-parent</artifactId>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>bundle-parent</artifactId>
- <version>
1.8
.0-SNAPSHOT</version>
+ <version>
3.0
.0-SNAPSHOT</version>
<relativePath/>
</parent>
<packaging>bundle</packaging>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>util</artifactId>
<relativePath/>
</parent>
<packaging>bundle</packaging>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>util</artifactId>
- <version>
1.1
.0-SNAPSHOT</version>
+ <version>
2.0
.0-SNAPSHOT</version>
<dependencyManagement>
<dependencies>
<dependencyManagement>
<dependencies>
@@
-39,20
+39,16
@@
<artifactId>concepts</artifactId>
</dependency>
<dependency>
<artifactId>concepts</artifactId>
</dependency>
<dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <groupId>org.opendaylight.yangtools</groupId>
+ <artifactId>triemap</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>
com.github.romix
</groupId>
- <artifactId>
java-concurrent-hash-trie-map
</artifactId>
+ <groupId>
org.immutables
</groupId>
+ <artifactId>
value
</artifactId>
</dependency>
<dependency>
</dependency>
<dependency>
@@
-72,19
+68,31
@@
</dependency>
</dependencies>
</dependency>
</dependencies>
- <!--
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <!--
Maven Site Configuration
The following configuration is necessary for maven-site-plugin to
correctly identify the correct deployment path for OpenDaylight Maven
sites.
Maven Site Configuration
The following configuration is necessary for maven-site-plugin to
correctly identify the correct deployment path for OpenDaylight Maven
sites.
- -->
- <url>${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/</url>
+
-->
+
<url>${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/</url>
- <distributionManagement>
- <site>
- <id>opendaylight-site</id>
- <url>${nexus.site.url}/${project.artifactId}/</url>
- </site>
- </distributionManagement>
+
<distributionManagement>
+
<site>
+
<id>opendaylight-site</id>
+
<url>${nexus.site.url}/${project.artifactId}/</url>
+
</site>
+
</distributionManagement>
</project>
</project>