refactor poms to use dependencyManagement; upgrade Jetty
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/271fe0e2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/271fe0e2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/271fe0e2 Branch: refs/heads/master Commit: 271fe0e20a4bdf6043c151c9ac2b33adab9548dc Parents: 9fc5afb Author: Andrew Avenoso <[email protected]> Authored: Wed Oct 29 00:04:42 2014 -0400 Committer: Andrew Avenoso <[email protected]> Committed: Tue Nov 4 20:55:46 2014 -0500 ---------------------------------------------------------------------- blur-command/pom.xml | 88 +--------- blur-console/pom.xml | 176 ++----------------- .../org/apache/blur/console/JettyServer.java | 41 +++-- .../org/apache/blur/console/util/NodeUtil.java | 2 +- blur-core/pom.xml | 37 +--- .../blur/thrift/ThriftBlurControllerServer.java | 4 +- .../blur/thrift/ThriftBlurShardServer.java | 4 +- blur-gui/pom.xml | 73 +------- .../org/apache/blur/gui/HttpJettyServer.java | 11 +- blur-mapred-hadoop2/pom.xml | 24 --- blur-query/pom.xml | 55 ------ blur-shell/pom.xml | 39 ---- blur-store/pom.xml | 32 ---- blur-thrift/pom.xml | 28 --- blur-util/pom.xml | 80 --------- distribution/src/assemble/bin-hadoop1.xml | 54 +++--- distribution/src/assemble/bin-hadoop2.xml | 55 +++--- pom.xml | 112 +++++++++++- 18 files changed, 235 insertions(+), 680 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/271fe0e2/blur-command/pom.xml ---------------------------------------------------------------------- diff --git a/blur-command/pom.xml b/blur-command/pom.xml index 3198075..066ddeb 100644 --- a/blur-command/pom.xml +++ b/blur-command/pom.xml @@ -42,44 +42,18 @@ under the License. <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - <version>${commons-logging.version}</version> </dependency> <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> - <version>${zookeeper.version}</version> - <exclusions> - <exclusion> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </exclusion> - <exclusion> - <groupId>javax.jms</groupId> - <artifactId>jms</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jdmk</groupId> - <artifactId>jmxtools</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jmx</groupId> - <artifactId>jmxri</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${junit.version}</version> + <groupId>org.apache.blur</groupId> + <artifactId>blur-core</artifactId> + <version>${project.version}</version> + <type>test-jar</type> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.blur</groupId> - <artifactId>blur-core</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> @@ -100,26 +74,7 @@ under the License. <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>${log4j.version}</version> <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </exclusion> - <exclusion> - <groupId>javax.jms</groupId> - <artifactId>jms</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jdmk</groupId> - <artifactId>jmxtools</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jmx</groupId> - <artifactId>jmxri</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>com.yammer.metrics</groupId> @@ -218,39 +173,4 @@ under the License. </plugins> </pluginManagement> </build> - <profiles> - <profile> - <id>hadoop1</id> - <activation> - <property> - <name>hadoop1</name> - </property> - </activation> - <properties> - <projectVersion>${project.parent.version}-hadoop1</projectVersion> - </properties> - </profile> - <profile> - <id>hadoop2-mr1</id> - <activation> - <property> - <name>hadoop2-mr1</name> - </property> - </activation> - <properties> - <projectVersion>${project.parent.version}-hadoop2-mr1</projectVersion> - </properties> - </profile> - <profile> - <id>hadoop2</id> - <activation> - <property> - <name>hadoop2</name> - </property> - </activation> - <properties> - <projectVersion>${project.parent.version}-hadoop2</projectVersion> - </properties> - </profile> - </profiles> </project> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/271fe0e2/blur-console/pom.xml ---------------------------------------------------------------------- diff --git a/blur-console/pom.xml b/blur-console/pom.xml index 0d82e2c..b1f078b 100644 --- a/blur-console/pom.xml +++ b/blur-console/pom.xml @@ -43,11 +43,6 @@ <artifactId>blur-thrift</artifactId> <version>${project.version}</version> </dependency> -<!-- <dependency> - <groupId>org.apache.blur</groupId> - <artifactId>blur-core</artifactId> - <version>${project.version}</version> - </dependency> --> <dependency> <groupId>org.apache.blur</groupId> <artifactId>blur-util</artifactId> @@ -75,19 +70,31 @@ <artifactId>commons-collections4</artifactId> <version>4.0</version> </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-webapp</artifactId> + </dependency> <!-- Test Dependancies --> <dependency> - <groupId>org.apache.blur</groupId> - <artifactId>blur-core</artifactId> - <version>${project.version}</version> + <groupId>org.apache.blur</groupId> + <artifactId>blur-core</artifactId> + <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.blur</groupId> <artifactId>blur-core</artifactId> <version>${project.version}</version> <type>test-jar</type> - <scope>test</scope> </dependency> <dependency> <groupId>org.apache.blur</groupId> @@ -174,131 +181,6 @@ </plugins> </build> - <!--build> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - <includes> - <include>**/blur-console-build.properties</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> - <filtering>false</filtering> - <excludes> - <exclude>**/blur-console-build.properties</exclude> - </excludes> - </resource> - </resources> - - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-clean-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - </plugin> - < - plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - </plugin - > - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jxr-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <includes> - <include>**/ConsoleTestSuite.*</include> - </includes> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.5.1</version> - <inherited>true</inherited> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.12.1</version> - <configuration> - <configLocation>checkstyle.xml</configLocation> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <version>3.3</version> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>cobertura-maven-plugin</artifactId> - < - <version>2.6</version> - > - <configuration> - <instrumentation> - <excludes> - <exclude>org/apache/blur/console/**/*Test.class</exclude> - </excludes> - </instrumentation> - </configuration> - <executions> - <execution> - <goals> - <goal>clean</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build--> - - <!--reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.12.1</version> - <configuration> - <configLocation>checkstyle.xml</configLocation> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-report-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jxr-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>cobertura-maven-plugin</artifactId> - <configuration> - <formats> - <format>html</format> - <format>xml</format> - </formats> - </configuration> - </plugin> - </plugins> - </reporting--> - <profiles> <profile> <id>hadoop1</id> @@ -307,14 +189,10 @@ <name>hadoop1</name> </property> </activation> - <properties> - <projectVersion>${project.parent.version}-hadoop1</projectVersion> - </properties> <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-test</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> </dependency> </dependencies> @@ -326,26 +204,17 @@ <name>hadoop2-mr1</name> </property> </activation> - <properties> - <projectVersion>${project.parent.version}-hadoop2-mr1</projectVersion> - </properties> <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-client</artifactId> - <version>${hadoop.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-minicluster</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty</artifactId> - <version>6.1.26</version> - </dependency> </dependencies> </profile> <profile> @@ -355,26 +224,17 @@ <name>hadoop2</name> </property> </activation> - <properties> - <projectVersion>${project.parent.version}-hadoop2</projectVersion> - </properties> <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-client</artifactId> - <version>${hadoop.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-minicluster</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty</artifactId> - <version>6.1.26</version> - </dependency> </dependencies> </profile> <profile> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/271fe0e2/blur-console/src/main/java/org/apache/blur/console/JettyServer.java ---------------------------------------------------------------------- diff --git a/blur-console/src/main/java/org/apache/blur/console/JettyServer.java b/blur-console/src/main/java/org/apache/blur/console/JettyServer.java index 41c772b..31313a9 100644 --- a/blur-console/src/main/java/org/apache/blur/console/JettyServer.java +++ b/blur-console/src/main/java/org/apache/blur/console/JettyServer.java @@ -21,11 +21,17 @@ import org.apache.blur.console.filters.LoggedInFilter; import org.apache.blur.console.servlets.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.mortbay.jetty.Handler; -import org.mortbay.jetty.Server; -import org.mortbay.jetty.servlet.Context; -import org.mortbay.jetty.webapp.WebAppContext; +import org.eclipse.jetty.server.Handler; +import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.handler.ContextHandler; +import org.eclipse.jetty.server.handler.HandlerList; +import org.eclipse.jetty.server.session.HashSessionIdManager; +import org.eclipse.jetty.server.session.HashSessionManager; +import org.eclipse.jetty.server.session.SessionHandler; +import org.eclipse.jetty.servlet.*; +import org.eclipse.jetty.webapp.WebAppContext; +import javax.servlet.DispatcherType; import java.io.File; import java.net.MalformedURLException; import java.net.URL; @@ -70,20 +76,27 @@ public class JettyServer { warUrl = this.getClass().getClassLoader().getResource(PROD_WEBAPPDIR); } String warUrlString = warUrl.toExternalForm(); - server.setHandler(new WebAppContext(warUrlString, CONTEXTPATH)); + WebAppContext staticContext = new WebAppContext(warUrlString, CONTEXTPATH); - // for localhost:port/service/dashboard, etc. - Context serviceContext = new Context(server, "/service", Context.SESSIONS); - serviceContext.addServlet(AuthServlet.class, "/auth/*"); - serviceContext.addServlet(NodesServlet.class, "/nodes/*"); - serviceContext.addServlet(TablesServlet.class, "/tables/*"); - serviceContext.addServlet(QueriesServlet.class, "/queries/*"); - serviceContext.addServlet(SearchServlet.class, "/search/*"); - serviceContext.addServlet(JavascriptServlet.class, "/config.js"); - serviceContext.addFilter(LoggedInFilter.class, "/*", Handler.REQUEST); + // service calls + ContextHandler servletContext = new ServletContextHandler(ServletContextHandler.SESSIONS); + servletContext.setContextPath("/console/service"); + ServletHandler serviceHandler = new ServletHandler(); + serviceHandler.addServletWithMapping(AuthServlet.class, "/auth/*"); + serviceHandler.addServletWithMapping(NodesServlet.class, "/nodes/*"); + serviceHandler.addServletWithMapping(TablesServlet.class, "/tables/*"); + serviceHandler.addServletWithMapping(QueriesServlet.class, "/queries/*"); + serviceHandler.addServletWithMapping(SearchServlet.class, "/search/*"); + serviceHandler.addServletWithMapping(JavascriptServlet.class, "/config.js"); + serviceHandler.addFilterWithMapping(LoggedInFilter.class, "/*", FilterMapping.REQUEST); + servletContext.setHandler(serviceHandler); + HandlerList handlers = new HandlerList(); + handlers.setHandlers(new Handler[] { servletContext, staticContext }); + + server.setHandler(handlers); System.out.println("started server on http://localhost:"; + port + CONTEXTPATH); try { server.start(); http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/271fe0e2/blur-console/src/main/java/org/apache/blur/console/util/NodeUtil.java ---------------------------------------------------------------------- diff --git a/blur-console/src/main/java/org/apache/blur/console/util/NodeUtil.java b/blur-console/src/main/java/org/apache/blur/console/util/NodeUtil.java index 08e20a4..5344609 100644 --- a/blur-console/src/main/java/org/apache/blur/console/util/NodeUtil.java +++ b/blur-console/src/main/java/org/apache/blur/console/util/NodeUtil.java @@ -33,7 +33,7 @@ import java.util.Map; import java.util.Set; import org.apache.blur.thirdparty.thrift_0_9_0.TException; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; public class NodeUtil { private static Set<String> onlineControllers = new HashSet<String>(); http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/271fe0e2/blur-core/pom.xml ---------------------------------------------------------------------- diff --git a/blur-core/pom.xml b/blur-core/pom.xml index 997dbf2..c04100a 100644 --- a/blur-core/pom.xml +++ b/blur-core/pom.xml @@ -80,7 +80,6 @@ under the License. <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> - <version>${zookeeper.version}</version> <scope>provided</scope> </dependency> <dependency> @@ -92,27 +91,12 @@ under the License. <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>${log4j.version}</version> <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </exclusion> - <exclusion> - <groupId>javax.jms</groupId> - <artifactId>jms</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jdmk</groupId> - <artifactId>jmxtools</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jmx</groupId> - <artifactId>jmxri</artifactId> - </exclusion> - </exclusions> </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-webapp</artifactId> + </dependency> </dependencies> <repositories> @@ -167,9 +151,6 @@ under the License. <name>hadoop1</name> </property> </activation> - <properties> - <projectVersion>${project.parent.version}-hadoop1</projectVersion> - </properties> <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> @@ -186,19 +167,14 @@ under the License. <name>hadoop2-mr1</name> </property> </activation> - <properties> - <projectVersion>${project.parent.version}-hadoop2-mr1</projectVersion> - </properties> <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-client</artifactId> - <version>${hadoop.version}</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-minicluster</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> </dependency> </dependencies> @@ -210,19 +186,14 @@ under the License. <name>hadoop2</name> </property> </activation> - <properties> - <projectVersion>${project.parent.version}-hadoop2</projectVersion> - </properties> <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-client</artifactId> - <version>${hadoop.version}</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-minicluster</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/271fe0e2/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurControllerServer.java ---------------------------------------------------------------------- diff --git a/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurControllerServer.java b/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurControllerServer.java index ab25e20..2c7764a 100644 --- a/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurControllerServer.java +++ b/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurControllerServer.java @@ -77,8 +77,8 @@ import org.apache.blur.utils.MemoryReporter; import org.apache.blur.zookeeper.ZkUtils; import org.apache.hadoop.conf.Configuration; import org.apache.zookeeper.ZooKeeper; -import org.mortbay.jetty.servlet.ServletHolder; -import org.mortbay.jetty.webapp.WebAppContext; +import org.eclipse.jetty.servlet.ServletHolder; +import org.eclipse.jetty.webapp.WebAppContext; public class ThriftBlurControllerServer extends ThriftServer { http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/271fe0e2/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurShardServer.java ---------------------------------------------------------------------- diff --git a/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurShardServer.java b/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurShardServer.java index 5201e43..18dc375 100644 --- a/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurShardServer.java +++ b/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurShardServer.java @@ -107,9 +107,9 @@ import org.apache.blur.zookeeper.ZkUtils; import org.apache.hadoop.conf.Configuration; import org.apache.lucene.search.BooleanQuery; import org.apache.zookeeper.ZooKeeper; -import org.mortbay.jetty.servlet.ServletHolder; -import org.mortbay.jetty.webapp.WebAppContext; +import org.eclipse.jetty.servlet.ServletHolder; +import org.eclipse.jetty.webapp.WebAppContext; import sun.misc.VM; public class ThriftBlurShardServer extends ThriftServer { http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/271fe0e2/blur-gui/pom.xml ---------------------------------------------------------------------- diff --git a/blur-gui/pom.xml b/blur-gui/pom.xml index 39aac38..b5d52d3 100644 --- a/blur-gui/pom.xml +++ b/blur-gui/pom.xml @@ -58,29 +58,14 @@ under the License. <artifactId>metrics-servlet</artifactId> <version>${metrics.version}</version> </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-webapp</artifactId> + </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>${log4j.version}</version> <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </exclusion> - <exclusion> - <groupId>javax.jms</groupId> - <artifactId>jms</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jdmk</groupId> - <artifactId>jmxtools</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jmx</groupId> - <artifactId>jmxri</artifactId> - </exclusion> - </exclusions> </dependency> </dependencies> @@ -145,54 +130,4 @@ under the License. </plugins> </pluginManagement> </build> - - <profiles> - <profile> - <id>hadoop1</id> - <activation> - <property> - <name>hadoop1</name> - </property> - </activation> - <properties> - <projectVersion>${project.parent.version}-hadoop1</projectVersion> - </properties> - </profile> - <profile> - <id>hadoop2-mr1</id> - <activation> - <property> - <name>hadoop2-mr1</name> - </property> - </activation> - <properties> - <projectVersion>${project.parent.version}-hadoop2-mr1</projectVersion> - </properties> - <dependencies> - <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty</artifactId> - <version>6.1.26</version> - </dependency> - </dependencies> - </profile> - <profile> - <id>hadoop2</id> - <activation> - <property> - <name>hadoop2</name> - </property> - </activation> - <properties> - <projectVersion>${project.parent.version}-hadoop2</projectVersion> - </properties> - <dependencies> - <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty</artifactId> - <version>6.1.26</version> - </dependency> - </dependencies> - </profile> - </profiles> </project> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/271fe0e2/blur-gui/src/main/java/org/apache/blur/gui/HttpJettyServer.java ---------------------------------------------------------------------- diff --git a/blur-gui/src/main/java/org/apache/blur/gui/HttpJettyServer.java b/blur-gui/src/main/java/org/apache/blur/gui/HttpJettyServer.java index bb91868..012b1b2 100644 --- a/blur-gui/src/main/java/org/apache/blur/gui/HttpJettyServer.java +++ b/blur-gui/src/main/java/org/apache/blur/gui/HttpJettyServer.java @@ -22,12 +22,13 @@ import java.util.Properties; import org.apache.blur.log.Log; import org.apache.blur.log.LogFactory; -import org.mortbay.jetty.Connector; -import org.mortbay.jetty.Server; -import org.mortbay.jetty.servlet.ServletHolder; -import org.mortbay.jetty.webapp.WebAppContext; import com.yammer.metrics.reporting.MetricsServlet; +import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.Connector; +import org.eclipse.jetty.server.ServerConnector; +import org.eclipse.jetty.servlet.ServletHolder; +import org.eclipse.jetty.webapp.WebAppContext; /** * Starts up a Jetty server to run the utility gui. @@ -89,7 +90,7 @@ public class HttpJettyServer { } Connector[] connectors = server.getConnectors(); for (Connector connector : connectors) { - _localPort = connector.getLocalPort(); + _localPort = ((ServerConnector)(connector)).getLocalPort(); } LOG.info("Http server up on port: " + _localPort); } http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/271fe0e2/blur-mapred-hadoop2/pom.xml ---------------------------------------------------------------------- diff --git a/blur-mapred-hadoop2/pom.xml b/blur-mapred-hadoop2/pom.xml index 8709d9d..1efe504 100644 --- a/blur-mapred-hadoop2/pom.xml +++ b/blur-mapred-hadoop2/pom.xml @@ -72,26 +72,7 @@ under the License. <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>${log4j.version}</version> <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </exclusion> - <exclusion> - <groupId>javax.jms</groupId> - <artifactId>jms</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jdmk</groupId> - <artifactId>jmxtools</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jmx</groupId> - <artifactId>jmxri</artifactId> - </exclusion> - </exclusions> </dependency> </dependencies> @@ -148,9 +129,6 @@ under the License. <name>hadoop2</name> </property> </activation> - <properties> - <projectVersion>${project.parent.version}-hadoop2</projectVersion> - </properties> <dependencies> <dependency> <groupId>org.apache.mrunit</groupId> @@ -162,12 +140,10 @@ under the License. <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-client</artifactId> - <version>${hadoop.version}</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-minicluster</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/271fe0e2/blur-query/pom.xml ---------------------------------------------------------------------- diff --git a/blur-query/pom.xml b/blur-query/pom.xml index 5c32d7c..3f208f1 100644 --- a/blur-query/pom.xml +++ b/blur-query/pom.xml @@ -84,26 +84,7 @@ under the License. <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>${log4j.version}</version> <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </exclusion> - <exclusion> - <groupId>javax.jms</groupId> - <artifactId>jms</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jdmk</groupId> - <artifactId>jmxtools</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jmx</groupId> - <artifactId>jmxri</artifactId> - </exclusion> - </exclusions> </dependency> </dependencies> @@ -150,40 +131,4 @@ under the License. </plugin> </plugins> </build> - - <profiles> - <profile> - <id>hadoop1</id> - <activation> - <property> - <name>hadoop1</name> - </property> - </activation> - <properties> - <projectVersion>${project.parent.version}-hadoop1</projectVersion> - </properties> - </profile> - <profile> - <id>hadoop2-mr1</id> - <activation> - <property> - <name>hadoop2-mr1</name> - </property> - </activation> - <properties> - <projectVersion>${project.parent.version}-hadoop2-mr1</projectVersion> - </properties> - </profile> - <profile> - <id>hadoop2</id> - <activation> - <property> - <name>hadoop2</name> - </property> - </activation> - <properties> - <projectVersion>${project.parent.version}-hadoop2</projectVersion> - </properties> - </profile> - </profiles> </project> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/271fe0e2/blur-shell/pom.xml ---------------------------------------------------------------------- diff --git a/blur-shell/pom.xml b/blur-shell/pom.xml index 34b1e4e..54c53c4 100644 --- a/blur-shell/pom.xml +++ b/blur-shell/pom.xml @@ -44,38 +44,12 @@ under the License. <groupId>org.apache.blur</groupId> <artifactId>blur-thrift</artifactId> <version>${project.version}</version> - - <exclusions> - <exclusion> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </exclusion> - <exclusion> - <groupId>javax.jms</groupId> - <artifactId>jms</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jdmk</groupId> - <artifactId>jmxtools</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jmx</groupId> - <artifactId>jmxri</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>jline</groupId> <artifactId>jline</artifactId> <version>${jline.version}</version> </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${junit.version}</version> - <scope>test</scope> - </dependency> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> @@ -119,9 +93,6 @@ under the License. <name>hadoop1</name> </property> </activation> - <properties> - <projectVersion>${project.parent.version}-hadoop1</projectVersion> - </properties> <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> @@ -143,19 +114,14 @@ under the License. <name>hadoop2-mr1</name> </property> </activation> - <properties> - <projectVersion>${project.parent.version}-hadoop2-mr1</projectVersion> - </properties> <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-client</artifactId> - <version>${hadoop.version}</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-minicluster</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> </dependency> </dependencies> @@ -167,19 +133,14 @@ under the License. <name>hadoop2</name> </property> </activation> - <properties> - <projectVersion>${project.parent.version}-hadoop2</projectVersion> - </properties> <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-client</artifactId> - <version>${hadoop.version}</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-minicluster</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/271fe0e2/blur-store/pom.xml ---------------------------------------------------------------------- diff --git a/blur-store/pom.xml b/blur-store/pom.xml index 8850415..aef60ed 100644 --- a/blur-store/pom.xml +++ b/blur-store/pom.xml @@ -83,26 +83,7 @@ under the License. <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>${log4j.version}</version> <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </exclusion> - <exclusion> - <groupId>javax.jms</groupId> - <artifactId>jms</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jdmk</groupId> - <artifactId>jmxtools</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jmx</groupId> - <artifactId>jmxri</artifactId> - </exclusion> - </exclusions> </dependency> </dependencies> @@ -158,9 +139,6 @@ under the License. <name>hadoop1</name> </property> </activation> - <properties> - <projectVersion>${project.parent.version}-hadoop1</projectVersion> - </properties> <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> @@ -182,19 +160,14 @@ under the License. <name>hadoop2-mr1</name> </property> </activation> - <properties> - <projectVersion>${project.parent.version}-hadoop2-mr1</projectVersion> - </properties> <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-client</artifactId> - <version>${hadoop.version}</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-minicluster</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> </dependency> </dependencies> @@ -206,19 +179,14 @@ under the License. <name>hadoop2</name> </property> </activation> - <properties> - <projectVersion>${project.parent.version}-hadoop2</projectVersion> - </properties> <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-client</artifactId> - <version>${hadoop.version}</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-minicluster</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/271fe0e2/blur-thrift/pom.xml ---------------------------------------------------------------------- diff --git a/blur-thrift/pom.xml b/blur-thrift/pom.xml index 8dee677..b9b77d4 100644 --- a/blur-thrift/pom.xml +++ b/blur-thrift/pom.xml @@ -43,26 +43,7 @@ under the License. <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>${log4j.version}</version> <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </exclusion> - <exclusion> - <groupId>javax.jms</groupId> - <artifactId>jms</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jdmk</groupId> - <artifactId>jmxtools</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jmx</groupId> - <artifactId>jmxri</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> @@ -137,9 +118,6 @@ under the License. <name>hadoop1</name> </property> </activation> - <properties> - <projectVersion>${project.parent.version}-hadoop1</projectVersion> - </properties> </profile> <profile> <id>hadoop2-mr1</id> @@ -148,9 +126,6 @@ under the License. <name>hadoop2-mr1</name> </property> </activation> - <properties> - <projectVersion>${project.parent.version}-hadoop2-mr1</projectVersion> - </properties> <dependencies> <dependency> <groupId>javax.servlet</groupId> @@ -167,9 +142,6 @@ under the License. <name>hadoop2</name> </property> </activation> - <properties> - <projectVersion>${project.parent.version}-hadoop2</projectVersion> - </properties> <dependencies> <dependency> <groupId>javax.servlet</groupId> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/271fe0e2/blur-util/pom.xml ---------------------------------------------------------------------- diff --git a/blur-util/pom.xml b/blur-util/pom.xml index c93f096..1dce0ae 100644 --- a/blur-util/pom.xml +++ b/blur-util/pom.xml @@ -37,36 +37,10 @@ under the License. <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - <version>${commons-logging.version}</version> </dependency> <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> - <version>${zookeeper.version}</version> - <exclusions> - <exclusion> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </exclusion> - <exclusion> - <groupId>javax.jms</groupId> - <artifactId>jms</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jdmk</groupId> - <artifactId>jmxtools</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jmx</groupId> - <artifactId>jmxri</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${junit.version}</version> - <scope>test</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> @@ -88,26 +62,7 @@ under the License. <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>${log4j.version}</version> <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </exclusion> - <exclusion> - <groupId>javax.jms</groupId> - <artifactId>jms</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jdmk</groupId> - <artifactId>jmxtools</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jmx</groupId> - <artifactId>jmxri</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>com.yammer.metrics</groupId> @@ -206,39 +161,4 @@ under the License. </plugins> </pluginManagement> </build> - <profiles> - <profile> - <id>hadoop1</id> - <activation> - <property> - <name>hadoop1</name> - </property> - </activation> - <properties> - <projectVersion>${project.parent.version}-hadoop1</projectVersion> - </properties> - </profile> - <profile> - <id>hadoop2-mr1</id> - <activation> - <property> - <name>hadoop2-mr1</name> - </property> - </activation> - <properties> - <projectVersion>${project.parent.version}-hadoop2-mr1</projectVersion> - </properties> - </profile> - <profile> - <id>hadoop2</id> - <activation> - <property> - <name>hadoop2</name> - </property> - </activation> - <properties> - <projectVersion>${project.parent.version}-hadoop2</projectVersion> - </properties> - </profile> - </profiles> </project> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/271fe0e2/distribution/src/assemble/bin-hadoop1.xml ---------------------------------------------------------------------- diff --git a/distribution/src/assemble/bin-hadoop1.xml b/distribution/src/assemble/bin-hadoop1.xml index 8d1d59b..2d9ba63 100644 --- a/distribution/src/assemble/bin-hadoop1.xml +++ b/distribution/src/assemble/bin-hadoop1.xml @@ -32,7 +32,6 @@ under the License. <unpack>false</unpack> <includes> <include>org.apache.blur:*</include> - <include>org.apache.zookeeper:zookeeper</include> <include>org.slf4j:slf4j-api</include> <include>org.slf4j:slf4j-log4j12</include> @@ -44,6 +43,8 @@ under the License. <include>org.apache.lucene:*</include> <include>com.spatial4j:spatial4j</include> <include>commons-cli:commons-cli</include> + <include>org.apache.commons:commons-collections4</include> + <include>org.eclipse.jetty:*</include> <include>com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru</include> <include>jline:jline</include> <include>com.fasterxml.jackson.core:*</include> @@ -53,38 +54,41 @@ under the License. <useProjectArtifact>false</useProjectArtifact> <outputDirectory>apache-blur-${project.version}-bin/lib/hadoop-${hadoop.version}</outputDirectory> <unpack>false</unpack> - <includes> - <include>org.apache.hadoop:*</include> - </includes> + <includes> + <include>org.apache.hadoop:*</include> + </includes> </dependencySet> <dependencySet> <useProjectArtifact>false</useProjectArtifact> <outputDirectory>apache-blur-${project.version}-bin/lib/hadoop-${hadoop.version}/lib</outputDirectory> <unpack>false</unpack> - <excludes> - <exclude>org.apache.blur:*</exclude> + <excludes> + <exclude>org.apache.blur:*</exclude> - <!-- No need to package eclipse stuff in there --> - <exclude>org.eclipse.jdt:core</exclude> + <!-- No need to package eclipse stuff in there --> + <exclude>org.eclipse.jdt:core</exclude> - <!-- Removing dup --> - <exclude>org.apache.hadoop:*</exclude> + <!-- Removing dup --> + <exclude>org.apache.hadoop:*</exclude> - <exclude>org.apache.zookeeper:zookeeper</exclude> - <exclude>org.slf4j:slf4j-api</exclude> - <exclude>org.slf4j:slf4j-log4j12</exclude> - <exclude>org.json:json</exclude> - <exclude>log4j:log4j</exclude> - <exclude>com.yammer.metrics:*</exclude> - <exclude>com.google.guava:guava</exclude> - <exclude>org.apache.httpcomponents:*</exclude> - <exclude>org.apache.lucene:*</exclude> - <exclude>com.spatial4j:spatial4j</exclude> - <exclude>commons-cli:commons-cli</exclude> - <exclude>com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru</exclude> - <exclude>jline:jline</exclude> - <exclude>com.fasterxml.jackson.core:*</exclude> - </excludes> + <exclude>org.apache.zookeeper:zookeeper</exclude> + <exclude>org.slf4j:slf4j-api</exclude> + <exclude>org.slf4j:slf4j-log4j12</exclude> + <exclude>org.json:json</exclude> + <exclude>log4j:log4j</exclude> + <exclude>com.yammer.metrics:*</exclude> + <exclude>com.google.guava:guava</exclude> + <exclude>org.apache.httpcomponents:*</exclude> + <exclude>org.apache.lucene:*</exclude> + <exclude>com.spatial4j:spatial4j</exclude> + <exclude>commons-cli:commons-cli</exclude> + <exclude>com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru</exclude> + <exclude>jline:jline</exclude> + <exclude>com.fasterxml.jackson.core:*</exclude> + <exclude>org.apache.commons:commons-collections4</exclude> + <exclude>org.mortbay.jetty:*</exclude> + <exclude>org.eclipse.jetty:*</exclude> + </excludes> </dependencySet> </dependencySets> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/271fe0e2/distribution/src/assemble/bin-hadoop2.xml ---------------------------------------------------------------------- diff --git a/distribution/src/assemble/bin-hadoop2.xml b/distribution/src/assemble/bin-hadoop2.xml index ee7d62b..52c8aab 100644 --- a/distribution/src/assemble/bin-hadoop2.xml +++ b/distribution/src/assemble/bin-hadoop2.xml @@ -18,7 +18,7 @@ under the License. --> <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd";> + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd";> <id>bin</id> <formats> <format>tar.gz</format> @@ -44,6 +44,8 @@ under the License. <include>org.apache.lucene:*</include> <include>com.spatial4j:spatial4j</include> <include>commons-cli:commons-cli</include> + <include>org.apache.commons:commons-collections4</include> + <include>org.eclipse.jetty:*</include> <include>com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru</include> <include>jline:jline</include> <include>com.fasterxml.jackson.core:*</include> @@ -53,38 +55,41 @@ under the License. <useProjectArtifact>false</useProjectArtifact> <outputDirectory>apache-blur-${project.version}-bin/lib/hadoop-${hadoop.version}</outputDirectory> <unpack>false</unpack> - <includes> - <include>org.apache.hadoop:*</include> - </includes> + <includes> + <include>org.apache.hadoop:*</include> + </includes> </dependencySet> <dependencySet> <useProjectArtifact>false</useProjectArtifact> <outputDirectory>apache-blur-${project.version}-bin/lib/hadoop-${hadoop.version}/lib</outputDirectory> <unpack>false</unpack> - <excludes> - <exclude>org.apache.blur:*</exclude> + <excludes> + <exclude>org.apache.blur:*</exclude> - <!-- No need to package eclipse stuff in there --> - <exclude>org.eclipse.jdt:core</exclude> + <!-- No need to package eclipse stuff in there --> + <exclude>org.eclipse.jdt:core</exclude> - <!-- Removing dup --> - <exclude>org.apache.hadoop:*</exclude> + <!-- Removing dup --> + <exclude>org.apache.hadoop:*</exclude> - <exclude>org.apache.zookeeper:zookeeper</exclude> - <exclude>org.slf4j:slf4j-api</exclude> - <exclude>org.slf4j:slf4j-log4j12</exclude> - <exclude>org.json:json</exclude> - <exclude>log4j:log4j</exclude> - <exclude>com.yammer.metrics:*</exclude> - <exclude>com.google.guava:guava</exclude> - <exclude>org.apache.httpcomponents:*</exclude> - <exclude>org.apache.lucene:*</exclude> - <exclude>com.spatial4j:spatial4j</exclude> - <exclude>commons-cli:commons-cli</exclude> - <exclude>com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru</exclude> - <exclude>jline:jline</exclude> - <exclude>com.fasterxml.jackson.core:*</exclude> - </excludes> + <exclude>org.apache.zookeeper:zookeeper</exclude> + <exclude>org.slf4j:slf4j-api</exclude> + <exclude>org.slf4j:slf4j-log4j12</exclude> + <exclude>org.json:json</exclude> + <exclude>log4j:log4j</exclude> + <exclude>com.yammer.metrics:*</exclude> + <exclude>com.google.guava:guava</exclude> + <exclude>org.apache.httpcomponents:*</exclude> + <exclude>org.apache.lucene:*</exclude> + <exclude>com.spatial4j:spatial4j</exclude> + <exclude>commons-cli:commons-cli</exclude> + <exclude>com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru</exclude> + <exclude>jline:jline</exclude> + <exclude>com.fasterxml.jackson.core:*</exclude> + <exclude>org.apache.commons:commons-collections4</exclude> + <exclude>org.mortbay.jetty:*</exclude> + <exclude>org.eclipse.jetty:*</exclude> + </excludes> </dependencySet> </dependencySets> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/271fe0e2/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b927694..58ccf8b 100644 --- a/pom.xml +++ b/pom.xml @@ -194,6 +194,107 @@ under the License. <servlet-api.version>2.5</servlet-api.version> </properties> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>${commons-logging.version}</version> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>2.1</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-webapp</artifactId> + <version>9.2.3.v20140905</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-test</artifactId> + <version>${hadoop.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-client</artifactId> + <version>${hadoop.version}</version> + <exclusions> + <exclusion> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-util</artifactId> + </exclusion> + <exclusion> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-minicluster</artifactId> + <version>${hadoop.version}</version> + <exclusions> + <exclusion> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-util</artifactId> + </exclusion> + <exclusion> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>${log4j.version}</version> + <exclusions> + <exclusion> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + </exclusion> + <exclusion> + <groupId>javax.jms</groupId> + <artifactId>jms</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jdmk</groupId> + <artifactId>jmxtools</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jmx</groupId> + <artifactId>jmxri</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + <version>${zookeeper.version}</version> + <exclusions> + <exclusion> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + </exclusion> + <exclusion> + <groupId>javax.jms</groupId> + <artifactId>jms</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jdmk</groupId> + <artifactId>jmxtools</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jmx</groupId> + <artifactId>jmxri</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + </dependencyManagement> + <dependencies> <dependency> <groupId>junit</groupId> @@ -389,9 +490,10 @@ under the License. </activation> <properties> <hadoop.version>1.2.1</hadoop.version> + <projectVersion>${project.parent.version}-hadoop1</projectVersion> </properties> <modules> - <module>blur-console</module> + <module>blur-console</module> <module>blur-core</module> <module>blur-thrift</module> <module>blur-query</module> @@ -412,10 +514,11 @@ under the License. </property> </activation> <properties> - <hadoop.version>2.3.0-mr1-cdh5.0.2</hadoop.version> + <hadoop.version>2.0.0-mr1-cdh4.6.0</hadoop.version> + <projectVersion>${project.parent.version}-hadoop2-mr1</projectVersion> </properties> <modules> - <module>blur-console</module> + <module>blur-console</module> <module>blur-core</module> <module>blur-thrift</module> <module>blur-query</module> @@ -437,9 +540,10 @@ under the License. </activation> <properties> <hadoop.version>2.2.0</hadoop.version> + <projectVersion>${project.parent.version}-hadoop2</projectVersion> </properties> <modules> - <module>blur-console</module> + <module>blur-console</module> <module>blur-core</module> <module>blur-thrift</module> <module>blur-query</module>
