Repository: metron Updated Branches: refs/heads/master 3d95fdf90 -> 82bf89ba4
METRON-1094: MaaS will not start due to classpath error relating to Yarn closes apache/incubator-metron#688 Project: http://git-wip-us.apache.org/repos/asf/metron/repo Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/82bf89ba Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/82bf89ba Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/82bf89ba Branch: refs/heads/master Commit: 82bf89ba4ada583ac68dbb44e7fd658ad45e8337 Parents: 3d95fdf Author: cstella <[email protected]> Authored: Fri Aug 11 13:30:04 2017 -0400 Committer: cstella <[email protected]> Committed: Fri Aug 11 13:30:04 2017 -0400 ---------------------------------------------------------------------- metron-analytics/metron-maas-service/pom.xml | 19 ++++++++++++++++--- .../metron/maas/functions/MaaSFunctions.java | 2 +- .../apache/metron/maas/service/MockDGAModel.java | 2 +- 3 files changed, 18 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metron/blob/82bf89ba/metron-analytics/metron-maas-service/pom.xml ---------------------------------------------------------------------- diff --git a/metron-analytics/metron-maas-service/pom.xml b/metron-analytics/metron-maas-service/pom.xml index e76aec2..0ac9bac 100644 --- a/metron-analytics/metron-maas-service/pom.xml +++ b/metron-analytics/metron-maas-service/pom.xml @@ -33,19 +33,31 @@ </properties> <dependencies> <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-yarn-api</artifactId> + <version>${hadoop.version}</version> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.apache.metron</groupId> <artifactId>metron-maas-common</artifactId> <version>${project.parent.version}</version> </dependency> <dependency> - <groupId>org.apache.metron</groupId> - <artifactId>metron-common</artifactId> - <version>${project.parent.version}</version> + <groupId>de.javakaffee</groupId> + <artifactId>kryo-serializers</artifactId> + <version>${global_kryo_serializers_version}</version> </dependency> <dependency> <groupId>org.apache.metron</groupId> <artifactId>stellar-common</artifactId> <version>${project.parent.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-auth</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> @@ -59,6 +71,7 @@ <version>${hadoop.version}</version> <scope>provided</scope> </dependency> + <dependency> <groupId>com.sun.jersey.contribs</groupId> <artifactId>jersey-guice</artifactId> http://git-wip-us.apache.org/repos/asf/metron/blob/82bf89ba/metron-analytics/metron-maas-service/src/main/java/org/apache/metron/maas/functions/MaaSFunctions.java ---------------------------------------------------------------------- diff --git a/metron-analytics/metron-maas-service/src/main/java/org/apache/metron/maas/functions/MaaSFunctions.java b/metron-analytics/metron-maas-service/src/main/java/org/apache/metron/maas/functions/MaaSFunctions.java index e205518..eacb64d 100644 --- a/metron-analytics/metron-maas-service/src/main/java/org/apache/metron/maas/functions/MaaSFunctions.java +++ b/metron-analytics/metron-maas-service/src/main/java/org/apache/metron/maas/functions/MaaSFunctions.java @@ -29,13 +29,13 @@ import java.util.Map; import java.util.Optional; import java.util.concurrent.TimeUnit; import org.apache.curator.framework.CuratorFramework; -import org.apache.metron.common.utils.JSONUtils; import org.apache.metron.maas.config.Endpoint; import org.apache.metron.maas.config.MaaSConfig; import org.apache.metron.maas.config.ModelEndpoint; import org.apache.metron.maas.discovery.ServiceDiscoverer; import org.apache.metron.maas.util.ConfigUtil; import org.apache.metron.maas.util.RESTUtil; +import org.apache.metron.stellar.common.utils.JSONUtils; import org.apache.metron.stellar.dsl.Context; import org.apache.metron.stellar.dsl.ParseException; import org.apache.metron.stellar.dsl.Stellar; http://git-wip-us.apache.org/repos/asf/metron/blob/82bf89ba/metron-analytics/metron-maas-service/src/test/java/org/apache/metron/maas/service/MockDGAModel.java ---------------------------------------------------------------------- diff --git a/metron-analytics/metron-maas-service/src/test/java/org/apache/metron/maas/service/MockDGAModel.java b/metron-analytics/metron-maas-service/src/test/java/org/apache/metron/maas/service/MockDGAModel.java index 18604b4..66948aa 100644 --- a/metron-analytics/metron-maas-service/src/test/java/org/apache/metron/maas/service/MockDGAModel.java +++ b/metron-analytics/metron-maas-service/src/test/java/org/apache/metron/maas/service/MockDGAModel.java @@ -21,7 +21,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.google.common.collect.ImmutableMap; import com.sun.net.httpserver.HttpHandler; import com.sun.net.httpserver.HttpServer; -import org.apache.metron.common.utils.JSONUtils; +import org.apache.metron.stellar.common.utils.JSONUtils; import javax.ws.rs.*; import javax.ws.rs.core.Application;
