ATLAS-2251: removed typesystem module and scala, json4s, gson libraries
Project: http://git-wip-us.apache.org/repos/asf/atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/0a00dcb1 Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/0a00dcb1 Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/0a00dcb1 Branch: refs/heads/ATLAS-2251 Commit: 0a00dcb1a504f9959617f95942f44444bca3c581 Parents: d511b28 Author: Madhan Neethiraj <mad...@apache.org> Authored: Wed Nov 8 16:36:17 2017 -0800 Committer: Madhan Neethiraj <mad...@apache.org> Committed: Wed Nov 8 20:50:43 2017 -0800 ---------------------------------------------------------------------- addons/falcon-bridge/pom.xml | 61 +- addons/hbase-bridge/pom.xml | 97 +-- addons/hdfs-model/pom.xml | 66 -- addons/hive-bridge/pom.xml | 56 +- .../hive/bridge/HiveMetaStoreBridgeTest.java | 2 +- .../org/apache/atlas/hive/hook/HiveHookIT.java | 13 +- addons/sqoop-bridge/pom.xml | 61 +- addons/storm-bridge/pom.xml | 115 +--- authorization/pom.xml | 7 + client/client-v1/pom.xml | 9 +- client/pom.xml | 12 +- common/pom.xml | 1 + graphdb/api/pom.xml | 6 +- graphdb/common/pom.xml | 6 + intg/pom.xml | 18 +- .../apache/atlas/TestRelationshipUtilsV2.java | 26 +- .../test/java/org/apache/atlas/TestUtilsV2.java | 140 ++-- .../atlas/type/TestAtlasRelationshipType.java | 14 +- .../test/resources/atlas-application.properties | 145 +++++ intg/src/test/resources/policy-store.txt | 9 + intg/src/test/resources/sampleInstance.json | 72 +++ intg/src/test/resources/sampleTypes.json | 633 +++++++++++++++++++ .../test/resources/users-credentials.properties | 3 + notification/pom.xml | 33 +- .../atlas/kafka/KafkaNotificationMockTest.java | 2 +- pom.xml | 137 +--- repository/pom.xml | 85 +-- .../atlas/discovery/EntityDiscoveryService.java | 14 +- .../org/apache/atlas/query/QueryParser.java | 6 +- .../atlas/query/SelectExpressionHelper.java | 6 +- server-api/pom.xml | 5 - typesystem/.gitignore | 35 - typesystem/LICENSE.md | 201 ------ typesystem/doc/IDataType.uml | 190 ------ typesystem/doc/Instance.uml | 126 ---- typesystem/doc/QueryDSL.org | 266 -------- typesystem/doc/notes.MD | 78 --- typesystem/pom.xml | 165 ----- .../atlas/classification/InterfaceAudience.java | 48 -- .../exception/TypeExistsException.java | 27 - .../exception/TypeNotFoundException.java | 46 -- .../atlas/typesystem/types/package-info.java | 125 ---- typesystem/src/main/resources/atlas-log4j.xml | 105 --- .../test/resources/atlas-application.properties | 145 ----- typesystem/src/test/resources/policy-store.txt | 9 - .../src/test/resources/sampleInstance.json | 72 --- typesystem/src/test/resources/sampleTypes.json | 633 ------------------- .../test/resources/users-credentials.properties | 3 - webapp/pom.xml | 24 +- .../atlas/classification/InterfaceAudience.java | 48 ++ .../org/apache/atlas/examples/QuickStart.java | 38 +- .../org/apache/atlas/examples/QuickStartV2.java | 66 +- .../atlas/web/service/ActiveInstanceState.java | 2 +- .../notification/EntityNotificationIT.java | 8 +- .../atlas/web/integration/BasicSearchIT.java | 4 +- .../DataSetLineageJerseyResourceIT.java | 34 +- .../EntityDiscoveryJerseyResourceIT.java | 11 +- .../web/integration/EntityJerseyResourceIT.java | 43 +- .../EntityLineageJerseyResourceIT.java | 32 +- .../integration/EntityV2JerseyResourceIT.java | 35 +- .../MetadataDiscoveryJerseyResourceIT.java | 11 +- .../integration/TypedefsJerseyResourceIT.java | 23 +- .../web/integration/TypesJerseyResourceIT.java | 36 +- .../web/service/ActiveInstanceStateTest.java | 2 +- 64 files changed, 1225 insertions(+), 3326 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/atlas/blob/0a00dcb1/addons/falcon-bridge/pom.xml ---------------------------------------------------------------------- diff --git a/addons/falcon-bridge/pom.xml b/addons/falcon-bridge/pom.xml index a732e5d..f5b0b45 100644 --- a/addons/falcon-bridge/pom.xml +++ b/addons/falcon-bridge/pom.xml @@ -48,11 +48,6 @@ <dependency> <groupId>org.apache.atlas</groupId> - <artifactId>atlas-typesystem</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.atlas</groupId> <artifactId>atlas-client-v1</artifactId> </dependency> @@ -100,13 +95,6 @@ <type>pom</type> <scope>test</scope> </dependency> - - <dependency> - <groupId>org.apache.atlas</groupId> - <artifactId>atlas-typesystem</artifactId> - <classifier>tests</classifier> - <scope>test</scope> - </dependency> </dependencies> <profiles> @@ -141,21 +129,6 @@ <version>${project.version}</version> </artifactItem> <artifactItem> - <groupId>org.json4s</groupId> - <artifactId>json4s-native_${scala.binary.version}</artifactId> - <version>${json.version}</version> - </artifactItem> - <artifactItem> - <groupId>org.json4s</groupId> - <artifactId>json4s-core_${scala.binary.version}</artifactId> - <version>${json.version}</version> - </artifactItem> - <artifactItem> - <groupId>org.json4s</groupId> - <artifactId>json4s-ast_${scala.binary.version}</artifactId> - <version>${json.version}</version> - </artifactItem> - <artifactItem> <groupId>${project.groupId}</groupId> <artifactId>atlas-client-common</artifactId> <version>${project.version}</version> @@ -172,11 +145,6 @@ </artifactItem> <artifactItem> <groupId>${project.groupId}</groupId> - <artifactId>atlas-typesystem</artifactId> - <version>${project.version}</version> - </artifactItem> - <artifactItem> - <groupId>${project.groupId}</groupId> <artifactId>atlas-intg</artifactId> <version>${project.version}</version> </artifactItem> @@ -196,28 +164,8 @@ <version>${project.version}</version> </artifactItem> <artifactItem> - <groupId>org.scala-lang</groupId> - <artifactId>scala-compiler</artifactId> - <version>${scala.version}</version> - </artifactItem> - <artifactItem> - <groupId>org.scala-lang</groupId> - <artifactId>scala-reflect</artifactId> - <version>${scala.version}</version> - </artifactItem> - <artifactItem> - <groupId>org.scala-lang</groupId> - <artifactId>scala-library</artifactId> - <version>${scala.version}</version> - </artifactItem> - <artifactItem> - <groupId>org.scala-lang</groupId> - <artifactId>scalap</artifactId> - <version>${scala.version}</version> - </artifactItem> - <artifactItem> <groupId>org.apache.kafka</groupId> - <artifactId>kafka_${scala.binary.version}</artifactId> + <artifactId>kafka_${kafka.scala.binary.version}</artifactId> <version>${kafka.version}</version> </artifactItem> <artifactItem> @@ -225,11 +173,6 @@ <artifactId>kafka-clients</artifactId> <version>${kafka.version}</version> </artifactItem> - <artifactItem> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - <version>${gson.version}</version> - </artifactItem> </artifactItems> </configuration> </execution> @@ -302,7 +245,7 @@ </systemProperty> <systemProperty> <key>atlas.conf</key> - <value>${project.build.directory}/../../../typesystem/target/test-classes</value> + <value>${project.build.directory}/../../../intg/target/test-classes</value> </systemProperty> <systemProperty> <key>atlas.home</key> http://git-wip-us.apache.org/repos/asf/atlas/blob/0a00dcb1/addons/hbase-bridge/pom.xml ---------------------------------------------------------------------- diff --git a/addons/hbase-bridge/pom.xml b/addons/hbase-bridge/pom.xml index ebdb361..3dc4f1b 100644 --- a/addons/hbase-bridge/pom.xml +++ b/addons/hbase-bridge/pom.xml @@ -124,13 +124,6 @@ </dependency> <dependency> - <groupId>org.apache.atlas</groupId> - <artifactId>atlas-typesystem</artifactId> - <classifier>tests</classifier> - <scope>test</scope> - </dependency> - - <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-server</artifactId> <version>${hbase.version}</version> @@ -186,42 +179,6 @@ <id>dist</id> <build> <plugins> - <plugin> - <groupId>net.alchim31.maven</groupId> - <artifactId>scala-maven-plugin</artifactId> - <version>3.2.0</version> - <executions> - <execution> - <id>scala-compile-first</id> - <phase>process-resources</phase> - <goals> - <goal>compile</goal> - </goals> - </execution> - <execution> - <id>scala-test-compile-first</id> - <phase>process-test-resources</phase> - <goals> - <goal>testCompile</goal> - </goals> - </execution> - </executions> - <configuration> - <scalaVersion>${scala.version}</scalaVersion> - <recompileMode>incremental</recompileMode> - <useZincServer>true</useZincServer> - <source>1.7</source> - <target>1.7</target> - <args> - <arg>-unchecked</arg> - <arg>-deprecation</arg> - <arg>-feature</arg> - </args> - <jvmArgs> - <jvmArg>-Xmx512m</jvmArg> - </jvmArgs> - </configuration> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> @@ -244,21 +201,6 @@ <version>${project.version}</version> </artifactItem> <artifactItem> - <groupId>org.json4s</groupId> - <artifactId>json4s-native_${scala.binary.version}</artifactId> - <version>${json.version}</version> - </artifactItem> - <artifactItem> - <groupId>org.json4s</groupId> - <artifactId>json4s-core_${scala.binary.version}</artifactId> - <version>${json.version}</version> - </artifactItem> - <artifactItem> - <groupId>org.json4s</groupId> - <artifactId>json4s-ast_${scala.binary.version}</artifactId> - <version>${json.version}</version> - </artifactItem> - <artifactItem> <groupId>${project.groupId}</groupId> <artifactId>atlas-client-v1</artifactId> <version>${project.version}</version> @@ -275,11 +217,6 @@ </artifactItem> <artifactItem> <groupId>${project.groupId}</groupId> - <artifactId>atlas-typesystem</artifactId> - <version>${project.version}</version> - </artifactItem> - <artifactItem> - <groupId>${project.groupId}</groupId> <artifactId>atlas-notification</artifactId> <version>${project.version}</version> </artifactItem> @@ -294,33 +231,8 @@ <version>${project.version}</version> </artifactItem> <artifactItem> - <groupId>org.scala-lang</groupId> - <artifactId>scala-compiler</artifactId> - <version>${scala.version}</version> - </artifactItem> - <artifactItem> - <groupId>org.scala-lang</groupId> - <artifactId>scala-reflect</artifactId> - <version>${scala.version}</version> - </artifactItem> - <artifactItem> - <groupId>org.scala-lang</groupId> - <artifactId>scala-library</artifactId> - <version>${scala.version}</version> - </artifactItem> - <artifactItem> - <groupId>org.scala-lang</groupId> - <artifactId>scalap</artifactId> - <version>${scala.version}</version> - </artifactItem> - <artifactItem> - <groupId>com.google.inject.extensions</groupId> - <artifactId>guice-multibindings</artifactId> - <version>${guice.version}</version> - </artifactItem> - <artifactItem> <groupId>org.apache.kafka</groupId> - <artifactId>kafka_${scala.binary.version}</artifactId> + <artifactId>kafka_${kafka.scala.binary.version}</artifactId> <version>${kafka.version}</version> </artifactItem> <artifactItem> @@ -328,11 +240,6 @@ <artifactId>kafka-clients</artifactId> <version>${kafka.version}</version> </artifactItem> - <artifactItem> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - <version>${gson.version}</version> - </artifactItem> </artifactItems> </configuration> </execution> @@ -406,7 +313,7 @@ </systemProperty> <systemProperty> <key>atlas.conf</key> - <value>${project.build.directory}/../../../typesystem/target/test-classes</value> + <value>${project.build.directory}/../../../intg/target/test-classes</value> </systemProperty> <systemProperty> <key>atlas.home</key> http://git-wip-us.apache.org/repos/asf/atlas/blob/0a00dcb1/addons/hdfs-model/pom.xml ---------------------------------------------------------------------- diff --git a/addons/hdfs-model/pom.xml b/addons/hdfs-model/pom.xml index 4fd738a..b3f06b7 100644 --- a/addons/hdfs-model/pom.xml +++ b/addons/hdfs-model/pom.xml @@ -45,11 +45,6 @@ <!-- apache atlas core dependencies --> <dependency> <groupId>org.apache.atlas</groupId> - <artifactId>atlas-typesystem</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.atlas</groupId> <artifactId>atlas-client-v1</artifactId> </dependency> @@ -83,72 +78,11 @@ <artifactId>atlas-repository</artifactId> <scope>test</scope> </dependency> - - <dependency> - <groupId>org.apache.atlas</groupId> - <artifactId>atlas-typesystem</artifactId> - <classifier>tests</classifier> - <scope>test</scope> - </dependency> </dependencies> <build> <plugins> <plugin> - <groupId>net.alchim31.maven</groupId> - <artifactId>scala-maven-plugin</artifactId> - <version>3.2.0</version> - <executions> - <execution> - <id>scala-compile-first</id> - <phase>process-resources</phase> - <goals> - <goal>compile</goal> - </goals> - </execution> - <execution> - <id>scala-test-compile-first</id> - <phase>process-test-resources</phase> - <goals> - <goal>testCompile</goal> - </goals> - </execution> - </executions> - <configuration> - <scalaVersion>${scala.version}</scalaVersion> - <recompileMode>incremental</recompileMode> - <useZincServer>true</useZincServer> - <source>1.7</source> - <target>1.7</target> - <args> - <arg>-unchecked</arg> - <arg>-deprecation</arg> - <arg>-feature</arg> - </args> - <jvmArgs> - <jvmArg>-Xmx512m</jvmArg> - </jvmArgs> - <!-- - <javacArgs> - <javacArg>-source</javacArg> - <javacArg>${java.version}</javacArg> - <javacArg>-target</javacArg> - <javacArg>${java.version}</javacArg> - </javacArgs> - --> - <!-- The following plugin is required to use quasiquotes in Scala 2.10 and is used - by Spark SQL for code generation. --> - <!--<compilerPlugins> - <compilerPlugin> - <groupId>org.scalamacros</groupId> - <artifactId>paradise_${scala.version}</artifactId> - <version>${scala.macros.version}</version> - </compilerPlugin> - </compilerPlugins>--> - </configuration> - </plugin> - - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> <dependencies> http://git-wip-us.apache.org/repos/asf/atlas/blob/0a00dcb1/addons/hive-bridge/pom.xml ---------------------------------------------------------------------- diff --git a/addons/hive-bridge/pom.xml b/addons/hive-bridge/pom.xml index faf14d3..b16d1c3 100755 --- a/addons/hive-bridge/pom.xml +++ b/addons/hive-bridge/pom.xml @@ -95,11 +95,6 @@ <dependency> <groupId>org.apache.atlas</groupId> - <artifactId>atlas-typesystem</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.atlas</groupId> <artifactId>atlas-client-v1</artifactId> </dependency> @@ -156,7 +151,7 @@ <dependency> <groupId>org.apache.atlas</groupId> - <artifactId>atlas-typesystem</artifactId> + <artifactId>atlas-intg</artifactId> <classifier>tests</classifier> <scope>test</scope> </dependency> @@ -189,21 +184,6 @@ <version>${project.version}</version> </artifactItem> <artifactItem> - <groupId>org.json4s</groupId> - <artifactId>json4s-native_${scala.binary.version}</artifactId> - <version>${json.version}</version> - </artifactItem> - <artifactItem> - <groupId>org.json4s</groupId> - <artifactId>json4s-core_${scala.binary.version}</artifactId> - <version>${json.version}</version> - </artifactItem> - <artifactItem> - <groupId>org.json4s</groupId> - <artifactId>json4s-ast_${scala.binary.version}</artifactId> - <version>${json.version}</version> - </artifactItem> - <artifactItem> <groupId>${project.groupId}</groupId> <artifactId>atlas-client-common</artifactId> <version>${project.version}</version> @@ -220,11 +200,6 @@ </artifactItem> <artifactItem> <groupId>${project.groupId}</groupId> - <artifactId>atlas-typesystem</artifactId> - <version>${project.version}</version> - </artifactItem> - <artifactItem> - <groupId>${project.groupId}</groupId> <artifactId>atlas-intg</artifactId> <version>${project.version}</version> </artifactItem> @@ -244,28 +219,8 @@ <version>${project.version}</version> </artifactItem> <artifactItem> - <groupId>org.scala-lang</groupId> - <artifactId>scala-compiler</artifactId> - <version>${scala.version}</version> - </artifactItem> - <artifactItem> - <groupId>org.scala-lang</groupId> - <artifactId>scala-reflect</artifactId> - <version>${scala.version}</version> - </artifactItem> - <artifactItem> - <groupId>org.scala-lang</groupId> - <artifactId>scala-library</artifactId> - <version>${scala.version}</version> - </artifactItem> - <artifactItem> - <groupId>org.scala-lang</groupId> - <artifactId>scalap</artifactId> - <version>${scala.version}</version> - </artifactItem> - <artifactItem> <groupId>org.apache.kafka</groupId> - <artifactId>kafka_${scala.binary.version}</artifactId> + <artifactId>kafka_${kafka.scala.binary.version}</artifactId> <version>${kafka.version}</version> </artifactItem> <artifactItem> @@ -273,11 +228,6 @@ <artifactId>kafka-clients</artifactId> <version>${kafka.version}</version> </artifactItem> - <artifactItem> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - <version>${gson.version}</version> - </artifactItem> </artifactItems> </configuration> </execution> @@ -351,7 +301,7 @@ </systemProperty> <systemProperty> <key>atlas.conf</key> - <value>${project.build.directory}/../../../typesystem/target/test-classes</value> + <value>${project.build.directory}/../../../intg/target/test-classes</value> </systemProperty> <systemProperty> <key>atlas.home</key> http://git-wip-us.apache.org/repos/asf/atlas/blob/0a00dcb1/addons/hive-bridge/src/test/java/org/apache/atlas/hive/bridge/HiveMetaStoreBridgeTest.java ---------------------------------------------------------------------- diff --git a/addons/hive-bridge/src/test/java/org/apache/atlas/hive/bridge/HiveMetaStoreBridgeTest.java b/addons/hive-bridge/src/test/java/org/apache/atlas/hive/bridge/HiveMetaStoreBridgeTest.java index 8cc1bc9..819d734 100644 --- a/addons/hive-bridge/src/test/java/org/apache/atlas/hive/bridge/HiveMetaStoreBridgeTest.java +++ b/addons/hive-bridge/src/test/java/org/apache/atlas/hive/bridge/HiveMetaStoreBridgeTest.java @@ -38,8 +38,8 @@ import org.mockito.MockitoAnnotations; import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import scala.actors.threadpool.Arrays; +import java.util.Arrays; import java.util.ArrayList; import java.util.List; http://git-wip-us.apache.org/repos/asf/atlas/blob/0a00dcb1/addons/hive-bridge/src/test/java/org/apache/atlas/hive/hook/HiveHookIT.java ---------------------------------------------------------------------- diff --git a/addons/hive-bridge/src/test/java/org/apache/atlas/hive/hook/HiveHookIT.java b/addons/hive-bridge/src/test/java/org/apache/atlas/hive/hook/HiveHookIT.java index e90e7e3..773a1e8 100755 --- a/addons/hive-bridge/src/test/java/org/apache/atlas/hive/hook/HiveHookIT.java +++ b/addons/hive-bridge/src/test/java/org/apache/atlas/hive/hook/HiveHookIT.java @@ -19,7 +19,6 @@ package org.apache.atlas.hive.hook; import com.google.common.base.Joiner; -import com.google.common.collect.ImmutableList; import com.sun.jersey.api.client.ClientResponse; import org.apache.atlas.AtlasClient; import org.apache.atlas.AtlasServiceException; @@ -1348,15 +1347,15 @@ public class HiveHookIT extends HiveITBase { @Test public void testAlterTableBucketingClusterSort() throws Exception { String tableName = createTable(); - ImmutableList<String> cols = ImmutableList.of("id"); + List<String> cols = Collections.singletonList("id"); runBucketSortQuery(tableName, 5, cols, cols); - cols = ImmutableList.of("id", NAME); + cols = Arrays.asList("id", NAME); runBucketSortQuery(tableName, 2, cols, cols); } - private void runBucketSortQuery(String tableName, final int numBuckets, final ImmutableList<String> bucketCols, - final ImmutableList<String> sortCols) throws Exception { + private void runBucketSortQuery(String tableName, final int numBuckets, final List<String> bucketCols, + final List<String> sortCols) throws Exception { final String fmtQuery = "alter table %s CLUSTERED BY (%s) SORTED BY (%s) INTO %s BUCKETS"; String query = String.format(fmtQuery, tableName, stripListBrackets(bucketCols.toString()), stripListBrackets(sortCols.toString()), numBuckets); @@ -1374,8 +1373,8 @@ public class HiveHookIT extends HiveITBase { } private void verifyBucketSortingProperties(Referenceable tableRef, int numBuckets, - ImmutableList<String> bucketColNames, - ImmutableList<String> sortcolNames) throws Exception { + List<String> bucketColNames, + List<String> sortcolNames) throws Exception { Referenceable sdRef = (Referenceable) tableRef.get(HiveMetaStoreBridge.STORAGE_DESC); Assert.assertEquals(((scala.math.BigInt) sdRef.get(HiveMetaStoreBridge.STORAGE_NUM_BUCKETS)).intValue(), numBuckets); http://git-wip-us.apache.org/repos/asf/atlas/blob/0a00dcb1/addons/sqoop-bridge/pom.xml ---------------------------------------------------------------------- diff --git a/addons/sqoop-bridge/pom.xml b/addons/sqoop-bridge/pom.xml index d46d8a9..5a9305e 100644 --- a/addons/sqoop-bridge/pom.xml +++ b/addons/sqoop-bridge/pom.xml @@ -94,11 +94,6 @@ <scope>compile</scope> </dependency> - <dependency> - <groupId>org.apache.atlas</groupId> - <artifactId>atlas-typesystem</artifactId> - </dependency> - <dependency> <groupId>org.apache.atlas</groupId> <artifactId>atlas-client-v1</artifactId> @@ -155,13 +150,6 @@ <type>pom</type> <scope>test</scope> </dependency> - - <dependency> - <groupId>org.apache.atlas</groupId> - <artifactId>atlas-typesystem</artifactId> - <classifier>tests</classifier> - <scope>test</scope> - </dependency> </dependencies> <profiles> @@ -206,21 +194,6 @@ <version>${project.version}</version> </artifactItem> <artifactItem> - <groupId>org.json4s</groupId> - <artifactId>json4s-native_${scala.binary.version}</artifactId> - <version>${json.version}</version> - </artifactItem> - <artifactItem> - <groupId>org.json4s</groupId> - <artifactId>json4s-core_${scala.binary.version}</artifactId> - <version>${json.version}</version> - </artifactItem> - <artifactItem> - <groupId>org.json4s</groupId> - <artifactId>json4s-ast_${scala.binary.version}</artifactId> - <version>${json.version}</version> - </artifactItem> - <artifactItem> <groupId>${project.groupId}</groupId> <artifactId>atlas-client-common</artifactId> <version>${project.version}</version> @@ -237,11 +210,6 @@ </artifactItem> <artifactItem> <groupId>${project.groupId}</groupId> - <artifactId>atlas-typesystem</artifactId> - <version>${project.version}</version> - </artifactItem> - <artifactItem> - <groupId>${project.groupId}</groupId> <artifactId>atlas-intg</artifactId> <version>${project.version}</version> </artifactItem> @@ -256,28 +224,8 @@ <version>${project.version}</version> </artifactItem> <artifactItem> - <groupId>org.scala-lang</groupId> - <artifactId>scala-compiler</artifactId> - <version>${scala.version}</version> - </artifactItem> - <artifactItem> - <groupId>org.scala-lang</groupId> - <artifactId>scala-reflect</artifactId> - <version>${scala.version}</version> - </artifactItem> - <artifactItem> - <groupId>org.scala-lang</groupId> - <artifactId>scala-library</artifactId> - <version>${scala.version}</version> - </artifactItem> - <artifactItem> - <groupId>org.scala-lang</groupId> - <artifactId>scalap</artifactId> - <version>${scala.version}</version> - </artifactItem> - <artifactItem> <groupId>org.apache.kafka</groupId> - <artifactId>kafka_${scala.binary.version}</artifactId> + <artifactId>kafka_${kafka.scala.binary.version}</artifactId> <version>${kafka.version}</version> </artifactItem> <artifactItem> @@ -285,11 +233,6 @@ <artifactId>kafka-clients</artifactId> <version>${kafka.version}</version> </artifactItem> - <artifactItem> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - <version>${gson.version}</version> - </artifactItem> </artifactItems> </configuration> </execution> @@ -363,7 +306,7 @@ </systemProperty> <systemProperty> <key>atlas.conf</key> - <value>${project.build.directory}/../../../typesystem/target/test-classes</value> + <value>${project.build.directory}/../../../intg/target/test-classes</value> </systemProperty> <systemProperty> <key>atlas.home</key> http://git-wip-us.apache.org/repos/asf/atlas/blob/0a00dcb1/addons/storm-bridge/pom.xml ---------------------------------------------------------------------- diff --git a/addons/storm-bridge/pom.xml b/addons/storm-bridge/pom.xml index 16104ca..e57c021 100644 --- a/addons/storm-bridge/pom.xml +++ b/addons/storm-bridge/pom.xml @@ -38,11 +38,6 @@ <!-- apache atlas core dependencies --> <dependency> <groupId>org.apache.atlas</groupId> - <artifactId>atlas-typesystem</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.atlas</groupId> <artifactId>atlas-client-v1</artifactId> </dependency> @@ -124,13 +119,6 @@ <type>war</type> <scope>test</scope> </dependency> - - <dependency> - <groupId>org.apache.atlas</groupId> - <artifactId>atlas-typesystem</artifactId> - <classifier>tests</classifier> - <scope>test</scope> - </dependency> </dependencies> <profiles> @@ -160,21 +148,6 @@ <version>${project.version}</version> </artifactItem> <artifactItem> - <groupId>org.json4s</groupId> - <artifactId>json4s-native_${scala.binary.version}</artifactId> - <version>${json.version}</version> - </artifactItem> - <artifactItem> - <groupId>org.json4s</groupId> - <artifactId>json4s-core_${scala.binary.version}</artifactId> - <version>${json.version}</version> - </artifactItem> - <artifactItem> - <groupId>org.json4s</groupId> - <artifactId>json4s-ast_${scala.binary.version}</artifactId> - <version>${json.version}</version> - </artifactItem> - <artifactItem> <groupId>${project.groupId}</groupId> <artifactId>atlas-client-common</artifactId> <version>${project.version}</version> @@ -191,11 +164,6 @@ </artifactItem> <artifactItem> <groupId>${project.groupId}</groupId> - <artifactId>atlas-typesystem</artifactId> - <version>${project.version}</version> - </artifactItem> - <artifactItem> - <groupId>${project.groupId}</groupId> <artifactId>hive-bridge</artifactId> <version>${project.version}</version> </artifactItem> @@ -220,28 +188,8 @@ <version>${project.version}</version> </artifactItem> <artifactItem> - <groupId>org.scala-lang</groupId> - <artifactId>scala-compiler</artifactId> - <version>${scala.version}</version> - </artifactItem> - <artifactItem> - <groupId>org.scala-lang</groupId> - <artifactId>scala-reflect</artifactId> - <version>${scala.version}</version> - </artifactItem> - <artifactItem> - <groupId>org.scala-lang</groupId> - <artifactId>scala-library</artifactId> - <version>${scala.version}</version> - </artifactItem> - <artifactItem> - <groupId>org.scala-lang</groupId> - <artifactId>scalap</artifactId> - <version>${scala.version}</version> - </artifactItem> - <artifactItem> <groupId>org.apache.kafka</groupId> - <artifactId>kafka_${scala.binary.version}</artifactId> + <artifactId>kafka_${kafka.scala.binary.version}</artifactId> <version>${kafka.version}</version> </artifactItem> <artifactItem> @@ -300,11 +248,6 @@ <version>${hadoop.version}</version> </artifactItem> <artifactItem> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - <version>${gson.version}</version> - </artifactItem> - <artifactItem> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <version>${log4j.version}</version> @@ -347,60 +290,6 @@ <build> <plugins> <plugin> - <groupId>net.alchim31.maven</groupId> - <artifactId>scala-maven-plugin</artifactId> - <version>3.2.0</version> - <executions> - <execution> - <id>scala-compile-first</id> - <phase>process-resources</phase> - <goals> - <goal>compile</goal> - </goals> - </execution> - <execution> - <id>scala-test-compile-first</id> - <phase>process-test-resources</phase> - <goals> - <goal>testCompile</goal> - </goals> - </execution> - </executions> - <configuration> - <scalaVersion>${scala.version}</scalaVersion> - <recompileMode>incremental</recompileMode> - <useZincServer>true</useZincServer> - <source>1.7</source> - <target>1.7</target> - <args> - <arg>-unchecked</arg> - <arg>-deprecation</arg> - <arg>-feature</arg> - </args> - <jvmArgs> - <jvmArg>-Xmx512m</jvmArg> - </jvmArgs> - <!-- - <javacArgs> - <javacArg>-source</javacArg> - <javacArg>${java.version}</javacArg> - <javacArg>-target</javacArg> - <javacArg>${java.version}</javacArg> - </javacArgs> - --> - <!-- The following plugin is required to use quasiquotes in Scala 2.10 and is used - by Spark SQL for code generation. --> - <!--<compilerPlugins> - <compilerPlugin> - <groupId>org.scalamacros</groupId> - <artifactId>paradise_${scala.version}</artifactId> - <version>${scala.macros.version}</version> - </compilerPlugin> - </compilerPlugins>--> - </configuration> - </plugin> - - <plugin> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> <configuration> @@ -437,7 +326,7 @@ </systemProperty> <systemProperty> <key>atlas.conf</key> - <value>${project.build.directory}/../../../typesystem/target/test-classes</value> + <value>${project.build.directory}/../../../intg/target/test-classes</value> </systemProperty> <systemProperty> <key>atlas.home</key> http://git-wip-us.apache.org/repos/asf/atlas/blob/0a00dcb1/authorization/pom.xml ---------------------------------------------------------------------- diff --git a/authorization/pom.xml b/authorization/pom.xml index 143c4e4..f210a2f 100644 --- a/authorization/pom.xml +++ b/authorization/pom.xml @@ -42,8 +42,15 @@ </dependency> <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>${guava.version}</version> + </dependency> + + <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> + <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/atlas/blob/0a00dcb1/client/client-v1/pom.xml ---------------------------------------------------------------------- diff --git a/client/client-v1/pom.xml b/client/client-v1/pom.xml index 2b492bb..e25a308 100644 --- a/client/client-v1/pom.xml +++ b/client/client-v1/pom.xml @@ -31,18 +31,13 @@ <dependencies> <dependency> <groupId>org.apache.atlas</groupId> - <artifactId>atlas-typesystem</artifactId> - </dependency> - <dependency> - <groupId>org.apache.atlas</groupId> <artifactId>atlas-client-common</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.atlas</groupId> - <artifactId>atlas-typesystem</artifactId> - <classifier>tests</classifier> - <scope>test</scope> + <artifactId>atlas-common</artifactId> + <version>${project.version}</version> </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/atlas/blob/0a00dcb1/client/pom.xml ---------------------------------------------------------------------- diff --git a/client/pom.xml b/client/pom.xml index b69c077..728c706 100755 --- a/client/pom.xml +++ b/client/pom.xml @@ -39,16 +39,22 @@ <dependencies> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <scope>test</scope> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> </dependency> + <dependency> <groupId>com.sun.jersey.contribs</groupId> <artifactId>jersey-multipart</artifactId> </dependency> <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <scope>test</scope> + </dependency> + + <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/atlas/blob/0a00dcb1/common/pom.xml ---------------------------------------------------------------------- diff --git a/common/pom.xml b/common/pom.xml index c2e5da6..6d7515b 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -76,6 +76,7 @@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> <version>${guava.version}</version> + <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/atlas/blob/0a00dcb1/graphdb/api/pom.xml ---------------------------------------------------------------------- diff --git a/graphdb/api/pom.xml b/graphdb/api/pom.xml index c949a98..d0462b4 100644 --- a/graphdb/api/pom.xml +++ b/graphdb/api/pom.xml @@ -32,10 +32,14 @@ <packaging>jar</packaging> <dependencies> + <dependency> + <groupId>org.apache.atlas</groupId> + <artifactId>atlas-common</artifactId> + </dependency> <dependency> <groupId>org.apache.atlas</groupId> - <artifactId>atlas-typesystem</artifactId> + <artifactId>atlas-intg</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/atlas/blob/0a00dcb1/graphdb/common/pom.xml ---------------------------------------------------------------------- diff --git a/graphdb/common/pom.xml b/graphdb/common/pom.xml index d290b92..71e3bbc 100644 --- a/graphdb/common/pom.xml +++ b/graphdb/common/pom.xml @@ -34,6 +34,12 @@ under the License. --> </dependency> <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>${guava.version}</version> + </dependency> + + <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> <version>6.9.4</version> http://git-wip-us.apache.org/repos/asf/atlas/blob/0a00dcb1/intg/pom.xml ---------------------------------------------------------------------- diff --git a/intg/pom.xml b/intg/pom.xml index 2f801e7..071e6c7 100644 --- a/intg/pom.xml +++ b/intg/pom.xml @@ -36,11 +36,6 @@ </dependency> <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - </dependency> - - <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> </dependency> @@ -58,20 +53,23 @@ </dependency> <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> - - <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> <scope>test</scope> </dependency> + <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> <version>${spring.version}</version> </dependency> + + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>${guava.version}</version> + <scope>test</scope> + </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/atlas/blob/0a00dcb1/intg/src/test/java/org/apache/atlas/TestRelationshipUtilsV2.java ---------------------------------------------------------------------- diff --git a/intg/src/test/java/org/apache/atlas/TestRelationshipUtilsV2.java b/intg/src/test/java/org/apache/atlas/TestRelationshipUtilsV2.java index d0effd6..02613b5 100755 --- a/intg/src/test/java/org/apache/atlas/TestRelationshipUtilsV2.java +++ b/intg/src/test/java/org/apache/atlas/TestRelationshipUtilsV2.java @@ -18,8 +18,6 @@ package org.apache.atlas; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; import org.apache.atlas.exception.AtlasBaseException; import org.apache.atlas.model.instance.AtlasEntity; import org.apache.atlas.model.instance.AtlasEntity.AtlasEntitiesWithExtInfo; @@ -38,10 +36,7 @@ import org.apache.commons.lang.StringUtils; import java.math.BigDecimal; import java.math.BigInteger; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.List; +import java.util.*; import static org.apache.atlas.model.typedef.AtlasRelationshipDef.PropagateTags.BOTH; import static org.apache.atlas.model.typedef.AtlasRelationshipDef.PropagateTags.ONE_TO_TWO; @@ -146,11 +141,11 @@ public final class TestRelationshipUtilsV2 { new AtlasRelationshipEndDef(PERSON_TYPE, "sibling", SINGLE), new AtlasRelationshipEndDef(PERSON_TYPE, "sibling", SINGLE)); - return new AtlasTypesDef(ImmutableList.of(orgLevelType), - ImmutableList.of(addressType), - ImmutableList.of(securityClearanceType), - ImmutableList.of(personType, employeeType, departmentType, managerType), - ImmutableList.of(employeeDepartmentType, employeeManagerType, employeeMentorsType, employeeFriendsType, personSiblingType)); + return new AtlasTypesDef(Collections.singletonList(orgLevelType), + Collections.singletonList(addressType), + Collections.singletonList(securityClearanceType), + Arrays.asList(personType, employeeType, departmentType, managerType), + Arrays.asList(employeeDepartmentType, employeeManagerType, employeeMentorsType, employeeFriendsType, personSiblingType)); } public static AtlasEntitiesWithExtInfo getDepartmentEmployeeInstances() { @@ -282,9 +277,8 @@ public final class TestRelationshipUtilsV2 { new AtlasRelationshipEndDef(TYPE_B, "mappedFromA", SINGLE), new AtlasRelationshipEndDef(TYPE_A, "mapToB", SET)); - return new AtlasTypesDef(ImmutableList.<AtlasEnumDef>of(), ImmutableList.<AtlasStructDef>of(), - ImmutableList.<AtlasClassificationDef>of(), ImmutableList.of(aType, bType), - ImmutableList.of(relationshipType1, relationshipType2, relationshipType3, relationshipType4)); + return new AtlasTypesDef(Collections.<AtlasEnumDef>emptyList(), Collections.<AtlasStructDef>emptyList(), Collections.<AtlasClassificationDef>emptyList(), Arrays.asList(aType, bType), + Arrays.asList(relationshipType1, relationshipType2, relationshipType3, relationshipType4)); } private static List<AtlasEnumElementDef> getOrgLevelElements() { @@ -299,8 +293,8 @@ public final class TestRelationshipUtilsV2 { return typeName + " description"; } - private static ImmutableSet<String> superType(String superTypeName) { - return StringUtils.isNotEmpty(superTypeName) ? ImmutableSet.of(superTypeName) : ImmutableSet.<String>of(); + private static Set<String> superType(String superTypeName) { + return StringUtils.isNotEmpty(superTypeName) ? Collections.singleton(superTypeName) : Collections.<String>emptySet(); } private static List<AtlasObjectId> getAtlasObjectIds(AtlasEntity... entities) {
