Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert the upgrade of jakarta.xml.bind to be backward-compatible with Java8 #465

Merged
merged 2 commits into from
Jan 4, 2023
Merged

Revert the upgrade of jakarta.xml.bind to be backward-compatible with Java8 #465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
226fa8c
Revert the upgrade of jakarta.xml.bind to be backward-compatible with…
zengyu714 Jan 4, 2023
29c6e30
Add logs for IMDSV2 verification
zengyu714 Jan 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion aws/kinesis/main.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,9 @@ std::shared_ptr<aws::auth::MutableStaticCredentialsProvider> create_creds(const

std::string get_region(const aws::kinesis::core::Configuration& config) {
if (!config.region().empty()) {
return config.region();
std::string region = config.region();
LOG(info) << "Region has been successfully set to " << region << " from user's input configuration";
return region;
}

Aws::Internal::EC2MetadataClient ec2_client;
Expand All @@ -264,6 +266,7 @@ std::string get_region(const aws::kinesis::core::Configuration& config) {
throw 1;
}

LOG(info) << "Region has been successfully set to " << region << " using EC2 metadata (IMDSV2)";
return region;
}

Expand Down
16 changes: 13 additions & 3 deletions java/amazon-kinesis-producer/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,19 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>4.0.0</version>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.1</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<version>2.3.0.1</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.3.7</version>
</dependency>
<dependency>
<groupId>org.mock-server</groupId>
Expand Down
2 changes: 1 addition & 1 deletion ...amazon-kinesis-producer/src/main/java/com/amazonaws/services/kinesis/producer/Daemon.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import jakarta.xml.bind.DatatypeConverter;
import javax.xml.bind.DatatypeConverter;
import java.io.File;
import java.io.IOException;
import java.io.OutputStream;
Expand Down
2 changes: 1 addition & 1 deletion ...esis-producer/src/main/java/com/amazonaws/services/kinesis/producer/HashedFileCopier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import java.security.MessageDigest;
import java.util.Arrays;

import jakarta.xml.bind.DatatypeConverter;
import javax.xml.bind.DatatypeConverter;

import org.apache.commons.io.IOUtils;
import org.slf4j.Logger;
Expand Down
2 changes: 1 addition & 1 deletion ...-producer/src/test/java/com/amazonaws/services/kinesis/producer/HashedFileCopierTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import java.security.DigestInputStream;
import java.security.MessageDigest;

import jakarta.xml.bind.DatatypeConverter;
import javax.xml.bind.DatatypeConverter;

import org.apache.commons.io.IOUtils;
import org.junit.After;
Expand Down