Skip to content
Permalink
Browse files
Merge pull request #168 from jcabrerizo/feature/bump-karaf
Bumping depencencies
  • Loading branch information
nakomis committed Mar 3, 2021
2 parents 776a5f3 + 578288e commit 5860622ab16df3e6c00b461622148dad84aa4179
Showing 3 changed files with 7 additions and 4 deletions.
@@ -53,13 +53,16 @@
</feature>

<feature name="brooklyn-startup-features" version="${project.version}" description="Bundles to add to startup.properties">
<!-- <bundle dependency="true">mvn:org.apache.servicemix.specs.activation-api-1.1</bundle>-->
<!-- <bundle dependency="true">mvn:org.apache.servicemix.specs.activation-api-1.1/2.9.0</bundle>-->
<bundle dependency="true">mvn:com.sun.activation/jakarta.activation/${jakarta.activation.version}</bundle>
<!-- Register javax.mail along with pax-logging-service so it doesn't get refreshed later -->
<bundle>mvn:javax.mail/mail/${javax.mail.version}</bundle>
<bundle dependency="true">mvn:javax.mail/mail/${javax.mail.version}</bundle>
</feature>

<feature name="brooklyn-guava-optional-deps" version="${project.version}" description="Guava dependencies to avoid refreshing the bundle">
<!-- Register javax.annotation (coming from cxf-jaxrs) before guava so it doesn't get rewired when it sees it -->
<bundle>mvn:javax.annotation/javax.annotation-api/${cxf.javax.annotation-api.version}</bundle>
<bundle>mvn:jakarta.annotation/jakarta.annotation-api/${jakarta.annotation-api.version}</bundle>
</feature>

<feature name="brooklyn-config" version="${project.version}">
@@ -111,7 +111,7 @@

<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<artifactId>osgi.core</artifactId>
<version>${org.osgi.core.version}</version>
<scope>provided</scope>
</dependency>
@@ -45,7 +45,7 @@
<pax.exam.version>4.13.1</pax.exam.version>
<pax.url.version>2.5.2</pax.url.version>

<ops4j.base.version>1.5.0</ops4j.base.version>
<ops4j.base.version>1.5.1</ops4j.base.version>
<tinybundles.version>1.0.0</tinybundles.version>

<!-- feature repositories -->

0 comments on commit 5860622

Please sign in to comment.