This is an automated email from the ASF dual-hosted git repository.
alien11689 pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/aries.git
The following commit(s) were added to refs/heads/trunk by this push:
new 9724ee233 [MAINTENANCE] Remove unnecessary dependencies from quiesce
(#416)
9724ee233 is described below
commit 9724ee23370ef80812808b2d3367c3944b1fc0ea
Author: Dominik Przybysz <[email protected]>
AuthorDate: Mon Feb 3 15:43:20 2025 +0100
[MAINTENANCE] Remove unnecessary dependencies from quiesce (#416)
---
quiesce/quiesce-manager-itest/pom.xml | 51 +---------------------
.../quiesce/manager/itest/QuiesceManagerTest.java | 20 ++++-----
2 files changed, 9 insertions(+), 62 deletions(-)
diff --git a/quiesce/quiesce-manager-itest/pom.xml
b/quiesce/quiesce-manager-itest/pom.xml
index 0113f2327..0b7a8d04d 100644
--- a/quiesce/quiesce-manager-itest/pom.xml
+++ b/quiesce/quiesce-manager-itest/pom.xml
@@ -40,19 +40,14 @@
</scm>
<properties>
- <commons-collections.version>3.2.2</commons-collections.version>
- <commons-lang.version>2.6</commons-lang.version>
- <commons-pool.version>1.6</commons-pool.version>
<depends-maven-plugin.version>1.5.0</depends-maven-plugin.version>
<org.apache.aries.quiesce.api.version>1.0.1-SNAPSHOT</org.apache.aries.quiesce.api.version>
<org.apache.aries.quiesce.manager.version>1.0.1-SNAPSHOT</org.apache.aries.quiesce.manager.version>
<org.apache.aries.testsupport.unit.version>2.0.0-SNAPSHOT</org.apache.aries.testsupport.unit.version>
<org.apache.aries.util.version>1.2.0-SNAPSHOT</org.apache.aries.util.version>
-
<org.apache.felix.configadmin.version>1.2.4</org.apache.felix.configadmin.version>
-
<org.apache.servicemix.bundles.serp.version>1.13.1_2</org.apache.servicemix.bundles.serp.version>
<org.eclipse.osgi.version>3.22.0</org.eclipse.osgi.version>
<pax-exam.version>4.13.5</pax-exam.version>
- <pax-url-aether.version>2.5.3</pax-url-aether.version>
+ <pax-url-aether.version>2.6.16</pax-url-aether.version>
</properties>
<dependencies>
@@ -79,13 +74,6 @@
<version>${org.apache.aries.testsupport.unit.version}</version>
<scope>test</scope>
</dependency>
- <!--
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
- </dependency>
- -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
@@ -142,43 +130,6 @@
<scope>test</scope>
<version>${org.apache.aries.util.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.configadmin</artifactId>
- <version>${org.apache.felix.configadmin.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${commons-lang.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <scope>test</scope>
- <version>${commons-collections.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- <scope>test</scope>
- <version>${commons-pool.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.serp</artifactId>
- <version>${org.apache.servicemix.bundles.serp.version}</version>
- </dependency>
</dependencies>
<build>
diff --git
a/quiesce/quiesce-manager-itest/src/test/java/org/apache/aries/quiesce/manager/itest/QuiesceManagerTest.java
b/quiesce/quiesce-manager-itest/src/test/java/org/apache/aries/quiesce/manager/itest/QuiesceManagerTest.java
index 60a05b377..3653fff19 100644
---
a/quiesce/quiesce-manager-itest/src/test/java/org/apache/aries/quiesce/manager/itest/QuiesceManagerTest.java
+++
b/quiesce/quiesce-manager-itest/src/test/java/org/apache/aries/quiesce/manager/itest/QuiesceManagerTest.java
@@ -83,7 +83,7 @@ public class QuiesceManagerTest extends
AbstractIntegrationTest {
@Test
public void testNullSafe() throws Exception {
//Check we're null safe
- manager.quiesce(null);
+ manager.quiesce(null);
}
@Test
@@ -106,9 +106,9 @@ public class QuiesceManagerTest extends
AbstractIntegrationTest {
bundleContext.registerService(QuiesceParticipant.class.getName(),
participant1, null);
//Try quiescing the bundle with immediate return
assertEquals("Bundle "+b1.getSymbolicName()+" should be in active
state", Bundle.ACTIVE, b1.getState());
-
+
manager.quiesceWithFuture(1000,bundleList).get(5000,
TimeUnit.MILLISECONDS);
-
+
assertEquals("Participant should have finished once", 1,
participant1.getFinishedCount());
assertTrue("Bundle "+b1.getSymbolicName()+" should not be in active
state", b1.getState() != Bundle.ACTIVE);
}
@@ -128,7 +128,7 @@ public class QuiesceManagerTest extends
AbstractIntegrationTest {
while (System.currentTimeMillis() < timeoutTime && b1.getState() ==
Bundle.ACTIVE){
Thread.sleep(500);
}
-
+
assertEquals("Participant should have started once", 1,
participant2.getStartedCount());
assertEquals("Participant should not have finished", 0,
participant2.getFinishedCount());
assertTrue("Bundle "+b1.getSymbolicName()+" should not be in active
state", b1.getState() != Bundle.ACTIVE);
@@ -143,7 +143,7 @@ public class QuiesceManagerTest extends
AbstractIntegrationTest {
bundleList.add(b1);
assertEquals("Bundle "+b1.getSymbolicName()+" should be in active
state", Bundle.ACTIVE, b1.getState());
-
+
// we should be finishing in about 5000 millis not 10000
manager.quiesceWithFuture(10000,bundleList).get(7000,
TimeUnit.MILLISECONDS);
@@ -162,9 +162,9 @@ public class QuiesceManagerTest extends
AbstractIntegrationTest {
bundleList = new ArrayList<Bundle>();
bundleList.add(b1);
assertEquals("Bundle "+b1.getSymbolicName()+" should be in active
state", Bundle.ACTIVE, b1.getState());
-
+
manager.quiesceWithFuture(10000,bundleList).get(15000,
TimeUnit.MILLISECONDS);
-
+
assertEquals("Participant 1 should have started once", 1,
participant1.getStartedCount());
assertEquals("Participant 1 should finished once", 1,
participant1.getFinishedCount());
assertEquals("Participant 2 should have started once", 1,
participant2.getStartedCount());
@@ -192,7 +192,7 @@ public class QuiesceManagerTest extends
AbstractIntegrationTest {
assertEquals("Participant 3 has started", 1,
participant3.getStartedCount());
assertEquals("Participant 3 has finished", 1,
participant3.getFinishedCount());
}
-
+
@Test
public void testFutureWithWait() throws Exception {
bundleContext.registerService(QuiesceParticipant.class.getName(),
participant2, null);
@@ -295,10 +295,6 @@ public class QuiesceManagerTest extends
AbstractIntegrationTest {
// Bundles
mavenBundle("org.osgi",
"org.osgi.compendium").versionAsInProject(),
mavenBundle("org.apache.aries",
"org.apache.aries.util").versionAsInProject(),
- mavenBundle("commons-lang",
"commons-lang").versionAsInProject(),
- mavenBundle("commons-collections",
"commons-collections").versionAsInProject(),
- mavenBundle("commons-pool",
"commons-pool").versionAsInProject(),
- mavenBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.serp").versionAsInProject(),
mavenBundle("org.apache.aries.quiesce",
"org.apache.aries.quiesce.api").versionAsInProject(),
mavenBundle("org.apache.aries.quiesce",
"org.apache.aries.quiesce.manager").versionAsInProject(),
mavenBundle("org.apache.aries.testsupport",
"org.apache.aries.testsupport.unit").versionAsInProject(),
