Do not embed java-concurrent-hash-trie-map

The package is a full OSGi bundle, no need to inline it in the user
anymore.

Change-Id: I9560ab80f07769c77a75b9c99043b8dc694ab2a8
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/common/features/src/main/features/features.xml b/common/features/src/main/features/features.xml
index 0971820ecd17ab02aecc8566e1170bc63cd618a9..6f85f8c33ba547a553e4d8c537722d2ede7f82c4 100644 (file)
--- a/common/features/src/main/features/features.xml
+++ b/common/features/src/main/features/features.xml
@@ -57,6 +57,7 @@
         <feature version='${project.version}'>odl-yangtools-common</feature>
         <bundle>mvn:org.opendaylight.yangtools/yang-binding/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.yangtools/util/{{VERSION}}</bundle>
         <feature version='${project.version}'>odl-yangtools-common</feature>
         <bundle>mvn:org.opendaylight.yangtools/yang-binding/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.yangtools/util/{{VERSION}}</bundle>

+        <bundle>mvn:com.github.romix/java-concurrent-hash-trie-map/{{VERSION}}</bundle>

     </feature>
 
     <feature name='odl-yangtools-common' version='${project.version}' description='OpenDaylight :: Yangtools :: Common'>
     </feature>
 
     <feature name='odl-yangtools-common' version='${project.version}' description='OpenDaylight :: Yangtools :: Common'>


@@ -67,6 +68,7 @@
         <bundle>mvn:org.opendaylight.yangtools/object-cache-api/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.yangtools/object-cache-guava/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.yangtools/object-cache-noop/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.yangtools/object-cache-api/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.yangtools/object-cache-guava/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.yangtools/object-cache-noop/{{VERSION}}</bundle>

+        <bundle>mvn:com.github.romix/java-concurrent-hash-trie-map/{{VERSION}}</bundle>

     </feature>
     <feature name='odl-yangtools-binding-generator' version='${project.version}' description='OpenDaylight :: Yangtools :: Binding Generator'>
         <feature version='${project.version}'>odl-yangtools-data-binding</feature>
     </feature>
     <feature name='odl-yangtools-binding-generator' version='${project.version}' description='OpenDaylight :: Yangtools :: Binding Generator'>
         <feature version='${project.version}'>odl-yangtools-data-binding</feature>

diff --git a/common/util/pom.xml b/common/util/pom.xml
index 9532377335d0daf403438ffe2f2366ca2c1f2a2b..9c9ab40246a8c12b87347792a62a01d4492c1d5c 100644 (file)
--- a/common/util/pom.xml
+++ b/common/util/pom.xml
@@ -58,11 +58,6 @@
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>

-                <configuration>
-                    <instructions>
-                        <Embed-Dependency>java-concurrent-hash-trie-map;inline=true</Embed-Dependency>
-                    </instructions>
-                </configuration>

             </plugin>
         </plugins>
     </build>
             </plugin>
         </plugins>
     </build>

diff --git a/integration-test/bundle-test/src/test/java/org/opendaylight/yangtools/bundle/test/BundleStartTest.java b/integration-test/bundle-test/src/test/java/org/opendaylight/yangtools/bundle/test/BundleStartTest.java
index 721d844fd660b44b019de88a405c8482e3e63aeb..00c76cdfe6f4e8295ae3d0d87e33af231b10c3c2 100644 (file)
--- a/integration-test/bundle-test/src/test/java/org/opendaylight/yangtools/bundle/test/BundleStartTest.java
+++ b/integration-test/bundle-test/src/test/java/org/opendaylight/yangtools/bundle/test/BundleStartTest.java
@@ -42,6 +42,7 @@ public class BundleStartTest {
         options.add(mavenBundle("org.opendaylight.yangtools.thirdparty", "antlr4-runtime-osgi-nohead")
                 .versionAsInProject());
         options.add(mavenBundle("org.javassist", "javassist").versionAsInProject());
         options.add(mavenBundle("org.opendaylight.yangtools.thirdparty", "antlr4-runtime-osgi-nohead")
                 .versionAsInProject());
         options.add(mavenBundle("org.javassist", "javassist").versionAsInProject());

+        options.add(mavenBundle("com.github.romix", "java-concurrent-hash-trie-map").versionAsInProject());

 
         options.add(mavenBundle(GROUP, "concepts").versionAsInProject());
         options.add(mavenBundle(GROUP, "util").versionAsInProject());
 
         options.add(mavenBundle(GROUP, "concepts").versionAsInProject());
         options.add(mavenBundle(GROUP, "util").versionAsInProject());