You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2020/03/15 10:51:28 UTC
[felix-dev] branch master updated: Updating pax url in a few places
(#7)
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
The following commit(s) were added to refs/heads/master by this push:
new a7c6af3 Updating pax url in a few places (#7)
a7c6af3 is described below
commit a7c6af3262c0b01232d16ee78c8191ee2f13cbe7
Author: Colm O hEigeartaigh <co...@users.noreply.github.com>
AuthorDate: Sun Mar 15 10:51:19 2020 +0000
Updating pax url in a few places (#7)
---
configadmin/pom.xml | 2 +-
deploymentadmin/itest/pom.xml | 9 ++++++++-
eventadmin/impl/pom.xml | 4 ++--
healthcheck/core/pom.xml | 2 +-
http/itest/pom.xml | 4 ++--
scr/pom.xml | 4 ++--
webconsole-plugins/script-console/pom.xml | 2 +-
7 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/configadmin/pom.xml b/configadmin/pom.xml
index 0d92b89..e88eee7 100644
--- a/configadmin/pom.xml
+++ b/configadmin/pom.xml
@@ -146,7 +146,7 @@
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-aether</artifactId>
- <version>1.5.0</version>
+ <version>2.6.2</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/deploymentadmin/itest/pom.xml b/deploymentadmin/itest/pom.xml
index 5a0296d..247f480 100644
--- a/deploymentadmin/itest/pom.xml
+++ b/deploymentadmin/itest/pom.xml
@@ -21,7 +21,7 @@
<properties>
<osgi.version>4.2.0</osgi.version>
<pax.exam.version>3.6.0</pax.exam.version>
- <pax.url.version>1.6.0</pax.url.version>
+ <pax.url.version>2.6.2</pax.url.version>
</properties>
<name>Apache Felix DeploymentAdmin Integration Tests</name>
<version>0.1.1-SNAPSHOT</version>
@@ -37,6 +37,13 @@
</dependency>
<dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <version>1</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<version>${osgi.version}</version>
diff --git a/eventadmin/impl/pom.xml b/eventadmin/impl/pom.xml
index 2b6c1e8..b63f9c9 100644
--- a/eventadmin/impl/pom.xml
+++ b/eventadmin/impl/pom.xml
@@ -120,13 +120,13 @@
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-aether</artifactId>
- <version>2.5.4</version>
+ <version>2.6.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-wrap</artifactId>
- <version>2.5.4</version>
+ <version>2.6.2</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/healthcheck/core/pom.xml b/healthcheck/core/pom.xml
index 6dd020a..36333a5 100644
--- a/healthcheck/core/pom.xml
+++ b/healthcheck/core/pom.xml
@@ -40,7 +40,7 @@
<properties>
<felix.java.version>8</felix.java.version>
<pax-exam.version>4.11.0</pax-exam.version>
- <pax-link.version>2.4.3</pax-link.version>
+ <pax-link.version>2.6.2</pax-link.version>
<org.ops4j.pax.logging.DefaultServiceLog.level>INFO</org.ops4j.pax.logging.DefaultServiceLog.level>
<felix.shell>false</felix.shell>
<project.bundle.file>${project.build.directory}/${project.build.finalName}.jar</project.bundle.file>
diff --git a/http/itest/pom.xml b/http/itest/pom.xml
index 1e49583..dc7a1cb 100644
--- a/http/itest/pom.xml
+++ b/http/itest/pom.xml
@@ -33,9 +33,9 @@
<properties>
<felix.java.version>8</felix.java.version>
<pax.exam.version>4.11.0</pax.exam.version>
- <pax.url.aether.version>2.5.2</pax.url.aether.version>
+ <pax.url.aether.version>2.6.2</pax.url.aether.version>
<http.servlet.api.version>1.1.2</http.servlet.api.version>
- <http.jetty.version>4.0.13-SNAPSHOT</http.jetty.version>
+ <http.jetty.version>4.0.14</http.jetty.version>
</properties>
<build>
diff --git a/scr/pom.xml b/scr/pom.xml
index b20b7fc..d846ce5 100644
--- a/scr/pom.xml
+++ b/scr/pom.xml
@@ -169,13 +169,13 @@
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-aether</artifactId>
- <version>1.4.0.RC1</version>
+ <version>2.6.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-wrap</artifactId>
- <version>1.4.0.RC1</version>
+ <version>2.6.2</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/webconsole-plugins/script-console/pom.xml b/webconsole-plugins/script-console/pom.xml
index 64515d2..4a3d39c 100644
--- a/webconsole-plugins/script-console/pom.xml
+++ b/webconsole-plugins/script-console/pom.xml
@@ -242,7 +242,7 @@
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-wrap</artifactId>
- <version>2.4.3</version>
+ <version>2.6.2</version>
<scope>test</scope>
</dependency>
<dependency>