eagle-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h..@apache.org
Subject incubator-eagle git commit: [EAGLE-329] Dependency incompatibility bug among jersey, asm and extcos under Java 8
Date Tue, 07 Jun 2016 06:10:00 GMT
Repository: incubator-eagle
Updated Branches:
  refs/heads/develop 985080112 -> 9d16f213c


[EAGLE-329] Dependency incompatibility bug among jersey, asm and extcos under Java 8

https://issues.apache.org/jira/browse/EAGLE-329

Author: Hao Chen <hao@apache.org>

Closes #226 from haoch/EAGLE-329.


Project: http://git-wip-us.apache.org/repos/asf/incubator-eagle/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-eagle/commit/9d16f213
Tree: http://git-wip-us.apache.org/repos/asf/incubator-eagle/tree/9d16f213
Diff: http://git-wip-us.apache.org/repos/asf/incubator-eagle/diff/9d16f213

Branch: refs/heads/develop
Commit: 9d16f213c991a816b4cf89732a51243b871b0c5a
Parents: 9850801
Author: Hao Chen <hao@apache.org>
Authored: Tue Jun 7 14:09:49 2016 +0800
Committer: Hao Chen <hao@apache.org>
Committed: Tue Jun 7 14:09:49 2016 +0800

----------------------------------------------------------------------
 .github/PULL_REQUEST_TEMPLATE.md                |  23 +-
 .../metadata/resource/MetadataResource.java     | 225 -------------------
 .../metadata/resource/MetadataResource.java     |   2 +-
 .../eagle-alert-parent/eagle-alert/pom.xml      | 101 +--------
 .../eagle-query/eagle-entity-base/pom.xml       |  10 +
 .../entity/repo/EntityRepositoryScanner.java    |   4 +-
 eagle-security/eagle-metric-collection/pom.xml  |   3 +-
 eagle-webservice/pom.xml                        |  67 +++++-
 pom.xml                                         |  31 ++-
 9 files changed, 132 insertions(+), 334 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/9d16f213/.github/PULL_REQUEST_TEMPLATE.md
----------------------------------------------------------------------
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index b17f620..c205680 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,8 +1,27 @@
+<!--
+{% comment %}
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to you under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+{% endcomment %}
+-->
+
 Be sure to do all of the following to help us incorporate your contribution
 quickly and easily:
 
  - [ ] Make sure the PR title is formatted like:
-   `[BEAM-<Jira issue #>] Description of pull request`
+   `[EAGLE-<Jira issue #>] Description of pull request`
  - [ ] Make sure tests pass via `mvn clean verify`. (Even better, enable
        Travis-CI on your fork and ensure the whole test matrix passes).
  - [ ] Replace `<Jira issue #>` in the title with the actual Jira issue
@@ -10,4 +29,4 @@ quickly and easily:
  - [ ] If this contribution is large, please file an Apache
        [Individual Contributor License Agreement](https://www.apache.org/licenses/icla.txt).
 
----
+---
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/9d16f213/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata-service/src/main/java/org/apache/eagle/alert/metadata/resource/MetadataResource.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata-service/src/main/java/org/apache/eagle/alert/metadata/resource/MetadataResource.java
b/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata-service/src/main/java/org/apache/eagle/alert/metadata/resource/MetadataResource.java
deleted file mode 100644
index 94ec767..0000000
--- a/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata-service/src/main/java/org/apache/eagle/alert/metadata/resource/MetadataResource.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.eagle.alert.metadata.resource;
-
-import java.util.List;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-
-import org.apache.eagle.alert.coordination.model.Kafka2TupleMetadata;
-import org.apache.eagle.alert.coordination.model.ScheduleState;
-import org.apache.eagle.alert.coordination.model.internal.PolicyAssignment;
-import org.apache.eagle.alert.coordination.model.internal.Topology;
-import org.apache.eagle.alert.engine.coordinator.PolicyDefinition;
-import org.apache.eagle.alert.engine.coordinator.Publishment;
-import org.apache.eagle.alert.engine.coordinator.PublishmentType;
-import org.apache.eagle.alert.engine.coordinator.StreamDefinition;
-import org.apache.eagle.alert.engine.coordinator.StreamingCluster;
-import org.apache.eagle.alert.metadata.impl.MetadataDaoFactory;
-
-/**
- * @since Apr 11, 2016
- *
- */
-@Path("/metadata")
-@Produces("application/json")
-@Consumes("application/json")
-public class MetadataResource {
-
-    private IMetadataDao dao = MetadataDaoFactory.getInstance().getMetadataDao();
-
-    @Path("/clusters")
-    @GET
-    public List<StreamingCluster> listClusters() {
-        return dao.listClusters();
-    }
-    
-    @Path("/clear")
-    @POST
-    public OpResult clear() {
-        return dao.clear();
-    }
-
-    @Path("/export")
-    @GET
-    public Models export() {
-        return dao.export();
-    }
-
-    @Path("/import")
-    @GET
-    public OpResult importModels(Models model) {
-        return dao.importModels(model);
-    }
-
-    @Path("/clusters")
-    @POST
-    public OpResult addCluster(StreamingCluster cluster) {
-        return dao.addCluster(cluster);
-    }
-
-    @Path("/clusters/{clusterId}")
-    @DELETE
-    public OpResult removeCluster(@PathParam("clusterId") String clusterId) {
-        return dao.removeCluster(clusterId);
-    }
-
-    @Path("/streams")
-    @GET
-    public List<StreamDefinition> listStreams() {
-        return dao.listStreams();
-    }
-
-    @Path("/streams")
-    @POST
-    public OpResult createStream(StreamDefinition stream) {
-        return dao.createStream(stream);
-    }
-
-    @Path("/streams/{streamId}")
-    @DELETE
-    public OpResult removeStream(@PathParam("streamId") String streamId) {
-        return dao.removeStream(streamId);
-    }
-
-    @Path("/datasources")
-    @GET
-    public List<Kafka2TupleMetadata> listDataSources() {
-        return dao.listDataSources();
-    }
-
-    @Path("/datasources")
-    @POST
-    public OpResult addDataSource(Kafka2TupleMetadata dataSource) {
-        return dao.addDataSource(dataSource);
-    }
-
-    @Path("/datasources/{datasourceId}")
-    @DELETE
-    public OpResult removeDataSource(@PathParam("datasourceId") String datasourceId) {
-        return dao.removeDataSource(datasourceId);
-    }
-
-    @Path("/policies")
-    @GET
-    public List<PolicyDefinition> listPolicies() {
-        return dao.listPolicies();
-    }
-
-    @Path("/policies")
-    @POST
-    public OpResult addPolicy(PolicyDefinition policy) {
-        return dao.addPolicy(policy);
-    }
-
-    @Path("/policies/{policyId}")
-    @DELETE
-    public OpResult removePolicy(@PathParam("policyId") String policyId) {
-        return dao.removePolicy(policyId);
-    }
-
-    @Path("/publishments")
-    @GET
-    public List<Publishment> listPublishment() {
-        return dao.listPublishment();
-    }
-
-    @Path("/publishments")
-    @POST
-    public OpResult addPublishment(Publishment publishment) {
-        return dao.addPublishment(publishment);
-    }
-
-    @Path("/publishments/{pubId}")
-    @DELETE
-    public OpResult removePublishment(@PathParam("pubId") String pubId) {
-        return dao.removePublishment(pubId);
-    }
-
-    @Path("/publishmentTypes")
-    @GET
-    public List<PublishmentType> listPublishmentType() {
-        return dao.listPublishmentType();
-    }
-
-    @Path("/publishmentTypes")
-    @POST
-    public OpResult addPublishmentType(PublishmentType publishmentType) {
-        return dao.addPublishmentType(publishmentType);
-    }
-
-    @Path("/publishmentTypes/{pubType}")
-    @DELETE
-    public OpResult removePublishmentType(@PathParam("pubType") String pubType) {
-        return dao.removePublishmentType(pubType);
-    }
-
-    @Path("/schedulestates/{versionId}")
-    @GET
-    public ScheduleState listScheduleState(@PathParam("versionId") String versionId) {
-        return dao.getScheduleState(versionId);
-    }
-
-    @Path("/schedulestates")
-    @GET
-    public ScheduleState latestScheduleState() {
-        return dao.getScheduleState();
-    }
-
-    @Path("/schedulestates")
-    @POST
-    public OpResult addScheduleState(ScheduleState state) {
-        return dao.addScheduleState(state);
-    }
-
-    @Path("/assignments")
-    @GET
-    public List<PolicyAssignment> listAssignmenets() {
-        return dao.listAssignments();
-    }
-
-    @Path("/assignments")
-    @POST
-    public OpResult addAssignmenet(PolicyAssignment pa) {
-        return dao.addAssignment(pa);
-    }
-
-    @Path("/topologies")
-    @GET
-    public List<Topology> listTopologies() {
-        return dao.listTopologies();
-    }
-
-    @Path("/topologies")
-    @POST
-    public OpResult addTopology(Topology t) {
-        return dao.addTopology(t);
-    }
-
-    @Path("/topologies/{topologyName}")
-    @DELETE
-    public OpResult removeTopology(@PathParam("topologyName") String topologyName) {
-        return dao.removeTopology(topologyName);
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/9d16f213/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata-service/src/main/java/org/apache/eagle/service/metadata/resource/MetadataResource.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata-service/src/main/java/org/apache/eagle/service/metadata/resource/MetadataResource.java
b/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata-service/src/main/java/org/apache/eagle/service/metadata/resource/MetadataResource.java
index 3ddc5eb..59ef52f 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata-service/src/main/java/org/apache/eagle/service/metadata/resource/MetadataResource.java
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata-service/src/main/java/org/apache/eagle/service/metadata/resource/MetadataResource.java
@@ -70,7 +70,7 @@ public class MetadataResource {
     }
 
     @Path("/import")
-    @GET
+    @POST
     public OpResult importModels(Models model) {
         return dao.importModels(model);
     }

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/9d16f213/eagle-core/eagle-alert-parent/eagle-alert/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/pom.xml b/eagle-core/eagle-alert-parent/eagle-alert/pom.xml
index 4ef83a3..906d148 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert/pom.xml
+++ b/eagle-core/eagle-alert-parent/eagle-alert/pom.xml
@@ -19,7 +19,6 @@
 		<version>0.5.0-incubating-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
-
 	<artifactId>eagle-alert</artifactId>
 	<packaging>pom</packaging>
 
@@ -32,97 +31,17 @@
 		<module>alert-devtools</module>
 	</modules>
 
-	<properties>
-		<!-- Runtime -->
-		<java.version>1.8</java.version>
-
-		<!-- Build -->
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<maven-compiler.version>2.0.2</maven-compiler.version>
-
-		<!-- Test -->
-		<junit.version>4.12</junit.version>
-
-		<!-- Utilities -->
-		<typesafe-config.version>1.2.1</typesafe-config.version>
-		<guava.version>19.0</guava.version>
-		<commons-lang3.version>3.3.2</commons-lang3.version>
-		<commons-collections.version>3.2.1</commons-collections.version>
-		<commons-lang.version>2.6</commons-lang.version>
-		<archaius.version>0.6.1</archaius.version>
-		<metrics.version>3.1.0</metrics.version>
-		<mapdb.version>3.0.0-M6</mapdb.version>
-
-		<!-- CEP -->
-		<siddhi.version>3.0.5</siddhi.version>
-
-		<!-- PUBLISH -->
-		<velocity.version>1.7</velocity.version>
-		<javax.mail.version>1.4</javax.mail.version>
-
-		<!-- JSON -->
-		<fastxml.version>2.4.5</fastxml.version>
-		<jackson.version>1.9.13</jackson.version>
-		<fasterxml-jackson.version>2.4.5</fasterxml-jackson.version>
-		<codehaus-jackson.version>1.9.13</codehaus-jackson.version>
-
-		<!-- Storm and Kafka -->
-		<storm.version>0.9.3</storm.version>
-		<storm-kafka.version>0.9.3.2.2.0.0-2041</storm-kafka.version>
-		<kafka-clients.version>0.8.2.0</kafka-clients.version>
-		<kafka.version>0.8.1.2.2.0.0-2041</kafka.version>
-		<kafka.artifact.id>kafka_2.10</kafka.artifact.id>
-		<zkclient.version>0.3</zkclient.version>
-		<slf4j-api.veresion>1.7.20</slf4j-api.veresion>
-		<slf4j-log4j12.veresion>1.7.20</slf4j-log4j12.veresion>
-		<logback.version>1.1.7</logback.version>
-
-		<!-- Web Service/Client -->
-		<jersey.version>1.19.1</jersey.version>
-		<!--<jersey-client.version>1.19.1</jersey-client.version>-->
-		<!--<jersey-server.version>1.19.1</jersey-server.version>-->
-		<!--<jersey-multipart.version>1.19.1</jersey-multipart.version>-->
-
-		<jetty.version>9.2.3.v20140905</jetty.version>
-		<tomcat-embed.version>7.0.55</tomcat-embed.version>
-		<swagger.version>1.5.8</swagger.version>
-		<curator-framework.version>2.8.0</curator-framework.version>
-		<mongodb.version>3.2.2</mongodb.version>
-		<mockito.version>1.10.19</mockito.version>
-		<joda.version>2.2</joda.version>
-		<metrics-elasticsearch-reporter.version>2.2.0</metrics-elasticsearch-reporter.version>
-	</properties>
-
-	<repositories>
-		<repository>
-			<id>Maven Central Repository</id>
-			<url>http://central.maven.org/maven2/</url>
-		</repository>
-		<repository>
-			<id>HDP Release Repository</id>
-			<url>http://repo.hortonworks.com/content/repositories/releases/</url>
-		</repository>
-		<repository>
-			<id>HDP Central Repository</id>
-			<url>http://repo.hortonworks.com/content/repositories/central/</url>
-		</repository>
-		<repository>
-			<id>WSO2 Public</id>
-			<url>http://maven.wso2.org/nexus/content/groups/wso2-public</url>
-		</repository>
-	</repositories>
-
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
 				<groupId>com.fasterxml.jackson.core</groupId>
 				<artifactId>jackson-core</artifactId>
-				<version>${fastxml.version}</version>
+				<version>${fasterxml-jackson.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>com.fasterxml.jackson.core</groupId>
 				<artifactId>jackson-databind</artifactId>
-				<version>${fastxml.version}</version>
+				<version>${fasterxml-jackson.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>javax.mail</groupId>
@@ -142,12 +61,12 @@
 			<dependency>
 				<groupId>org.apache.curator</groupId>
 				<artifactId>curator-framework</artifactId>
-				<version>${curator-framework.version}</version>
+				<version>${curator.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.curator</groupId>
 				<artifactId>curator-recipes</artifactId>
-				<version>${curator-framework.version}</version>
+				<version>${curator.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>com.fasterxml.jackson.core</groupId>
@@ -188,7 +107,7 @@
 			<dependency>
 				<groupId>org.slf4j</groupId>
 				<artifactId>slf4j-log4j12</artifactId>
-				<version>${slf4j-log4j12.veresion}</version>
+				<version>${slf4j-log4j12.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.storm</groupId>
@@ -243,7 +162,7 @@
 			<dependency>
 				<groupId>com.typesafe</groupId>
 				<artifactId>config</artifactId>
-				<version>${typesafe-config.version}</version>
+				<version>${typesafe.config.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>com.netflix.archaius</groupId>
@@ -336,13 +255,8 @@
 			<dependency>
 				<groupId>org.slf4j</groupId>
 				<artifactId>slf4j-api</artifactId>
-				<version>${slf4j-api.veresion}</version>
+				<version>${slf4j.version}</version>
 			</dependency>
-			<!--<dependency>-->
-				<!--<groupId>ch.qos.logback</groupId>-->
-				<!--<artifactId>logback-classic</artifactId>-->
-				<!--<version>${logback.version}</version>-->
-			<!--</dependency>-->
 			<dependency>
 				<groupId>io.swagger</groupId>
 				<artifactId>swagger-jaxrs</artifactId>
@@ -358,7 +272,6 @@
 				<artifactId>joda-time</artifactId>
 				<version>${joda.version}</version>
 			</dependency>
-
 			<dependency>
 				<groupId>org.elasticsearch</groupId>
 				<artifactId>metrics-elasticsearch-reporter</artifactId>

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/9d16f213/eagle-core/eagle-query/eagle-entity-base/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-entity-base/pom.xml b/eagle-core/eagle-query/eagle-entity-base/pom.xml
index 640e493..0c7bc75 100755
--- a/eagle-core/eagle-query/eagle-entity-base/pom.xml
+++ b/eagle-core/eagle-query/eagle-entity-base/pom.xml
@@ -34,6 +34,16 @@
 		<dependency>
 			<groupId>net.sf.extcos</groupId>
 			<artifactId>extcos</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.ow2.asm</groupId>
+					<artifactId>asm-all</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.ow2.asm</groupId>
+			<artifactId>asm-all</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.eagle</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/9d16f213/eagle-core/eagle-query/eagle-entity-base/src/main/java/org/apache/eagle/log/entity/repo/EntityRepositoryScanner.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-entity-base/src/main/java/org/apache/eagle/log/entity/repo/EntityRepositoryScanner.java
b/eagle-core/eagle-query/eagle-entity-base/src/main/java/org/apache/eagle/log/entity/repo/EntityRepositoryScanner.java
index 049964b..7065cbe 100644
--- a/eagle-core/eagle-query/eagle-entity-base/src/main/java/org/apache/eagle/log/entity/repo/EntityRepositoryScanner.java
+++ b/eagle-core/eagle-query/eagle-entity-base/src/main/java/org/apache/eagle/log/entity/repo/EntityRepositoryScanner.java
@@ -66,7 +66,5 @@ public final class EntityRepositoryScanner {
 			select().from("org.apache.eagle").returning(
 			allExtending(EntityRepository.class));
 		}
-
 	}
-
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/9d16f213/eagle-security/eagle-metric-collection/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-security/eagle-metric-collection/pom.xml b/eagle-security/eagle-metric-collection/pom.xml
index 67a6bad..8d7377f 100644
--- a/eagle-security/eagle-metric-collection/pom.xml
+++ b/eagle-security/eagle-metric-collection/pom.xml
@@ -91,9 +91,10 @@
           <version>${project.version}</version>
       </dependency>
       <dependency>
+          <!-- TODO: Clean explicit dependency version -->
           <groupId>com.hierynomus</groupId>
           <artifactId>sshj</artifactId>
           <version>0.13.0</version>
       </dependency>
   </dependencies>
-</project>
+</project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/9d16f213/eagle-webservice/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-webservice/pom.xml b/eagle-webservice/pom.xml
index eaa8312..1065506 100644
--- a/eagle-webservice/pom.xml
+++ b/eagle-webservice/pom.xml
@@ -74,9 +74,19 @@
 		<dependency>
 			<groupId>net.sf.extcos</groupId>
 			<artifactId>extcos</artifactId>
-			<version>${extcos3.version}</version>
+			<!--<version>${extcos3.version}</version>-->
+			<version>${extcos4.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.ow2.asm</groupId>
+					<artifactId>asm-all</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.ow2.asm</groupId>
+			<artifactId>asm-all</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>org.apache.eagle</groupId>
 			<artifactId>eagle-security-hbase-web</artifactId>
@@ -328,14 +338,65 @@
 			<groupId>org.apache.eagle</groupId>
 			<artifactId>alert-coordinator</artifactId>
 			<version>${project.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.ow2.asm</groupId>
+					<artifactId>asm-all</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>asm</groupId>
+					<artifactId>asm</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>asm</groupId>
+					<artifactId>asm-all</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>asm</groupId>
+					<artifactId>asm-commons</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>asm</groupId>
+					<artifactId>asm-tree</artifactId>
+				</exclusion>
+				<exclusion>
+					<artifactId>servlet-api</artifactId>
+					<groupId>javax.servlet</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.eagle</groupId>
 			<artifactId>alert-metadata-service</artifactId>
 			<version>${project.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.ow2.asm</groupId>
+					<artifactId>asm-all</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>asm</groupId>
+					<artifactId>asm</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>asm</groupId>
+					<artifactId>asm-all</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>asm</groupId>
+					<artifactId>asm-commons</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>asm</groupId>
+					<artifactId>asm-tree</artifactId>
+				</exclusion>
+				<exclusion>
+					<artifactId>servlet-api</artifactId>
+					<groupId>javax.servlet</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 	</dependencies>
-
 	<build>
 		<finalName>eagle-service</finalName>
 		<plugins>

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/9d16f213/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6b79490..adb6227 100755
--- a/pom.xml
+++ b/pom.xml
@@ -188,6 +188,7 @@
         <commons-httpclient.version>3.1</commons-httpclient.version>
         <commons-beanutils.version>1.8.0</commons-beanutils.version>
         <commons-collections4.version>4.0</commons-collections4.version>
+        <commons-collections.version>3.2.1</commons-collections.version>
         <commons-io.version>2.4</commons-io.version>
 
         <!-- Configuration -->
@@ -209,15 +210,22 @@
         <joda-convert.version>1.7</joda-convert.version>
         <log4j.version>1.2.17</log4j.version>
         <slf4j.version>1.7.5</slf4j.version>
+        <slf4j-log4j12.version>1.7.5</slf4j-log4j12.version>
         <log4j-over-slf4j.version>1.7.2</log4j-over-slf4j.version>
+        <logback.version>1.1.7</logback.version>
+
         <quartz.version>2.2.1</quartz.version>
         <scopt.version>3.3.0</scopt.version>
         <akka.actor.version>2.3.14</akka.actor.version>
         <reflections.version>0.9.10</reflections.version>
+        <metrics.version>3.1.0</metrics.version>
+        <mapdb.version>3.0.0-M6</mapdb.version>
+        <asm.version>5.0</asm.version>
 
         <!-- Streaming -->
         <kafka.version>0.8.2.2</kafka.version>
         <kafka-clients.version>0.8.2.0</kafka-clients.version>
+        <kafka.artifact.id>kafka_2.10</kafka.artifact.id>
         <jgrapht.version>0.9.0</jgrapht.version>
         <storm-kafka.version>0.9.3.2.2.0.0-2041</storm-kafka.version>
         <storm.version>0.9.3</storm.version>
@@ -228,6 +236,7 @@
         <mapr-storm.version>0.9.3-mapr-1509</mapr-storm.version>
 
         <curator.version>2.8.0</curator.version>
+        <zkclient.version>0.3</zkclient.version>
 
         <!-- Query -->
         <tomcat.version>7.0.42</tomcat.version>
@@ -246,7 +255,7 @@
         <derby.version>10.10.2.0</derby.version>
 
         <!-- REST Service-->
-        <jersey.version>1.8</jersey.version>
+        <jersey.version>1.19.1</jersey.version>
         <jaxb-api.version>2.1</jaxb-api.version>
         <jaxb-impl.version>2.2.6</jaxb-impl.version>
         <stax-api.version>1.0.1</stax-api.version>
@@ -263,7 +272,7 @@
         <siddhi.version>3.0.5</siddhi.version>
 
         <!-- Testing -->
-        <unit.test.version>4.10</unit.test.version>
+        <junit.version>4.12</junit.version>
         <junit-benchmarks.version>0.7.0</junit-benchmarks.version>
         <h2.version>1.3.172</h2.version>
         <scalatest.version>2.2.4</scalatest.version>
@@ -276,6 +285,13 @@
         <!-- sprint security -->
         <spring.framework.version>3.1.2.RELEASE</spring.framework.version>
 
+        <jetty.version>9.2.3.v20140905</jetty.version>
+        <tomcat-embed.version>7.0.55</tomcat-embed.version>
+        <swagger.version>1.5.8</swagger.version>
+        <mongodb.version>3.2.2</mongodb.version>
+        <mockito.version>1.10.19</mockito.version>
+        <joda.version>2.2</joda.version>
+        <metrics-elasticsearch-reporter.version>2.2.0</metrics-elasticsearch-reporter.version>
     </properties>
 
     <dependencyManagement>
@@ -357,6 +373,12 @@
                 <artifactId>scala-library</artifactId>
                 <version>${scala-lang.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.ow2.asm</groupId>
+                <artifactId>asm-all</artifactId>
+                <version>${asm.version}</version>
+            </dependency>
+
             <!-- Configuration -->
             <dependency>
                 <groupId>com.typesafe</groupId>
@@ -374,7 +396,7 @@
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-api</artifactId>
                 <version>${slf4j.version}</version>
-                <scope>compile</scope>
+                <!--<scope>compile</scope>-->
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
@@ -413,7 +435,6 @@
                 <artifactId>scopt_${scala.version}</artifactId>
                 <version>${scopt.version}</version>
             </dependency>
-
             <dependency>
                 <groupId>org.reflections</groupId>
                 <artifactId>reflections</artifactId>
@@ -657,7 +678,7 @@
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
-                <version>${unit.test.version}</version>
+                <version>${junit.version}</version>
                 <scope>test</scope>
             </dependency>
             <dependency>


Mime
View raw message