Skip to content

Commit 3d638db

Browse files
jjohannesjjohannes
committed
Add rule for 'javax.inject:javax.inject'
1 parent 0efce9f commit 3d638db

File tree

5 files changed

+34
-3
lines changed

5 files changed

+34
-3
lines changed

‎README.MD‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,8 @@ Each Capability's GA coordinates correspond to the GA coordinates of the Compone
111111
* [javax.el:el-api](https://mvnrepository.com/artifact/javax.el/el-api) ([JakartaElApiRule](plugin/src/main/java/de/jjohannes/gradle/javaecosystem/capabilities/rules/JakartaElApiRule.java))
112112
* [jakarta.el:jakarta.el-api](https://mvnrepository.com/artifact/jakarta.el/jakarta.el-api)
113113
* [javax.el:javax.el-api](https://mvnrepository.com/artifact/javax.el/javax.el-api)
114+
* [javax.inject:javax.inject](https://mvnrepository.com/artifact/javax.inject/javax.inject) ([JakartaInjectApiRule](plugin/src/main/java/de/jjohannes/gradle/javaecosystem/capabilities/rules/JakartaInjectApiRule.java))
115+
* [jakarta.inject:jakarta.inject-api](https://mvnrepository.com/artifact/jakarta.inject/jakarta.inject-api)
114116
* [javax.jws:javax.jws-api](https://mvnrepository.com/artifact/javax.jws/javax.jws-api) ([JakartaJwsApisRule](plugin/src/main/java/de/jjohannes/gradle/javaecosystem/capabilities/rules/JakartaJwsApisRule.java))
115117
* [jakarta.jws:jakarta.jws-api](https://mvnrepository.com/artifact/jakarta.jws/jakarta.jws-api)
116118
* [javax.mail:mail](https://mvnrepository.com/artifact/javax.mail/mail) ([JakartaMailApiRule](plugin/src/main/java/de/jjohannes/gradle/javaecosystem/capabilities/rules/JakartaMailApiRule.java))

‎plugin/src/main/java/de/jjohannes/gradle/javaecosystem/capabilities/JavaEcosystemCapabilitiesPlugin.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ private void registerRules(ComponentMetadataHandler components) {
3434
for (String module : JakartaAnnotationApiRule.MODULES) { components.withModule(module, JakartaAnnotationApiRule.class); }
3535
for (String module : JakartaEjbApiRule.MODULES) { components.withModule(module, JakartaEjbApiRule.class); }
3636
for (String module : JakartaElApiRule.MODULES) { components.withModule(module, JakartaElApiRule.class); }
37+
for (String module : JakartaInjectApiRule.MODULES) { components.withModule(module, JakartaInjectApiRule.class); }
3738
for (String module : JakartaJwsApisRule.MODULES) { components.withModule(module, JakartaJwsApisRule.class); }
3839
for (String module : JakartaMailApiRule.MODULES) { components.withModule(module, JakartaMailApiRule.class); }
3940
for (String module : JakartaPersistenceApiRule.MODULES) { components.withModule(module, JakartaPersistenceApiRule.class); }
@@ -58,6 +59,7 @@ private void defineStrategies(CapabilitiesResolution resolution) {
5859
selectHighestVersion(resolution, JakartaAnnotationApiRule.CAPABILITY_GROUP, JakartaAnnotationApiRule.CAPABILITY_NAME);
5960
selectHighestVersion(resolution, JakartaEjbApiRule.CAPABILITY_GROUP, JakartaEjbApiRule.CAPABILITY_NAME);
6061
selectHighestVersion(resolution, JakartaElApiRule.CAPABILITY_GROUP, JakartaElApiRule.CAPABILITY_NAME);
62+
selectHighestVersion(resolution, JakartaInjectApiRule.CAPABILITY_GROUP, JakartaInjectApiRule.CAPABILITY_NAME);
6163
selectHighestVersion(resolution, JakartaJwsApisRule.CAPABILITY_GROUP, JakartaJwsApisRule.CAPABILITY_NAME);
6264
selectHighestVersion(resolution, JakartaMailApiRule.CAPABILITY_GROUP, JakartaMailApiRule.CAPABILITY_NAME);
6365
selectHighestVersion(resolution, JakartaPersistenceApiRule.CAPABILITY_GROUP, JakartaPersistenceApiRule.CAPABILITY_NAME);

‎plugin/src/main/java/de/jjohannes/gradle/javaecosystem/capabilities/rules/JakartaInjectApiRule.java‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
package de.jjohannes.gradle.javaecosystem.capabilities.rules;
2+
3+
import org.gradle.api.artifacts.CacheableRule;
4+
import org.gradle.api.artifacts.ComponentMetadataContext;
5+
import org.gradle.api.artifacts.ComponentMetadataRule;
6+
7+
@CacheableRule
8+
public abstract class JakartaInjectApiRule implements ComponentMetadataRule {
9+
10+
public static final String CAPABILITY_GROUP = "javax.inject";
11+
public static final String CAPABILITY_NAME = "javax.inject";
12+
13+
public static final String[] MODULES = {
14+
"jakarta.inject:jakarta.inject-api"
15+
};
16+
17+
@Override
18+
public void execute(ComponentMetadataContext context) {
19+
String version = context.getDetails().getId().getVersion();
20+
context.getDetails().allVariants(variant -> variant.withCapabilities(capabilities -> capabilities.addCapability(
21+
CAPABILITY_GROUP, CAPABILITY_NAME, version
22+
)));
23+
}
24+
}

‎samples/sample-all/build.gradle.kts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ plugins {
44
}
55

66
dependencies {
7-
implementation("org.ow2.asm:asm:9.2")
87
implementation("asm:asm:3.3.1")
98
implementation("c3p0:c3p0:0.9.1.2")
109
implementation("cglib:cglib-nodep:3.2.12")
@@ -17,6 +16,7 @@ dependencies {
1716
implementation("jakarta.annotation:jakarta.annotation-api:2.1.0")
1817
implementation("jakarta.ejb:jakarta.ejb-api:4.0.0")
1918
implementation("jakarta.el:jakarta.el-api:4.0.0")
19+
implementation("jakarta.inject:jakarta.inject-api:1.0.5")
2020
implementation("jakarta.jws:jakarta.jws-api:3.0.0")
2121
implementation("jakarta.persistence:jakarta.persistence-api:3.0.0")
2222
implementation("jakarta.servlet:jakarta.servlet-api:5.0.0")
@@ -33,6 +33,7 @@ dependencies {
3333
implementation("javax.ejb:javax.ejb-api:3.2.2")
3434
implementation("javax.el:el-api:2.2")
3535
implementation("javax.el:javax.el-api:3.0.0")
36+
implementation("javax.inject:javax.inject:1")
3637
implementation("javax.jws:javax.jws-api:1.1")
3738
implementation("javax.mail:mail:1.4.7")
3839
implementation("javax.persistence:javax.persistence-api:2.2")
@@ -66,11 +67,11 @@ dependencies {
6667
implementation("org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.0_spec:1.0.1.Final")
6768
implementation("org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.1_spec:2.0.2.Final")
6869
implementation("org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_3.0_spec:1.0.1.Final")
70+
implementation("org.ow2.asm:asm:9.2")
6971
implementation("stax:stax-api:1.0")
7072
implementation("velocity:velocity:1.4")
7173
implementation("woodstox:wstx-asl:2.9.3")
7274
implementation("xml-apis:xml-apis:2.0.2")
73-
7475
// implementation("woodstox:wstx-lgpl:3.2.7") - has no POM file
7576
}
7677
repositories {

‎samples/sample-all/build.out‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ Root project 'sample-all_build.sample'
33
------------------------------------------------------------
44

55
compileClasspath - Compile classpath for source set 'main'.
6-
+--- org.ow2.asm:asm:9.2
76
+--- asm:asm:3.3.1 -> org.ow2.asm:asm:9.2
87
+--- c3p0:c3p0:0.9.1.2 -> com.mchange:c3p0:0.9.5.5
98
| \--- com.mchange:mchange-commons-java:0.2.19
@@ -20,6 +19,7 @@ compileClasspath - Compile classpath for source set 'main'.
2019
+--- jakarta.ejb:jakarta.ejb-api:4.0.0
2120
| \--- jakarta.transaction:jakarta.transaction-api:2.0.0
2221
+--- jakarta.el:jakarta.el-api:4.0.0
22+
+--- jakarta.inject:jakarta.inject-api:1.0.5
2323
+--- jakarta.jws:jakarta.jws-api:3.0.0
2424
+--- jakarta.persistence:jakarta.persistence-api:3.0.0
2525
+--- jakarta.servlet:jakarta.servlet-api:5.0.0 -> org.apache.tomcat:tomcat-servlet-api:9.0.1
@@ -41,6 +41,7 @@ compileClasspath - Compile classpath for source set 'main'.
4141
+--- javax.ejb:javax.ejb-api:3.2.2 -> jakarta.ejb:jakarta.ejb-api:4.0.0 (*)
4242
+--- javax.el:el-api:2.2 -> jakarta.el:jakarta.el-api:4.0.0
4343
+--- javax.el:javax.el-api:3.0.0 -> jakarta.el:jakarta.el-api:4.0.0
44+
+--- javax.inject:javax.inject:1 -> jakarta.inject:jakarta.inject-api:1.0.5
4445
+--- javax.jws:javax.jws-api:1.1 -> jakarta.jws:jakarta.jws-api:3.0.0
4546
+--- javax.mail:mail:1.4.7 -> com.sun.mail:jakarta.mail:2.0.1 (*)
4647
+--- javax.persistence:javax.persistence-api:2.2 -> jakarta.persistence:jakarta.persistence-api:3.0.0
@@ -78,6 +79,7 @@ compileClasspath - Compile classpath for source set 'main'.
7879
+--- org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.0_spec:1.0.1.Final -> org.jboss.resteasy:jaxrs-api:3.0.1.Final
7980
+--- org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.1_spec:2.0.2.Final -> org.jboss.resteasy:jaxrs-api:3.0.1.Final
8081
+--- org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_3.0_spec:1.0.1.Final -> org.jboss.resteasy:jaxrs-api:3.0.1.Final
82+
+--- org.ow2.asm:asm:9.2
8183
+--- velocity:velocity:1.4 -> org.apache.velocity:velocity-engine-core:2.3 (*)
8284
+--- woodstox:wstx-asl:2.9.3 -> org.codehaus.woodstox:woodstox-core-asl:4.4.1 (*)
8385
\--- xml-apis:xml-apis:2.0.2 -> jakarta.xml.bind:jakarta.xml.bind-api:3.0.1 (*)

0 commit comments

Comments
 (0)