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

Jump to bottom

Removing Netty4 local copy and consume from Maven #76

Merged
merged 5 commits into from
Aug 8, 2022
Merged

Removing Netty4 local copy and consume from Maven #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6061fe9
Removing Netty4 local copy and consume from Maven
saratvemulapalli Aug 3, 2022
f88c22b
Removing from spotless exclusion
saratvemulapalli Aug 3, 2022
822c4ff
Removing from JavaDocs
saratvemulapalli Aug 3, 2022
5c118c2
Merge branch 'main' into remove-netty4-local-copy
saratvemulapalli Aug 5, 2022
67ff1b9
Addressing comments
saratvemulapalli Aug 5, 2022
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
13 changes: 1 addition & 12 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,22 +44,14 @@ configurations {

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can remove the commented code here: https://github.com/opensearch-project/opensearch-sdk/pull/76/files#diff-49a96e7eea8a94af862798a45174e6ac43eb4f8b4bd40759b5da63ba31ec3ef7R55-R63

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The link redirects to the same diff. Could you point me to the link on main?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure why the link redirects to the same diff. May be since it's not a part of this PR but here it is https://github.com/opensearch-project/opensearch-sdk/blob/main/build.gradle#L55-L62

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure done.

dependencies {
implementation "org.opensearch:opensearch:3.0.0-SNAPSHOT"
implementation "org.opensearch.plugin:transport-netty4-client:3.0.0-SNAPSHOT"
implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.17.1'
implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.17.1'
implementation "io.netty:netty-all:4.1.73.Final"
testCompileOnly ("junit:junit:4.13.2") {
exclude module : 'hamcrest'
exclude module : 'hamcrest-core'
}
// Keeping it for now. Will remove it later once figure out the right dependencies
// implementation "io.netty:netty-buffer:4.1.73.Final"
// implementation "io.netty:netty-codec:4.1.73.Final"
// implementation "io.netty:netty-codec-http:4.1.73.Final"
// implementation "io.netty:netty-common:4.1.73.Final"
// implementation "io.netty:netty-handler:4.1.73.Final"
// implementation "io.netty:netty-resolver:4.1.73.Final"
// implementation "io.netty:netty-transportservice.transport:4.1.73.Final"
//implementation "org.apache.logging.log4j:log4j-1.2-api:2.17.1"
implementation 'javax.xml.bind:jaxb-api:2.2.2'
implementation 'com.fasterxml.jackson.core:jackson-databind: 2.12.6.1'
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml: 2.12.6.1'
Expand All @@ -80,9 +72,6 @@ task requireJavadoc(type: JavaExec) {
args "--dont-require-private=true"
// javadocs on trivial getters/setters optional
args "--dont-require-trivial-properties"
// the netty4 package will eventually be published to mavenCentral
// See https://github.com/opensearch-project/OpenSearch/issues/3118
args "--exclude=netty4"
}
check.dependsOn requireJavadoc

Expand Down
1 change: 0 additions & 1 deletion gradle/formatting.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ allprojects {
format("license", {
licenseHeaderFile("${rootProject.file("formatter/license-header.txt")}", "package ");
target("src/main/java/**/*.java")
targetExclude("**/netty4/*")
})
}
}
4 changes: 2 additions & 2 deletions src/main/java/org/opensearch/sdk/ExtensionsRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@
import org.opensearch.indices.IndicesModule;
import org.opensearch.indices.breaker.CircuitBreakerService;
import org.opensearch.indices.breaker.NoneCircuitBreakerService;
import org.opensearch.transport.netty4.Netty4Transport;
import org.opensearch.transport.SharedGroupFactory;
import org.opensearch.sdk.handlers.ClusterSettingsResponseHandler;
import org.opensearch.sdk.handlers.ClusterStateResponseHandler;
import org.opensearch.sdk.handlers.LocalNodeResponseHandler;
import org.opensearch.sdk.netty4.Netty4Transport;
import org.opensearch.sdk.netty4.SharedGroupFactory;
import org.opensearch.search.SearchModule;
import org.opensearch.threadpool.ThreadPool;
import org.opensearch.transport.ClusterConnectionManager;
Expand Down
86 changes: 0 additions & 86 deletions src/main/java/org/opensearch/sdk/netty4/CopyBytesServerSocketChannel.java
View file
Open in desktop

This file was deleted.

230 changes: 0 additions & 230 deletions src/main/java/org/opensearch/sdk/netty4/CopyBytesSocketChannel.java
View file
Open in desktop

This file was deleted.

Loading