Code Review
/
mdsal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bump versions to 9.0.2-SNAPSHOT
[mdsal.git]
/
binding
/
mdsal-binding-dom-codec-osgi
/
pom.xml
diff --git
a/binding/mdsal-binding-dom-codec-osgi/pom.xml
b/binding/mdsal-binding-dom-codec-osgi/pom.xml
index 7311fa57614e68fa9921c95c274fcf10697cff26..7907bff9a52b9b88d18daacc1d461d483b6fa93d 100644
(file)
--- a/
binding/mdsal-binding-dom-codec-osgi/pom.xml
+++ b/
binding/mdsal-binding-dom-codec-osgi/pom.xml
@@
-1,7
+1,7
@@
<?xml version="1.0" encoding="UTF-8"?>
<!-- vi: set et smarttab sw=4 tabstop=4: -->
<!--
<?xml version="1.0" encoding="UTF-8"?>
<!-- vi: set et smarttab sw=4 tabstop=4: -->
<!--
- Copyright (c) 20
17 Pantheon Technologies
, s.r.o. and others. All rights reserved.
+ Copyright (c) 20
20 PANTHEON.tech
, s.r.o. and others. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v1.0 which accompanies this distribution,
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v1.0 which accompanies this distribution,
@@
-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.0
-SNAPSHOT</version>
+ <version>
9.0.2
-SNAPSHOT</version>
<relativePath>../../dom/dom-parent</relativePath>
</parent>
<relativePath>../../dom/dom-parent</relativePath>
</parent>
@@
-22,28
+22,23
@@
<dependencies>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
<dependencies>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
- <artifactId>mdsal-binding-dom-codec</artifactId>
+ <artifactId>mdsal-binding-dom-codec
-spi
</artifactId>
</dependency>
</dependency>
-
- <!-- FIXME: MDSAL-392: this is ugly, we should be looking this up,
- but then we may want to end up doing something
- completely different in thes artifacts -->
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
- <artifactId>mdsal-binding-
generator-impl
</artifactId>
+ <artifactId>mdsal-binding-
runtime-osgi
</artifactId>
</dependency>
</dependency>
-
<dependency>
<dependency>
- <groupId>org.o
pendaylight.mdsal
</groupId>
- <artifactId>
mdsal-binding-runtime-spi
</artifactId>
+ <groupId>org.o
sgi
</groupId>
+ <artifactId>
org.osgi.framework
</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.
core
</artifactId>
+ <artifactId>org.osgi.
service.component
</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>o
sgi.cmpn
</artifactId>
+ <artifactId>o
rg.osgi.service.component.annotations
</artifactId>
</dependency>
<dependency>
</dependency>
<dependency>
@@
-51,8
+46,13
@@
<artifactId>mockito-configuration</artifactId>
</dependency>
<dependency>
<artifactId>mockito-configuration</artifactId>
</dependency>
<dependency>
- <groupId>org.opendaylight.yangtools</groupId>
- <artifactId>yang-test-util</artifactId>
+ <groupId>org.opendaylight.mdsal</groupId>
+ <artifactId>mdsal-binding-test-model</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.mdsal</groupId>
+ <artifactId>mdsal-binding-generator</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
</dependency>
</dependencies>
@@
-61,10
+61,11
@@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
<configuration>
<configuration>
+ <Automatic-Module-Name>org.opendaylight.mdsal.binding.dom.codec.osgi</Automatic-Module-Name>
<instructions>
<instructions>
- <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
+ <!-- Karaf cannot handle Factory Component requirements, see https://issues.apache.org/jira/browse/KARAF-6625 -->
+ <_dsannotations-options>norequirements</_dsannotations-options>
</instructions>
</configuration>
</plugin>
</instructions>
</configuration>
</plugin>