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/04/23 19:49:03 UTC
(aries) branch ARIES-2177-bump-dependencies-in-blog-samples created (now 7937bef8c)
This is an automated email from the ASF dual-hosted git repository.
alien11689 pushed a change to branch ARIES-2177-bump-dependencies-in-blog-samples
in repository https://gitbox.apache.org/repos/asf/aries.git
at 7937bef8c ARIES-2177: Bump dependencies in sample blog
This branch includes the following new commits:
new 7937bef8c ARIES-2177: Bump dependencies in sample blog
The 1 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) 01/01: ARIES-2177: Bump dependencies in sample blog
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
alien11689 pushed a commit to branch ARIES-2177-bump-dependencies-in-blog-samples
in repository https://gitbox.apache.org/repos/asf/aries.git
commit 7937bef8cb1eb337fac22abf2c1444c34b14865d
Author: Dominik Przybysz <al...@gmail.com>
AuthorDate: Wed Apr 23 21:09:00 2025 +0200
ARIES-2177: Bump dependencies in sample blog
---
samples/blog/blog-itests/pom.xml | 82 ++++------------------
.../src/test/java/org/apache/aries/itest | 1 -
.../blog/itests/AbstractBlogIntegrationTest.java | 29 ++------
samples/blog/pom.xml | 14 ----
.../blueprint/helloworld/helloworld-itests/pom.xml | 6 --
samples/pom.xml | 19 +----
6 files changed, 21 insertions(+), 130 deletions(-)
diff --git a/samples/blog/blog-itests/pom.xml b/samples/blog/blog-itests/pom.xml
index 3b74cd45e..2ed8504f5 100644
--- a/samples/blog/blog-itests/pom.xml
+++ b/samples/blog/blog-itests/pom.xml
@@ -31,31 +31,21 @@
</description>
<properties>
- <cm.version>3.2.0-v20070116</cm.version>
- <commons-dbcp.version>1.4</commons-dbcp.version>
<java.source.version>8</java.source.version>
- <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>
- <!-- 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>
+
+ <commons-dbcp.version>1.4</commons-dbcp.version>
+ <org.eclipse.osgi.version>3.23.0</org.eclipse.osgi.version>
<pax-exam.version>4.13.5</pax-exam.version>
- <!-- pax-logging 1.11.x does not support runtime 1.6 - eclipse upgrade needed -->
- <pax-logging.version>1.10.10</pax-logging.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>4.5</xbean.version>
+ <pax-web.version>4.4.2</pax-web.version>
+ <xbean.version>4.27</xbean.version>
</properties>
<dependencies>
<dependency>
- <groupId>org.eclipse</groupId>
+ <groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
<version>${org.eclipse.osgi.version}</version>
</dependency>
@@ -83,17 +73,14 @@
<scope>test</scope>
</dependency>
-<!-- TODO ARIES-2165 Use testsupport dependency when application runs on newer eclipse -->
-<!-- <dependency>-->
-<!-- <groupId>org.apache.aries.testsupport</groupId>-->
-<!-- <artifactId>org.apache.aries.testsupport.unit</artifactId>-->
-<!-- <version>${org.apache.aries.testsupport.unit.version}</version>-->
-<!-- <scope>test</scope>-->
-<!-- </dependency>-->
+ <dependency>
+ <groupId>org.apache.aries.testsupport</groupId>
+ <artifactId>org.apache.aries.testsupport.unit</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
- <version>${javax.inject.version}</version>
</dependency>
<dependency>
@@ -132,12 +119,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
@@ -159,23 +140,9 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>cm</artifactId>
- <version>${cm.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.osgi</groupId>
- <artifactId>services</artifactId>
- <version>${services.version}</version>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>org.apache.xbean</groupId>
- <artifactId>xbean-asm5-shaded</artifactId>
+ <artifactId>xbean-asm9-shaded</artifactId>
<version>${xbean.version}</version>
</dependency>
<dependency>
@@ -219,12 +186,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.fileinstall</artifactId>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.0_spec</artifactId>
@@ -285,11 +246,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.bundlerepository</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.api</artifactId>
@@ -379,18 +335,6 @@
<version>${pax-url.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-core</artifactId>
- <version>${logback.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>${logback.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.ops4j.pax.tinybundles</groupId>
<artifactId>tinybundles</artifactId>
@@ -416,13 +360,11 @@
<dependency>
<groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-api</artifactId>
- <version>${pax-logging.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-log4j2</artifactId>
- <version>${pax-logging.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/samples/blog/blog-itests/src/test/java/org/apache/aries/itest b/samples/blog/blog-itests/src/test/java/org/apache/aries/itest
deleted file mode 120000
index 5e145ea8a..000000000
--- a/samples/blog/blog-itests/src/test/java/org/apache/aries/itest
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../../../testsupport/testsupport-unit/src/main/java/org/apache/aries/itest
\ No newline at end of file
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 e965bfe01..e1885c7c5 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
@@ -26,9 +26,6 @@ import static org.ops4j.pax.exam.CoreOptions.frameworkProperty;
import static org.ops4j.pax.exam.CoreOptions.junitBundles;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.options;
-import static org.ops4j.pax.exam.CoreOptions.systemProperty;
-import static org.ops4j.pax.exam.CoreOptions.vmOption;
-import static org.ops4j.pax.exam.CoreOptions.when;
import java.io.BufferedReader;
import java.io.IOException;
@@ -119,18 +116,12 @@ public abstract class AbstractBlogIntegrationTest extends org.apache.aries.itest
}
protected Option baseOptions() {
- String localRepo = System.getProperty("maven.repo.local");
-
- if (localRepo == null) {
- localRepo = System.getProperty("org.ops4j.pax.url.mvn.localRepository");
- }
return composite(
junitBundles(),
- mavenBundle("org.ops4j.pax.logging", "pax-logging-api").versionAsInProject(),
- mavenBundle("org.ops4j.pax.logging", "pax-logging-log4j2").versionAsInProject(),
-// mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit").versionAsInProject(),
- systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"),
- when(localRepo != null).useOptions(vmOption("-Dorg.ops4j.pax.url.mvn.localRepository=" + localRepo))
+ addPaxLoggingBundles(),
+ setPaxExamLogLevel("INFO"),
+ configurePaxUrlLocalMavenRepoIfNeeded(),
+ mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit").versionAsInProject()
);
}
@@ -141,10 +132,9 @@ public abstract class AbstractBlogIntegrationTest extends org.apache.aries.itest
frameworkProperty("org.osgi.framework.system.packages")
.value("javax.accessibility,javax.activation,javax.activity,javax.annotation,javax.annotation.processing,javax.crypto,javax.crypto.interfaces,javax.crypto.spec,javax.imageio,javax.imageio.event,javax.imageio.metadata,javax.imageio.plugins.bmp,javax.imageio.plugins.jpeg,javax.imageio.spi,javax.imageio.stream,javax.jws,javax.jws.soap,javax.lang.model,javax.lang.model.element,javax.lang.model.type,javax.lang.model.util,javax.management,javax.management.loading,javax. [...]
- mavenBundle("org.eclipse.equinox", "cm").versionAsInProject(),
- mavenBundle("org.eclipse.osgi", "services").versionAsInProject(),
+ mavenBundle("org.osgi", "osgi.cmpn").versionAsInProject(),
- mavenBundle("org.apache.xbean", "xbean-asm5-shaded").versionAsInProject(),
+ mavenBundle("org.apache.xbean", "xbean-asm9-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(),
@@ -172,8 +162,6 @@ public abstract class AbstractBlogIntegrationTest extends org.apache.aries.itest
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(),
- mavenBundle("org.apache.felix", "org.apache.felix.fileinstall").versionAsInProject(),
- mavenBundle("org.apache.felix", "org.apache.felix.bundlerepository").versionAsInProject(),
mavenBundle("org.apache.aries.jpa", "org.apache.aries.jpa.api").versionAsInProject(),
mavenBundle("org.apache.aries.jpa", "org.apache.aries.jpa.container").versionAsInProject(),
mavenBundle("org.apache.aries.jpa", "org.apache.aries.jpa.blueprint.aries").versionAsInProject(),
@@ -181,10 +169,7 @@ public abstract class AbstractBlogIntegrationTest extends org.apache.aries.itest
mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.manager").versionAsInProject(),
mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.blueprint").versionAsInProject(),
mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.wrappers").versionAsInProject(),
- mavenBundle("org.ow2.asm", "asm").versionAsInProject(),
- mavenBundle("org.ow2.asm", "asm-commons").versionAsInProject(),
- mavenBundle("org.ow2.asm", "asm-tree").versionAsInProject(),
- mavenBundle("org.ow2.asm", "asm-analysis").versionAsInProject(),
+ addAsmBundles(),
mavenBundle("org.apache.aries.samples.blog", "org.apache.aries.samples.blog.datasource").versionAsInProject()
);
}
diff --git a/samples/blog/pom.xml b/samples/blog/pom.xml
index 60f2b9b4c..d4216c496 100644
--- a/samples/blog/pom.xml
+++ b/samples/blog/pom.xml
@@ -30,11 +30,8 @@
<packaging>pom</packaging>
<properties>
- <!-- used eclipse version needs java 6-->
- <java.source.version>1.6</java.source.version>
<!-- newer version generates osgi.extender capability for jpa bundle -->
<maven-bundle-plugin.version>2.5.0</maven-bundle-plugin.version>
- <org.eclipse.osgi.version>3.7.0.v20110613</org.eclipse.osgi.version>
</properties>
<dependencyManagement>
@@ -44,11 +41,6 @@
<artifactId>org.apache.aries.samples.blog.api</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.aries.samples.blog</groupId>
- <artifactId>org.apache.aries.samples.blog.assembly</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.aries.samples.blog</groupId>
<artifactId>org.apache.aries.samples.blog.biz</artifactId>
@@ -74,12 +66,6 @@
<artifactId>org.apache.aries.samples.blog.web</artifactId>
<version>${project.version}</version>
</dependency>
- <!-- Override the version of OSGi used in samples, so we can show off weaving (different group id too, unfortunately) -->
- <dependency>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>org.eclipse.osgi</artifactId>
- <version>${org.eclipse.osgi.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
diff --git a/samples/blueprint/helloworld/helloworld-itests/pom.xml b/samples/blueprint/helloworld/helloworld-itests/pom.xml
index 1ce71996d..b51afafff 100644
--- a/samples/blueprint/helloworld/helloworld-itests/pom.xml
+++ b/samples/blueprint/helloworld/helloworld-itests/pom.xml
@@ -154,12 +154,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
diff --git a/samples/pom.xml b/samples/pom.xml
index 0a4ba3c3a..1c24063e8 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -64,7 +64,7 @@
<org.apache.aries.quiesce.manager.version>1.0.0</org.apache.aries.quiesce.manager.version>
<!-- Aries Testsupport Versions -->
- <org.apache.aries.testsupport.unit.version>1.0.0</org.apache.aries.testsupport.unit.version>
+ <org.apache.aries.testsupport.unit.version>2.0.0-SNAPSHOT</org.apache.aries.testsupport.unit.version>
<!-- Aries Transaction Versions -->
<org.apache.aries.transaction.blueprint.version>1.0.0</org.apache.aries.transaction.blueprint.version>
@@ -79,7 +79,6 @@
<commons-lang.version>2.6</commons-lang.version>
<commons-pool.version>1.6</commons-pool.version>
<org.apache.servicemix.bundles.serp.version>1.15.1_1</org.apache.servicemix.bundles.serp.version>
- <org.apache.servicemix.bundles.cglib.version>3.3.0_1</org.apache.servicemix.bundles.cglib.version>
<openjpa.version>2.2.2</openjpa.version>
<geronimo-jpa_2.0_spec.version>1.1</geronimo-jpa_2.0_spec.version>
@@ -95,8 +94,6 @@
<serp.version>1.15.1</serp.version>
<javax-servlet.version>1.2</javax-servlet.version>
- <twitter4j.version>2.0.10</twitter4j.version>
-
<aries.javadoc.exclude.packages>*</aries.javadoc.exclude.packages>
<!-- Felix dependencies -->
@@ -117,8 +114,7 @@
<javax.persistence-api.version>2.2</javax.persistence-api.version>
<javax.transaction-api.version>1.2</javax.transaction-api.version>
<osgi.core.version>8.0.0</osgi.core.version>
- <slf4j.version>1.7.36</slf4j.version>
- <pax-logging.version>1.12.12</pax-logging.version>
+ <pax-logging.version>2.2.9</pax-logging.version>
<!-- Aries dependencies -->
<blueprint-maven-plugin-annotation.version>1.3.0</blueprint-maven-plugin-annotation.version>
@@ -310,23 +306,12 @@
<artifactId>commons-collections</artifactId>
<version>${commons-collections.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
- <version>${org.apache.servicemix.bundles.cglib.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.fileinstall</artifactId>
<version>${org.apache.felix.fileinstall.version}</version>
</dependency>
- <dependency>
- <groupId>net.homeip.yusuke</groupId>
- <artifactId>twitter4j</artifactId>
- <version>${twitter4j.version}</version>
- </dependency>
-
<!-- other aries subproject dependency management -->
<!-- blueprint -->
<dependency>