Skip to content

Commit

Permalink
Removing Netty4 local copy and consume from Maven (opensearch-project#76
Browse files Browse the repository at this point in the history
)

* Removing Netty4 local copy and consume from Maven

Signed-off-by: Sarat Vemulapalli <[email protected]>

* Removing from spotless exclusion

Signed-off-by: Sarat Vemulapalli <[email protected]>

* Removing from JavaDocs

Signed-off-by: Sarat Vemulapalli <[email protected]>

* Addressing comments

Signed-off-by: Sarat Vemulapalli <[email protected]>
  • Loading branch information
saratvemulapalli authored Aug 8, 2022
1 parent 19fae1a commit cf86065
Show file tree
Hide file tree
Showing 17 changed files with 5 additions and 2,030 deletions.
13 changes: 1 addition & 12 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -44,22 +44,14 @@ configurations {

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
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
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

This file was deleted.

230 changes: 0 additions & 230 deletions src/main/java/org/opensearch/sdk/netty4/CopyBytesSocketChannel.java

This file was deleted.

Loading

0 comments on commit cf86065

Please sign in to comment.