Code Review
/
mdsal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Remove _dsannotations-options override
[mdsal.git]
/
binding
/
mdsal-binding-runtime-osgi
/
pom.xml
diff --git
a/binding/mdsal-binding-runtime-osgi/pom.xml
b/binding/mdsal-binding-runtime-osgi/pom.xml
index 1494a0abe92289c9e596f919f8cb6aff722bafda..2ca3b5fe61ebdbc410e75814d8b9701af7df01c4 100644
(file)
--- a/
binding/mdsal-binding-runtime-osgi/pom.xml
+++ b/
binding/mdsal-binding-runtime-osgi/pom.xml
@@
-12,7
+12,7
@@
<parent>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>dom-parent</artifactId>
<parent>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>dom-parent</artifactId>
- <version>
6.0.2
-SNAPSHOT</version>
+ <version>
10.0.0
-SNAPSHOT</version>
<relativePath>../../dom/dom-parent</relativePath>
</parent>
<relativePath>../../dom/dom-parent</relativePath>
</parent>
@@
-30,11
+30,15
@@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.
core
</artifactId>
+ <artifactId>org.osgi.
framework
</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
+ <artifactId>org.osgi.service.component</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
</dependency>
<dependency>
</dependency>
<dependency>
@@
-47,7
+51,7
@@
</dependency>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
- <artifactId>mdsal-binding-generator
-impl
</artifactId>
+ <artifactId>mdsal-binding-generator</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<scope>test</scope>
</dependency>
</dependencies>
@@
-58,10
+62,8
@@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
- <Automatic-Module-Name>org.opendaylight.mdsal.binding.runtime.osgi</Automatic-Module-Name>
<instructions>
<instructions>
- <!-- Karaf cannot handle Factory Component requirements, see https://issues.apache.org/jira/browse/KARAF-6625 -->
- <_dsannotations-options>norequirements</_dsannotations-options>
+ <Automatic-Module-Name>org.opendaylight.mdsal.binding.runtime.osgi</Automatic-Module-Name>
</instructions>
</configuration>
</plugin>
</instructions>
</configuration>
</plugin>