You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by al...@apache.org on 2025/01/11 12:51:36 UTC
(aries) branch add-proxy-workflow-and-bump-logback-version created (now 3d70fd108)
This is an automated email from the ASF dual-hosted git repository.
alien11689 pushed a change to branch add-proxy-workflow-and-bump-logback-version
in repository https://gitbox.apache.org/repos/asf/aries.git
at 3d70fd108 [MAINTENANCE] Add proxy workflow
This branch includes the following new commits:
new cdc756f3b [MAINTENANCE] Make proxy pass itests
new 7be8f566d [MAINTENANCE] Bump logback version
new 3d70fd108 [MAINTENANCE] Add proxy workflow
The 3 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.
(aries) 02/03: [MAINTENANCE] Bump logback version
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
alien11689 pushed a commit to branch add-proxy-workflow-and-bump-logback-version
in repository https://gitbox.apache.org/repos/asf/aries.git
commit 7be8f566dbdb00253650a482cddb4cb28751a4d8
Author: Dominik Przybysz <al...@gmail.com>
AuthorDate: Sat Jan 11 13:30:21 2025 +0100
[MAINTENANCE] Bump logback version
---
proxy/proxy-itests/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/proxy/proxy-itests/pom.xml b/proxy/proxy-itests/pom.xml
index f63f5e624..579eb7336 100644
--- a/proxy/proxy-itests/pom.xml
+++ b/proxy/proxy-itests/pom.xml
@@ -45,7 +45,7 @@
<properties>
<exam.version>4.13.3</exam.version>
<url.version>2.5.3</url.version>
- <logback.version>0.9.29</logback.version>
+ <logback.version>1.5.16</logback.version>
<asm.version>9.6</asm.version>
</properties>
(aries) 03/03: [MAINTENANCE] Add proxy workflow
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
alien11689 pushed a commit to branch add-proxy-workflow-and-bump-logback-version
in repository https://gitbox.apache.org/repos/asf/aries.git
commit 3d70fd1087b2bb882df9e89efc42af16c365e97c
Author: Dominik Przybysz <al...@gmail.com>
AuthorDate: Sat Jan 11 13:49:33 2025 +0100
[MAINTENANCE] Add proxy workflow
---
.github/workflows/proxy.yml | 47 +++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 47 insertions(+)
diff --git a/.github/workflows/proxy.yml b/.github/workflows/proxy.yml
new file mode 100644
index 000000000..db0f3d9b6
--- /dev/null
+++ b/.github/workflows/proxy.yml
@@ -0,0 +1,47 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: Proxy - CI Build
+
+on:
+ pull_request:
+ paths:
+ - proxy/**
+ - .github/workflows/proxy.yml
+ push:
+ branches:
+ - 'trunk'
+
+env:
+ LC_ALL: en_US.UTF-8
+
+jobs:
+ JDKxx_Matrix:
+ timeout-minutes: 10
+ strategy:
+ matrix:
+ java: [ 8 ]
+ os: [ ubuntu-latest ]
+ name: JDK${{ matrix.java }} ${{ matrix.os }}
+ runs-on: ${{ matrix.os }}
+ steps:
+ - name: Git Checkout
+ uses: actions/checkout@v4
+ - name: Set up Java
+ uses: actions/setup-java@v4
+ with:
+ distribution: 'temurin'
+ java-version: ${{ matrix.java }}
+ - name: Build
+ shell: bash
+ run: |
+ mvn -U -e -B -ntp clean install -f proxy/pom.xml
(aries) 01/03: [MAINTENANCE] Make proxy pass itests
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
alien11689 pushed a commit to branch add-proxy-workflow-and-bump-logback-version
in repository https://gitbox.apache.org/repos/asf/aries.git
commit cdc756f3bbfac2e3a58f7ee3deb605a628a3fa8e
Author: Dominik Przybysz <al...@gmail.com>
AuthorDate: Sat Jan 11 13:17:40 2025 +0100
[MAINTENANCE] Make proxy pass itests
---
proxy/proxy-api/pom.xml | 4 +--
proxy/proxy-impl/pom.xml | 2 +-
proxy/proxy-itests/pom.xml | 34 +++++++++++++++-------
.../aries/proxy/itests/AbstractProxyTest.java | 3 ++
4 files changed, 30 insertions(+), 13 deletions(-)
diff --git a/proxy/proxy-api/pom.xml b/proxy/proxy-api/pom.xml
index 45ada53a9..6171cabdd 100644
--- a/proxy/proxy-api/pom.xml
+++ b/proxy/proxy-api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>2.1.0</version>
+ <version>2.1.1</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
@@ -50,7 +50,7 @@
org.apache.aries.proxy*
</aries.osgi.export.pkg>
<aries.osgi.private.pkg />
- <lastReleaseVersion>1.0.1</lastReleaseVersion>
+ <lastReleaseVersion>1.1.1</lastReleaseVersion>
<!-- Skip version check for release 1.1.0 as the plugin does not handle the case
of removing a dpendency correctly -->
diff --git a/proxy/proxy-impl/pom.xml b/proxy/proxy-impl/pom.xml
index f70372287..9ed4c0877 100644
--- a/proxy/proxy-impl/pom.xml
+++ b/proxy/proxy-impl/pom.xml
@@ -63,7 +63,7 @@
<aries.osgi.private.pkg>
org.apache.aries.proxy.impl*
</aries.osgi.private.pkg>
- <lastReleaseVersion>1.0.1</lastReleaseVersion>
+ <lastReleaseVersion>1.1.14</lastReleaseVersion>
</properties>
<dependencies>
diff --git a/proxy/proxy-itests/pom.xml b/proxy/proxy-itests/pom.xml
index 0fdcaac7d..f63f5e624 100644
--- a/proxy/proxy-itests/pom.xml
+++ b/proxy/proxy-itests/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>2.1.0</version>
+ <version>2.1.1</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
@@ -44,14 +44,16 @@
<properties>
<exam.version>4.13.3</exam.version>
- <url.version>1.6.0</url.version>
+ <url.version>2.5.3</url.version>
+ <logback.version>0.9.29</logback.version>
+ <asm.version>9.6</asm.version>
</properties>
<dependencies>
<dependency>
- <groupId>org.eclipse</groupId>
+ <groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
- <version>3.8.0.v20120529-1548</version>
+ <version>3.11.3</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -63,13 +65,13 @@
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy.api</artifactId>
<scope>test</scope>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.1.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy</artifactId>
<scope>test</scope>
- <version>1.1.8-SNAPSHOT</version>
+ <version>1.1.15-SNAPSHOT</version>
</dependency>
<!-- pax exam -->
@@ -111,13 +113,13 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
- <version>0.9.29</version>
+ <version>${logback.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>0.9.29</version>
+ <version>${logback.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -134,13 +136,25 @@
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
- <version>8.0.1</version>
+ <version>${asm.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-commons</artifactId>
- <version>8.0.1</version>
+ <version>${asm.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-tree</artifactId>
+ <version>${asm.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-analysis</artifactId>
+ <version>${asm.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/AbstractProxyTest.java b/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/AbstractProxyTest.java
index 7196a7ae9..0713c033f 100644
--- a/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/AbstractProxyTest.java
+++ b/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/AbstractProxyTest.java
@@ -299,8 +299,11 @@ public abstract class AbstractProxyTest {
when(localRepo != null).useOptions(CoreOptions.vmOption("-Dorg.ops4j.pax.url.mvn.localRepository=" + localRepo)),
mavenBundle("org.ow2.asm", "asm-commons").versionAsInProject(),
mavenBundle("org.ow2.asm", "asm").versionAsInProject(),
+ mavenBundle("org.ow2.asm", "asm-tree").versionAsInProject(),
+ mavenBundle("org.ow2.asm", "asm-analysis").versionAsInProject(),
mavenBundle("org.ops4j.pax.logging", "pax-logging-api").versionAsInProject(),
mavenBundle("org.ops4j.pax.logging", "pax-logging-service").versionAsInProject(),
+ mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy.api").versionAsInProject(),
mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy").versionAsInProject()
/* vmOption ("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),
waitForFrameworkStartup(),*/