avoid using mavenLocal() in devtools/gradle

This is step 1; when merged, a follow-up applying the same to gradle-it is planned. related to tqvarnst/quarkus-workshop#6
vorburger · Apr 9, 2019 · f9e0d56 · f9e0d56
1 parent 8fa5e40
commit f9e0d56
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 54 deletions.
diff --git a/devtools/gradle-it/build.gradle b/devtools/gradle-it/build.gradle
@@ -6,11 +6,17 @@ compileTestJava.options.encoding = "UTF-8"
 
 buildscript {
     repositories {
+        maven { url '../gradle/target/dependencies/' }
         mavenCentral()
     }
     dependencies {
         classpath fileTree(dir: '../gradle/build/libs', include: 'quarkus-gradle-plugin-*.jar')
-        classpath fileTree(dir: '../gradle/target/dependencies/compile', include: '*.jar')
+
+        classpath 'io.quarkus:quarkus-bootstrap-core:999-SNAPSHOT'
+        classpath 'io.quarkus:quarkus-devtools-common:999-SNAPSHOT'
+        classpath 'io.quarkus:quarkus-devtools-common-core:999-SNAPSHOT'
+        classpath 'io.quarkus:quarkus-development-mode:999-SNAPSHOT'
+        classpath 'io.quarkus:quarkus-creator:999-SNAPSHOT'
     }
 }
 

diff --git a/devtools/gradle-it/src/test/java/org/acme/quickstart/GreetingResourceTest.java b/devtools/gradle-it/src/test/java/org/acme/quickstart/GreetingResourceTest.java
diff --git a/devtools/gradle/build.gradle b/devtools/gradle/build.gradle
@@ -16,15 +16,21 @@ compileJava   {
 }
 
 repositories {
-    //Needs latest from local snapshots too:
-    mavenLocal()
+    maven { url 'target/dependencies/' }
     mavenCentral()
     jcenter()
 }
 
 dependencies {
-    compile fileTree(dir: 'target/dependencies/compile', include: '*.jar')
-    testCompile fileTree(dir: 'target/dependencies/test', include: '*.jar')
+    compile 'io.quarkus:quarkus-bootstrap-core:999-SNAPSHOT'
+    compile 'io.quarkus:quarkus-devtools-common:999-SNAPSHOT'
+    compile 'io.quarkus:quarkus-devtools-common-core:999-SNAPSHOT'
+    compile 'io.quarkus:quarkus-development-mode:999-SNAPSHOT'
+    compile 'io.quarkus:quarkus-creator:999-SNAPSHOT'
+
+    testCompile 'org.junit.jupiter:junit-jupiter-api:5.4.1'
+    testCompile 'org.junit.jupiter:junit-jupiter-params:5.4.1'
+    testCompile 'org.junit.jupiter:junit-jupiter-engine:5.4.1'
 }
 
 test {

diff --git a/devtools/gradle/pom.xml b/devtools/gradle/pom.xml
@@ -20,6 +20,15 @@
         <skip.gradle.build>false</skip.gradle.build>
     </properties>
     <dependencies>
+        <!-- Special -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-bom</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <!-- NOT <scope>import</scope> because this is for the maven-dependency-plugin -->
+        </dependency>
+
         <!-- Compile -->
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -45,6 +54,8 @@
             <artifactId>quarkus-creator</artifactId>
             <version>${project.version}</version>
         </dependency>
+
+        <!-- Test -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
@@ -75,20 +86,10 @@
                         </goals>
                         <inherited>false</inherited>
                         <configuration>
-                            <includeScope>compile</includeScope>
-                            <outputDirectory>${project.build.directory}/dependencies/compile</outputDirectory>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>copy-test-dependencies</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <inherited>false</inherited>
-                        <configuration>
-                            <includeScope>test</includeScope>
-                            <outputDirectory>${project.build.directory}/dependencies/test</outputDirectory>
+                            <addParentPoms>true</addParentPoms>
+                            <copyPom>true</copyPom>
+                            <useRepositoryLayout>true</useRepositoryLayout>
+                            <outputDirectory>${project.build.directory}/dependencies</outputDirectory>
                         </configuration>
                     </execution>
                 </executions>