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 versions to 6.0.3-SNAPSHOT
[yangtools.git]
/
yang
/
yang-data-impl
/
pom.xml
diff --git
a/yang/yang-data-impl/pom.xml
b/yang/yang-data-impl/pom.xml
index fe440445fe7c7bdcdf2d50eab618c9a743215b24..6eb83ae828a942e0f5b9289cc65ff1160a0c5e8f 100644
(file)
--- a/
yang/yang-data-impl/pom.xml
+++ b/
yang/yang-data-impl/pom.xml
@@
-9,7
+9,7
@@
<parent>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>bundle-parent</artifactId>
<parent>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>bundle-parent</artifactId>
- <version>
5.0.0-SNAPSHO
T</version>
+ <version>
6.0.3-SNAPHOS
T</version>
<relativePath>../../bundle-parent</relativePath>
</parent>
<relativePath>../../bundle-parent</relativePath>
</parent>
@@
-18,11
+18,6
@@
<name>${project.artifactId}</name>
<description>${project.artifactId}</description>
<name>${project.artifactId}</name>
<description>${project.artifactId}</description>
- <properties>
- <!-- FIXME: fixup/suppress remaining bugs and remove this -->
- <odlparent.spotbugs.enforce>false</odlparent.spotbugs.enforce>
- </properties>
-
<build>
<plugins>
<plugin>
<build>
<plugins>
<plugin>
@@
-31,13
+26,13
@@
<extensions>true</extensions>
<configuration>
<instructions>
<extensions>true</extensions>
<configuration>
<instructions>
- <Automatic-Module-Name>org.opendaylight.yangtools.yang.data.impl</Automatic-Module-Name>
+ <!-- FIXME: do not export data.impl -->
+ <!-- FIXME: use OSGi annotations when we have R7 -->
<Export-Package>
{local-packages},
org.opendaylight.yangtools.yang.data.impl.*,
;-split-package:=error
</Export-Package>
<Export-Package>
{local-packages},
org.opendaylight.yangtools.yang.data.impl.*,
;-split-package:=error
</Export-Package>
- <Bundle-Activator>org.opendaylight.yangtools.yang.data.impl.osgi.Activator</Bundle-Activator>
</instructions>
</configuration>
</plugin>
</instructions>
</configuration>
</plugin>
@@
-81,18
+76,20
@@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
+
<dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
</dependency>
</dependency>
-
<dependency>
<groupId>org.kohsuke.metainf-services</groupId>
<artifactId>metainf-services</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<dependency>
<groupId>org.kohsuke.metainf-services</groupId>
<artifactId>metainf-services</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.
core
</artifactId>
+ <artifactId>org.osgi.
service.component.annotations
</artifactId>
</dependency>
<dependency>
</dependency>
<dependency>