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

release-drafter workflow #1

Merged
merged 2 commits into from
Jan 5, 2023
Merged

release-drafter workflow #1

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
3e21e5a
patch CVE and sync versioning (#44)
YANG-DB Jan 4, 2023
567fb15
Update dependency com.amazonaws:aws-java-sdk-core to v1.12.1 (#10)
mend-for-github-com[bot] 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
10 changes: 5 additions & 5 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ plugins {
group 'org.opensearch.driver'

// keep version in sync with version in Driver source
version '2.0.0.0'
version '1.2.0.0'

boolean snapshot = "true".equals(System.getProperty("build.snapshot", "false"));
if (snapshot) {
Expand All @@ -47,16 +47,16 @@ repositories {

dependencies {
implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.13'
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "2.13.3"
implementation group: 'com.amazonaws', name: 'aws-java-sdk-core', version: '1.11.452'
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "2.13.4.2"
implementation group: 'com.amazonaws', name: 'aws-java-sdk-core', version: '1.12.1'

testImplementation('org.junit.jupiter:junit-jupiter-api:5.3.1')
testImplementation('org.junit.jupiter:junit-jupiter-params:5.3.1')
testImplementation('com.github.tomakehurst:wiremock:2.27.2')
testImplementation('com.github.tomakehurst:wiremock-jre8-standalone:2.34.0')
testImplementation('org.mockito:mockito-core:2.23.0')
testImplementation('org.junit.jupiter:junit-jupiter-engine:5.3.1')
testImplementation('org.junit-pioneer:junit-pioneer:0.3.0')
testImplementation('org.eclipse.jetty:jetty-server:9.2.24.v20180105')
testImplementation('org.eclipse.jetty:jetty-server:9.4.48.v20220622')

// Enforce wiremock to use latest guava and json-smart
testImplementation('com.google.guava:guava:31.1-jre')
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/opensearch/jdbc/internal/Version.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
public enum Version {

// keep this in sync with the gradle version
Current(1, 0, 0, 0);
Current(1, 2, 0, 0);

private int major;
private int minor;
Expand Down
4 changes: 1 addition & 3 deletions src/test/java/org/opensearch/jdbc/test/TLSServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public static Server startSecureServer(
ServerConnector httpsConnector = null;

// setup ssl
SslContextFactory sslContextFactory = new SslContextFactory();
SslContextFactory.Server sslContextFactory = new SslContextFactory.Server();
sslContextFactory.setKeyStorePath(keyStorePath);
sslContextFactory.setKeyStorePassword(keyStorePassword);
sslContextFactory.setKeyStoreType(keyStoreType);
Expand Down Expand Up @@ -132,8 +132,6 @@ private static ServerConnector createServerConnector(
connectionFactories
);
connector.setPort(port);
connector.setStopTimeout(0);
connector.getSelectorManager().setStopTimeout(0);
connector.setHost(bindAddress);

return connector;
Expand Down