honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed netty dependency. Use shaded classes as imports 

Original commit: elastic/x-pack-elasticsearch@46483aa44f
This commit is contained in:
Alexander Reelsen 2014-07-22 11:20:41 +02:00
parent 9b3160b7ac
commit bc0e233589
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pom.xml
View File

@ -32,7 +32,6 @@
<properties> <properties>
<lucene.version>4.9.0</lucene.version> <lucene.version>4.9.0</lucene.version>
<elasticsearch.version>1.4.0-SNAPSHOT</elasticsearch.version> <elasticsearch.version>1.4.0-SNAPSHOT</elasticsearch.version>
<netty.version>3.9.1.Final</netty.version>
<tests.jvms>auto</tests.jvms> <tests.jvms>auto</tests.jvms>
<tests.shuffle>true</tests.shuffle> <tests.shuffle>true</tests.shuffle>
@ -99,13 +98,6 @@
<version>1.2</version> <version>1.2</version>
</dependency> </dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
<version>${netty.version}</version>
</dependency>
<!-- needed for forbidden APIs, embarassing, need to fix --> <!-- needed for forbidden APIs, embarassing, need to fix -->
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
@ -416,4 +408,4 @@
</profile> </profile>
</profiles> </profiles>
</project> </project>

6
src/main/java/org/elasticsearch/shield/n2n/IPFilteringN2NAuthentricator.java
View File

@ -11,14 +11,14 @@ import org.elasticsearch.common.Nullable;
import org.elasticsearch.common.component.AbstractComponent; import org.elasticsearch.common.component.AbstractComponent;
import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.Inject;
import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.ESLogger;
import org.elasticsearch.common.netty.handler.ipfilter.IpFilterRule;
import org.elasticsearch.common.netty.handler.ipfilter.IpSubnetFilterRule;
import org.elasticsearch.common.netty.handler.ipfilter.PatternRule;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment; import org.elasticsearch.env.Environment;
import org.elasticsearch.watcher.FileChangesListener; import org.elasticsearch.watcher.FileChangesListener;
import org.elasticsearch.watcher.FileWatcher; import org.elasticsearch.watcher.FileWatcher;
import org.elasticsearch.watcher.ResourceWatcherService; import org.elasticsearch.watcher.ResourceWatcherService;
import org.jboss.netty.handler.ipfilter.IpFilterRule;
import org.jboss.netty.handler.ipfilter.IpSubnetFilterRule;
import org.jboss.netty.handler.ipfilter.PatternRule;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;