Skip to content

Commit

Permalink
Adds Feature #1568 - [OSGi] Opting in to Service Loader Mediator
Browse files Browse the repository at this point in the history
  • Loading branch information
fipro78 committed May 23, 2024
1 parent efdfcd0 commit 6762424
Show file tree
Hide file tree
Showing 98 changed files with 242 additions and 372 deletions.
43 changes: 43 additions & 0 deletions .github/workflows/earlyaccess-javadoc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# This workflow will build a Java project with Maven
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven

name: JDK-EA Javadoc

on: [push, pull_request]

jobs:
applications:
name: Unit Test EA
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest]
java-version: [23]

runs-on: ${{ matrix.os }}

steps:
- name: Git Checkout
uses: actions/checkout@v4
- name: Download JDK ${{ matrix.java-version }} from jdk.java.net
uses: oracle-actions/setup-java@v1
id: download-jdk
with:
website: jdk.java.net
release: ${{ matrix.java-version }}
- name: 'Print outputs'
shell: bash
run: |
echo 'Outputs'
echo "steps.download-jdk.outputs.archive = ${{ steps.download-jdk.outputs.archive }}"
echo "steps.download-jdk.outputs.version = ${{ steps.download-jdk.outputs.version }}"
- name: Set Maven Wrapper
run: mvn -N wrapper:wrapper -Dmaven=3.6.3 --no-transfer-progress
- name: 'JDK Version'
run: java --version
- name: Build Generator
run: ./mvnw -Dsurefire.useFile=false -DskipTests -Denforcer.skip=true clean install -pl 'eclipse-collections-code-generator,eclipse-collections-code-generator-maven-plugin' --no-transfer-progress
- name: Javadoc
run: ./mvnw -Dsurefire.useFile=false -DskipTests -Denforcer.skip=true clean javadoc:aggregate install -pl '!unit-tests,!serialization-tests,!jcstress-tests,!junit-trait-runner,!unit-tests-java8,!test-coverage' --no-transfer-progress
env:
MAVEN_OPTS: "-Xmx2g"
10 changes: 5 additions & 5 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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"

Expand Down Expand Up @@ -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 javadoc:aggregate verify --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"

Expand All @@ -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 javadoc:aggregate verify --projects '!unit-tests,!serialization-tests,!jcstress-tests,!junit-trait-runner,!unit-tests-java8,!test-coverage'
env:
MAVEN_OPTS: "-Xmx2g"
8 changes: 6 additions & 2 deletions eclipse-collections-api/bnd.bnd
Original file line number Diff line number Diff line change
@@ -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)))"
7 changes: 0 additions & 7 deletions eclipse-collections-code-generator-maven-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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)
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

0 comments on commit 6762424

Please sign in to comment.