Skip to content

Commit 2003201

Browse files
committed
clean latestDep
1 parent ccfd0e9 commit 2003201

File tree

1 file changed

+4
-27
lines changed

1 file changed

+4
-27
lines changed

dd-java-agent/instrumentation/mule-4/build.gradle

Lines changed: 4 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ ext {
22
forkedTestMaxJavaVersionForTests = JavaVersion.VERSION_11
33
mule46ForkedTestMaxJavaVersionForTests = JavaVersion.VERSION_11
44
latestDepForkedTestMinJavaVersionForTests = JavaVersion.VERSION_17
5+
latestDepForkedTestMaxJavaVersionForTests = JavaVersion.VERSION_17
56
}
67

78
muzzle {
@@ -35,12 +36,6 @@ addTestSuiteForDir('latestDepForkedTest', 'test')
3536
def muleVersion = '4.5.0'
3637
def appDir = "$projectDir/application"
3738

38-
clean.doFirst {
39-
delete "$buildDir/mule/forkedTest"
40-
delete "$buildDir/mule/mule46ForkedTest"
41-
delete "$buildDir/mule/latestDepForkedTest"
42-
}
43-
4439
repositories {
4540
maven {
4641
name "mulesoft-releases"
@@ -141,15 +136,15 @@ dependencies {
141136
latestDepForkedTestImplementation group: 'org.mule.runtime', name: 'mule-core', version: '4.8.+'
142137
latestDepForkedTestImplementation group: 'org.mule.runtime', name: 'mule-module-extensions-spring-support', version: '4.8.+'
143138
latestDepForkedTestImplementation group: 'org.mule.runtime', name: 'mule-module-service', version: '4.8.+'
144-
// this is needed for mule to find removed javax.* APIs on Java 11+
145139
latestDepForkedTestImplementation group: 'org.mule.runtime', name: 'mule-module-javaee', version: '4.8.+'
146140

141+
147142
//TODO: 4.9.0 is not yet out but it looks like using 4.+ instead of above 4.8.+ brings in 4.9.0-SNAPSHOT artifacts.
148143
/*
149144
When testing with them, the mule container does not bootstrap because of:
150145
None of [protected void java.lang.Object.finalize() throws java.lang.Throwable, public final void java.lang.Object.wait(long,int) throws java.lang.InterruptedException, public final void java.lang.Object.wait() throws java.lang.InterruptedException, public final native void java.lang.Object.wait(long) throws java.lang.InterruptedException, public boolean java.lang.Object.equals(java.lang.Object), public java.lang.String java.lang.Object.toString(), public native int java.lang.Object.hashCode(), public final native java.lang.Class java.lang.Object.getClass(), protected native java.lang.Object java.lang.Object.clone() throws java.lang.CloneNotSupportedException, public final native void java.lang.Object.notify(), public final native void java.lang.Object.notifyAll(), public abstract java.lang.Object java.lang.reflect.InvocationHandler.invoke(java.lang.Object,java.lang.reflect.Method,java.lang.Object[]) throws java.lang.Throwable] allows for delegation from public boolean org.springframework.beans.factory.SmartFactoryBean.isEagerInit()
151146
*/
152-
latestDepForkedTestImplementation group: 'org.mule.runtime', name: 'mule-extensions-soap-api', version: '+'
147+
latestDepForkedTestImplementation group: 'org.mule.runtime', name: 'mule-extensions-soap-api', version: '1.8.+'
153148

154149
latestDepForkedTestImplementation group: 'jakarta.xml.ws', name: 'jakarta.xml.ws-api', version: '4.0.2'
155150
// back to the future
@@ -159,7 +154,7 @@ dependencies {
159154

160155
latestMuleServices group: 'org.mule.services', name: 'mule-service-http', version: '1.+', classifier: 'mule-service'
161156
latestMuleServices group: 'org.mule.services', name: 'mule-service-scheduler', version: '1.+', classifier: 'mule-service'
162-
latestMuleServices group: 'org.mule.services', name: 'mule-service-weave', version: '2.+', classifier: 'mule-service'
157+
latestMuleServices group: 'org.mule.services', name: 'mule-service-weave', version: '2.8.1', classifier: 'mule-service'
163158
}
164159

165160
def copyMuleArtifacts(String configName, String muleBaseDir, Sync sync) {
@@ -221,24 +216,6 @@ def createAppResourceTask(Task task, String name) {
221216
}
222217
}
223218

224-
tasks.named("test").configure {
225-
outputs.upToDateWhen {
226-
!mvnPackage.didWork && !extractMuleServices.didWork
227-
}
228-
}
229-
230-
tasks.named("mule46ForkedTest").configure {
231-
outputs.upToDateWhen {
232-
!mvnPackage.didWork && !extractMule46Services.didWork
233-
}
234-
}
235-
236-
tasks.named("latestDepForkedTest").configure {
237-
outputs.upToDateWhen {
238-
!mvnPackage.didWork && !latestDepForkedTest.didWork
239-
}
240-
}
241-
242219
spotless {
243220
java {
244221
target "**/*.java"

0 commit comments

Comments
 (0)