From 1ef5d29d706c84af48bfb4a5da459a7824fe2865 Mon Sep 17 00:00:00 2001
From: Maxim Petrusevich <maks1464@gmail.com>
Date: Tue, 30 May 2017 17:35:57 +0300
Subject: [PATCH] CAY-2301 rebase dependencies in pom.xml, + mockito dependency
 in cayenne-test-utilities

---
 .travis.yml                                |  2 +-
 build-tools/cayenne-test-utilities/pom.xml |  5 ++++
 cayenne-gradle-plugin/build.gradle         | 25 +++++++++++++----
 cayenne-gradle-plugin/pom.xml              | 32 ++++++++++++++++++++--
 4 files changed, 54 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3b8a5f577a..8929e432da 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,7 +36,7 @@ jdk:
   - oraclejdk7
 
 script:
-  - mvn install -q -DcayenneTestConnection=$DB_PROFILE -DcayenneLogLevel=ERROR
+  - mvn verify -q -DcayenneTestConnection=$DB_PROFILE -DcayenneLogLevel=ERROR
 
 # prevent Travis from unneeded "mvn install" run
 install: /bin/true
diff --git a/build-tools/cayenne-test-utilities/pom.xml b/build-tools/cayenne-test-utilities/pom.xml
index 8641e64893..bdf66a2c95 100644
--- a/build-tools/cayenne-test-utilities/pom.xml
+++ b/build-tools/cayenne-test-utilities/pom.xml
@@ -42,5 +42,10 @@
 			<artifactId>junit</artifactId>
 			<scope>compile</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-all</artifactId>
+			<scope>compile</scope>
+		</dependency>
 	</dependencies>
 </project>
diff --git a/cayenne-gradle-plugin/build.gradle b/cayenne-gradle-plugin/build.gradle
index 15c0947ab9..0068cfd8c9 100644
--- a/cayenne-gradle-plugin/build.gradle
+++ b/cayenne-gradle-plugin/build.gradle
@@ -20,13 +20,14 @@ plugins {
     id 'java-gradle-plugin'
 }
 
+def projectVersion = getProjectVersion()
+
 group 'org.apache.cayenne.plugins'
 version projectVersion
 def cayenneVersion = version
 
 apply plugin: 'java'
 
-sourceCompatibility = 1.8
 sourceCompatibility = 1.7
 
 repositories {
@@ -34,14 +35,26 @@ repositories {
     mavenCentral()
 }
 
+def getProjectVersion() {
+    def pomFile = file('pom.xml')
+    if (pomFile.file) {
+        def pom = new XmlSlurper().parseText(file('pom.xml').text)
+        def pomVersion = pom.parent.version
+        return pomVersion
+    }
+}
+
+def classpathFile = file('build/classpath.txt')
+if (classpathFile.file) {
+    String[] paths = classpathFile.text.split(':')
+    dependencies {
+        add 'compile', files(paths)
+    }
+}
+
 dependencies {
     compile gradleApi()
     compile localGroovy()
-    compile group: 'org.apache.cayenne', name: 'cayenne-cgen', version: cayenneVersion
-    compile group: 'org.apache.derby', name: 'derby', version: '10.12.1.1'
-    testCompile group: 'junit', name: 'junit', version: '4.11'
-    testCompile group: 'org.mockito', name: 'mockito-all', version: '1.9.5'
-    testCompile group: 'org.apache.cayenne.build-tools', name: 'cayenne-test-utilities', version: cayenneVersion
 }
 
 // Create file with cayenne-gradle-plugin version
diff --git a/cayenne-gradle-plugin/pom.xml b/cayenne-gradle-plugin/pom.xml
index 66163f596f..45472e83ea 100644
--- a/cayenne-gradle-plugin/pom.xml
+++ b/cayenne-gradle-plugin/pom.xml
@@ -67,6 +67,23 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>2.9</version>
+                <executions>
+                    <execution>
+                        <id>build-classpath</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>build-classpath</goal>
+                        </goals>
+                        <configuration>
+                            <outputFile>build/classpath.txt</outputFile>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <!-- GRADLE TASKS EXECUTOR -->
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
@@ -81,8 +98,6 @@
                             <arguments>
                                 <argument>clean</argument>
                                 <argument>${gradle.task}</argument>
-                                <argument>-PprojectVersion=${project.version}</argument>
-                                <argument>--info</argument>
                             </arguments>
                         </configuration>
                         <goals>
@@ -124,12 +139,23 @@
             <artifactId>cayenne-cgen</artifactId>
             <version>${project.version}</version>
         </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-
+        <dependency>
+            <groupId>org.apache.cayenne.build-tools</groupId>
+            <artifactId>cayenne-test-utilities</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>