diff --git a/README.MD b/README.MD index ed96403e..7400963a 100644 --- a/README.MD +++ b/README.MD @@ -318,6 +318,8 @@ Each Capability's GA coordinates correspond to the GA coordinates of the Compone * [junit:junit-dep](https://search.maven.org/artifact/junit/junit-dep) * [net.java.dev.jna:platform](https://search.maven.org/artifact/net.java.dev.jna/platform) ([JnaPlatformRule](src/main/java/org/gradlex/javaecosystem/capabilities/rules/JnaPlatformRule.java)) * [net.java.dev.jna:jna-platform](https://search.maven.org/artifact/net.java.dev.jna/jna-platform) +* [net.jcip:jcip-annotations](https://search.maven.org/artifact/net.jcip/jcip-annotations) ([JcipAnnotationsRule](src/main/java/org/gradlex/javaecosystem/capabilities/rules/JcipAnnotationsRule.java)) + * [com.github.stephenc.jcip:jcip-annotations](https://search.maven.org/artifact/com.github.stephenc.jcip/jcip-annotations) * [org.bouncycastle:bcmail](https://search.maven.org/artifact/org.bouncycastle/bcmail) ([BouncycastleBcmailRule](src/main/java/org/gradlex/javaecosystem/capabilities/rules/BouncycastleBcmailRule.java)) * [org.bouncycastle:bcmail-fips](https://search.maven.org/artifact/org.bouncycastle/bcmail-fips) * [org.bouncycastle:bcmail-jdk14](https://search.maven.org/artifact/org.bouncycastle/bcmail-jdk14) diff --git a/samples/sample-all-deactivated/build.gradle.kts b/samples/sample-all-deactivated/build.gradle.kts index 1ba20aad..2bc26069 100644 --- a/samples/sample-all-deactivated/build.gradle.kts +++ b/samples/sample-all-deactivated/build.gradle.kts @@ -13,6 +13,7 @@ dependencies { implementation("c3p0:c3p0:0.9.1.2") implementation("cglib:cglib-nodep:3.2.12") implementation("cglib:cglib:3.3.0") + implementation("com.github.stephenc.jcip:jcip-annotations:1.0-1") implementation("com.google.collections:google-collections:1.0") implementation("com.google.guava:guava-jdk5:17.0") implementation("com.google.guava:guava:31.1-jre") @@ -88,6 +89,7 @@ dependencies { implementation("junit:junit:4.12") implementation("net.java.dev.jna:jna-platform:5.10.0") implementation("net.java.dev.jna:platform:3.4.0") + implementation("net.jcip:jcip-annotations:1.0") implementation("org.apache.commons:commons-io:1.3.2") implementation("org.apache.geronimo.javamail:geronimo-javamail_1.3.1_mail:1.1") implementation("org.apache.geronimo.javamail:geronimo-javamail_1.3.1_provider:1.1") diff --git a/samples/sample-all-deactivated/build.out b/samples/sample-all-deactivated/build.out index a77c1f0a..494f93d4 100644 --- a/samples/sample-all-deactivated/build.out +++ b/samples/sample-all-deactivated/build.out @@ -8,6 +8,7 @@ compileClasspath - Compile classpath for source set 'main'. +--- c3p0:c3p0:0.9.1.2 FAILED +--- cglib:cglib-nodep:3.2.12 FAILED +--- cglib:cglib:3.3.0 FAILED ++--- com.github.stephenc.jcip:jcip-annotations:1.0-1 FAILED +--- com.google.collections:google-collections:1.0 FAILED +--- com.google.guava:guava-jdk5:17.0 FAILED +--- com.google.guava:guava:31.1-jre FAILED @@ -83,6 +84,7 @@ compileClasspath - Compile classpath for source set 'main'. +--- junit:junit:4.12 FAILED +--- net.java.dev.jna:jna-platform:5.10.0 FAILED +--- net.java.dev.jna:platform:3.4.0 FAILED ++--- net.jcip:jcip-annotations:1.0 FAILED +--- org.apache.commons:commons-io:1.3.2 FAILED +--- org.apache.geronimo.javamail:geronimo-javamail_1.3.1_mail:1.1 FAILED +--- org.apache.geronimo.javamail:geronimo-javamail_1.3.1_provider:1.1 FAILED diff --git a/samples/sample-all/build.gradle.kts b/samples/sample-all/build.gradle.kts index 13788c06..b3b9ec32 100644 --- a/samples/sample-all/build.gradle.kts +++ b/samples/sample-all/build.gradle.kts @@ -13,6 +13,7 @@ dependencies { implementation("c3p0:c3p0:0.9.1.2") implementation("cglib:cglib-nodep:3.2.12") implementation("cglib:cglib:3.3.0") + implementation("com.github.stephenc.jcip:jcip-annotations:1.0-1") implementation("com.google.collections:google-collections:1.0") implementation("com.google.guava:guava-jdk5:17.0") implementation("com.google.guava:guava:31.1-jre") @@ -88,6 +89,7 @@ dependencies { implementation("junit:junit:4.12") implementation("net.java.dev.jna:jna-platform:5.10.0") implementation("net.java.dev.jna:platform:3.4.0") + implementation("net.jcip:jcip-annotations:1.0") implementation("org.apache.commons:commons-io:1.3.2") implementation("org.apache.geronimo.javamail:geronimo-javamail_1.3.1_mail:1.1") implementation("org.apache.geronimo.javamail:geronimo-javamail_1.3.1_provider:1.1") diff --git a/samples/sample-all/build.out b/samples/sample-all/build.out index d55e0df7..f1c5b6a9 100644 --- a/samples/sample-all/build.out +++ b/samples/sample-all/build.out @@ -14,6 +14,7 @@ compileClasspath - Compile classpath for source set 'main'. +--- cglib:cglib-nodep:3.2.12 -> cglib:cglib:3.3.0 | \--- org.ow2.asm:asm:7.1 -> 9.2 +--- cglib:cglib:3.3.0 (*) ++--- com.github.stephenc.jcip:jcip-annotations:1.0-1 +--- com.google.collections:google-collections:1.0 -> com.google.guava:guava:31.1-jre | +--- com.google.guava:failureaccess:1.0.1 | +--- com.google.code.findbugs:jsr305:3.0.2 @@ -104,6 +105,7 @@ compileClasspath - Compile classpath for source set 'main'. +--- net.java.dev.jna:jna-platform:5.10.0 | \--- net.java.dev.jna:jna:5.10.0 +--- net.java.dev.jna:platform:3.4.0 -> net.java.dev.jna:jna-platform:5.10.0 (*) ++--- net.jcip:jcip-annotations:1.0 -> com.github.stephenc.jcip:jcip-annotations:1.0-1 +--- org.apache.commons:commons-io:1.3.2 -> commons-io:commons-io:2.11.0 +--- org.apache.geronimo.javamail:geronimo-javamail_1.3.1_mail:1.1 -> org.apache.geronimo.javamail:geronimo-javamail_1.4_mail:1.8.4 +--- org.apache.geronimo.javamail:geronimo-javamail_1.3.1_provider:1.1 -> org.apache.geronimo.javamail:geronimo-javamail_1.4_mail:1.8.4 diff --git a/src/main/java/org/gradlex/javaecosystem/capabilities/JavaEcosystemCapabilitiesPlugin.java b/src/main/java/org/gradlex/javaecosystem/capabilities/JavaEcosystemCapabilitiesPlugin.java index 4442464d..157b7476 100644 --- a/src/main/java/org/gradlex/javaecosystem/capabilities/JavaEcosystemCapabilitiesPlugin.java +++ b/src/main/java/org/gradlex/javaecosystem/capabilities/JavaEcosystemCapabilitiesPlugin.java @@ -77,6 +77,7 @@ import org.gradlex.javaecosystem.capabilities.rules.JavaxWsRsApiRule; import org.gradlex.javaecosystem.capabilities.rules.JavaxXmlBindApiRule; import org.gradlex.javaecosystem.capabilities.rules.JavaxXmlWsApiRule; +import org.gradlex.javaecosystem.capabilities.rules.JcipAnnotationsRule; import org.gradlex.javaecosystem.capabilities.rules.JnaPlatformRule; import org.gradlex.javaecosystem.capabilities.rules.JtsCoreRule; import org.gradlex.javaecosystem.capabilities.rules.JtsRule; @@ -200,6 +201,7 @@ private void registerCapabilityRules(ComponentMetadataHandler components, Set variant.withCapabilities(capabilities -> capabilities.addCapability( + CAPABILITY_GROUP, CAPABILITY_NAME, version + ))); + } +}