Merge pull request #13 from rundeck/fix-gradle-template-deps

sjrd218 · web-flow · commit 2349c5d28580 · 2019-05-01T12:39:52.000-05:00
fixing build.gradle template for dependencies
diff --git a/src/main/resources/templates/java-plugin/logfilter/build.gradle.template b/src/main/resources/templates/java-plugin/logfilter/build.gradle.template
@@ -65,6 +65,7 @@ jar {
         attributes 'Rundeck-Plugin-Libs': "\${libList}"
 
     }
+    dependsOn(copyToLib)
 }
 
 wrapper {
diff --git a/src/main/resources/templates/java-plugin/nodeexecutor/build.gradle.template b/src/main/resources/templates/java-plugin/nodeexecutor/build.gradle.template
@@ -67,6 +67,7 @@ jar {
         attributes 'Rundeck-Plugin-Libs': "\${libList}"
 
     }
+    dependsOn(copyToLib)
 }
 
 wrapper {
diff --git a/src/main/resources/templates/java-plugin/notification/build.gradle.template b/src/main/resources/templates/java-plugin/notification/build.gradle.template
@@ -40,6 +40,12 @@ dependencies {
     testCompile "org.spockframework:spock-core:1.0-groovy-2.4"
 }
 
+// task to copy plugin libs to output/lib dir
+task copyToLib(type: Copy) {
+    into "\$buildDir/output/lib"
+    from configurations.pluginLibs
+}
+
 jar {
     from "\$buildDir/output"
     manifest {
@@ -59,6 +65,7 @@ jar {
         attributes 'Rundeck-Plugin-Libs': "\${libList}"
 
     }
+    dependsOn(copyToLib)
 }
 
 wrapper {
diff --git a/src/main/resources/templates/java-plugin/option/build.gradle.template b/src/main/resources/templates/java-plugin/option/build.gradle.template
@@ -61,6 +61,7 @@ jar {
         attributes 'Rundeck-Plugin-Libs': "\${libList}"
 
     }
+    dependsOn(copyToLib)
 }
 
 wrapper {
diff --git a/src/main/resources/templates/java-plugin/orchestrator/build.gradle.template b/src/main/resources/templates/java-plugin/orchestrator/build.gradle.template
@@ -40,6 +40,12 @@ dependencies {
     testCompile "org.spockframework:spock-core:1.0-groovy-2.4"
 }
 
+// task to copy plugin libs to output/lib dir
+task copyToLib(type: Copy) {
+    into "\$buildDir/output/lib"
+    from configurations.pluginLibs
+}
+
 jar {
     from "\$buildDir/output"
     manifest {
@@ -59,6 +65,7 @@ jar {
         attributes 'Rundeck-Plugin-Libs': "\${libList}"
 
     }
+    dependsOn(copyToLib)
 }
 
 wrapper {
diff --git a/src/main/resources/templates/java-plugin/resourcemodelsource/build.gradle.template b/src/main/resources/templates/java-plugin/resourcemodelsource/build.gradle.template
@@ -40,6 +40,12 @@ dependencies {
     testCompile "org.spockframework:spock-core:1.0-groovy-2.4"
 }
 
+// task to copy plugin libs to output/lib dir
+task copyToLib(type: Copy) {
+    into "\$buildDir/output/lib"
+    from configurations.pluginLibs
+}
+
 jar {
     from "\$buildDir/output"
     manifest {
@@ -59,6 +65,7 @@ jar {
         attributes 'Rundeck-Plugin-Libs': "\${libList}"
 
     }
+    dependsOn(copyToLib)
 }
 
 wrapper {
diff --git a/src/main/resources/templates/java-plugin/workflownodestep/build.gradle.template b/src/main/resources/templates/java-plugin/workflownodestep/build.gradle.template
@@ -40,6 +40,12 @@ dependencies {
     testCompile "org.spockframework:spock-core:1.0-groovy-2.4"
 }
 
+// task to copy plugin libs to output/lib dir
+task copyToLib(type: Copy) {
+    into "\$buildDir/output/lib"
+    from configurations.pluginLibs
+}
+
 jar {
     from "\$buildDir/output"
     manifest {
@@ -59,6 +65,7 @@ jar {
         attributes 'Rundeck-Plugin-Libs': "\${libList}"
 
     }
+    dependsOn(copyToLib)
 }
 
 wrapper {
diff --git a/src/main/resources/templates/java-plugin/workflowstep/build.gradle.template b/src/main/resources/templates/java-plugin/workflowstep/build.gradle.template
@@ -40,6 +40,12 @@ dependencies {
     testCompile "org.spockframework:spock-core:1.0-groovy-2.4"
 }
 
+// task to copy plugin libs to output/lib dir
+task copyToLib(type: Copy) {
+    into "\$buildDir/output/lib"
+    from configurations.pluginLibs
+}
+
 jar {
     from "\$buildDir/output"
     manifest {
@@ -59,6 +65,7 @@ jar {
         attributes 'Rundeck-Plugin-Libs': "\${libList}"
 
     }
+    dependsOn(copyToLib)
 }
 
 wrapper {

Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,7 @@ jar {`
`65`	`65`	`attributes 'Rundeck-Plugin-Libs': "\${libList}"`
`66`	`66`
`67`	`67`	`}`
	`68`	`+ dependsOn(copyToLib)`
`68`	`69`	`}`
`69`	`70`
`70`	`71`	`wrapper {`
Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,7 @@ jar {`
`67`	`67`	`attributes 'Rundeck-Plugin-Libs': "\${libList}"`
`68`	`68`
`69`	`69`	`}`
	`70`	`+ dependsOn(copyToLib)`
`70`	`71`	`}`
`71`	`72`
`72`	`73`	`wrapper {`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,12 @@ dependencies {`
`40`	`40`	`testCompile "org.spockframework:spock-core:1.0-groovy-2.4"`
`41`	`41`	`}`
`42`	`42`
	`43`	`+// task to copy plugin libs to output/lib dir`
	`44`	`+task copyToLib(type: Copy) {`
	`45`	`+ into "\$buildDir/output/lib"`
	`46`	`+ from configurations.pluginLibs`
	`47`	`+}`
	`48`	`+`
`43`	`49`	`jar {`
`44`	`50`	`from "\$buildDir/output"`
`45`	`51`	`manifest {`
`@@ -59,6 +65,7 @@ jar {`
`59`	`65`	`attributes 'Rundeck-Plugin-Libs': "\${libList}"`
`60`	`66`
`61`	`67`	`}`
	`68`	`+ dependsOn(copyToLib)`
`62`	`69`	`}`
`63`	`70`
`64`	`71`	`wrapper {`
Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,7 @@ jar {`
`61`	`61`	`attributes 'Rundeck-Plugin-Libs': "\${libList}"`
`62`	`62`
`63`	`63`	`}`
	`64`	`+ dependsOn(copyToLib)`
`64`	`65`	`}`
`65`	`66`
`66`	`67`	`wrapper {`