You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by sa...@apache.org on 2017/10/31 22:37:53 UTC

atlas git commit: ATLAS-2240: Update JanusGraph to version 0.2.0 - revert to building all the graph modules

Repository: atlas
Updated Branches:
  refs/heads/master 091347707 -> c7a61629d


ATLAS-2240: Update JanusGraph to version 0.2.0 - revert to building all the graph modules

Signed-off-by: Sarath Subramanian <ss...@hortonworks.com>


Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/c7a61629
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/c7a61629
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/c7a61629

Branch: refs/heads/master
Commit: c7a61629dd03775804dd7fd62a6a2e0419b4aaf8
Parents: 0913477
Author: Graham Wallis <gr...@uk.ibm.com>
Authored: Tue Oct 31 15:37:22 2017 -0700
Committer: Sarath Subramanian <ss...@hortonworks.com>
Committed: Tue Oct 31 15:37:22 2017 -0700

----------------------------------------------------------------------
 graphdb/graphdb-impls/pom.xml |  3 +--
 graphdb/pom.xml               |  8 ++++++--
 pom.xml                       | 28 ++++++++++++----------------
 3 files changed, 19 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/atlas/blob/c7a61629/graphdb/graphdb-impls/pom.xml
----------------------------------------------------------------------
diff --git a/graphdb/graphdb-impls/pom.xml b/graphdb/graphdb-impls/pom.xml
index fd87ea4..1e60a9c 100644
--- a/graphdb/graphdb-impls/pom.xml
+++ b/graphdb/graphdb-impls/pom.xml
@@ -34,8 +34,7 @@
 
 
     <dependencies>
-        <!-- Single graph provider configured in root pom using
-             graphGroup, graphModule, graphVersion properties -->
+        <!-- Use the single graph provider configured in root pom using graphGroup, graphArtifact properties -->
         <dependency>
             <groupId>${graphGroup}</groupId>
             <artifactId>${graphArtifact}</artifactId>

http://git-wip-us.apache.org/repos/asf/atlas/blob/c7a61629/graphdb/pom.xml
----------------------------------------------------------------------
diff --git a/graphdb/pom.xml b/graphdb/pom.xml
index 1659b12..426238c 100644
--- a/graphdb/pom.xml
+++ b/graphdb/pom.xml
@@ -31,12 +31,16 @@
     <name>Apache Atlas Graph Database Projects</name>
     <packaging>pom</packaging>
 
-    <!-- Modules built for all profiles -->
+
+
+    <!-- Build all modules including all the possible graph providers although only one will be used -->
     <modules>
         <module>api</module>
         <module>common</module>
         <module>graphdb-impls</module>
-        <module>${graphModule}</module>
+        <module>titan0</module>
+        <module>titan1</module>
+        <module>janus</module>
     </modules>
 
 

http://git-wip-us.apache.org/repos/asf/atlas/blob/c7a61629/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3eb252e..6f67935 100644
--- a/pom.xml
+++ b/pom.xml
@@ -628,18 +628,18 @@
         </profile>
 
         <!-- Graph provider selection profiles
-            The following profiles are used to select the graph provider.
-            These profiles are mutually exclusive and should be activated by setting the system
-            property GRAPH-PROVIDER.
-            This can be optionally specified when invoking mvn:
-               e.g. mvn clean install -DGRAPH-PROVIDER=titan0
-            The settings for GRAPH-PROVIDER have the following effects:
-            * If GRAPH-PROVIDER is not specified, the graph-provider-default profile is activated.
-            * If GRAPH-PROVIDER is set to titan0, the graph-provider-titan0 profile is activated.
-            * If GRAPH-PROVIDER is set to titan1, the graph-provider-titan1 profile is activated.
-            * If GRAPH-PROVIDER is set to anything else, the build will fail.
-            Do not activate the graph-provider selection profiles using -P.
-         -->
+        The following profiles are used to select the graph provider.
+        These profiles are mutually exclusive and should be activated by setting the system
+        property GRAPH-PROVIDER.
+        This can be optionally specified when invoking mvn:
+           e.g. mvn clean install -DGRAPH-PROVIDER=titan0
+        The settings for GRAPH-PROVIDER have the following effects:
+        * If GRAPH-PROVIDER is not specified, the graph-provider-default profile is activated.
+        * If GRAPH-PROVIDER is set to titan0, the graph-provider-titan0 profile is activated.
+        * If GRAPH-PROVIDER is set to titan1, the graph-provider-titan1 profile is activated.
+        * If GRAPH-PROVIDER is set to anything else, the build will fail.
+        Do not activate the graph-provider selection profiles using -P.
+        -->
 
         <profile>
             <!-- Default profile, i.e. GRAPH-PROVIDER not set -->
@@ -651,7 +651,6 @@
             </activation>
             <properties>
                 <!-- Define graph dependency type/version -->
-                <graphModule>titan0</graphModule>
                 <graphGroup>org.apache.atlas</graphGroup>
                 <graphArtifact>atlas-graphdb-titan0</graphArtifact>
                 <skipDocs>false</skipDocs>
@@ -670,7 +669,6 @@
             </activation>
             <properties>
                 <!-- Define graph dependency type/version -->
-                <graphModule>titan0</graphModule>
                 <graphGroup>org.apache.atlas</graphGroup>
                 <graphArtifact>atlas-graphdb-titan0</graphArtifact>
                 <skipDocs>false</skipDocs>
@@ -689,7 +687,6 @@
             </activation>
             <properties>
                 <!-- Define graph dependency type/version -->
-                <graphModule>titan1</graphModule>
                 <graphGroup>org.apache.atlas</graphGroup>
                 <graphArtifact>atlas-graphdb-titan1</graphArtifact>
                 <skipDocs>false</skipDocs>
@@ -708,7 +705,6 @@
             </activation>
             <properties>
                 <!-- Define graph dependency type/version -->
-                <graphModule>janus</graphModule>
                 <graphGroup>org.apache.atlas</graphGroup>
                 <graphArtifact>atlas-graphdb-janus</graphArtifact>
                 <skipDocs>false</skipDocs>