Skip to content

Commit 45ddf65

Browse files
authored
Merge pull request #31 from jboss-fuse/ggrzybek-alignment1
[ENTESB-20663] Clean up core/cmpn OSGi dependencies after upgrading t…
2 parents cb9ce7c + 5b7e5ba commit 45ddf65

File tree

3 files changed

+2
-13
lines changed

3 files changed

+2
-13
lines changed

Diff for: platform/karaf/features/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<dependencies>
4444
<dependency>
4545
<groupId>org.osgi</groupId>
46-
<artifactId>org.osgi.core</artifactId>
46+
<artifactId>osgi.core</artifactId>
4747
<scope>provided</scope>
4848
</dependency>
4949
<dependency>

Diff for: pom.xml

-11
Original file line numberDiff line numberDiff line change
@@ -86,24 +86,13 @@
8686
<rserve-version>1.7-3</rserve-version>
8787
<scala-version>2.10.1</scala-version>
8888
<spring-neo4j-version>4.1.9.RELEASE</spring-neo4j-version>
89-
<spring-data-commons-version>1.11.4.RELEASE</spring-data-commons-version>
9089
<spring-data-neo4j-version>3.4.4.RELEASE</spring-data-neo4j-version>
91-
<servicemix-jaxb-impl-version>2.2.6_1</servicemix-jaxb-impl-version>
92-
<!--<servicemix-lucene-bundle-version>3.6.2_1</servicemix-lucene-bundle-version>-->
93-
<servicemix.bundles.cglib-version>2.2.2_1</servicemix.bundles.cglib-version>
9490
<servicemix.bundles.jdo2-api-version>2.2_1</servicemix.bundles.jdo2-api-version>
95-
<servicemix.bundles.jaxb-impl>2.2.6_1</servicemix.bundles.jaxb-impl>
96-
<servicemix.bundles.javax-inject-version>1_2</servicemix.bundles.javax-inject-version>
9791
<servicemix.bundles.jdt-core-version>3.2.3_5</servicemix.bundles.jdt-core-version>
98-
<servicemix.bundles.guava-version>11.0.2_2</servicemix.bundles.guava-version>
99-
<servicemix.bundles.aspectj-version>1.7.2_1</servicemix.bundles.aspectj-version>
10092
<servicemix.bundles.lucene-version>3.6.2</servicemix.bundles.lucene-version>
10193
<servicemix.bundles.neo4j-version>1.8_2</servicemix.bundles.neo4j-version>
10294
<servicemix.bundles.spring-data-neo4j-version>2.2.2.RELEASE_1</servicemix.bundles.spring-data-neo4j-version>
10395
<servicemix.bundles.querydsl-version>2.9.0_1</servicemix.bundles.querydsl-version>
104-
<servicemix.specs.activation-api-version>2.2.0</servicemix.specs.activation-api-version>
105-
<servicemix.specs.java-persistence-api-version>2.4.0</servicemix.specs.java-persistence-api-version>
106-
<servicemix.specs.jsr303-api-version>2.4.0</servicemix.specs.jsr303-api-version>
10796
<typesafe-config-version>1.0.2</typesafe-config-version>
10897
<virtualbox-version>4.2.8</virtualbox-version>
10998
<vtd-xml-version>2.11</vtd-xml-version>

Diff for: tests/camel-extra-itest-karaf/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ http://www.gnu.org/licenses/gpl-2.0-standalone.html
112112
</dependency>
113113
<dependency>
114114
<groupId>org.osgi</groupId>
115-
<artifactId>org.osgi.core</artifactId>
115+
<artifactId>osgi.core</artifactId>
116116
<version>${osgi-version}</version>
117117
<scope>test</scope>
118118
</dependency>

0 commit comments

Comments
 (0)