Skip to content

Commit 3130c0e

Browse files
committed
build: update target
1 parent 133a75b commit 3130c0e

File tree

5 files changed

+16
-14
lines changed

5 files changed

+16
-14
lines changed

com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ Require-Bundle: com.avaloq.tools.ddk.check.core,
2626
org.eclipse.ui.workbench;resolution:=optional,
2727
org.eclipse.xtext.xbase,
2828
org.eclipse.xtext.xbase.lib,
29-
org.apache.logging.log4j,
3029
org.apache.commons.lang,
3130
org.eclipse.xtext.xbase.testing,
3231
junit-jupiter-api,
@@ -41,5 +40,6 @@ Import-Package: org.junit.runner;version="4.5.0",
4140
org.junit.runner.notification;version="4.5.0",
4241
org.junit.runners;version="4.5.0",
4342
org.junit.runners.model;version="4.5.0",
44-
org.hamcrest.core
43+
org.hamcrest.core,
44+
org.apache.logging.log4j
4545
Automatic-Module-Name: com.avaloq.tools.ddk.check.core.test

com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/quickfix/CheckQuickfixTest.xtend

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ class CheckQuickfixTest extends AbstractCheckQuickfixTest {
172172
// Build the catalogs, and wait for the expected markers to appear
173173
testProjectManager.build
174174
val markersTreeBot = ProblemsViewTestUtil.getMarkersTree(bot)
175-
bot.waitUntil(new WaitForEquals("Not all expected markers appeared.", [expectedMarkers], [markersTreeBot.allItems.length]))
175+
bot.waitUntil(new WaitForEquals("Not all expected markers appeared.", [expectedMarkers], [markersTreeBot.allItems.filter[n | n.text.startsWith("Check")].length]))
176176

177177
// ACT
178178
// Disable autobuilding, to avoid losing focus while selecting markers

com.avaloq.tools.ddk.checkcfg.core/META-INF/MANIFEST.MF

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ Require-Bundle: org.eclipse.xtext,
2121
com.avaloq.tools.ddk.check.core,
2222
com.avaloq.tools.ddk.check.runtime.core,
2323
org.eclipse.xtext.xbase.lib,
24-
org.apache.logging.log4j,
2524
org.objectweb.asm;resolution:=optional,
2625
io.github.classgraph.classgraph
2726
Export-Package: com.avaloq.tools.ddk.checkcfg,
@@ -37,4 +36,5 @@ Export-Package: com.avaloq.tools.ddk.checkcfg,
3736
com.avaloq.tools.ddk.checkcfg.validation,
3837
com.avaloq.tools.ddk.checkcfg.serializer
3938
Automatic-Module-Name: com.avaloq.tools.ddk.checkcfg.core
40-
Import-Package: org.apache.log4j
39+
Import-Package: org.apache.log4j,
40+
org.apache.logging.log4j

com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/builder/XtextBuildTriggerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,6 @@ public void testTriggerRespectsAutoBuilding() {
7373
when(workspace.getRoot()).thenReturn(root);
7474
when(root.getProjects()).thenReturn(projects);
7575
buildTrigger.scheduleFullBuild();
76-
verify(scheduler).scheduleBuildIfNecessary(eq(Arrays.asList(projects)), ArgumentMatchers.<IBuildFlag[]> any());
76+
verify(scheduler).scheduleBuildIfNecessary(eq(Arrays.asList(projects)));
7777
}
7878
}

ddk-target/ddk.target

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,16 @@
4444
<unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
4545
</location>
4646
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
47-
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository"/>
48-
<unit id="org.apache.logging.log4j" version="2.17.1.v20220106-2156"/>
49-
<unit id="org.apache.commons.lang" version="2.6.0.v20220406-2305"/>
50-
<unit id="org.apache.log4j" version="1.2.24.v20221221-2012"/>
51-
<unit id="org.slf4j.ext" version="1.7.30.v20221112-0806"/>
52-
<unit id="org.mockito.mockito-core" version="4.8.1.v20221103-2317"/>
53-
<unit id="org.hamcrest" version="2.2.0.v20210711-0821"/>
54-
<unit id="org.junit" version="4.13.2.v20211018-1956"/>
47+
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025-06"/>
48+
<unit id="net.bytebuddy.byte-buddy" version="1.17.5"/>
49+
<unit id="net.bytebuddy.byte-buddy-agent" version="1.17.5"/>
50+
<unit id="org.apache.logging.log4j.core" version="2.24.3"/>
51+
<unit id="org.apache.commons.lang" version="2.6.0"/>
52+
<unit id="org.apache.log4j" version="1.2.26"/>
53+
<unit id="org.apache.logging.log4j.to.slf4j" version="2.24.3"/>
54+
<unit id="org.mockito.mockito-core" version="5.18.0"/>
55+
<unit id="org.hamcrest" version="2.2.0"/>
56+
<unit id="org.junit" version="4.13.2.v20240929-1000"/>
5557
</location>
5658
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
5759
<repository location="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/2025-09"/>

0 commit comments

Comments
 (0)