Improved test dependency handling
diff --git a/build.gradle b/build.gradle
index 459ef2b..8cca719 100644
--- a/build.gradle
+++ b/build.gradle
@@ -76,6 +76,9 @@
ecj {}
embedded
compile.extendsFrom(embedded)
+ testBundles {
+ transitive = false
+ }
}
repositories {
mavenCentral()
@@ -134,6 +137,18 @@
javadoc {
failOnError = false
}
+ test.dependsOn('copyTestBundles')
+ task copyTestBundles(){
+ doLast {
+ configurations.testBundles.resolvedConfiguration.resolvedArtifacts.each { artifact ->
+ copy {
+ into "$buildDir/testBundles"
+ from artifact.file
+ rename '.*', artifact.name + '.jar'
+ }
+ }
+ }
+ }
task sourcesJar(type: Jar, dependsOn: classes) {
description 'Assembles a jar archive containing the sources.'
group = 'build'
@@ -192,12 +207,12 @@
}
}
-configure(javaProjects) {
- apply plugin: 'signing'
- signing {
- sign configurations.archives
- }
-}
+//configure(javaProjects) {
+// apply plugin: 'signing'
+// signing {
+// sign configurations.archives
+// }
+//}
configure(javaProjects) {
apply plugin: 'eclipse'
diff --git a/org.eclipse.virgo.bundlor/build.gradle b/org.eclipse.virgo.bundlor/build.gradle
index e21823c..45b1ec2 100644
--- a/org.eclipse.virgo.bundlor/build.gradle
+++ b/org.eclipse.virgo.bundlor/build.gradle
@@ -12,12 +12,6 @@
embedded "org.eclipse.virgo.util:org.eclipse.virgo.util.parser.manifest:${eclipseVirgoUtilVersion}"
testCompile "junit:junit:${junitVersion}"
- testCompile "org.apache.wicket:wicket-ioc:${apacheWicketInjectionVersion}"
-}
-
-test.dependsOn('copyTestJars')
-
-task copyTestJars(type: Copy) {
- into "$buildDir/test-jars"
- from configurations.testCompile
+
+ testBundles "org.apache.wicket:wicket-ioc:${apacheWicketInjectionVersion}"
}
diff --git a/org.eclipse.virgo.bundlor/src/test/java/org/eclipse/virgo/bundlor/support/asm/AsmTypeArtifactAnalyzerTests.java b/org.eclipse.virgo.bundlor/src/test/java/org/eclipse/virgo/bundlor/support/asm/AsmTypeArtifactAnalyzerTests.java
index 9399c3c..ac6ac68 100644
--- a/org.eclipse.virgo.bundlor/src/test/java/org/eclipse/virgo/bundlor/support/asm/AsmTypeArtifactAnalyzerTests.java
+++ b/org.eclipse.virgo.bundlor/src/test/java/org/eclipse/virgo/bundlor/support/asm/AsmTypeArtifactAnalyzerTests.java
@@ -352,7 +352,7 @@
@Test
public void viaJava14CompiledClassLiteral() throws Exception {
- JarFile jarFile = new JarFile("build/test-jars/wicket-ioc-1.3.3.jar");
+ JarFile jarFile = new JarFile("build/testBundles/wicket-ioc.jar");
InputStream inputStream = jarFile.getInputStream(jarFile.getEntry("org/apache/wicket/injection/Injector.class"));
ReadablePartialManifest model = analyse(inputStream, "org/apache/wicket/injection/Injector.class");
assertImportsPackage(model, "org.apache.wicket.markup.html");
