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 <[email protected]> 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(),*/
