Code Review
/
aaf
/
cadi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Prepare for release 2.1.19
[aaf/cadi.git]
/
shiro-osgi-bundle
/
pom.xml
diff --git
a/shiro-osgi-bundle/pom.xml
b/shiro-osgi-bundle/pom.xml
index
7478ebf
..
228ae37
100644
(file)
--- a/
shiro-osgi-bundle/pom.xml
+++ b/
shiro-osgi-bundle/pom.xml
@@
-22,7
+22,7
@@
<parent>
<groupId>org.onap.aaf.cadi</groupId>
<artifactId>parent</artifactId>
<parent>
<groupId>org.onap.aaf.cadi</groupId>
<artifactId>parent</artifactId>
- <version>2.1.1
0
-SNAPSHOT</version>
+ <version>2.1.1
9
-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<relativePath>..</relativePath>
</parent>
@@
-40,7
+40,7
@@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>
2.5.4
</version>
+ <version>
4.2.1
</version>
<extensions>true</extensions>
<configuration>
<instructions>
<extensions>true</extensions>
<configuration>
<instructions>
@@
-53,12
+53,11
@@
javax.servlet,
javax.servlet.http,
org.osgi.service.blueprint;version="[1.0.0,2.0.0)",
javax.servlet,
javax.servlet.http,
org.osgi.service.blueprint;version="[1.0.0,2.0.0)",
- org.osgi.framework,
javax.net.ssl,
javax.crypto,
javax.crypto.spec,
javax.net.ssl,
javax.crypto,
javax.crypto.spec,
- javax.xml.bind.annotation,
- javax.xml.bind,
+ javax.xml.bind.annotation
;version="[2.0,3)"
,
+ javax.xml.bind
;version="[2.0,3)"
,
javax.xml.transform,
javax.xml.datatype,
javax.ws.rs,
javax.xml.transform,
javax.xml.datatype,
javax.ws.rs,
@@
-73,10
+72,7
@@
org.w3c.dom,
org.xml.sax,
javax.xml.transform.stream,
org.w3c.dom,
org.xml.sax,
javax.xml.transform.stream,
- org.apache.log4j,
- org.slf4j.impl,
- org.slf4j,
- org.slf4j.spi
+ org.apache.log4j
</Import-Package>
<Embed-Dependency>*;scope=compile|runtime;inline=false</Embed-Dependency>
<!-- <Embed-Dependency>*;scope=compile|runtime;artifactId=!shiro-core;inline=false</Embed-Dependency> -->
</Import-Package>
<Embed-Dependency>*;scope=compile|runtime;inline=false</Embed-Dependency>
<!-- <Embed-Dependency>*;scope=compile|runtime;artifactId=!shiro-core;inline=false</Embed-Dependency> -->