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/02/24 05:42:45 UTC
(aries) branch restore-sample-twitter created (now fc619d96e)
This is an automated email from the ASF dual-hosted git repository.
alien11689 pushed a change to branch restore-sample-twitter
in repository https://gitbox.apache.org/repos/asf/aries.git
at fc619d96e [MAINTENANCE] Restore sample twitter
This branch includes the following new commits:
new fc619d96e [MAINTENANCE] Restore sample twitter
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: [MAINTENANCE] Restore sample twitter
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
alien11689 pushed a commit to branch restore-sample-twitter
in repository https://gitbox.apache.org/repos/asf/aries.git
commit fc619d96e1b75aa3acd15b5c47491616362bbd41
Author: Dominik Przybysz <al...@gmail.com>
AuthorDate: Mon Feb 24 06:41:51 2025 +0100
[MAINTENANCE] Restore sample twitter
---
samples/pom.xml | 2 +-
samples/twitter/twitter-itests/pom.xml | 15 +++++++++++++--
.../apache/aries/sample/twitter/itest/TwitterTest.java | 2 +-
3 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/samples/pom.xml b/samples/pom.xml
index 4d5856ee0..bfcb5158a 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -689,7 +689,7 @@
<module>ariestrader</module>
<module>blog</module>
<module>blueprint</module>
-<!-- <module>twitter</module>-->
+ <module>twitter</module>
</modules>
</project>
diff --git a/samples/twitter/twitter-itests/pom.xml b/samples/twitter/twitter-itests/pom.xml
index 0ef404f5d..9045a0df3 100644
--- a/samples/twitter/twitter-itests/pom.xml
+++ b/samples/twitter/twitter-itests/pom.xml
@@ -35,13 +35,16 @@
<properties>
<asm.version>4.0</asm.version>
<depends-maven-plugin.version>1.2</depends-maven-plugin.version>
- <exam.version>3.4.0</exam.version>
+ <exam.version>4.13.5</exam.version>
+ <javax.inject.version>1</javax.inject.version>
<logback.version>0.9.29</logback.version>
+ <org.apache.aries.proxy.version>1.1.0</org.apache.aries.proxy.version>
<org.apache.aries.testsupport.unit.version>2.0.0-SNAPSHOT</org.apache.aries.testsupport.unit.version>
+ <org.apache.felix.bundlerepository.version>1.6.6</org.apache.felix.bundlerepository.version>
<org.eclipse.osgi.version>3.8.0.v20120529-1548</org.eclipse.osgi.version>
<swissbox.version>1.7.0</swissbox.version>
<tinybundles.version>2.0.0</tinybundles.version>
- <url.version>1.6.0</url.version>
+ <url.version>2.6.16</url.version>
</properties>
<dependencies>
@@ -86,12 +89,20 @@
<artifactId>org.apache.aries.application.utils</artifactId>
<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>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <version>${javax.inject.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
diff --git a/samples/twitter/twitter-itests/src/test/java/org/apache/aries/sample/twitter/itest/TwitterTest.java b/samples/twitter/twitter-itests/src/test/java/org/apache/aries/sample/twitter/itest/TwitterTest.java
index 97b9bfef1..0f7711bad 100644
--- a/samples/twitter/twitter-itests/src/test/java/org/apache/aries/sample/twitter/itest/TwitterTest.java
+++ b/samples/twitter/twitter-itests/src/test/java/org/apache/aries/sample/twitter/itest/TwitterTest.java
@@ -168,7 +168,7 @@ public class TwitterTest extends AbstractIntegrationTest
junitBundles(),
mavenBundle("org.ops4j.pax.logging", "pax-logging-api", "1.7.2"),
mavenBundle("org.ops4j.pax.logging", "pax-logging-service", "1.7.2"),
- mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit").versionAsInProject(),
+ //mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit").versionAsInProject(),
// this is how you set the default log level when using pax
// logging (logProfile)
systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"),