Merge pull request #10 from stbischof/conv_def_method
[converter] handle default methods - FELIX-6239
diff --git a/bundlerepository/pom.xml b/bundlerepository/pom.xml
index 212e959..be6c3eb 100644
--- a/bundlerepository/pom.xml
+++ b/bundlerepository/pom.xml
@@ -38,7 +38,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>org.apache.felix.utils</artifactId>
- <version>1.11.0-SNAPSHOT</version>
+ <version>1.11.4</version>
<optional>true</optional>
</dependency>
<dependency>
@@ -91,7 +91,7 @@
<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>woodstox-core-asl</artifactId>
- <version>4.0.7</version>
+ <version>4.4.1</version>
<optional>true</optional>
</dependency>
<dependency>
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/converter/serializer/pom.xml b/converter/serializer/pom.xml
index b08b2f9..3e615a8 100644
--- a/converter/serializer/pom.xml
+++ b/converter/serializer/pom.xml
@@ -115,7 +115,7 @@
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
- <version>1.17</version>
+ <version>1.26</version>
</dependency>
<dependency>
diff --git a/deploymentadmin/itest/pom.xml b/deploymentadmin/itest/pom.xml
index 5a0296d..9172164 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>
@@ -119,25 +126,25 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
- <version>1.54</version>
+ <version>1.64</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
- <version>1.54</version>
+ <version>1.64</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
- <version>1.1.3</version>
+ <version>1.2.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>1.1.3</version>
+ <version>1.2.0</version>
<scope>test</scope>
</dependency>
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..65d286a 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.17-SNAPSHOT</http.jetty.version>
</properties>
<build>
diff --git a/http/jetty/pom.xml b/http/jetty/pom.xml
index 1ca1881..408d02a 100644
--- a/http/jetty/pom.xml
+++ b/http/jetty/pom.xml
@@ -30,14 +30,15 @@
<description>This is an implementation of the R7 OSGi Http Service and the R7 OSGi Http Whiteboard Specification</description>
<artifactId>org.apache.felix.http.jetty</artifactId>
- <version>4.0.15-SNAPSHOT</version>
+ <version>4.0.17-SNAPSHOT</version>
<packaging>bundle</packaging>
<scm>
<connection>scm:git:https://github.com/apache/felix-dev.git</connection>
<developerConnection>scm:git:https://github.com/apache/felix-dev.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=felix-dev.git</url>
- </scm>
+ <tag>HEAD</tag>
+ </scm>
<properties>
<!-- Skip because of problems with Java 8 -->
@@ -262,7 +263,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.base</artifactId>
- <version>4.0.9-SNAPSHOT</version>
+ <version>4.0.8</version>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
diff --git a/httplite/core/pom.xml b/httplite/core/pom.xml
index 0e0f139..653e802 100644
--- a/httplite/core/pom.xml
+++ b/httplite/core/pom.xml
@@ -59,7 +59,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.1</version>
+ <version>2.5</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/ipojo/distributions/ipojo-webconsole-quicktart/pom.xml b/ipojo/distributions/ipojo-webconsole-quicktart/pom.xml
index 93750ab..7b84c5b 100644
--- a/ipojo/distributions/ipojo-webconsole-quicktart/pom.xml
+++ b/ipojo/distributions/ipojo-webconsole-quicktart/pom.xml
@@ -106,7 +106,7 @@
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.2.2</version>
+ <version>1.4</version>
</dependency>
</dependencies>
@@ -145,4 +145,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/ipojo/handler/eventadmin/eventadmin-handler-it/pom.xml b/ipojo/handler/eventadmin/eventadmin-handler-it/pom.xml
index f8983a5..20f637e 100644
--- a/ipojo/handler/eventadmin/eventadmin-handler-it/pom.xml
+++ b/ipojo/handler/eventadmin/eventadmin-handler-it/pom.xml
@@ -110,14 +110,14 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
- <version>0.9.20</version>
+ <version>1.2.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>0.9.20</version>
+ <version>1.2.0</version>
<scope>test</scope>
</dependency>
diff --git a/ipojo/handler/jmx/jmx-handler-it/pom.xml b/ipojo/handler/jmx/jmx-handler-it/pom.xml
index 231e621..d39c41b 100644
--- a/ipojo/handler/jmx/jmx-handler-it/pom.xml
+++ b/ipojo/handler/jmx/jmx-handler-it/pom.xml
@@ -109,14 +109,14 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
- <version>0.9.20</version>
+ <version>1.2.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>0.9.20</version>
+ <version>1.2.0</version>
<scope>test</scope>
</dependency>
diff --git a/ipojo/handler/temporal/temporal-dependency-handler-it/pom.xml b/ipojo/handler/temporal/temporal-dependency-handler-it/pom.xml
index ca8f175..0b34cf8 100644
--- a/ipojo/handler/temporal/temporal-dependency-handler-it/pom.xml
+++ b/ipojo/handler/temporal/temporal-dependency-handler-it/pom.xml
@@ -110,14 +110,14 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
- <version>0.9.20</version>
+ <version>1.2.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>0.9.20</version>
+ <version>1.2.0</version>
<scope>test</scope>
</dependency>
diff --git a/ipojo/handler/transaction/transaction-handler-it/pom.xml b/ipojo/handler/transaction/transaction-handler-it/pom.xml
index cc38ec7..2d0364a 100644
--- a/ipojo/handler/transaction/transaction-handler-it/pom.xml
+++ b/ipojo/handler/transaction/transaction-handler-it/pom.xml
@@ -130,14 +130,14 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
- <version>0.9.20</version>
+ <version>1.2.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>0.9.20</version>
+ <version>1.2.0</version>
<scope>test</scope>
</dependency>
diff --git a/ipojo/handler/whiteboard/whiteboard-handler-it/pom.xml b/ipojo/handler/whiteboard/whiteboard-handler-it/pom.xml
index c2d764d..b1b17f0 100644
--- a/ipojo/handler/whiteboard/whiteboard-handler-it/pom.xml
+++ b/ipojo/handler/whiteboard/whiteboard-handler-it/pom.xml
@@ -105,14 +105,14 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
- <version>0.9.20</version>
+ <version>1.2.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>0.9.20</version>
+ <version>1.2.0</version>
<scope>test</scope>
</dependency>
diff --git a/ipojo/manipulator/ipojo-ant-task/pom.xml b/ipojo/manipulator/ipojo-ant-task/pom.xml
index dae6707..06813a4 100644
--- a/ipojo/manipulator/ipojo-ant-task/pom.xml
+++ b/ipojo/manipulator/ipojo-ant-task/pom.xml
@@ -49,7 +49,7 @@
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>2.9.1</version>
+ <version>2.12.0</version>
</dependency>
<dependency>
<groupId>ant</groupId>
diff --git a/ipojo/manipulator/manipulator-it/pom.xml b/ipojo/manipulator/manipulator-it/pom.xml
index ff4f7fe..0311b9d 100644
--- a/ipojo/manipulator/manipulator-it/pom.xml
+++ b/ipojo/manipulator/manipulator-it/pom.xml
@@ -169,14 +169,14 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
- <version>0.9.6</version>
+ <version>1.2.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>0.9.6</version>
+ <version>1.2.0</version>
<scope>test</scope>
</dependency>
diff --git a/ipojo/manipulator/maven-ipojo-plugin/pom.xml b/ipojo/manipulator/maven-ipojo-plugin/pom.xml
index 7f5734a..7f1b1da 100644
--- a/ipojo/manipulator/maven-ipojo-plugin/pom.xml
+++ b/ipojo/manipulator/maven-ipojo-plugin/pom.xml
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>2.0.5</version>
+ <version>3.0.16</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -64,11 +64,6 @@
<version>2.0.4</version>
</dependency>
<dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.9.1</version>
- </dependency>
- <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.metadata</artifactId>
</dependency>
diff --git a/ipojo/runtime/composite-it/pom.xml b/ipojo/runtime/composite-it/pom.xml
index b92c3cf..ad6f640 100644
--- a/ipojo/runtime/composite-it/pom.xml
+++ b/ipojo/runtime/composite-it/pom.xml
@@ -159,14 +159,14 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
- <version>0.9.6</version>
+ <version>1.2.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>0.9.6</version>
+ <version>1.2.0</version>
<scope>test</scope>
</dependency>
diff --git a/ipojo/runtime/core-it/pom.xml b/ipojo/runtime/core-it/pom.xml
index 9540f0c..3194397 100644
--- a/ipojo/runtime/core-it/pom.xml
+++ b/ipojo/runtime/core-it/pom.xml
@@ -180,14 +180,14 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
- <version>0.9.6</version>
+ <version>1.2.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>0.9.6</version>
+ <version>1.2.0</version>
<scope>test</scope>
</dependency>
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/scr/src/main/java/org/apache/felix/scr/impl/manager/SingleRefPair.java b/scr/src/main/java/org/apache/felix/scr/impl/manager/SingleRefPair.java
index a7592bc..59eb7c3 100644
--- a/scr/src/main/java/org/apache/felix/scr/impl/manager/SingleRefPair.java
+++ b/scr/src/main/java/org/apache/felix/scr/impl/manager/SingleRefPair.java
@@ -71,7 +71,7 @@
{
if (bundleContext != null)
{
- bundleContext.ungetService(getRef());
+ safeUngetService(bundleContext, getRef());
}
}
}
@@ -97,8 +97,20 @@
if (!setServiceObject(key, service))
{
// Another thread got the service before, so unget our
- context.ungetService( getRef() );
+ safeUngetService(context, getRef());
}
return true;
}
+
+ static private void safeUngetService(BundleContext context, ServiceReference<?> ref)
+ {
+ try
+ {
+ context.ungetService(ref);
+ }
+ catch (IllegalStateException e)
+ {
+ // ignore
+ }
+ }
}
diff --git a/systemready/pom.xml b/systemready/pom.xml
index 31bf50d..8f5dc25 100644
--- a/systemready/pom.xml
+++ b/systemready/pom.xml
@@ -197,14 +197,14 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
- <version>1.0.13</version>
+ <version>1.2.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>1.0.13</version>
+ <version>1.2.0</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/systemready/src/main/java/org/apache/felix/systemready/CheckStatus.java b/systemready/src/main/java/org/apache/felix/systemready/CheckStatus.java
index ff42169..d4cfe10 100644
--- a/systemready/src/main/java/org/apache/felix/systemready/CheckStatus.java
+++ b/systemready/src/main/java/org/apache/felix/systemready/CheckStatus.java
@@ -20,61 +20,57 @@
import static java.util.stream.Collectors.minBy;
+import java.util.Objects;
import java.util.stream.Stream;
public final class CheckStatus {
- public enum State {
- // Be aware that the order of the enum declarations matters for the Comparator
- RED, YELLOW, GREEN;
+ public enum State {
+ // Be aware that the order of the enum declarations matters for the Comparator
+ RED, YELLOW, GREEN;
- public static State fromBoolean(boolean ready) {
+ public static State fromBoolean(boolean ready) {
return (ready) ? State.GREEN : State.YELLOW;
}
-
+
public static State worstOf(Stream<State> states) {
return states.collect(minBy(State::compareTo)).orElse(State.GREEN);
}
}
-
+
private final String checkName;
-
+
private final StateType type;
private final State state;
private final String details;
-
+
public CheckStatus(String checkName, StateType type, State state, String details) {
- this.checkName = checkName;
- this.type = type;
- this.state = state;
- this.details = details;
+ this.checkName = Objects.requireNonNull(checkName);
+ this.type = Objects.requireNonNull(type);
+ this.state = Objects.requireNonNull(state);
+ this.details = Objects.toString(details, "");
}
-
+
public String getCheckName() {
- return checkName;
- }
-
-
+ return checkName;
+ }
+
public StateType getType() {
- return type;
- }
-
+ return type;
+ }
+
public State getState() {
return state;
}
-
+
public String getDetails() {
return details;
}
@Override
public String toString() {
- return "CheckStatus{" +
- "state=" + state +
- ", details='" + details + '\'' +
- '}';
+ return "CheckStatus{" + "state=" + state + ", details='" + details + '\'' + '}';
}
-
-
+
}
diff --git a/tools/maven-bundle-plugin/pom.xml b/tools/maven-bundle-plugin/pom.xml
index d2e59ce..f2e969d 100644
--- a/tools/maven-bundle-plugin/pom.xml
+++ b/tools/maven-bundle-plugin/pom.xml
@@ -205,7 +205,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-archiver</artifactId>
- <version>2.6</version>
+ <version>3.4.0</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
@@ -215,7 +215,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>3.0.24</version>
+ <version>3.3.0</version>
</dependency>
<dependency>
<groupId>org.sonatype.plexus</groupId>
diff --git a/tools/maven-bundle-plugin/src/it/dep-reduced/pom.xml b/tools/maven-bundle-plugin/src/it/dep-reduced/pom.xml
index b449343..68dbeb9 100644
--- a/tools/maven-bundle-plugin/src/it/dep-reduced/pom.xml
+++ b/tools/maven-bundle-plugin/src/it/dep-reduced/pom.xml
@@ -28,12 +28,12 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
- <version>1.10</version>
+ <version>1.19</version>
</dependency>
</dependencies>
<build>
diff --git a/tools/maven-bundle-plugin/src/it/embed-multiple-artifacts/pom.xml b/tools/maven-bundle-plugin/src/it/embed-multiple-artifacts/pom.xml
index d9a173f..4c9302e 100644
--- a/tools/maven-bundle-plugin/src/it/embed-multiple-artifacts/pom.xml
+++ b/tools/maven-bundle-plugin/src/it/embed-multiple-artifacts/pom.xml
@@ -28,12 +28,12 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
- <version>1.10</version>
+ <version>1.19</version>
</dependency>
</dependencies>
<build>
diff --git a/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java b/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
index 5a31003..8d0e570 100644
--- a/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
+++ b/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
@@ -1070,7 +1070,7 @@
* Grab customized manifest entries from the maven-jar-plugin configuration
*/
MavenArchiveConfiguration archiveConfig = JarPluginConfiguration.getArchiveConfiguration( currentProject );
- String mavenManifestText = new MavenArchiver().getManifest( currentProject, archiveConfig ).toString();
+ String mavenManifestText = new MavenArchiver().getManifest( currentProject, archiveConfig.getManifest() ).toString();
addMavenDescriptor = addMavenDescriptor && archiveConfig.isAddMavenDescriptor();
Manifest mavenManifest = new Manifest();
diff --git a/useradmin/filestore/pom.xml b/useradmin/filestore/pom.xml
index 689d1d1..b7f1005 100644
--- a/useradmin/filestore/pom.xml
+++ b/useradmin/filestore/pom.xml
@@ -43,7 +43,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.useradmin</artifactId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>1.0.7-SNAPSHOT</version>
<type>bundle</type>
</dependency>
</dependencies>
diff --git a/useradmin/itest/pom.xml b/useradmin/itest/pom.xml
index 505c241..3de6b1e 100644
--- a/useradmin/itest/pom.xml
+++ b/useradmin/itest/pom.xml
@@ -32,7 +32,7 @@
<pax.exam.plugin.version>1.2.4</pax.exam.plugin.version>
<pax.url.aether.version>1.4.0</pax.url.aether.version>
<pax.swissbox.version>1.3.1</pax.swissbox.version>
- <pax.runner.version>1.7.6</pax.runner.version>
+ <pax.runner.version>1.9.0</pax.runner.version>
</properties>
<artifactId>org.apache.felix.useradmin.itest</artifactId>
<version>1.0.0-SNAPSHOT</version>
@@ -47,7 +47,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.useradmin</artifactId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>1.0.7-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/useradmin/mongodb/pom.xml b/useradmin/mongodb/pom.xml
index 319bc2e..89b2f2e 100644
--- a/useradmin/mongodb/pom.xml
+++ b/useradmin/mongodb/pom.xml
@@ -48,7 +48,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.useradmin</artifactId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>1.0.7-SNAPSHOT</version>
<type>bundle</type>
</dependency>
</dependencies>
@@ -104,4 +104,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/webconsole-plugins/deppack/pom.xml b/webconsole-plugins/deppack/pom.xml
index e334ba1..1d0109b 100644
--- a/webconsole-plugins/deppack/pom.xml
+++ b/webconsole-plugins/deppack/pom.xml
@@ -111,7 +111,7 @@
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.3.2</version>
+ <version>1.4</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
diff --git a/webconsole-plugins/packageadmin/pom.xml b/webconsole-plugins/packageadmin/pom.xml
index 868a7df..14ac5ee 100644
--- a/webconsole-plugins/packageadmin/pom.xml
+++ b/webconsole-plugins/packageadmin/pom.xml
@@ -139,7 +139,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.4</version>
+ <version>2.5</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/webconsole-plugins/script-console/pom.xml b/webconsole-plugins/script-console/pom.xml
index 64515d2..31f23f5 100644
--- a/webconsole-plugins/script-console/pom.xml
+++ b/webconsole-plugins/script-console/pom.xml
@@ -190,7 +190,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.4</version>
+ <version>2.5</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -208,7 +208,7 @@
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.3.2</version>
+ <version>1.4</version>
<scope>provided</scope>
</dependency>
@@ -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>
diff --git a/webconsole-plugins/subsystems/pom.xml b/webconsole-plugins/subsystems/pom.xml
index 68eba32..78f364f 100644
--- a/webconsole-plugins/subsystems/pom.xml
+++ b/webconsole-plugins/subsystems/pom.xml
@@ -81,7 +81,7 @@
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.3.2</version>
+ <version>1.4</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/webconsole/pom.xml b/webconsole/pom.xml
index d1901bb..cb7df48 100644
--- a/webconsole/pom.xml
+++ b/webconsole/pom.xml
@@ -350,14 +350,14 @@
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.2.1</version>
+ <version>1.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.4</version>
+ <version>2.5</version>
<scope>provided</scope>
</dependency>
