This is an automated email from the ASF dual-hosted git repository. alien11689 pushed a commit to branch update-dependencies-in-jndi in repository https://gitbox.apache.org/repos/asf/aries.git
commit c7caede1cabd815953d25d48223d165711e28647 Author: Dominik Przybysz <[email protected]> AuthorDate: Mon Feb 10 21:59:11 2025 +0100 [MAINTENANCE] Update JNDI dependencies --- .github/workflows/jndi.yml | 3 ++ jndi/jndi-url-itest/pom.xml | 55 ++++++++++++++++++---- .../aries/jndi/itests/JndiUrlIntegrationTest.java | 10 +++- jndi/parent/pom.xml | 50 ++++---------------- 4 files changed, 66 insertions(+), 52 deletions(-) diff --git a/.github/workflows/jndi.yml b/.github/workflows/jndi.yml index c5ee6f4d3..d79a11137 100644 --- a/.github/workflows/jndi.yml +++ b/.github/workflows/jndi.yml @@ -50,6 +50,9 @@ jobs: - name: Build testsupport shell: bash run: mvn -U -e -B -ntp clean install -f testsupport + - name: Build util + shell: bash + run: mvn -U -e -B -ntp clean install -f util - name: Build jndi shell: bash run: mvn -U -e -B -ntp clean install -f jndi diff --git a/jndi/jndi-url-itest/pom.xml b/jndi/jndi-url-itest/pom.xml index a1cae9441..715d751e3 100644 --- a/jndi/jndi-url-itest/pom.xml +++ b/jndi/jndi-url-itest/pom.xml @@ -46,7 +46,7 @@ <asm-debug-all.version>5.0.3</asm-debug-all.version> <cm.version>3.2.0-v20070116</cm.version> <depends-maven-plugin.version>1.5.0</depends-maven-plugin.version> - <geronimo-servlet_2.5_spec.version>1.2</geronimo-servlet_2.5_spec.version> + <geronimo-servlet_3.0_spec.version>1.0</geronimo-servlet_3.0_spec.version> <jndi-api.version>${jndi-api.dev-version}</jndi-api.version> <jndi-bundle.version>${jndi-bundle.dev-version}</jndi-bundle.version> <jndi-url-itest-biz.version>${jndi-url-itest-biz.dev-version}</jndi-url-itest-biz.version> @@ -54,15 +54,16 @@ <jndi-url.version>${jndi-url.dev-version}</jndi-url.version> <logback.version>1.5.16</logback.version> <org.apache.aries.testsupport.unit.version>2.0.0-SNAPSHOT</org.apache.aries.testsupport.unit.version> - <org.apache.felix.fileinstall.version>3.4.0</org.apache.felix.fileinstall.version> + <org.apache.felix.fileinstall.version>3.7.4</org.apache.felix.fileinstall.version> <org.apache.servicemix.bundles.cglib.version>3.3.0_1</org.apache.servicemix.bundles.cglib.version> - <org.eclipse.osgi.version>3.11.3</org.eclipse.osgi.version> - <pax-exam.version>4.11.0</pax-exam.version> - <pax-url.version>2.6.0</pax-url.version> - <pax-web.version>1.1.18</pax-web.version> + <org.eclipse.osgi.version>3.22.0</org.eclipse.osgi.version> + <pax-exam.version>4.13.0</pax-exam.version> + <pax-url.version>2.6.16</pax-url.version> + <pax-web.version>6.1.2</pax-web.version> <services.version>3.1.200-v20070605</services.version> <slf4j-api.version>1.7.7</slf4j-api.version> <tinybundles.version>2.0.0</tinybundles.version> + <xbean.version>4.26</xbean.version> </properties> <dependencies> @@ -135,7 +136,7 @@ </dependency> <dependency> <groupId>org.apache.aries.proxy</groupId> - <artifactId>org.apache.aries.proxy.impl</artifactId> + <artifactId>org.apache.aries.proxy</artifactId> </dependency> <!-- pax exam --> @@ -238,9 +239,9 @@ <dependency> <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-servlet_2.5_spec</artifactId> + <artifactId>geronimo-servlet_3.0_spec</artifactId> <scope>test</scope> - <version>${geronimo-servlet_2.5_spec.version}</version> + <version>${geronimo-servlet_3.0_spec.version}</version> </dependency> <dependency> @@ -255,6 +256,42 @@ <scope>test</scope> <version>${pax-web.version}</version> </dependency> + <dependency> + <groupId>org.ops4j.pax.web</groupId> + <artifactId>pax-web-api</artifactId> + <scope>test</scope> + <version>${pax-web.version}</version> + </dependency> + <dependency> + <groupId>org.ops4j.pax.web</groupId> + <artifactId>pax-web-spi</artifactId> + <scope>test</scope> + <version>${pax-web.version}</version> + </dependency> + <dependency> + <groupId>org.ops4j.pax.web</groupId> + <artifactId>pax-web-descriptor</artifactId> + <scope>test</scope> + <version>${pax-web.version}</version> + </dependency> + <dependency> + <groupId>org.apache.xbean</groupId> + <artifactId>xbean-finder-shaded</artifactId> + <version>${xbean.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.xbean</groupId> + <artifactId>xbean-asm9-shaded</artifactId> + <version>${xbean.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.xbean</groupId> + <artifactId>xbean-bundleutils</artifactId> + <version>${xbean.version}</version> + <scope>test</scope> + </dependency> <dependency> <groupId>org.apache.felix</groupId> diff --git a/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java b/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java index 4847a152e..3eead3fd0 100644 --- a/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java +++ b/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java @@ -151,15 +151,21 @@ public class JndiUrlIntegrationTest extends AbstractIntegrationTest { // Bundles mavenBundle("org.eclipse.equinox", "cm").versionAsInProject(), mavenBundle("org.eclipse.osgi", "services").versionAsInProject(), - mavenBundle("org.apache.geronimo.specs", "geronimo-servlet_2.5_spec").versionAsInProject(), + mavenBundle("org.apache.geronimo.specs", "geronimo-servlet_3.0_spec").versionAsInProject(), mavenBundle("org.ops4j.pax.web", "pax-web-extender-war").versionAsInProject(), mavenBundle("org.ops4j.pax.web", "pax-web-jetty-bundle").versionAsInProject(), + mavenBundle("org.ops4j.pax.web", "pax-web-api").versionAsInProject(), + mavenBundle("org.ops4j.pax.web", "pax-web-spi").versionAsInProject(), + mavenBundle("org.ops4j.pax.web", "pax-web-descriptor").versionAsInProject(), + mavenBundle("org.apache.xbean", "xbean-finder-shaded").versionAsInProject(), + mavenBundle("org.apache.xbean", "xbean-asm9-shaded").versionAsInProject(), + mavenBundle("org.apache.xbean", "xbean-bundleutils").versionAsInProject(), mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.api").versionAsInProject(), mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.core").versionAsInProject(), mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy.api").versionAsInProject(), - mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy.impl").versionAsInProject(), + mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy").versionAsInProject(), mavenBundle("org.apache.aries", "org.apache.aries.util").versionAsInProject(), mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi").versionAsInProject(), diff --git a/jndi/parent/pom.xml b/jndi/parent/pom.xml index a50038005..13e98ff47 100644 --- a/jndi/parent/pom.xml +++ b/jndi/parent/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>2.0.1</version> + <version>2.1.2-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> @@ -52,17 +52,14 @@ <jndi-rmi.dev-version>1.0.1-SNAPSHOT</jndi-rmi.dev-version> <jndi-url-itest-web.dev-version>1.0.1-SNAPSHOT</jndi-url-itest-web.dev-version> <jndi-url-itest-biz.dev-version>1.0.1-SNAPSHOT</jndi-url-itest-biz.dev-version> - <org.apache.aries.util.version>1.1.3</org.apache.aries.util.version> - <org.apache.aries.proxy.api.version>1.0.0</org.apache.aries.proxy.api.version> - <org.apache.aries.proxy.impl.version>1.0.6</org.apache.aries.proxy.impl.version> - <org.apache.aries.blueprint.api.version>1.0.0</org.apache.aries.blueprint.api.version> - <org.apache.aries.blueprint.core.version>1.0.0</org.apache.aries.blueprint.core.version> - <osgi.core.version>6.0.0</osgi.core.version> + <org.apache.aries.util.version>1.2.0-SNAPSHOT</org.apache.aries.util.version> + <org.apache.aries.proxy.api.version>1.1.1</org.apache.aries.proxy.api.version> + <org.apache.aries.proxy.impl.version>1.1.14</org.apache.aries.proxy.impl.version> + <org.apache.aries.blueprint.api.version>1.0.1</org.apache.aries.blueprint.api.version> + <org.apache.aries.blueprint.core.version>1.10.3</org.apache.aries.blueprint.core.version> + <osgi.core.version>8.0.0</osgi.core.version> <osgi.cmpn.version>7.0.0</osgi.cmpn.version> - <osgi.enterprise.version>6.0.0</osgi.enterprise.version> - <apache-rat-plugin.version>0.12</apache-rat-plugin.version> - <java.source.version>1.8</java.source.version> - <java.target.version>1.8</java.target.version> + <osgi.enterprise.version>7.0.0</osgi.enterprise.version> <org.apache.aries.testsupport.unit.version>2.0.0-SNAPSHOT</org.apache.aries.testsupport.unit.version> <slf4j-api.version>1.7.25</slf4j-api.version> </properties> @@ -81,7 +78,7 @@ </dependency> <dependency> <groupId>org.apache.aries.proxy</groupId> - <artifactId>org.apache.aries.proxy.impl</artifactId> + <artifactId>org.apache.aries.proxy</artifactId> <version>${org.apache.aries.proxy.impl.version}</version> </dependency> <dependency> @@ -148,35 +145,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>${java.source.version}</source> - <target>${java.target.version}</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <version>${apache-rat-plugin.version}</version> - <executions> - <execution> - <phase>verify</phase> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> - <configuration> - <reportFile>${project.build.directory}/${project.build.finalName}.rat</reportFile> - <excludeSubProjects>true</excludeSubProjects> - <excludes> - <exclude>**/NOTICE.vm</exclude> - <exclude>**/dependency-reduced-pom.xml</exclude> - </excludes> - </configuration> - </plugin> </plugins> </build>
