You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2022/10/14 09:03:57 UTC
[karaf] branch main updated: [KARAF-7579] Upgrade to Pax URL 2.6.12
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/main by this push:
new f019b4800a [KARAF-7579] Upgrade to Pax URL 2.6.12
new f35f3fe861 Merge pull request #1658 from jbonofre/KARAF-7579
f019b4800a is described below
commit f019b4800a35a4f47268fb7687875e73761858f3
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Fri Oct 14 06:16:15 2022 +0200
[KARAF-7579] Upgrade to Pax URL 2.6.12
---
deployer/features/pom.xml | 6 ++++++
pom.xml | 3 ++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/deployer/features/pom.xml b/deployer/features/pom.xml
index 36cf9dc3cb..1af32bc5a9 100644
--- a/deployer/features/pom.xml
+++ b/deployer/features/pom.xml
@@ -65,6 +65,12 @@
<artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.annotation.versioning</artifactId>
+ <version>${org.osgi.annotation.versioning}</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.springframework.osgi</groupId>
<artifactId>spring-osgi-core</artifactId>
diff --git a/pom.xml b/pom.xml
index dd5d1a127f..0818202259 100644
--- a/pom.xml
+++ b/pom.xml
@@ -290,6 +290,7 @@
<maven.resolver.version>1.8.2</maven.resolver.version>
<osgi.version>8.0.0</osgi.version>
+ <org.osgi.annotation.versioning>1.1.2</org.osgi.annotation.versioning>
<org.osgi.service.cm.version>1.6.1</org.osgi.service.cm.version>
<org.osgi.service.component.version>1.5.0</org.osgi.service.component.version>
<org.osgi.service.component.annotations.version>1.5.0</org.osgi.service.component.annotations.version>
@@ -309,7 +310,7 @@
<pax.logging.version>2.1.3</pax.logging.version>
<pax.base.version>1.5.1</pax.base.version>
<pax.swissbox.version>1.8.5</pax.swissbox.version>
- <pax.url.version>2.6.11</pax.url.version>
+ <pax.url.version>2.6.12</pax.url.version>
<pax.web.version>8.0.11</pax.web.version>
<pax.tinybundle.version>3.0.0</pax.tinybundle.version>
<pax.jdbc.version>1.5.4</pax.jdbc.version>