add blueprints to distribution pom

due to commit for #5256 that modify scope of deps against blueprints to provided
orientechnologies · Nov 2, 2015 · 152905a · 152905a
1 parent 3671eba
commit 152905a
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 29 deletions.
diff --git a/client/pom.xml b/client/pom.xml
@@ -52,6 +52,7 @@
             <groupId>com.orientechnologies</groupId>
             <artifactId>orientdb-test-commons</artifactId>
             <version>${project.version}</version>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 

diff --git a/distributed/pom.xml b/distributed/pom.xml
@@ -29,6 +29,7 @@
         <groupId>com.orientechnologies</groupId>
         <artifactId>orientdb-parent</artifactId>
         <version>2.2.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>orientdb-distributed</artifactId>
@@ -91,6 +92,13 @@
     </profiles>
 
     <dependencies>
+
+        <dependency>
+            <groupId>com.orientechnologies</groupId>
+            <artifactId>orientdb-test-commons</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>com.orientechnologies</groupId>
             <artifactId>orientdb-server</artifactId>
@@ -110,12 +118,6 @@
             <!-- SET SCOPE=RUNTIME TO ENABLE STARTING DISTRIBUTED SERVER IN IDE (IntelliJ)-->
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.10</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>com.hazelcast</groupId>
             <artifactId>hazelcast-all</artifactId>

diff --git a/distribution/pom.xml b/distribution/pom.xml
@@ -10,7 +10,7 @@
     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/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
@@ -78,6 +78,24 @@
             <artifactId>orientdb-graphdb</artifactId>
             <version>${project.version}</version>
         </dependency>
+
+        <!-- #5256 removed dep from orientdb-graphdb -->
+        <dependency>
+            <groupId>com.tinkerpop.rexster</groupId>
+            <artifactId>rexster-core</artifactId>
+            <version>${blueprints.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.tinkerpop.gremlin</groupId>
+            <artifactId>gremlin-java</artifactId>
+            <version>${blueprints.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.tinkerpop.gremlin</groupId>
+            <artifactId>gremlin-groovy</artifactId>
+            <version>${blueprints.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>com.orientechnologies</groupId>
             <artifactId>orientdb-etl</artifactId>
@@ -93,6 +111,8 @@
             <artifactId>orientdb-jdbc</artifactId>
             <version>${project.version}</version>
         </dependency>
+
+
     </dependencies>
 
     <profiles>
@@ -129,7 +149,7 @@
                     </plugin>
                 </plugins>
             </build>
-        </profile>    
+        </profile>
         <profile>
             <id>localDeploy</id>
             <activation>

diff --git a/etl/pom.xml b/etl/pom.xml
@@ -43,7 +43,7 @@
                 <artifactId>maven-shade-plugin</artifactId>
                 <version>2.4.1</version>
                 <configuration>
-                    <createDependencyReducedPom>false</createDependencyReducedPom>
+                    <dependencyReducedPomLocation>${basedir}/target/dependency-reduced-pom.xml</dependencyReducedPomLocation>
                 </configuration>
                 <executions>
                     <execution>
@@ -99,6 +99,7 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-csv</artifactId>
             <version>1.2</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.orientechnologies</groupId>

diff --git a/graphdb/pom.xml b/graphdb/pom.xml
@@ -12,7 +12,7 @@
     ~ */ -->
 
 <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/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
@@ -42,7 +42,7 @@
             com.orientechnologies.orient.graph.*,
             com.tinkerpop.blueprints.impls.orient
         </osgi.export>
-        <blueprints.version>2.6.0</blueprints.version>
+
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <argLine>-ea -Xmx3G -Xss2048k -Dindex.flushAfterCreate=false
             -Dstorage.makeFullCheckpointAfterCreate=false
@@ -76,13 +76,6 @@
             <version>${project.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.11</version>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>com.tinkerpop.blueprints</groupId>
             <artifactId>blueprints-core</artifactId>

diff --git a/jdbc/pom.xml b/jdbc/pom.xml
@@ -82,11 +82,6 @@
                     <descriptors>
                         <descriptor>src/assembly/all.xml</descriptor>
                     </descriptors>
-                    <!--<finalName>${project.artifactId}-${project.version}-all</finalName>-->
-                    <!--<appendAssemblyId>false</appendAssemblyId>-->
-                    <!--<descriptorRefs>-->
-                        <!--<descriptorRef>jar-with-dependencies</descriptorRef>-->
-                    <!--</descriptorRefs>-->
                 </configuration>
                 <executions>
                     <execution>

diff --git a/pom.xml b/pom.xml
@@ -175,6 +175,7 @@
         <maven.compiler.target>1.6</maven.compiler.target>
         <maven.build.timestamp.format>yyyy-MM-dd HH:mm:ssZ</maven.build.timestamp.format>
         <implementation.build>${scmBranch}@r${buildNumber}</implementation.build>
+        <blueprints.version>2.6.0</blueprints.version>
         <!-- | Configuration properties for the OSGi maven-bundle-plugin -->
         <osgi.fragment.host/>
         <osgi.export>${project.groupId}.*;version=${project.version};-noimport:=true</osgi.export>

diff --git a/tools/pom.xml b/tools/pom.xml
@@ -44,21 +44,23 @@
     <dependencies>
         <dependency>
             <groupId>com.orientechnologies</groupId>
-            <artifactId>orientdb-client</artifactId>
+            <artifactId>orientdb-test-commons</artifactId>
             <version>${project.version}</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.orientechnologies</groupId>
-            <artifactId>orientdb-core</artifactId>
+            <artifactId>orientdb-client</artifactId>
             <version>${project.version}</version>
         </dependency>
 
+
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.10</version>
-            <scope>test</scope>
+            <groupId>com.orientechnologies</groupId>
+            <artifactId>orientdb-core</artifactId>
+            <version>${project.version}</version>
         </dependency>
+
     </dependencies>
 
     <build>