ARIES-2178: Remove CompositeBundle usage in aries.util

.github/dependabot.yaml

@@ -61,9 +61,6 @@ updates:
       - dependency-name: "org.mockito:mockito*"
         versions:
           - ">=5.0.0" # does not support java 8
-      - dependency-name: "org.eclipse:osgi" # should be upgraded to org.eclipse.platform:org.eclipse.osgi
-        versions:
-          - ">=3.9.1" # higher version removed CompositeBundle used by some artifacts
       - dependency-name: "org.ops4j.pax.cdi:pax-cdi*"
         versions:
           - ">=1.0.0" # pax-cdi is only used in blueprint maven plugin as an optional annotation provider and it's changed in version 1.x in incompatible way - blueprint-maven-plugin-annotation should be used instead since provides annotations more focused on blueprint elements

.github/workflows/subsystem.yml

@@ -17,9 +17,11 @@ on:
     paths:
       - parent/**
       - testsupport/**
+      - proxy/**
       - versioning/**
       - util/**
-      - application/**
+      - quiesce/**
+      - blueprint/**
       - subsystem/**
       - .github/workflows/subsystem.yml
   push:
@@ -53,12 +55,21 @@ jobs:
     - name: Build testsupport
       shell: bash
       run: mvn -U -e -B -ntp -Dmaven.test.skip=true clean install -f testsupport
+    - name: Build proxy
+      shell: bash
+      run: mvn -U -e -B -ntp -Dmaven.test.skip=true clean install -f proxy
     - name: Build versioning
       shell: bash
       run: mvn -V -U -e -B -ntp -Dmaven.test.skip=true clean install -f versioning
     - name: Build util
       shell: bash
       run: mvn -V -U -e -B -ntp -Dmaven.test.skip=true clean install -f util
+    - name: Build quiesce
+      shell: bash
+      run: mvn -V -U -e -B -ntp -Dmaven.test.skip=true clean install -f quiesce
+    - name: Build blueprint
+      shell: bash
+      run: mvn -V -U -e -B -ntp -Dmaven.test.skip=true clean install -f blueprint
     - name: Build subsystem
       shell: bash
       run: mvn -U -e -B -ntp clean install -f subsystem

blueprint/blueprint-core/pom.xml

@@ -108,7 +108,7 @@
         <proxy.api.version>1.1.1</proxy.api.version>
         <proxy.impl.version>1.1.9</proxy.impl.version>
         <quiesce.api.version>1.0.0</quiesce.api.version>
-        <util.version>1.1.3</util.version>
+        <util.version>2.0.0-SNAPSHOT</util.version>
         <slf4j.version>2.0.17</slf4j.version>
     </properties>
 

blueprint/blueprint-parent/pom.xml

@@ -55,7 +55,7 @@
         <blueprint.cm.dev.version>1.3.3-SNAPSHOT</blueprint.cm.dev.version>
         <blueprint.core.dev.version>1.10.4-SNAPSHOT</blueprint.core.dev.version>
         <blueprint.jexl.evaluator.dev.version>1.1.1-SNAPSHOT</blueprint.jexl.evaluator.dev.version>
-        <blueprint.noosgi.dev.version>1.2.0-SNAPSHOT</blueprint.noosgi.dev.version>
+        <blueprint.noosgi.dev.version>2.0.0-SNAPSHOT</blueprint.noosgi.dev.version>
         <blueprint.parser.dev.version>1.6.2-SNAPSHOT</blueprint.parser.dev.version>
         <blueprint.sample.dev.version>1.0.1-SNAPSHOT</blueprint.sample.dev.version>
         <blueprint.sample.fragment.dev.version>1.0.1-SNAPSHOT</blueprint.sample.fragment.dev.version>

blueprint/blueprint-repository/pom.xml

@@ -42,7 +42,7 @@
         <bnd-indexer-maven-plugin.version>6.4.0</bnd-indexer-maven-plugin.version>
         <org.apache.aries.proxy.api.version>1.0.1</org.apache.aries.proxy.api.version>
         <org.apache.aries.proxy.impl.version>1.0.6</org.apache.aries.proxy.impl.version>
-        <org.apache.aries.util.version>1.1.3</org.apache.aries.util.version>
+        <org.apache.aries.util.version>2.0.0-SNAPSHOT</org.apache.aries.util.version>
     </properties>
 
     <profiles>

blueprint/blueprint-web/pom.xml

@@ -48,7 +48,7 @@
         <lastReleaseVersion>1.1.1</lastReleaseVersion>
 
         <blueprint.noosgi.version>1.1.0</blueprint.noosgi.version>
-        <blueprint.nosgi.version>1.2.0-SNAPSHOT</blueprint.nosgi.version>
+        <blueprint.nosgi.version>2.0.0-SNAPSHOT</blueprint.nosgi.version>
         <blueprint.parser.version>1.5.0</blueprint.parser.version>
         <geronimo-servlet_2.5_spec.version>1.2</geronimo-servlet_2.5_spec.version>
         <slf4j.version>2.0.17</slf4j.version>

jndi/parent/pom.xml

@@ -52,7 +52,7 @@
         <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.2.0-SNAPSHOT</org.apache.aries.util.version>
+        <org.apache.aries.util.version>2.0.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>

quiesce/quiesce-manager-itest/pom.xml

@@ -45,7 +45,7 @@
         <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.aries.util.version>2.0.0-SNAPSHOT</org.apache.aries.util.version>
         <org.eclipse.osgi.version>3.23.0</org.eclipse.osgi.version>
         <pax-exam.version>4.13.5</pax-exam.version>
         <pax-url.version>2.6.16</pax-url.version>
@@ -128,8 +128,8 @@
         <dependency>
             <groupId>org.apache.aries</groupId>
             <artifactId>org.apache.aries.util</artifactId>
-            <scope>test</scope>
             <version>${org.apache.aries.util.version}</version>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 

quiesce/quiesce-manager/pom.xml

@@ -58,7 +58,7 @@
         <lastReleaseVersion>1.0.0</lastReleaseVersion>
 
         <org.apache.aries.quiesce.api.version>1.0.1-SNAPSHOT</org.apache.aries.quiesce.api.version>
-        <org.apache.aries.util.version>1.2.0-SNAPSHOT</org.apache.aries.util.version>
+        <org.apache.aries.util.version>2.0.0-SNAPSHOT</org.apache.aries.util.version>
     </properties>
 
     <dependencies>

samples/ariestrader/assemblies/equinox-test-harness/pom.xml

@@ -30,7 +30,7 @@
     <packaging>pom</packaging>
 
     <properties>
-        <osgi.version>3.5.0.v20090520</osgi.version>
+        <org.eclipse.osgi.version>3.23.0</org.eclipse.osgi.version>
     </properties>
 
     <dependencies>
@@ -39,9 +39,9 @@
             External Dependencies
         -->
         <dependency>
-            <groupId>org.eclipse</groupId>
-            <artifactId>osgi</artifactId>
-            <version>${osgi.version}</version>
+            <groupId>org.eclipse.platform</groupId>
+            <artifactId>org.eclipse.osgi</artifactId>
+            <version>${org.eclipse.osgi.version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.equinox</groupId>

samples/blueprint/helloworld/helloworld-assembly/pom.xml

@@ -29,17 +29,16 @@
     <packaging>pom</packaging>
 
     <properties>
-        <osgi.version>3.5.0.v20090520</osgi.version>
+        <org.eclipse.osgi.version>3.23.0</org.eclipse.osgi.version>
         <cm.version>3.2.0-v20070116</cm.version>
         <services.version>3.1.200-v20070605</services.version>
     </properties>
 
     <dependencies>
-
         <dependency>
-            <groupId>org.eclipse</groupId>
-            <artifactId>osgi</artifactId>
-            <version>${osgi.version}</version>
+            <groupId>org.eclipse.platform</groupId>
+            <artifactId>org.eclipse.osgi</artifactId>
+            <version>${org.eclipse.osgi.version}</version>
         </dependency>
 
         <dependency>

subsystem/subsystem-api/pom.xml

@@ -54,7 +54,7 @@
             *
         </aries.osgi.import>
 
-        <org.apache.aries.util.version>1.2.0-SNAPSHOT</org.apache.aries.util.version>
+        <org.apache.aries.util.version>2.0.0-SNAPSHOT</org.apache.aries.util.version>
         <osgi.annotation.version>8.1.0</osgi.annotation.version>
         <osgi.core.version>6.0.0</osgi.core.version>
         <osgi.enterprise.version>5.0.0</osgi.enterprise.version>

subsystem/subsystem-bundle/pom.xml

@@ -66,7 +66,7 @@
         <org.apache.aries.proxy.version>1.1.0</org.apache.aries.proxy.version>
         <org.apache.aries.subsystem.api.version>2.0.10</org.apache.aries.subsystem.api.version>
         <org.apache.aries.subsystem.core.version>2.0.10</org.apache.aries.subsystem.core.version>
-        <org.apache.aries.util.version>1.2.0-SNAPSHOT</org.apache.aries.util.version>
+        <org.apache.aries.util.version>2.0.0-SNAPSHOT</org.apache.aries.util.version>
         <org.apache.felix.resolver.version>2.0.4</org.apache.felix.resolver.version>
         <org.eclipse.equinox.coordinator.version>1.1.0.v20120522-1841</org.eclipse.equinox.coordinator.version>
         <org.eclipse.equinox.region.version>1.2.101.v20150831-1342</org.eclipse.equinox.region.version>

subsystem/subsystem-core/pom.xml

@@ -68,7 +68,7 @@
 
 
         <org.apache.aries.subsystem.api.version>2.0.10</org.apache.aries.subsystem.api.version>
-        <org.apache.aries.util.version>1.2.0-SNAPSHOT</org.apache.aries.util.version>
+        <org.apache.aries.util.version>2.0.0-SNAPSHOT</org.apache.aries.util.version>
         <org.apache.aries.subsystem.modeller.version>1.0.0-SNAPSHOT</org.apache.aries.subsystem.modeller.version>
         <osgi.core.version>6.0.0</osgi.core.version>
         <osgi.enterprise.version>5.0.0</osgi.enterprise.version>

subsystem/subsystem-itests/pom.xml

@@ -46,14 +46,14 @@
         <maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
         <maven-surefire-plugin.version>3.5.3</maven-surefire-plugin.version>
         <org.apache.aries.subsystem.modeller.version>1.0.0-SNAPSHOT</org.apache.aries.subsystem.modeller.version>
-        <org.apache.aries.blueprint.version>1.2.0</org.apache.aries.blueprint.version>
-        <org.apache.aries.proxy.version>1.1.0</org.apache.aries.proxy.version>
+        <org.apache.aries.blueprint.version>1.10.4-SNAPSHOT</org.apache.aries.blueprint.version>
+        <org.apache.aries.proxy.version>1.1.9</org.apache.aries.proxy.version>
         <org.apache.aries.subsystem.api.version>2.0.11-SNAPSHOT</org.apache.aries.subsystem.api.version>
         <org.apache.aries.subsystem.core.version>2.0.11-SNAPSHOT</org.apache.aries.subsystem.core.version>
         <org.apache.aries.subsystem.itest.interfaces.version>1.0.0-SNAPSHOT</org.apache.aries.subsystem.itest.interfaces.version>
         <org.apache.aries.subsystem.obr.version>1.0.5-SNAPSHOT</org.apache.aries.subsystem.obr.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.aries.util.version>2.0.0-SNAPSHOT</org.apache.aries.util.version>
         <org.apache.felix.bundlerepository.version>2.0.10</org.apache.felix.bundlerepository.version>
         <org.apache.felix.configadmin.version>1.9.26</org.apache.felix.configadmin.version>
         <org.eclipse.equinox.event.version>1.2.200.v20120522-2049</org.eclipse.equinox.event.version>

subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemTest.java

@@ -118,7 +118,7 @@ public Option baseOptions() {
         return composite(
                 junitBundles(),
                 addPaxLoggingBundles(),
-                setPaxExamLogLevel("INFO"),
+                setPaxExamLogLevel("DEBUG"),
                 configurePaxUrlLocalMavenRepoIfNeeded(),
                 setupRemoteDebugging()
          );

subsystem/subsystem-modeller/pom.xml

@@ -57,10 +57,10 @@
 <!--        <lastReleaseVersion>1.0.0</lastReleaseVersion>-->
         <org.apache.aries.versioning.plugin.version>0.3.2-SNAPSHOT</org.apache.aries.versioning.plugin.version>
 
-        <org.apache.aries.blueprint.core.version>1.2.0</org.apache.aries.blueprint.core.version>
+        <org.apache.aries.blueprint.core.version>1.10.4-SNAPSHOT</org.apache.aries.blueprint.core.version>
         <org.apache.aries.jndi.api.version>1.0.0</org.apache.aries.jndi.api.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.aries.util.version>2.0.0-SNAPSHOT</org.apache.aries.util.version>
         <osgi.cmpn.version>4.3.1</osgi.cmpn.version>
         <osgi.core.version>4.3.1</osgi.core.version>
     </properties>
@@ -85,6 +85,11 @@
             <artifactId>org.apache.aries.blueprint.core</artifactId>
             <version>${org.apache.aries.blueprint.core.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.aries</groupId>
+            <artifactId>org.apache.aries.util</artifactId>
+            <version>${org.apache.aries.util.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>org.osgi</groupId>
@@ -111,8 +116,8 @@
         <dependency>
             <groupId>org.apache.aries.testsupport</groupId>
             <artifactId>org.apache.aries.testsupport.unit</artifactId>
-            <scope>test</scope>
             <version>${org.apache.aries.testsupport.unit.version}</version>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 

subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ImportedServiceImpl.java

@@ -102,7 +102,7 @@ private Filter generateAttributeFilter (Map<String, String> attrsToPopulate) thr
           reducedBlueprintFilter = _blueprintFilter;
         }
 
-        attrsToPopulate.put(ManifestHeaderProcessor.NESTED_FILTER_ATTRIBUTE, reducedBlueprintFilter);
+        attrsToPopulate.put(ManifestHeaderProcessor.NESTED_FILTER_ATTRIBUTE_TO_USE_WITHOUT_FORMATTING, reducedBlueprintFilter);
       }
       if (_componentName != null) { 
         attrsToPopulate.put ("osgi.service.blueprint.compname", _componentName);

subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/impl/ParserProxyTest.java

@@ -69,7 +69,7 @@ public static ParserProxy getMockParserServiceProxy() {
       BundleContext mockCtx = Skeleton.newMock(new BundleContextMock(), BundleContext.class);
       NamespaceHandlerRegistry nhri = new NamespaceHandlerRegistryImpl (mockCtx);
 
-      ParserService parserService = new ParserServiceImpl(nhri);
+      ParserService parserService = new ParserServiceImpl(nhri, true);
       mockCtx.registerService(ParserService.class.getName(), parserService, new Hashtable<String, String>());
 
       ParserProxyImpl parserProxyService = new ParserProxyImpl();

util/pom.xml

@@ -30,7 +30,7 @@
 
     <artifactId>org.apache.aries.util</artifactId>
     <packaging>bundle</packaging>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <name>Apache Aries Util</name>
     <description>
         This bundle contains the OSGi common util for Apache Aries
@@ -52,9 +52,7 @@
             org.osgi.framework.launch;resolution:=optional,
             org.osgi.framework.wiring.*;resolution:=optional,
             org.osgi.service.framework;resolution:=optional,
-            org.eclipse.osgi.internal.loader;resolution:=optional,
             org.eclipse.osgi.framework.internal.core;resolution:=optional,
-            org.eclipse.osgi.framework.adaptor;resolution:=optional,
             org.osgi.service.log;resolution:=optional,
             *
         </aries.osgi.import.pkg>
@@ -68,7 +66,7 @@
 
         <maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version>
         <org.apache.aries.testsupport.unit.version>1.0.0</org.apache.aries.testsupport.unit.version>
-        <osgi.version>3.9.1-v20140110-1610</osgi.version>
+        <org.eclipse.osgi.version>3.23.0</org.eclipse.osgi.version>
     </properties>
 
     <dependencies>
@@ -83,9 +81,9 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.eclipse</groupId>
-            <artifactId>osgi</artifactId>
-            <version>${osgi.version}</version>
+            <groupId>org.eclipse.platform</groupId>
+            <artifactId>org.eclipse.osgi</artifactId>
+            <version>${org.eclipse.osgi.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

util/src/main/java/org/apache/aries/util/manifest/ManifestHeaderProcessor.java

@@ -36,11 +36,6 @@
 
 public class ManifestHeaderProcessor
 {
-    /**
-     * @deprecated use {@link #NESTED_FILTER_ATTRIBUTE_TO_USE_WITHOUT_FORMATTING}
-     */
-    @Deprecated
-  public static final String NESTED_FILTER_ATTRIBUTE = "org.apache.aries.application.filter.attribute";
   public static final String NESTED_FILTER_ATTRIBUTE_TO_USE_WITHOUT_FORMATTING = "org.apache.aries.manifestheaderprocessor.filter.attribute";
   private static final Pattern FILTER_ATTR = Pattern.compile("(\\(!)?\\((.*?)([<>]?=)(.*?)\\)\\)?");
   private static final String LESS_EQ_OP = "<=";
@@ -569,7 +564,7 @@ public static String generateFilter(Map<String, String> attribs) {
 				}
 				filter.append(")");
 
-			} else if (NESTED_FILTER_ATTRIBUTE.equals(attribName) || NESTED_FILTER_ATTRIBUTE_TO_USE_WITHOUT_FORMATTING.equals(attribName)) {
+			} else if (NESTED_FILTER_ATTRIBUTE_TO_USE_WITHOUT_FORMATTING.equals(attribName)) {
 				// Filters go in whole, no formatting needed
 				realAttrib = true;
 				filter.append(attrib.getValue());