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 5d624af Make http projects buildable with Java >= 9
5d624af is described below
commit 5d624afa4afe6e11ab176ab70a9ece1d80880435
Author: Carsten Ziegeler <[email protected]>
AuthorDate: Mon Oct 5 09:17:13 2020 +0200
Make http projects buildable with Java >= 9
---
http/base/pom.xml | 2 +-
http/bridge/pom.xml | 2 +-
http/itest/pom.xml | 2 +-
http/jetty/pom.xml | 2 +-
http/parent/pom.xml | 8 ++++----
http/pom.xml | 2 +-
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/http/base/pom.xml b/http/base/pom.xml
index 9679323..68b0db6 100644
--- a/http/base/pom.xml
+++ b/http/base/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.parent</artifactId>
- <version>12</version>
+ <version>13-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
diff --git a/http/bridge/pom.xml b/http/bridge/pom.xml
index 15ee7eb..803c6a6 100644
--- a/http/bridge/pom.xml
+++ b/http/bridge/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.parent</artifactId>
- <version>12</version>
+ <version>13-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
diff --git a/http/itest/pom.xml b/http/itest/pom.xml
index ea2fed9..f6e2170 100644
--- a/http/itest/pom.xml
+++ b/http/itest/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.parent</artifactId>
- <version>12</version>
+ <version>13-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
diff --git a/http/jetty/pom.xml b/http/jetty/pom.xml
index e42fb29..8e6d723 100644
--- a/http/jetty/pom.xml
+++ b/http/jetty/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.parent</artifactId>
- <version>12</version>
+ <version>13-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
diff --git a/http/parent/pom.xml b/http/parent/pom.xml
index 0b2c8b6..3e4db79 100755
--- a/http/parent/pom.xml
+++ b/http/parent/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>felix-parent</artifactId>
- <version>6</version>
+ <version>7</version>
<relativePath>../../pom/pom.xml</relativePath>
</parent>
@@ -92,7 +92,7 @@
<artifactId>junit</artifactId>
</dependency>
<dependency>
- <groupId>org.mockito</groupId>
+ <groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
</dependency>
</dependencies>
@@ -130,13 +130,13 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.12</version>
+ <version>4.13</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>2.17.0</version>
+ <version>3.5.13</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/http/pom.xml b/http/pom.xml
index 934c881..153fe90 100644
--- a/http/pom.xml
+++ b/http/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>felix-parent</artifactId>
- <version>5</version>
+ <version>7</version>
<relativePath>../pom/pom.xml</relativePath>
</parent>
