Skip to content

Updates the Orbit repository #763

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
rubenporras wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Updates the Orbit repository #763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,9 @@ Require-Bundle: com.avaloq.tools.ddk.check.core,
org.eclipse.ui.workbench;resolution:=optional,
org.eclipse.xtext.xbase,
org.eclipse.xtext.xbase.lib,
org.apache.logging.log4j,
org.apache.commons.lang,
org.apache.logging.log4j.api,
org.apache.logging.log4j.core,
org.eclipse.xtext.xbase.testing,
junit-jupiter-api,
junit-jupiter-engine,
Expand Down
3 changes: 2 additions & 1 deletion com.avaloq.tools.ddk.checkcfg.core/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ Require-Bundle: org.eclipse.xtext,
com.avaloq.tools.ddk.check.core,
com.avaloq.tools.ddk.check.runtime.core,
org.eclipse.xtext.xbase.lib,
org.apache.logging.log4j,
org.apache.logging.log4j.api,
org.apache.logging.log4j.core,
org.objectweb.asm;resolution:=optional,
io.github.classgraph.classgraph
Export-Package: com.avaloq.tools.ddk.checkcfg,
Expand Down
2 changes: 1 addition & 1 deletion ...ols.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/PluginTestProjectManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public class PluginTestProjectManager extends XtextTestProjectManager {

// org.eclipse.osgi needed for NLS
// org.apache.logging.log4j needed for logging in generated StandaloneSetup
private static final List<String> REQUIRED_BUNDLES = newArrayList("org.eclipse.xtext.xbase.lib", "org.eclipse.xtend.lib", "org.eclipse.emf.ecore", "com.avaloq.tools.ddk.check.core", "com.avaloq.tools.ddk.check.runtime.core", "com.avaloq.tools.ddk.check.lib", "com.avaloq.tools.ddk.xtext", "org.eclipse.xtext", "org.eclipse.osgi", "org.eclipse.xtend", "org.eclipse.core.runtime", "org.eclipse.xtext.xbase", "org.apache.logging.log4j");
private static final List<String> REQUIRED_BUNDLES = newArrayList("org.eclipse.xtext.xbase.lib", "org.eclipse.xtend.lib", "org.eclipse.emf.ecore", "com.avaloq.tools.ddk.check.core", "com.avaloq.tools.ddk.check.runtime.core", "com.avaloq.tools.ddk.check.lib", "com.avaloq.tools.ddk.xtext", "org.eclipse.xtext", "org.eclipse.osgi", "org.eclipse.xtend", "org.eclipse.core.runtime", "org.eclipse.xtext.xbase", "org.apache.logging.log4j.api", "org.apache.logging.log4j.core");

private final Injector injector;

Expand Down
2 changes: 1 addition & 1 deletion ...oq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/builder/XtextBuildTriggerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,6 @@ public void testTriggerRespectsAutoBuilding() {
when(workspace.getRoot()).thenReturn(root);
when(root.getProjects()).thenReturn(projects);
buildTrigger.scheduleFullBuild();
verify(scheduler).scheduleBuildIfNecessary(eq(Arrays.asList(projects)), ArgumentMatchers.<IBuildFlag[]> any());
verify(scheduler).scheduleBuildIfNecessary(eq(Arrays.asList(projects)));
}
}
18 changes: 10 additions & 8 deletions ddk-target/ddk.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,16 @@
<unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository"/>
<unit id="org.apache.logging.log4j" version="2.17.1.v20220106-2156"/>
<unit id="org.apache.commons.lang" version="2.6.0.v20220406-2305"/>
<unit id="org.apache.log4j" version="1.2.24.v20221221-2012"/>
<unit id="org.slf4j.ext" version="1.7.30.v20221112-0806"/>
<unit id="org.mockito.mockito-core" version="4.8.1.v20221103-2317"/>
<unit id="org.hamcrest" version="2.2.0.v20210711-0821"/>
<unit id="org.junit" version="4.13.2.v20211018-1956"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025-09"/>
<unit id="net.bytebuddy.byte-buddy" version="1.17.7"/>
<unit id="net.bytebuddy.byte-buddy-agent" version="1.17.7"/>
<unit id="org.apache.commons.lang" version="2.6.0"/>
<unit id="org.apache.logging.log4j.api" version="2.25.1"/>
<unit id="org.apache.logging.log4j.core" version="2.25.1"/>
<unit id="org.apache.logging.log4j.to.slf4j" version="2.25.1"/>
<unit id="org.mockito.mockito-core" version="5.19.0"/>
<unit id="org.hamcrest" version="2.2.0"/>
<unit id="org.junit" version="4.13.2.v20240929-1000"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/2025-09"/>
Expand Down