Merge pull request #321 from apache/add-proxy-workflow-and-bump-logback-version

[MAINTENANCE] Add proxy workflow and bump logback version

Author: alien11689

.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

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 -->

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>

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>1.5.16</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>

proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/AbstractProxyTest.java

@@ -299,8 +299,11 @@ protected Option proxyOptions() {
               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(),*/