You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by am...@apache.org on 2025/06/27 09:58:12 UTC
(aries-rsa) branch master updated (01e8c6f1 -> 40dedc30)
This is an automated email from the ASF dual-hosted git repository.
amichai pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/aries-rsa.git
from 01e8c6f1 Remove duplicate compiler plugin configuration
new 79e567f6 ARIES-2183 Upgrade Pax Logging to 1.11.17
new 296f6ef1 Bump version to 2.0.0-SNAPSHOT
new 0809e326 ARIES-2158 Upgrade build to JDK 11 and jakarta.* namespace
new 042b53f5 ARIES-2184 Upgrade SLF4J to 2.0.17
new d6572e21 ARIES-2185 Upgrade Logback to 1.5.18
new f3ec1ef4 ARIES-2186 Upgrade Mockito to 5.18.0
new 234778b8 ARIES-2187 Upgrade Easymock to 5.6.0
new 29e2fe37 ARIES-2188 Upgrade Zookeeper to 3.9.3
new 1e92da69 ARIES-2189 Upgrade Netty to 4.1.121.Final
new dea13125 ARIES-2190 Upgrade Snappy to 1.1.10.7
new 40dedc30 ARIES-2191 Upgrade ASM to 9.8
The 11 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
discovery/command/pom.xml | 2 +-
discovery/config/pom.xml | 2 +-
discovery/local/pom.xml | 17 +++++++---
.../endpoint/EndpointDescriptionParserImpl.java | 10 +++---
.../rsa/discovery/endpoint/PropertiesMapper.java | 2 +-
discovery/mdns/pom.xml | 2 +-
discovery/pom.xml | 2 +-
discovery/zookeeper/pom.xml | 4 +--
eapub/pom.xml | 2 +-
examples/echofastbin/fbapi/pom.xml | 2 +-
examples/echofastbin/fbconsumer/pom.xml | 2 +-
examples/echofastbin/fbservice/pom.xml | 2 +-
examples/echofastbin/pom.xml | 2 +-
examples/echotcp/api/pom.xml | 2 +-
examples/echotcp/consumer/pom.xml | 2 +-
examples/echotcp/pom.xml | 2 +-
examples/echotcp/service/pom.xml | 2 +-
examples/pom.xml | 2 +-
features/pom.xml | 2 +-
itests/felix/pom.xml | 29 +++++++++++++----
.../apache/aries/rsa/itests/felix/RsaTestBase.java | 3 ++
itests/pom.xml | 2 +-
itests/tck/pom.xml | 2 +-
itests/tck/tck.bndrun | 4 +--
parent/pom.xml | 36 ++++++++++++++++------
pom.xml | 2 +-
provider/fastbin/pom.xml | 2 +-
provider/pom.xml | 2 +-
provider/tcp/pom.xml | 2 +-
repository/pom.xml | 4 +--
rsa/pom.xml | 2 +-
spi/pom.xml | 2 +-
topology-manager/pom.xml | 2 +-
33 files changed, 101 insertions(+), 56 deletions(-)
(aries-rsa) 08/11: ARIES-2188 Upgrade Zookeeper to 3.9.3
Posted by am...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
amichai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-rsa.git
commit 29e2fe376629fee82032090f28cada067bb3fed4
Author: Amichai Rothman <am...@apache.org>
AuthorDate: Thu May 22 16:57:26 2025 +0300
ARIES-2188 Upgrade Zookeeper to 3.9.3
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index eb6002ef..35db0cfa 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -34,7 +34,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<bnd.version>6.4.0</bnd.version>
- <zookeeper.version>3.9.1_1</zookeeper.version>
+ <zookeeper.version>3.9.3_1</zookeeper.version>
<netty.version>4.1.101.Final</netty.version>
<slf4j.version>2.0.17</slf4j.version>
<logback.version>1.5.18</logback.version>
(aries-rsa) 04/11: ARIES-2184 Upgrade SLF4J to 2.0.17
Posted by am...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
amichai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-rsa.git
commit 042b53f52d17714367ee1b0799d5692cdaa1c8e8
Author: Amichai Rothman <am...@apache.org>
AuthorDate: Thu May 22 16:26:20 2025 +0300
ARIES-2184 Upgrade SLF4J to 2.0.17
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 329470ca..49277e60 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -36,7 +36,7 @@
<bnd.version>6.4.0</bnd.version>
<zookeeper.version>3.9.1_1</zookeeper.version>
<netty.version>4.1.101.Final</netty.version>
- <slf4j.version>2.0.13</slf4j.version>
+ <slf4j.version>2.0.17</slf4j.version>
<hawtdispatch.version>1.22</hawtdispatch.version>
<hawtbuf.version>1.11</hawtbuf.version>
<exam.version>4.13.5</exam.version>
(aries-rsa) 03/11: ARIES-2158 Upgrade build to JDK 11 and jakarta.* namespace
Posted by am...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
amichai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-rsa.git
commit 0809e326f668840cf51d85fd1822dd3d67346062
Author: Amichai Rothman <am...@apache.org>
AuthorDate: Wed Jun 5 13:23:38 2024 +0300
ARIES-2158 Upgrade build to JDK 11 and jakarta.* namespace
---
discovery/local/pom.xml | 15 ++++++++++++---
.../endpoint/EndpointDescriptionParserImpl.java | 10 +++++-----
.../rsa/discovery/endpoint/PropertiesMapper.java | 2 +-
itests/felix/pom.xml | 13 +++++++++++++
.../apache/aries/rsa/itests/felix/RsaTestBase.java | 3 +++
parent/pom.xml | 19 +++++++++++++++++--
6 files changed, 51 insertions(+), 11 deletions(-)
diff --git a/discovery/local/pom.xml b/discovery/local/pom.xml
index 32b4a980..036c50f4 100644
--- a/discovery/local/pom.xml
+++ b/discovery/local/pom.xml
@@ -50,14 +50,23 @@
<version>1.6</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-osgi</artifactId>
+ </dependency>
</dependencies>
<build>
<plugins>
<plugin>
- <groupId>org.jvnet.jaxb2.maven2</groupId>
- <artifactId>maven-jaxb2-plugin</artifactId>
- <version>0.15.3</version>
+ <groupId>org.jvnet.jaxb</groupId>
+ <artifactId>jaxb-maven-plugin</artifactId>
+ <version>4.0.6</version>
<executions>
<execution>
<goals>
diff --git a/discovery/local/src/main/java/org/apache/aries/rsa/discovery/endpoint/EndpointDescriptionParserImpl.java b/discovery/local/src/main/java/org/apache/aries/rsa/discovery/endpoint/EndpointDescriptionParserImpl.java
index f4c81455..5512cbfd 100644
--- a/discovery/local/src/main/java/org/apache/aries/rsa/discovery/endpoint/EndpointDescriptionParserImpl.java
+++ b/discovery/local/src/main/java/org/apache/aries/rsa/discovery/endpoint/EndpointDescriptionParserImpl.java
@@ -25,11 +25,11 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
+import jakarta.xml.bind.Unmarshaller;
import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamSource;
diff --git a/discovery/local/src/main/java/org/apache/aries/rsa/discovery/endpoint/PropertiesMapper.java b/discovery/local/src/main/java/org/apache/aries/rsa/discovery/endpoint/PropertiesMapper.java
index f3fa57fd..8882f9f8 100644
--- a/discovery/local/src/main/java/org/apache/aries/rsa/discovery/endpoint/PropertiesMapper.java
+++ b/discovery/local/src/main/java/org/apache/aries/rsa/discovery/endpoint/PropertiesMapper.java
@@ -30,7 +30,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBElement;
import javax.xml.transform.OutputKeys;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerFactory;
diff --git a/itests/felix/pom.xml b/itests/felix/pom.xml
index 5c9cf305..1e007a38 100644
--- a/itests/felix/pom.xml
+++ b/itests/felix/pom.xml
@@ -98,6 +98,19 @@
<version>9.7</version>
</dependency>
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-osgi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.aries.rsa</groupId>
<artifactId>org.apache.aries.rsa.core</artifactId>
diff --git a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/RsaTestBase.java b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/RsaTestBase.java
index a6da0542..e5003f78 100644
--- a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/RsaTestBase.java
+++ b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/RsaTestBase.java
@@ -137,6 +137,9 @@ public class RsaTestBase {
mvn("org.ow2.asm", "asm-util"),
mvn("org.ow2.asm", "asm-tree"),
mvn("org.ow2.asm", "asm-analysis"),
+ mvn("jakarta.xml.bind", "jakarta.xml.bind-api"),
+ mvn("com.sun.xml.bind", "jaxb-osgi"),
+ mvn("jakarta.activation", "jakarta.activation-api"),
mvn("org.apache.felix", "org.apache.felix.eventadmin"),
mvn("org.apache.felix", "org.apache.felix.configadmin"),
mvn("org.apache.felix", "org.apache.felix.scr"),
diff --git a/parent/pom.xml b/parent/pom.xml
index b2d6b1ce..329470ca 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -229,6 +229,22 @@
<artifactId>org.apache.felix.converter</artifactId>
<version>1.0.18</version>
</dependency>
+
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>4.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-osgi</artifactId>
+ <version>4.0.5</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
+ <version>2.1.3</version>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -242,8 +258,7 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.1</version>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <release>11</release>
</configuration>
</plugin>
<plugin>
(aries-rsa) 07/11: ARIES-2187 Upgrade Easymock to 5.6.0
Posted by am...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
amichai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-rsa.git
commit 234778b830384c3f2b8a377f72b2aeab764595ce
Author: Amichai Rothman <am...@apache.org>
AuthorDate: Thu May 22 15:52:11 2025 +0300
ARIES-2187 Upgrade Easymock to 5.6.0
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 22ccd242..eb6002ef 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -165,7 +165,7 @@
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>5.2.0</version>
+ <version>5.6.0</version>
<scope>test</scope>
</dependency>
<dependency>
(aries-rsa) 02/11: Bump version to 2.0.0-SNAPSHOT
Posted by am...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
amichai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-rsa.git
commit 296f6ef1f8064ac22318f1c0c0653f9293d12ad5
Author: Amichai Rothman <am...@apache.org>
AuthorDate: Wed Jun 5 13:01:05 2024 +0300
Bump version to 2.0.0-SNAPSHOT
---
discovery/command/pom.xml | 2 +-
discovery/config/pom.xml | 2 +-
discovery/local/pom.xml | 2 +-
discovery/mdns/pom.xml | 2 +-
discovery/pom.xml | 2 +-
discovery/zookeeper/pom.xml | 2 +-
eapub/pom.xml | 2 +-
examples/echofastbin/fbapi/pom.xml | 2 +-
examples/echofastbin/fbconsumer/pom.xml | 2 +-
examples/echofastbin/fbservice/pom.xml | 2 +-
examples/echofastbin/pom.xml | 2 +-
examples/echotcp/api/pom.xml | 2 +-
examples/echotcp/consumer/pom.xml | 2 +-
examples/echotcp/pom.xml | 2 +-
examples/echotcp/service/pom.xml | 2 +-
examples/pom.xml | 2 +-
features/pom.xml | 2 +-
itests/felix/pom.xml | 2 +-
itests/pom.xml | 2 +-
parent/pom.xml | 2 +-
pom.xml | 2 +-
provider/fastbin/pom.xml | 2 +-
provider/pom.xml | 2 +-
provider/tcp/pom.xml | 2 +-
repository/pom.xml | 2 +-
rsa/pom.xml | 2 +-
spi/pom.xml | 2 +-
topology-manager/pom.xml | 2 +-
28 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/discovery/command/pom.xml b/discovery/command/pom.xml
index 925583f1..e8b37c29 100644
--- a/discovery/command/pom.xml
+++ b/discovery/command/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.rsa</groupId>
<artifactId>org.apache.aries.rsa.parent</artifactId>
- <version>1.17.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
diff --git a/discovery/config/pom.xml b/discovery/config/pom.xml
index d8cf65f0..fdd2e133 100644
--- a/discovery/config/pom.xml
+++ b/discovery/config/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.aries.rsa</groupId>
<artifactId>org.apache.aries.rsa.discovery</artifactId>
- <version>1.17.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.aries.rsa.discovery</groupId>
diff --git a/discovery/local/pom.xml b/discovery/local/pom.xml
index d6039603..32b4a980 100644
--- a/discovery/local/pom.xml
+++ b/discovery/local/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.rsa</groupId>
<artifactId>org.apache.aries.rsa.parent</artifactId>
- <version>1.17.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
diff --git a/discovery/mdns/pom.xml b/discovery/mdns/pom.xml
index 97d44ed0..bf81ff90 100644
--- a/discovery/mdns/pom.xml
+++ b/discovery/mdns/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.aries.rsa</groupId>
<artifactId>org.apache.aries.rsa.parent</artifactId>
- <version>1.17.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
diff --git a/discovery/pom.xml b/discovery/pom.xml
index da13345e..31a7de5e 100644
--- a/discovery/pom.xml
+++ b/discovery/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.aries.rsa</groupId>
<artifactId>org.apache.aries.rsa.parent</artifactId>
- <version>1.17.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
diff --git a/discovery/zookeeper/pom.xml b/discovery/zookeeper/pom.xml
index 82dd8669..aacf2bf9 100644
--- a/discovery/zookeeper/pom.xml
+++ b/discovery/zookeeper/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.aries.rsa</groupId>
<artifactId>org.apache.aries.rsa.parent</artifactId>
- <version>1.17.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
diff --git a/eapub/pom.xml b/eapub/pom.xml
index 124b84c8..04738044 100644
--- a/eapub/pom.xml
+++ b/eapub/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.rsa</groupId>
<artifactId>org.apache.aries.rsa.parent</artifactId>
- <version>1.17.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<artifactId>org.apache.aries.rsa.eapub</artifactId>
diff --git a/examples/echofastbin/fbapi/pom.xml b/examples/echofastbin/fbapi/pom.xml
index 14e14ef9..c0c5234b 100644
--- a/examples/echofastbin/fbapi/pom.xml
+++ b/examples/echofastbin/fbapi/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.rsa.examples</groupId>
<artifactId>org.apache.aries.rsa.examples.echofastbin</artifactId>
- <version>1.17.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.rsa.examples.echofastbin</groupId>
diff --git a/examples/echofastbin/fbconsumer/pom.xml b/examples/echofastbin/fbconsumer/pom.xml
index 60528ae6..6d53a2ae 100644
--- a/examples/echofastbin/fbconsumer/pom.xml
+++ b/examples/echofastbin/fbconsumer/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.rsa.examples</groupId>
<artifactId>org.apache.aries.rsa.examples.echofastbin</artifactId>
- <version>1.17.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.rsa.examples.echofastbin</groupId>
diff --git a/examples/echofastbin/fbservice/pom.xml b/examples/echofastbin/fbservice/pom.xml
index 8f6ea912..27f58109 100644
--- a/examples/echofastbin/fbservice/pom.xml
+++ b/examples/echofastbin/fbservice/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.rsa.examples</groupId>
<artifactId>org.apache.aries.rsa.examples.echofastbin</artifactId>
- <version>1.17.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.rsa.examples.echofastbin</groupId>
diff --git a/examples/echofastbin/pom.xml b/examples/echofastbin/pom.xml
index 6116688a..c5583257 100644
--- a/examples/echofastbin/pom.xml
+++ b/examples/echofastbin/pom.xml
@@ -14,7 +14,7 @@
<parent>
<groupId>org.apache.aries.rsa</groupId>
<artifactId>org.apache.aries.rsa.examples</artifactId>
- <version>1.17.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.aries.rsa.examples</groupId>
<artifactId>org.apache.aries.rsa.examples.echofastbin</artifactId>
diff --git a/examples/echotcp/api/pom.xml b/examples/echotcp/api/pom.xml
index 4700eace..6a912260 100644
--- a/examples/echotcp/api/pom.xml
+++ b/examples/echotcp/api/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.rsa.examples</groupId>
<artifactId>org.apache.aries.rsa.examples.echotcp</artifactId>
- <version>1.17.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.rsa.examples.echotcp</groupId>
diff --git a/examples/echotcp/consumer/pom.xml b/examples/echotcp/consumer/pom.xml
index fbd3b370..d6bac448 100644
--- a/examples/echotcp/consumer/pom.xml
+++ b/examples/echotcp/consumer/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.rsa.examples</groupId>
<artifactId>org.apache.aries.rsa.examples.echotcp</artifactId>
- <version>1.17.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.rsa.examples.echotcp</groupId>
diff --git a/examples/echotcp/pom.xml b/examples/echotcp/pom.xml
index f35f7580..aba385a0 100644
--- a/examples/echotcp/pom.xml
+++ b/examples/echotcp/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.rsa</groupId>
<artifactId>org.apache.aries.rsa.examples</artifactId>
- <version>1.17.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.aries.rsa.examples</groupId>
<artifactId>org.apache.aries.rsa.examples.echotcp</artifactId>
diff --git a/examples/echotcp/service/pom.xml b/examples/echotcp/service/pom.xml
index b4b86db6..fdbef507 100644
--- a/examples/echotcp/service/pom.xml
+++ b/examples/echotcp/service/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.rsa.examples</groupId>
<artifactId>org.apache.aries.rsa.examples.echotcp</artifactId>
- <version>1.17.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.rsa.examples.echotcp</groupId>
diff --git a/examples/pom.xml b/examples/pom.xml
index 34e7b8d0..0fae36a7 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.rsa</groupId>
<artifactId>org.apache.aries.rsa.parent</artifactId>
- <version>1.17.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
diff --git a/features/pom.xml b/features/pom.xml
index 6c533660..37281563 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.rsa</groupId>
<artifactId>org.apache.aries.rsa.parent</artifactId>
- <version>1.17.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
diff --git a/itests/felix/pom.xml b/itests/felix/pom.xml
index f7ac689b..5c9cf305 100644
--- a/itests/felix/pom.xml
+++ b/itests/felix/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.rsa</groupId>
<artifactId>org.apache.aries.rsa.itests</artifactId>
- <version>1.17.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/itests/pom.xml b/itests/pom.xml
index cfee4998..e378e50c 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.rsa</groupId>
<artifactId>org.apache.aries.rsa.parent</artifactId>
- <version>1.17.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
diff --git a/parent/pom.xml b/parent/pom.xml
index 6cd9abc4..b2d6b1ce 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.aries.rsa</groupId>
<artifactId>org.apache.aries.rsa.main</artifactId>
- <version>1.17.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/pom.xml b/pom.xml
index 56917bba..b9f35e12 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.aries.rsa</groupId>
<artifactId>org.apache.aries.rsa.main</artifactId>
- <version>1.17.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Aries Remote Service Admin Main</name>
diff --git a/provider/fastbin/pom.xml b/provider/fastbin/pom.xml
index 11eae109..280dbea8 100644
--- a/provider/fastbin/pom.xml
+++ b/provider/fastbin/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.rsa</groupId>
<artifactId>org.apache.aries.rsa.parent</artifactId>
- <version>1.17.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
diff --git a/provider/pom.xml b/provider/pom.xml
index 44bb1107..7f9b7beb 100644
--- a/provider/pom.xml
+++ b/provider/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.rsa</groupId>
<artifactId>org.apache.aries.rsa.parent</artifactId>
- <version>1.17.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
diff --git a/provider/tcp/pom.xml b/provider/tcp/pom.xml
index 0d1235ad..306808f5 100644
--- a/provider/tcp/pom.xml
+++ b/provider/tcp/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.rsa</groupId>
<artifactId>org.apache.aries.rsa.parent</artifactId>
- <version>1.17.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
diff --git a/repository/pom.xml b/repository/pom.xml
index 8a15d2f1..8d1abcec 100644
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.rsa</groupId>
<artifactId>org.apache.aries.rsa.parent</artifactId>
- <version>1.17.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<artifactId>repository</artifactId>
diff --git a/rsa/pom.xml b/rsa/pom.xml
index e374d195..7485c685 100644
--- a/rsa/pom.xml
+++ b/rsa/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.rsa</groupId>
<artifactId>org.apache.aries.rsa.parent</artifactId>
- <version>1.17.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<artifactId>org.apache.aries.rsa.core</artifactId>
diff --git a/spi/pom.xml b/spi/pom.xml
index c5a6805b..e1b4b8f0 100644
--- a/spi/pom.xml
+++ b/spi/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.aries.rsa</groupId>
<artifactId>org.apache.aries.rsa.parent</artifactId>
- <version>1.17.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<artifactId>org.apache.aries.rsa.spi</artifactId>
diff --git a/topology-manager/pom.xml b/topology-manager/pom.xml
index 8d754e3d..b07bf6c7 100644
--- a/topology-manager/pom.xml
+++ b/topology-manager/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.rsa</groupId>
<artifactId>org.apache.aries.rsa.parent</artifactId>
- <version>1.17.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
(aries-rsa) 11/11: ARIES-2191 Upgrade ASM to 9.8
Posted by am...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
amichai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-rsa.git
commit 40dedc30ad2b47aca1575f8d14c32fd66097c46d
Author: Amichai Rothman <am...@apache.org>
AuthorDate: Thu May 22 16:30:50 2025 +0300
ARIES-2191 Upgrade ASM to 9.8
---
itests/felix/pom.xml | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/itests/felix/pom.xml b/itests/felix/pom.xml
index 1e007a38..0f0e5e6e 100644
--- a/itests/felix/pom.xml
+++ b/itests/felix/pom.xml
@@ -34,6 +34,10 @@
<name>Aries Remote Service Admin itests felix</name>
+ <properties>
+ <asm.version>9.8</asm.version>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -75,27 +79,27 @@
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
- <version>9.7</version>
+ <version>${asm.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-commons</artifactId>
- <version>9.7</version>
+ <version>${asm.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-util</artifactId>
- <version>9.7</version>
+ <version>${asm.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-tree</artifactId>
- <version>9.7</version>
+ <version>${asm.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-analysis</artifactId>
- <version>9.7</version>
+ <version>${asm.version}</version>
</dependency>
<dependency>
(aries-rsa) 09/11: ARIES-2189 Upgrade Netty to 4.1.121.Final
Posted by am...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
amichai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-rsa.git
commit 1e92da690828eb6dc9217d4a61e304e6b30428fa
Author: Amichai Rothman <am...@apache.org>
AuthorDate: Wed Jun 5 15:43:26 2024 +0300
ARIES-2189 Upgrade Netty to 4.1.121.Final
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 35db0cfa..1f3fc7c0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -35,7 +35,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<bnd.version>6.4.0</bnd.version>
<zookeeper.version>3.9.3_1</zookeeper.version>
- <netty.version>4.1.101.Final</netty.version>
+ <netty.version>4.1.121.Final</netty.version>
<slf4j.version>2.0.17</slf4j.version>
<logback.version>1.5.18</logback.version>
<hawtdispatch.version>1.22</hawtdispatch.version>
(aries-rsa) 01/11: ARIES-2183 Upgrade Pax Logging to 1.11.17
Posted by am...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
amichai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-rsa.git
commit 79e567f60d6dec23eff4b7ce3a1169332528d7bd
Author: Amichai Rothman <am...@apache.org>
AuthorDate: Thu May 22 16:00:04 2025 +0300
ARIES-2183 Upgrade Pax Logging to 1.11.17
---
itests/tck/pom.xml | 2 +-
itests/tck/tck.bndrun | 4 ++--
repository/pom.xml | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/itests/tck/pom.xml b/itests/tck/pom.xml
index f5a3573b..dba86c46 100644
--- a/itests/tck/pom.xml
+++ b/itests/tck/pom.xml
@@ -28,7 +28,7 @@
<name>Aries Remote Service Admin itests tck</name>
<properties>
- <paxlogging.version>1.11.2</paxlogging.version>
+ <paxlogging.version>1.11.17</paxlogging.version>
</properties>
<dependencies>
diff --git a/itests/tck/tck.bndrun b/itests/tck/tck.bndrun
index a41b4ca7..bca7e89f 100644
--- a/itests/tck/tck.bndrun
+++ b/itests/tck/tck.bndrun
@@ -57,5 +57,5 @@
org.apache.felix.eventadmin;version='[1.6.4,1.6.5)',\
org.apache.servicemix.bundles.junit;version='[3.8.2,3.8.3)',\
org.osgi.test.cases.remoteserviceadmin;version='[5.0.0,5.0.1)',\
- org.ops4j.pax.logging.pax-logging-api;version='[1.11.2,1.11.3)',\
- org.ops4j.pax.logging.pax-logging-service;version='[1.11.2,1.11.3)'
+ org.ops4j.pax.logging.pax-logging-api;version='[1.11.17,1.11.18)',\
+ org.ops4j.pax.logging.pax-logging-service;version='[1.11.17,1.11.18)'
diff --git a/repository/pom.xml b/repository/pom.xml
index 8263611e..8a15d2f1 100644
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -81,7 +81,7 @@
<dependency>
<groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-service</artifactId>
- <version>1.11.2</version>
+ <version>1.11.17</version>
</dependency>
</dependencies>
</project>
(aries-rsa) 05/11: ARIES-2185 Upgrade Logback to 1.5.18
Posted by am...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
amichai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-rsa.git
commit d6572e2104f04ba9c30bf3932cff939a1ed28a0d
Author: Amichai Rothman <am...@apache.org>
AuthorDate: Wed Jun 5 15:06:15 2024 +0300
ARIES-2185 Upgrade Logback to 1.5.18
---
parent/pom.xml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 49277e60..22ccd242 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -37,6 +37,7 @@
<zookeeper.version>3.9.1_1</zookeeper.version>
<netty.version>4.1.101.Final</netty.version>
<slf4j.version>2.0.17</slf4j.version>
+ <logback.version>1.5.18</logback.version>
<hawtdispatch.version>1.22</hawtdispatch.version>
<hawtbuf.version>1.11</hawtbuf.version>
<exam.version>4.13.5</exam.version>
@@ -67,12 +68,12 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>1.3.14</version>
+ <version>${logback.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
- <version>1.3.14</version>
+ <version>${logback.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
(aries-rsa) 10/11: ARIES-2190 Upgrade Snappy to 1.1.10.7
Posted by am...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
amichai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-rsa.git
commit dea13125d91bc6b0940c49daf80ee17027b0766b
Author: Amichai Rothman <am...@apache.org>
AuthorDate: Thu May 22 16:03:38 2025 +0300
ARIES-2190 Upgrade Snappy to 1.1.10.7
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 1f3fc7c0..af769cc6 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -223,7 +223,7 @@
<dependency>
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
- <version>1.1.10.5</version>
+ <version>1.1.10.7</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
(aries-rsa) 06/11: ARIES-2186 Upgrade Mockito to 5.18.0
Posted by am...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
amichai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-rsa.git
commit f3ec1ef40c3ead482566abfd7e30bd235629273a
Author: Amichai Rothman <am...@apache.org>
AuthorDate: Wed Jun 5 15:03:38 2024 +0300
ARIES-2186 Upgrade Mockito to 5.18.0
---
discovery/zookeeper/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/discovery/zookeeper/pom.xml b/discovery/zookeeper/pom.xml
index aacf2bf9..75507fa6 100644
--- a/discovery/zookeeper/pom.xml
+++ b/discovery/zookeeper/pom.xml
@@ -93,7 +93,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>4.11.0</version>
+ <version>5.18.0</version>
<scope>test</scope>
</dependency>
<dependency>