This is an automated email from the ASF dual-hosted git repository. alien11689 pushed a commit to branch fix-pax-web-version-in-samples in repository https://gitbox.apache.org/repos/asf/aries.git
commit d547f6ca60243cdd8834773246e3dfe8a55d0470 Author: Dominik Przybysz <[email protected]> AuthorDate: Tue Mar 25 19:54:04 2025 +0100 [MAINTENANCE] Upgrade pax-web to 4.x in samples/blog --- samples/blog/blog-itests/pom.xml | 36 ++++++++++++++-------- .../blog/itests/AbstractBlogIntegrationTest.java | 5 ++- 2 files changed, 28 insertions(+), 13 deletions(-) diff --git a/samples/blog/blog-itests/pom.xml b/samples/blog/blog-itests/pom.xml index 875fc740c..49d3af183 100644 --- a/samples/blog/blog-itests/pom.xml +++ b/samples/blog/blog-itests/pom.xml @@ -31,7 +31,7 @@ </description> <properties> - <asm.version>4.0</asm.version> + <asm.version>5.2</asm.version> <cm.version>3.2.0-v20070116</cm.version> <commons-dbcp.version>1.4</commons-dbcp.version> <depends-maven-plugin.version>1.5.0</depends-maven-plugin.version> @@ -39,16 +39,18 @@ <javax.inject.version>1</javax.inject.version> <logback.version>1.5.18</logback.version> <!-- <org.apache.aries.testsupport.unit.version>2.0.0-SNAPSHOT</org.apache.aries.testsupport.unit.version>--> + <!-- specific runtime needed for applications--> <org.eclipse.osgi.version>3.8.0.v20120529-1548</org.eclipse.osgi.version> <org.apache.aries.proxy.version>1.1.0</org.apache.aries.proxy.version> <org.apache.felix.bundlerepository.version>1.6.6</org.apache.felix.bundlerepository.version> - <pax-web.version>3.3.2</pax-web.version> + <!-- Higher pax-web needs framework supporting java 8 --> + <pax-web.version>4.4.2</pax-web.version> <services.version>3.1.200-v20070605</services.version> <pax-exam.version>4.13.5</pax-exam.version> <pax-swissbox.version>1.7.0</pax-swissbox.version> <pax-tinybundles.version>2.0.0</pax-tinybundles.version> <pax-url.version>2.6.16</pax-url.version> - <xbean.version>3.16</xbean.version> + <xbean.version>4.5</xbean.version> </properties> <dependencies> @@ -173,7 +175,7 @@ <dependency> <groupId>org.apache.xbean</groupId> - <artifactId>xbean-asm4-shaded</artifactId> + <artifactId>xbean-asm5-shaded</artifactId> <version>${xbean.version}</version> </dependency> <dependency> @@ -181,6 +183,12 @@ <artifactId>xbean-finder-shaded</artifactId> <version>${xbean.version}</version> </dependency> + <dependency> + <groupId>org.apache.xbean</groupId> + <artifactId>xbean-bundleutils</artifactId> + <version>${xbean.version}</version> + <scope>test</scope> + </dependency> <dependency> <groupId>org.ops4j.pax.web</groupId> <artifactId>pax-web-extender-war</artifactId> @@ -193,14 +201,18 @@ <version>${pax-web.version}</version> <scope>test</scope> </dependency> - - <!-- - <dependency> - <groupId>org.ops4j.pax.web</groupId> - <artifactId>pax-web-jsp</artifactId> - <scope>test</scope> - </dependency> - --> + <dependency> + <groupId>org.ops4j.pax.web</groupId> + <artifactId>pax-web-spi</artifactId> + <version>${pax-web.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.ops4j.pax.web</groupId> + <artifactId>pax-web-api</artifactId> + <version>${pax-web.version}</version> + <scope>test</scope> + </dependency> <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> diff --git a/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/AbstractBlogIntegrationTest.java b/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/AbstractBlogIntegrationTest.java index 1eb2cbc60..4447728db 100644 --- a/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/AbstractBlogIntegrationTest.java +++ b/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/AbstractBlogIntegrationTest.java @@ -182,10 +182,13 @@ public abstract class AbstractBlogIntegrationTest extends org.apache.aries.itest mavenBundle("org.eclipse.equinox", "cm").versionAsInProject(), mavenBundle("org.eclipse.osgi", "services").versionAsInProject(), - mavenBundle("org.apache.xbean", "xbean-asm4-shaded").versionAsInProject(), + mavenBundle("org.apache.xbean", "xbean-asm5-shaded").versionAsInProject(), mavenBundle("org.apache.xbean", "xbean-finder-shaded").versionAsInProject(), + mavenBundle("org.apache.xbean", "xbean-bundleutils").versionAsInProject(), mavenBundle("org.ops4j.pax.web", "pax-web-jetty-bundle").versionAsInProject(), mavenBundle("org.ops4j.pax.web", "pax-web-extender-war").versionAsInProject(), + mavenBundle("org.ops4j.pax.web", "pax-web-spi").versionAsInProject(), + mavenBundle("org.ops4j.pax.web", "pax-web-api").versionAsInProject(), //mavenBundle("org.ops4j.pax.web", "pax-web-jsp").versionAsInProject(), mavenBundle("org.apache.derby", "derby").versionAsInProject(),
