Code Review
/
yangtools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Convert yang-data-impl to a JPMS module
[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 6d06b5cdc15285d4034c23d21c580446a1f751de..f68efdfb8fd007b9f0464a564de1012d060c63b8 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
-SNAPSHOT</version>
+ <version>
6.0.2
-SNAPSHOT</version>
<relativePath>../../bundle-parent</relativePath>
</parent>
<relativePath>../../bundle-parent</relativePath>
</parent>
@@
-26,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>
@@
-76,14
+76,11
@@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
+ <scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<optional>true</optional>
</dependency>
<dependency>
@@
-92,7
+89,7
@@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.
core
</artifactId>
+ <artifactId>org.osgi.
service.component.annotations
</artifactId>
</dependency>
<dependency>
</dependency>
<dependency>