Skip to content

Commit a1d776e

Browse files
committed
Switch to guice 6.0.0 for jenkins compatibility
1 parent 54b5363 commit a1d776e

File tree

85 files changed

+91
-91
lines changed

Some content is hidden

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

85 files changed

+91
-91
lines changed

apis/atmos/src/main/java/org/jclouds/atmos/blobstore/AtmosBlobStore.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import java.util.Set;
2525

2626
import jakarta.inject.Inject;
27-
import jakarta.inject.Provider;
27+
import javax.inject.Provider;
2828
import jakarta.inject.Singleton;
2929

3030
import org.jclouds.atmos.AtmosClient;

apis/atmos/src/main/java/org/jclouds/atmos/domain/internal/AtmosObjectImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import static com.google.common.base.Preconditions.checkNotNull;
2020

2121
import jakarta.inject.Inject;
22-
import jakarta.inject.Provider;
22+
import javax.inject.Provider;
2323
import jakarta.inject.Singleton;
2424

2525
import org.jclouds.atmos.domain.AtmosObject;

apis/atmos/src/main/java/org/jclouds/atmos/filters/ShareUrl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public class ShareUrl implements Function<String, URI> {
5555

5656
private final Supplier<Credentials> creds;
5757
private final Supplier<URI> provider;
58-
private final jakarta.inject.Provider<Long> timeStampProvider;
58+
private final javax.inject.Provider<Long> timeStampProvider;
5959
private final Crypto crypto;
6060

6161
@Resource
@@ -67,7 +67,7 @@ public class ShareUrl implements Function<String, URI> {
6767

6868
@Inject
6969
public ShareUrl(@Provider Supplier<Credentials> creds, @Provider Supplier<URI> provider,
70-
@TimeStamp jakarta.inject.Provider<Long> timeStampProvider, Crypto crypto) {
70+
@TimeStamp javax.inject.Provider<Long> timeStampProvider, Crypto crypto) {
7171
this.creds = creds;
7272
this.provider = provider;
7373
this.timeStampProvider = timeStampProvider;

apis/atmos/src/main/java/org/jclouds/atmos/filters/SignRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import jakarta.annotation.Resource;
2929
import jakarta.inject.Inject;
3030
import jakarta.inject.Named;
31-
import jakarta.inject.Provider;
31+
import javax.inject.Provider;
3232
import jakarta.inject.Singleton;
3333

3434
import org.jclouds.atmos.reference.AtmosHeaders;

apis/atmos/src/main/java/org/jclouds/atmos/functions/ParseDirectoryListFromContentAndHeaders.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import static com.google.common.base.Preconditions.checkNotNull;
2020

2121
import jakarta.inject.Inject;
22-
import jakarta.inject.Provider;
22+
import javax.inject.Provider;
2323
import jakarta.inject.Singleton;
2424

2525
import org.jclouds.atmos.domain.BoundedSet;

apis/atmos/src/main/java/org/jclouds/atmos/util/AtmosUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import java.net.URI;
2424

2525
import jakarta.inject.Inject;
26-
import jakarta.inject.Provider;
26+
import javax.inject.Provider;
2727

2828
import org.jclouds.atmos.AtmosClient;
2929
import org.jclouds.atmos.blobstore.functions.BlobToObject;

apis/chef/src/main/java/org/jclouds/chef/filters/SignedHeaderAuth.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import jakarta.annotation.Resource;
3030
import jakarta.inject.Inject;
3131
import jakarta.inject.Named;
32-
import jakarta.inject.Provider;
32+
import javax.inject.Provider;
3333
import jakarta.inject.Singleton;
3434

3535
import org.jclouds.Constants;

apis/chef/src/main/java/org/jclouds/ohai/config/OhaiModule.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
import jakarta.inject.Inject;
2727
import jakarta.inject.Named;
28-
import jakarta.inject.Provider;
28+
import javax.inject.Provider;
2929
import jakarta.inject.Singleton;
3030

3131
import org.jclouds.date.TimeStamp;

apis/chef/src/test/java/org/jclouds/chef/filters/SignedHeaderAuthTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import java.io.IOException;
2424
import java.security.PrivateKey;
2525

26-
import jakarta.inject.Provider;
26+
import javax.inject.Provider;
2727
import jakarta.ws.rs.HttpMethod;
2828

2929
import org.jclouds.ContextBuilder;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/CloudStackComputeService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
import jakarta.inject.Inject;
3131
import jakarta.inject.Named;
32-
import jakarta.inject.Provider;
32+
import javax.inject.Provider;
3333
import jakarta.inject.Singleton;
3434

3535
import org.jclouds.Constants;

0 commit comments

Comments
 (0)