Repository: incubator-eagle Updated Branches: refs/heads/develop fe5091257 -> 72a1501c3
http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/72a1501c/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 906d148..2985600 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/pom.xml +++ b/eagle-core/eagle-alert-parent/eagle-alert/pom.xml @@ -10,7 +10,8 @@ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> @@ -29,6 +30,7 @@ <module>alert-coordinator</module> <module>alert-assembly</module> <module>alert-devtools</module> + <module>alert-service</module> </modules> <dependencyManagement> @@ -39,11 +41,6 @@ <version>${fasterxml-jackson.version}</version> </dependency> <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - <version>${fasterxml-jackson.version}</version> - </dependency> - <dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> <version>${javax.mail.version}</version> @@ -65,6 +62,11 @@ </dependency> <dependency> <groupId>org.apache.curator</groupId> + <artifactId>curator-test</artifactId> + <version>${curator.test.version}</version> + </dependency> + <dependency> + <groupId>org.apache.curator</groupId> <artifactId>curator-recipes</artifactId> <version>${curator.version}</version> </dependency> @@ -140,11 +142,6 @@ </exclusions> </dependency> <dependency> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-client</artifactId> - <version>${jersey.version}</version> - </dependency> - <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-jaxrs</artifactId> <version>${codehaus-jackson.version}</version> @@ -227,6 +224,12 @@ <artifactId>zkclient</artifactId> <version>${zkclient.version}</version> </dependency> + + <dependency> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-client</artifactId> + <version>${jersey.version}</version> + </dependency> <dependency> <groupId>com.sun.jersey</groupId> <artifactId>jersey-server</artifactId> @@ -234,6 +237,11 @@ </dependency> <dependency> <groupId>com.sun.jersey</groupId> + <artifactId>jersey-json</artifactId> + <version>${jersey.version}</version> + </dependency> + <dependency> + <groupId>com.sun.jersey</groupId> <artifactId>jersey-servlet</artifactId> <version>${jersey.version}</version> </dependency> @@ -242,6 +250,7 @@ <artifactId>jersey-multipart</artifactId> <version>${jersey.version}</version> </dependency> + <dependency> <groupId>org.apache.tomcat.embed</groupId> <artifactId>tomcat-embed-core</artifactId> @@ -277,13 +286,92 @@ <artifactId>metrics-elasticsearch-reporter</artifactId> <version>${metrics-elasticsearch-reporter.version}</version> </dependency> + <dependency> + <groupId>commons-cli</groupId> + <artifactId>commons-cli</artifactId> + <version>${common.cli.version}</version> + </dependency> + + <!-- dropwizard --> + <dependency> + <groupId>io.dropwizard</groupId> + <artifactId>dropwizard-core</artifactId> + <version>${dropwizard.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>io.dropwizard</groupId> + <artifactId>dropwizard-jersey</artifactId> + <version>${dropwizard.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>io.swagger</groupId> + <artifactId>swagger-jersey-jaxrs</artifactId> + <version>${swagger.version}</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>com.sun.jersey</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> + </dependency> </dependencies> </dependencyManagement> <build> + <plugins> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <executions> + <execution> + <id>header-check</id> + <phase>verify</phase> + <goals> + <goal>check</goal> + </goals> + <configuration> + <useDefaultExcludes>true</useDefaultExcludes> + <excludes> + <exclude>**/*.out</exclude> + <exclude>**/*.log</exclude> + <exclude>**/*.json</exclude> + <exclude>**/*.classpath</exclude> + <exclude>**/*.project</exclude> + <exclude>**/*.prefs</exclude> + <exclude>**/*.iml</exclude> + <exclude>**/MANIFEST.MF</exclude> + <exclude>**/dependency-reduced-pom.xml</exclude> + <exclude>**/target/**</exclude>` + </excludes> + </configuration> + </execution> + </executions> + </plugin> + </plugins> <pluginManagement> <plugins> <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <version>${maven-apache-rat.version}</version> + <configuration> + <useDefaultExcludes>true</useDefaultExcludes> + </configuration> + </plugin> + <plugin> <artifactId>maven-compiler-plugin</artifactId> <version>${maven-compiler.version}</version> <configuration> http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/72a1501c/eagle-core/eagle-data-process/eagle-stream-process-api/src/main/java/org/apache/eagle/dataproc/impl/storm/kafka/KafkaSourcedSpoutProvider.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-data-process/eagle-stream-process-api/src/main/java/org/apache/eagle/dataproc/impl/storm/kafka/KafkaSourcedSpoutProvider.java b/eagle-core/eagle-data-process/eagle-stream-process-api/src/main/java/org/apache/eagle/dataproc/impl/storm/kafka/KafkaSourcedSpoutProvider.java index 0107a9b..c6a4983 100644 --- a/eagle-core/eagle-data-process/eagle-stream-process-api/src/main/java/org/apache/eagle/dataproc/impl/storm/kafka/KafkaSourcedSpoutProvider.java +++ b/eagle-core/eagle-data-process/eagle-stream-process-api/src/main/java/org/apache/eagle/dataproc/impl/storm/kafka/KafkaSourcedSpoutProvider.java @@ -95,7 +95,7 @@ public class KafkaSourcedSpoutProvider implements StormSpoutProvider { } // "forceFromStart" is for test usage, prod should not use this if (context.hasPath("forceFromStart")) { - spoutConfig.forceFromStart = context.getBoolean("forceFromStart"); + spoutConfig.startOffsetTime = kafka.api.OffsetRequest.EarliestTime(); } spoutConfig.scheme = getStreamScheme(deserClsName, context); http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/72a1501c/eagle-security/eagle-security-common/src/main/java/org/apache/eagle/security/topo/NewKafkaSourcedSpoutProvider.java ---------------------------------------------------------------------- diff --git a/eagle-security/eagle-security-common/src/main/java/org/apache/eagle/security/topo/NewKafkaSourcedSpoutProvider.java b/eagle-security/eagle-security-common/src/main/java/org/apache/eagle/security/topo/NewKafkaSourcedSpoutProvider.java index 47d3b21..e60e59e 100644 --- a/eagle-security/eagle-security-common/src/main/java/org/apache/eagle/security/topo/NewKafkaSourcedSpoutProvider.java +++ b/eagle-security/eagle-security-common/src/main/java/org/apache/eagle/security/topo/NewKafkaSourcedSpoutProvider.java @@ -96,7 +96,7 @@ public class NewKafkaSourcedSpoutProvider implements StormSpoutProvider { } // "forceFromStart" is for test usage, prod should not use this if (context.hasPath("forceFromStart")) { - spoutConfig.forceFromStart = context.getBoolean("forceFromStart"); + spoutConfig.startOffsetTime = kafka.api.OffsetRequest.EarliestTime(); } if (context.hasPath("schemeCls")) { http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/72a1501c/eagle-security/eagle-security-hdfs-auditlog/src/main/java/org/apache/eagle/security/auditlog/kafka/UserPartitioner.java ---------------------------------------------------------------------- diff --git a/eagle-security/eagle-security-hdfs-auditlog/src/main/java/org/apache/eagle/security/auditlog/kafka/UserPartitioner.java b/eagle-security/eagle-security-hdfs-auditlog/src/main/java/org/apache/eagle/security/auditlog/kafka/UserPartitioner.java index 447c7ef..9948670 100644 --- a/eagle-security/eagle-security-hdfs-auditlog/src/main/java/org/apache/eagle/security/auditlog/kafka/UserPartitioner.java +++ b/eagle-security/eagle-security-hdfs-auditlog/src/main/java/org/apache/eagle/security/auditlog/kafka/UserPartitioner.java @@ -17,7 +17,6 @@ package org.apache.eagle.security.auditlog.kafka; import kafka.utils.VerifiableProperties; -import kafka.utils.Utils; public class UserPartitioner implements kafka.producer.Partitioner{ private VerifiableProperties prop; @@ -28,6 +27,6 @@ public class UserPartitioner implements kafka.producer.Partitioner{ @Override public int partition(Object arg0, int arg1) { String user = (String)arg0; - return Utils.abs(user.hashCode()) % arg1; + return Math.abs(user.hashCode()) % arg1; } } http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/72a1501c/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index adb6227..e240c8a 100755 --- a/pom.xml +++ b/pom.xml @@ -197,8 +197,8 @@ <!-- Serialization --> <gson.version>2.2.2</gson.version> - <guava.version>14.0.1</guava.version> - <fasterxml-jackson.version>2.4.5</fasterxml-jackson.version> + <guava.version>19.0</guava.version> + <fasterxml-jackson.version>2.5.4</fasterxml-jackson.version> <codehaus-jackson.version>1.9.13</codehaus-jackson.version> <jsoup.version>1.7.3</jsoup.version> <io.netty.version>3.6.7.Final</io.netty.version> @@ -223,11 +223,11 @@ <asm.version>5.0</asm.version> <!-- Streaming --> - <kafka.version>0.8.2.2</kafka.version> + <kafka.version>0.10.0.0</kafka.version> <kafka-clients.version>0.8.2.0</kafka-clients.version> - <kafka.artifact.id>kafka_2.10</kafka.artifact.id> + <kafka.artifact.id>kafka_2.11</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-kafka.version>0.10.0</storm-kafka.version> <storm.version>0.9.3</storm.version> <mapr-kafka.version>0.8.1.1</mapr-kafka.version> @@ -236,6 +236,7 @@ <mapr-storm.version>0.9.3-mapr-1509</mapr-storm.version> <curator.version>2.8.0</curator.version> + <curator.test.version>2.5.0</curator.test.version> <zkclient.version>0.3</zkclient.version> <!-- Query --> @@ -292,8 +293,17 @@ <mockito.version>1.10.19</mockito.version> <joda.version>2.2</joda.version> <metrics-elasticsearch-reporter.version>2.2.0</metrics-elasticsearch-reporter.version> + + <common.cli.version>1.3.1</common.cli.version> + + <!-- dropwizard --> + <dropwizard.version>0.7.1</dropwizard.version> + </properties> + + + <dependencyManagement> <dependencies> <!-- Commons Dependencies--> @@ -1147,6 +1157,18 @@ <updatePolicy>never</updatePolicy> </releases> </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> <pluginRepositories> <pluginRepository>
