Adds Feature eclipse#1568 - [OSGi] Opting in to Service Loader Mediator

.github/workflows/pull-request.yml

@@ -36,7 +36,7 @@ jobs:
           distribution: 'zulu'
           java-version: ${{ matrix.java-version }}
       - name: Unit-Test
-        run: ./mvnw verify --projects '!p2-repository,!org.eclipse.collections:org.eclipse.collections'
+        run: ./mvnw verify
         env:
           MAVEN_OPTS: "-Xmx1g"
 
@@ -60,7 +60,7 @@ jobs:
       - run: mvn --non-recursive wrapper:wrapper -Dmaven=3.9.6
       - run: java --version
       - name: Unit-Test
-        run: ./mvnw verify --projects '!p2-repository,!org.eclipse.collections:org.eclipse.collections'
+        run: ./mvnw verify
         env:
           MAVEN_OPTS: "-Xmx2g"
 
@@ -123,11 +123,11 @@ jobs:
           distribution: 'zulu'
           java-version: 11
       - name: JavaDoc Aggregate
-        run: ./mvnw -Dsurefire.useFile=false -DskipTests -Denforcer.skip=true clean install javadoc:aggregate --projects '!unit-tests,!serialization-tests,!jcstress-tests,!junit-trait-runner,!unit-tests-java8,!test-coverage,!p2-repository,!org.eclipse.collections:org.eclipse.collections'
+        run: ./mvnw -Dsurefire.useFile=false -DskipTests -Denforcer.skip=true clean install javadoc:aggregate --projects '!unit-tests,!serialization-tests,!jcstress-tests,!junit-trait-runner,!unit-tests-java8,!test-coverage'
         env:
           MAVEN_OPTS: "-Xmx1g"
       - name: JavaDoc Jar
-        run: ./mvnw -Dsurefire.useFile=false -DskipTests -Denforcer.skip=true clean install javadoc:jar --projects '!unit-tests,!serialization-tests,!jcstress-tests,!junit-trait-runner,!unit-tests-java8,!test-coverage,!p2-repository,!org.eclipse.collections:org.eclipse.collections'
+        run: ./mvnw -Dsurefire.useFile=false -DskipTests -Denforcer.skip=true clean install javadoc:jar --projects '!unit-tests,!serialization-tests,!jcstress-tests,!junit-trait-runner,!unit-tests-java8,!test-coverage'
         env:
           MAVEN_OPTS: "-Xmx1g"
 
@@ -151,6 +151,6 @@ jobs:
       - run: mvn --non-recursive wrapper:wrapper -Dmaven=3.9.6
       - run: java --version
       - name: Javadoc
-        run: ./mvnw -Dsurefire.useFile=false -DskipTests -Denforcer.skip=true clean install javadoc:aggregate --projects '!unit-tests,!serialization-tests,!jcstress-tests,!junit-trait-runner,!unit-tests-java8,!test-coverage,!p2-repository,!org.eclipse.collections:org.eclipse.collections'
+        run: ./mvnw -Dsurefire.useFile=false -DskipTests -Denforcer.skip=true clean install javadoc:aggregate --projects '!unit-tests,!serialization-tests,!jcstress-tests,!junit-trait-runner,!unit-tests-java8,!test-coverage'
         env:
           MAVEN_OPTS: "-Xmx2g"

eclipse-collections-api/bnd.bnd

@@ -1,6 +1,10 @@
-package-version=${version;===;${Bundle-Version}}
+package-version=${versionmask;===;${Bundle-Version}}
 
-Automatic-Module-Name: org.eclipse.collections.api
+-jpms-module-info: org.eclipse.collections.api;version="${package-version}"
 Bundle-SymbolicName: org.eclipse.collections.api
 Export-Package: \
   *;version="${package-version}"
+
+Require-Capability: \
+  osgi.extender;\
+    filter:="(&(osgi.extender=osgi.serviceloader.processor)(version>=1.0)(!(version>=2.0)))"

eclipse-collections-code-generator-maven-plugin/pom.xml

@@ -50,13 +50,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-model</artifactId>
-            <version>3.9.0</version>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.maven.plugin-tools</groupId>
             <artifactId>maven-plugin-annotations</artifactId>

eclipse-collections-code-generator/src/main/resources/api/map/mutablePrimitiveObjectMap.stg

@@ -186,7 +186,7 @@ public interface Mutable<name>ObjectMap\<V> extends <name>ObjectMap\<V>, Mutable
      * Puts all of the key/value mappings from the specified pairs into this map. If this
      * map already has a value associated with one of the keys in the pairs, it will be
      * replaced with the value in the pair.
-     * @param iterable the pairs to put into this map
+     * @param keyValuePairs the pairs to put into this map
      * @return this map
      * @see #putPair(<name>ObjectPair)
      */

eclipse-collections-code-generator/src/main/resources/api/map/mutablePrimitivePrimitiveMap.stg

@@ -204,7 +204,7 @@ public interface Mutable<name1><name2>Map extends <name1><name2>Map, Mutable<nam
      * Puts all of the key/value mappings from the specified pairs into this map. If this
      * map already has a value associated with one of the keys in the pairs, it will be
      * replaced with the value in the pair.
-     * @param iterable the pairs to put into this map
+     * @param keyValuePairs the pairs to put into this map
      * @return this map
      * @see #putPair(<name1><name2>Pair)
      */

eclipse-collections-code-generator/src/main/resources/api/map/objectPrimitiveMap.stg

@@ -111,7 +111,7 @@ public interface Object<name>Map\<K> extends <name>Iterable
 
     /**
      * Implements the injectInto pattern with each key/value pair of the map.
-     * @param value to be injected into the map
+     * @param injectedValue value to be injected into the map
      * @param function to apply to the injected value and key/value pairs
      * @return result of injecting the injectedValue into the map
      * @since 11.1

eclipse-collections-code-generator/src/main/resources/api/map/primitiveObjectMap.stg

@@ -76,7 +76,7 @@ public interface <name>ObjectMap\<V> extends PrimitiveObjectMap\<V>
 
     /**
      * Implements the injectInto pattern with each key/value pair of the map.
-     * @param value to be injected into the map
+     * @param injectedValue value to be injected into the map
      * @param function to apply to the injected value and key/value pairs
      * @return result of injecting the injectedValue into the map
      * @since 11.1

eclipse-collections-code-generator/src/main/resources/api/map/primitivePrimitiveMap.stg

@@ -92,7 +92,7 @@ public interface <name1><name2>Map extends <name2>ValuesMap
 
     /**
      * Implements the injectInto pattern with each key/value pair of the map.
-     * @param value to be injected into the map
+     * @param injectedValue value to be injected into the map
      * @param function to apply to the injected value and key/value pairs
      * @return result of injecting the injectedValue into the map
      * @since 11.1

eclipse-collections-code-generator/src/main/resources/impl/bag/immutable/immutablePrimitiveBagFactoryImpl.stg

@@ -27,6 +27,7 @@ import org.eclipse.collections.impl.factory.primitive.<name>Bags;
  *
  * @since 4.0.
  */
+@aQute.bnd.annotation.spi.ServiceProvider(Immutable<name>BagFactory.class)
 public class Immutable<name>BagFactoryImpl implements Immutable<name>BagFactory
 {
     public static final Immutable<name>BagFactory INSTANCE = new Immutable<name>BagFactoryImpl();

eclipse-collections-code-generator/src/main/resources/impl/bag/mutable/mutablePrimitiveBagFactoryImpl.stg

@@ -26,6 +26,7 @@ import org.eclipse.collections.impl.utility.Iterate;
  *
  * @since 6.0.
  */
+@aQute.bnd.annotation.spi.ServiceProvider(Mutable<name>BagFactory.class)
 public class Mutable<name>BagFactoryImpl implements Mutable<name>BagFactory
 {
     public static final Mutable<name>BagFactory INSTANCE = new Mutable<name>BagFactoryImpl();

eclipse-collections-code-generator/src/main/resources/impl/list/immutable/immutablePrimitiveListFactoryImpl.stg

@@ -25,6 +25,7 @@ import org.eclipse.collections.impl.factory.primitive.<name>Lists;
  *
  * @since 3.2.
  */
+@aQute.bnd.annotation.spi.ServiceProvider(Immutable<name>ListFactory.class)
 public class Immutable<name>ListFactoryImpl implements Immutable<name>ListFactory
 {
     public static final Immutable<name>ListFactory INSTANCE = new Immutable<name>ListFactoryImpl();

eclipse-collections-code-generator/src/main/resources/impl/list/mutable/mutablePrimitiveListFactoryImpl.stg

@@ -26,6 +26,7 @@ import org.eclipse.collections.impl.utility.Iterate;
  *
  * @since 6.0.
  */
+@aQute.bnd.annotation.spi.ServiceProvider(Mutable<name>ListFactory.class)
 public class Mutable<name>ListFactoryImpl implements Mutable<name>ListFactory
 {
     public static final Mutable<name>ListFactory INSTANCE = new Mutable<name>ListFactoryImpl();

eclipse-collections-code-generator/src/main/resources/impl/map/immutable/immutableObjectPrimitiveMapFactoryImpl.stg

@@ -27,6 +27,7 @@ import org.eclipse.collections.impl.factory.primitive.Object<name>Maps;
  *
  * @since 4.0.
  */
+@aQute.bnd.annotation.spi.ServiceProvider(ImmutableObject<name>MapFactory.class)
 public class ImmutableObject<name>MapFactoryImpl implements ImmutableObject<name>MapFactory
 {
     public static final ImmutableObject<name>MapFactory INSTANCE = new ImmutableObject<name>MapFactoryImpl();

eclipse-collections-code-generator/src/main/resources/impl/map/immutable/immutablePrimitiveObjectMapFactoryImpl.stg

@@ -28,6 +28,7 @@ import org.eclipse.collections.impl.factory.primitive.<name>ObjectMaps;
  *
  * @since 4.0.
  */
+@aQute.bnd.annotation.spi.ServiceProvider(Immutable<name>ObjectMapFactory.class)
 public class Immutable<name>ObjectMapFactoryImpl implements Immutable<name>ObjectMapFactory
 {
     public static final Immutable<name>ObjectMapFactory INSTANCE = new Immutable<name>ObjectMapFactoryImpl();

eclipse-collections-code-generator/src/main/resources/impl/map/immutable/immutablePrimitivePrimitiveMapFactoryImpl.stg

@@ -30,6 +30,7 @@ import org.eclipse.collections.impl.factory.primitive.<name1><name2>Maps;
  *
  * @since 4.0.
  */
+@aQute.bnd.annotation.spi.ServiceProvider(Immutable<name1><name2>MapFactory.class)
 public class Immutable<name1><name2>MapFactoryImpl implements Immutable<name1><name2>MapFactory
 {
     public static final Immutable<name1><name2>MapFactory INSTANCE = new Immutable<name1><name2>MapFactoryImpl();

eclipse-collections-code-generator/src/main/resources/impl/map/mutable/mutableObjectPrimitiveHashingStrategyMapFactoryImpl.stg

@@ -23,6 +23,7 @@ import org.eclipse.collections.api.map.primitive.MutableObject<name>Map;
  *
  * @since 11.1.
  */
+@aQute.bnd.annotation.spi.ServiceProvider(MutableObject<name>HashingStrategyMapFactory.class)
 public class MutableObject<name>HashingStrategyMapFactoryImpl implements MutableObject<name>HashingStrategyMapFactory
 {
     public static final MutableObject<name>HashingStrategyMapFactory INSTANCE = new MutableObject<name>HashingStrategyMapFactoryImpl();

eclipse-collections-code-generator/src/main/resources/impl/map/mutable/mutableObjectPrimitiveMapFactoryImpl.stg

@@ -27,6 +27,7 @@ import org.eclipse.collections.impl.utility.Iterate;
  *
  * @since 6.0.
  */
+@aQute.bnd.annotation.spi.ServiceProvider(MutableObject<name>MapFactory.class)
 public class MutableObject<name>MapFactoryImpl implements MutableObject<name>MapFactory
 {
     public static final MutableObject<name>MapFactory INSTANCE = new MutableObject<name>MapFactoryImpl();

eclipse-collections-code-generator/src/main/resources/impl/map/mutable/mutablePrimitiveObjectMapFactoryImpl.stg

@@ -29,6 +29,7 @@ import org.eclipse.collections.impl.utility.Iterate;
  *
  * @since 6.0.
  */
+@aQute.bnd.annotation.spi.ServiceProvider(Mutable<name>ObjectMapFactory.class)
 public class Mutable<name>ObjectMapFactoryImpl implements Mutable<name>ObjectMapFactory
 {
     public static final Mutable<name>ObjectMapFactory INSTANCE = new Mutable<name>ObjectMapFactoryImpl();

eclipse-collections-code-generator/src/main/resources/impl/map/mutable/mutablePrimitivePrimitiveMapFactoryImpl.stg

@@ -31,6 +31,7 @@ import org.eclipse.collections.impl.utility.Iterate;
  *
  * @since 6.0.
  */
+@aQute.bnd.annotation.spi.ServiceProvider(Mutable<name1><name2>MapFactory.class)
 public class Mutable<name1><name2>MapFactoryImpl implements Mutable<name1><name2>MapFactory
 {
     public static final Mutable<name1><name2>MapFactory INSTANCE = new Mutable<name1><name2>MapFactoryImpl();

eclipse-collections-code-generator/src/main/resources/impl/set/immutable/immutablePrimitiveSetFactoryImpl.stg

@@ -27,6 +27,7 @@ import org.eclipse.collections.impl.factory.primitive.<name>Sets;
  *
  * @since 4.0.
  */
+@aQute.bnd.annotation.spi.ServiceProvider(Immutable<name>SetFactory.class)
 public class Immutable<name>SetFactoryImpl implements Immutable<name>SetFactory
 {
     public static final Immutable<name>SetFactory INSTANCE = new Immutable<name>SetFactoryImpl();

eclipse-collections-code-generator/src/main/resources/impl/set/mutable/mutablePrimitiveSetFactoryImpl.stg

@@ -26,6 +26,7 @@ import org.eclipse.collections.impl.utility.Iterate;
  *
  * @since 6.0.
  */
+@aQute.bnd.annotation.spi.ServiceProvider(Mutable<name>SetFactory.class)
 public class Mutable<name>SetFactoryImpl implements Mutable<name>SetFactory
 {
     public static final Mutable<name>SetFactory INSTANCE = new Mutable<name>SetFactoryImpl();

eclipse-collections-code-generator/src/main/resources/impl/stack/immutable/immutablePrimitiveStackFactoryImpl.stg

@@ -25,6 +25,7 @@ import org.eclipse.collections.impl.factory.primitive.<name>Stacks;
  *
  * @since 4.0.
  */
+@aQute.bnd.annotation.spi.ServiceProvider(Immutable<name>StackFactory.class)
 public class Immutable<name>StackFactoryImpl implements Immutable<name>StackFactory
 {
     public static final Immutable<name>StackFactory INSTANCE = new Immutable<name>StackFactoryImpl();

eclipse-collections-code-generator/src/main/resources/impl/stack/mutable/mutablePrimitiveStackFactoryImpl.stg

@@ -26,6 +26,7 @@ import org.eclipse.collections.impl.utility.Iterate;
  *
  * @since 6.0.
  */
+@aQute.bnd.annotation.spi.ServiceProvider(Mutable<name>StackFactory.class)
 public class Mutable<name>StackFactoryImpl implements Mutable<name>StackFactory
 {
     public static final Mutable<name>StackFactory INSTANCE = new Mutable<name>StackFactoryImpl();