Skip to content

Commit 49b1a33

Browse files
samebGuice Team
sameb
authored and
Guice Team
committed
Remove redundant references to javax.{inject,persistence,servlet} and replace the rest with their jakarta variants.
This required upgrading some test dependencies, because the tests need some impls of the APIs which only exist in newer releases. This also removes the struts2 extension from the maven & bazel build (although it keeps the now-unused source), because struts2 has no release that supports jakarta. For users that want to continue using the struts2 extension, please continue to use the Guice 6.0 release (instead of the 7.0+ line, which will only support the jakarta dependencies). Fixes #1383. (I'll cut the 6.0 candidates/releases from before this commit, and if we need to make further 6.0 changes, I'll manually merge those into the 6.0 branch.) PiperOrigin-RevId: 529504991
1 parent 5a58425 commit 49b1a33

File tree

184 files changed

+542
-1962
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

184 files changed

+542
-1962
lines changed

‎BUILD‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ javadoc_library(
2424
"//extensions/persist/src/com/google/inject/persist:javadoc-srcs",
2525
"//extensions/servlet/src/com/google/inject/servlet:javadoc-srcs",
2626
"//extensions/spring/src/com/google/inject/spring:javadoc-srcs",
27-
"//extensions/struts2/src/com/google/inject/struts2:javadoc-srcs",
27+
# struts2 doesn't work with jakarta.servlet, so we don't include it.
28+
# We leave the commented out line as a bread-crumb for the future.
29+
# "//extensions/struts2/src/com/google/inject/struts2:javadoc-srcs",
2830
"//extensions/testlib/src/com/google/inject/testing/fieldbinder:javadoc-srcs",
2931
"//extensions/testlib/src/com/google/inject/testing/throwingproviders:javadoc-srcs",
3032
"//extensions/throwingproviders/src/com/google/inject/throwingproviders:javadoc-srcs",
@@ -62,7 +64,7 @@ javadoc_library(
6264
],
6365
"Servlet Extension": ["com.google.inject.servlet"],
6466
"Spring Extension": ["com.google.inject.spring"],
65-
"Struts2 Extension": ["com.google.inject.struts2"],
67+
# "Struts2 Extension": ["com.google.inject.struts2"],
6668
"Test Libraries Extension": ["com.google.inject.testing.*"],
6769
"ThrowingProviders Extension": ["com.google.inject.throwingproviders"],
6870
},
@@ -77,7 +79,7 @@ javadoc_library(
7779
"//extensions/persist/src/com/google/inject/persist",
7880
"//extensions/servlet/src/com/google/inject/servlet",
7981
"//extensions/spring/src/com/google/inject/spring",
80-
"//extensions/struts2/src/com/google/inject/struts2",
82+
# "//extensions/struts2/src/com/google/inject/struts2",
8183
"//extensions/testlib/src/com/google/inject/testing/fieldbinder",
8284
"//extensions/testlib/src/com/google/inject/testing/throwingproviders",
8385
"//extensions/throwingproviders/src/com/google/inject/throwingproviders",

‎WORKSPACE‎

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,9 @@ maven_install(
3535
"com.google.errorprone:error_prone_annotations:2.18.0",
3636
"com.google.guava:guava:31.0.1-jre",
3737
"commons-logging:commons-logging:1.2",
38-
"javax.inject:javax.inject:1",
3938
"jakarta.inject:jakarta.inject-api:2.0.1",
40-
"javax.persistence:javax.persistence-api:2.2",
41-
"javax.servlet:servlet-api:2.5",
39+
"jakarta.persistence:jakarta.persistence-api:3.0.0",
40+
"jakarta.servlet:jakarta.servlet-api:5.0.0",
4241
"org.apache.struts:struts2-core:2.5.30",
4342
"org.apache.struts.xwork:xwork-core:2.3.37",
4443
"org.ow2.asm:asm:9.5",
@@ -70,12 +69,6 @@ maven_install(
7069
"1.1.3",
7170
testonly = True,
7271
),
73-
maven.artifact(
74-
"javax.inject",
75-
"javax.inject-tck",
76-
"1",
77-
testonly = True,
78-
),
7972
maven.artifact(
8073
"jakarta.inject",
8174
"jakarta.inject-tck",
@@ -106,16 +99,10 @@ maven_install(
10699
"2.2",
107100
testonly = True,
108101
),
109-
maven.artifact(
110-
"org.hibernate.javax.persistence",
111-
"hibernate-jpa-2.0-api",
112-
"1.0.0.Final",
113-
testonly = True,
114-
),
115102
maven.artifact(
116103
"org.hibernate",
117-
"hibernate-core",
118-
"5.6.3.Final",
104+
"hibernate-core-jakarta",
105+
"5.6.15.Final",
119106
testonly = True,
120107
),
121108
maven.artifact(

‎bom/BUILD‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ java_library(
1919
"//extensions/persist/src/com/google/inject/persist",
2020
"//extensions/servlet/src/com/google/inject/servlet",
2121
"//extensions/spring/src/com/google/inject/spring",
22-
"//extensions/struts2/src/com/google/inject/struts2",
22+
# struts2 doesn't work with jakarta.servlet, so we don't include it.
23+
# We leave the commented out line as a bread-crumb for the future.
24+
# "//extensions/struts2/src/com/google/inject/struts2",
2325
"//extensions/testlib/src/com/google/inject/testing:testlib",
2426
"//extensions/throwingproviders/src/com/google/inject/throwingproviders",
2527
],

‎bom/pom.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,13 @@
6868
<artifactId>guice-spring</artifactId>
6969
<version>${project.version}</version>
7070
</dependency>
71+
<!-- struts2 doesn't support jakarta.servlet yet, so we don't include it.
7172
<dependency>
7273
<groupId>com.google.inject.extensions</groupId>
7374
<artifactId>guice-struts2</artifactId>
7475
<version>${project.version}</version>
7576
</dependency>
77+
-->
7678
<dependency>
7779
<groupId>com.google.inject.extensions</groupId>
7880
<artifactId>guice-testlib</artifactId>

‎core/pom.xml‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414
<name>Google Guice - Core Library</name>
1515

1616
<dependencies>
17-
<dependency>
18-
<groupId>javax.inject</groupId>
19-
<artifactId>javax.inject</artifactId>
20-
</dependency>
2117
<dependency>
2218
<groupId>jakarta.inject</groupId>
2319
<artifactId>jakarta.inject-api</artifactId>
@@ -46,8 +42,8 @@
4642
| Test dependencies
4743
-->
4844
<dependency>
49-
<groupId>javax.inject</groupId>
50-
<artifactId>javax.inject-tck</artifactId>
45+
<groupId>jakarta.inject</groupId>
46+
<artifactId>jakarta.inject-tck</artifactId>
5147
<scope>test</scope>
5248
</dependency>
5349
<dependency>
@@ -98,16 +94,6 @@
9894
<groupId>org.apache.maven.plugins</groupId>
9995
<artifactId>maven-compiler-plugin</artifactId>
10096
<version>3.11.0</version>
101-
<configuration>
102-
<testExcludes>
103-
<!--
104-
Don't compile the jakarta TCK b/c it would clash w/ the javax.inject TCK.
105-
We test it with the Bazel build for now, and basic jakarta functionality is tested
106-
with the JakartaTest in the same package.
107-
-->
108-
<testExclude>**/GuiceJakartaTck.java</testExclude>
109-
</testExcludes>
110-
</configuration>
11197
</plugin>
11298
<plugin>
11399
<artifactId>maven-surefire-plugin</artifactId>

‎core/src/com/google/inject/BUILD‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ java_library(
5252
srcs = PROVIDED_BY_SRCS,
5353
javacopts = JAVAC_OPTS,
5454
deps = [
55-
"//third_party/java/jsr330_inject",
55+
"//third_party/java/jakarta_inject",
5656
],
5757
)
5858

@@ -96,7 +96,6 @@ java_library(
9696
"//third_party/java/asm",
9797
"//third_party/java/error_prone:annotations",
9898
"//third_party/java/jsr305_annotations",
99-
"//third_party/java/jsr330_inject",
10099
"//third_party/java/jakarta_inject",
101100
],
102101
)
@@ -109,7 +108,7 @@ java_library(
109108
],
110109
deps = [
111110
"//third_party/java/error_prone:annotations",
112-
"//third_party/java/jsr330_inject",
111+
"//third_party/java/jakarta_inject",
113112
],
114113
)
115114

‎core/src/com/google/inject/Inject.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
* The Injector then proceeds to perform field and method injections.
3737
* <li>Pre-constructed instances passed to {@link Injector#injectMembers}, {@link
3838
* com.google.inject.binder.LinkedBindingBuilder#toInstance(Object)} and {@link
39-
* com.google.inject.binder.LinkedBindingBuilder#toProvider(javax.inject.Provider)}. In this
39+
* com.google.inject.binder.LinkedBindingBuilder#toProvider(jakarta.inject.Provider)}. In this
4040
* case all constructors are, of course, ignored.
4141
* <li>Static fields and methods of classes which any {@link Module} has specifically requested
4242
* static injection for, using {@link Binder#requestStaticInjection}.

‎core/src/com/google/inject/ProvidedBy.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
public @interface ProvidedBy {
3333

3434
/** The implementation type. */
35-
Class<? extends javax.inject.Provider<?>> value();
35+
Class<? extends jakarta.inject.Provider<?>> value();
3636
}

‎core/src/com/google/inject/Provider.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@
3838
* @param <T> the type of object this provides
3939
* @author [email protected] (Bob Lee)
4040
*/
41-
public interface Provider<T> extends javax.inject.Provider<T>, jakarta.inject.Provider<T> {
41+
public interface Provider<T>
42+
extends
43+
jakarta.inject.Provider<T> {
4244

4345
/**
4446
* Provides an instance of {@code T}.

‎core/src/com/google/inject/Scopes.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ public Boolean visitNoScoping() {
6969
@Override
7070
public Boolean visitScopeAnnotation(Class<? extends Annotation> scopeAnnotation) {
7171
return scopeAnnotation == Singleton.class
72-
|| scopeAnnotation == javax.inject.Singleton.class
7372
|| scopeAnnotation == jakarta.inject.Singleton.class;
7473
}
7574

0 commit comments

Comments
 (0)