Skip to content

update orbit repository to 4.39 #1336

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
KrisLimbo wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

update orbit repository to 4.39 #1336

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
1 change: 0 additions & 1 deletion com.avaloq.tools.ddk.check.core.test/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
<accessrules>
<accessrule kind="accessible" pattern="org/eclipse/xtext/junit4/ui/util/**"/>
<accessrule kind="accessible" pattern="org/eclipse/xtext/xbase/imports/RewritableImportSection"/>
<accessrule kind="accessible" pattern="org/eclipse/xtext/formatting2/**"/>
<accessrule kind="accessible" pattern="org/eclipse/xtext/preferences/**"/>
Expand Down
1 change: 0 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 @@ -29,7 +29,6 @@ Require-Bundle: com.avaloq.tools.ddk.check.core,
org.eclipse.xtext.xbase.testing,
junit-jupiter-api,
junit-jupiter-engine,
junit-vintage-engine,
junit-platform-suite-api
Export-Package: com.avaloq.tools.ddk.check.core.test,
com.avaloq.tools.ddk.check.core.test.util,
Expand Down
3 changes: 0 additions & 3 deletions com.avaloq.tools.ddk.check.test.runtime.tests/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@
<classpathentry kind="src" path="resource"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
<accessrules>
<accessrule kind="accessible" pattern="org/eclipse/xtext/junit4/ui/util/**"/>
</accessrules>
</classpathentry>
<classpathentry kind="output" path="bin"/>
</classpath>
3 changes: 1 addition & 2 deletions com.avaloq.tools.ddk.check.test.runtime.tests/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ Require-Bundle: com.avaloq.tools.ddk.check.runtime.core,
org.eclipse.xtext.xbase.lib,
junit-jupiter-api,
junit-jupiter-engine,
junit-platform-suite-api,
junit-vintage-engine
junit-platform-suite-api
Import-Package: org.hamcrest.core
Bundle-RequiredExecutionEnvironment: JavaSE-21
Export-Package: com.avaloq.tools.ddk.check.test.runtime,
Expand Down
3 changes: 1 addition & 2 deletions com.avaloq.tools.ddk.sample.helloworld.ui.test/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ Require-Bundle: com.avaloq.tools.ddk.sample.helloworld,
org.eclipse.xtext.xbase.ui.testing,
junit-jupiter-api,
junit-jupiter-engine,
junit-platform-suite-api,
junit-vintage-engine
junit-platform-suite-api
Bundle-RequiredExecutionEnvironment: JavaSE-21
Export-Package: com.avaloq.tools.ddk.sample.helloworld.test,
com.avaloq.tools.ddk.sample.helloworld.ui;x-internal=true
2 changes: 1 addition & 1 deletion com.avaloq.tools.ddk.test.ui.test/src/com/avaloq/tools/ddk/test/ui/test/AllTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@


/**
* Empty class serving only as holder for JUnit4 annotations.
* Empty class serving only as holder for JUnit annotations.
*/
@Suite
@SelectClasses({
Expand Down
2 changes: 1 addition & 1 deletion com.avaloq.tools.ddk.test.ui/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Require-Bundle: com.avaloq.tools.ddk.test.core,
org.eclipse.swt,
org.eclipse.swtbot.eclipse.core,
org.eclipse.swtbot.eclipse.finder;visibility:=reexport,
org.eclipse.swtbot.junit4_x,
org.eclipse.swtbot.junit5_x,
org.eclipse.swtbot.swt.finder,
org.eclipse.ui;visibility:=reexport,
org.hamcrest.library,
Expand Down
2 changes: 1 addition & 1 deletion ...ols.ddk.xtext.export.test/src/com/avaloq/tools/ddk/xtext/test/export/ExportTestSuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@


/**
* Empty class serving only as holder for JUnit4 annotations.
* Empty class serving only as holder for JUnit annotations.
*/
@Suite
@SelectClasses({ExportFormattingTest.class, ExportValidationTest.class, ExportValidationOkTest.class, ExportScopingTest.class, ExportExportingTest.class})
Expand Down
1 change: 0 additions & 1 deletion com.avaloq.tools.ddk.xtext.test/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ Require-Bundle: com.avaloq.tools.ddk.xtext,
org.eclipse.emf.ecore,
junit-jupiter-api,
junit-jupiter-engine,
junit-vintage-engine,
junit-platform-suite-api,
org.eclipse.xtext.testing,
org.opentest4j
Expand Down
5 changes: 3 additions & 2 deletions com.avaloq.tools.ddk.xtext.test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
<artifactId>tycho-surefire-plugin</artifactId>
<version>${tycho.version}</version>
<configuration>
<providerHint>junit5</providerHint>
<trimStackTrace>false</trimStackTrace>
<skip>false</skip>
<testClass>${test.testClass}</testClass>
Expand Down Expand Up @@ -49,8 +50,8 @@
<versionRange>0.0.0</versionRange>
</requirement>
<requirement>
<type>eclipse-feature</type>
<id>org.eclipse.pde</id>
<type>eclipse-plugin</type>
<id>org.eclipse.pde.junit.runtime</id>
<versionRange>0.0.0</versionRange>
</requirement>
<requirement>
Expand Down
2 changes: 1 addition & 1 deletion com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/AllTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@


/**
* Empty class serving only as holder for JUnit4 annotations.
* Empty class serving only as holder for JUnit annotations.
*/
// CHECKSTYLE:OFF HideUtilityClassConstructor

Expand Down
3 changes: 1 addition & 2 deletions ddk-configuration/launches/devkit-run.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@
<setEntry value="org.eclipse.swtbot.eclipse.ui@default:default"/>
<setEntry value="org.eclipse.swtbot.forms.finder@default:default"/>
<setEntry value="org.eclipse.swtbot.go@default:default"/>
<setEntry value="org.eclipse.swtbot.junit4_x@default:default"/>
<setEntry value="org.eclipse.swtbot.junit5_x@default:default"/>
<setEntry value="org.eclipse.swtbot.swt.finder@default:default"/>
<setEntry value="org.eclipse.team.core@default:default"/>
<setEntry value="org.eclipse.team.ui@default:default"/>
Expand Down Expand Up @@ -269,7 +269,6 @@
<setEntry value="org.eclipse.xtext.doc@default:default"/>
<setEntry value="org.eclipse.xtext.ecore@default:default"/>
<setEntry value="org.eclipse.xtext.xtext.generator@default:default"/>
<setEntry value="org.eclipse.xtext.junit4@default:default"/>
<setEntry value="org.eclipse.xtext.logging@default:false"/>
<setEntry value="org.eclipse.xtext.purexbase.ui@default:default"/>
<setEntry value="org.eclipse.xtext.purexbase@default:default"/>
Expand Down
60 changes: 32 additions & 28 deletions ddk-target/ddk.target
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,24 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<target name="DDK Target" sequenceNumber="27">
<target name="DDK Target" sequenceNumber="28">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
<unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/>
<unit id="org.eclipse.swtbot.ide.feature.group" version="0.0.0"/>
<unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/technology/swtbot/releases/4.2.1/"/>
<unit id="org.eclipse.swtbot.junit5.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/technology/swtbot/releases/4.3.0/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.pde.source.feature.group" version="0.0.0"/>
<unit id="org.eclipse.jdt.source.feature.group" version="0.0.0"/>
<unit id="org.eclipse.pde.core" version="0.0.0"/>
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
<unit id="org.eclipse.platform.source.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/eclipse/updates/4.34/"/>
<unit id="org.eclipse.pde.core" version="0.0.0"/>
<unit id="org.eclipse.pde.ui" version="0.0.0"/>
<unit id="org.eclipse.pde.ua.core" version="0.0.0"/>
<unit id="org.eclipse.pde.junit.runtime" version="0.0.0"/>
<unit id="org.eclipse.jdt.junit.runtime" version="0.0.0"/>
<unit id="org.eclipse.jdt.annotation" version="0.0.0"/>
<repository location="https://download.eclipse.org/releases/2026-03/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
Expand Down Expand Up @@ -42,27 +46,27 @@
<unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.37.0"/>
<unit id="net.bytebuddy.byte-buddy" version="1.17.7"/>
<unit id="org.objenesis" version="3.4.0"/>
<unit id="org.mockito.mockito-core" version="5.19.0"/>
<unit id="org.hamcrest" version="2.2.0"/>
<unit id="org.apache.commons.logging" version="1.2.0"/>
<unit id="org.apache.commons.text" version="1.14.0"/>
<unit id="org.junit" version="4.13.2.v20240929-1000"/>
<unit id="org.apache.commons.lang3" version="3.18.0"/>
<unit id="org.apache.logging.log4j.core" version="2.25.1"/>
<unit id="org.apache.logging.log4j.api" version="2.25.1"/>
<unit id="org.apache.log4j" version="1.2.26"/> <!--use reload4j 1.2.26 for org.eclipse.xtext dependencies to log4j-->
<unit id="junit-jupiter-api" version="5.13.4"/>
<unit id="junit-jupiter-engine" version="5.13.4"/>
<unit id="junit-jupiter-params" version="5.13.4"/>
<unit id="junit-vintage-engine" version="5.13.4"/>
<unit id="junit-platform-commons" version="1.13.4"/>
<unit id="junit-platform-engine" version="1.13.4"/>
<unit id="junit-platform-launcher" version="1.13.4"/>
<unit id="junit-platform-suite-api" version="1.13.4"/>
<unit id="junit-platform-suite-engine" version="1.13.4"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.39.0"/>
<unit id="net.bytebuddy.byte-buddy" version="1.18.5"/>
<unit id="org.objenesis" version="3.5.0"/>
<unit id="org.mockito.mockito-core" version="5.21.0"/>
<unit id="org.hamcrest" version="2.2.0"/>
<unit id="org.apache.commons.logging" version="1.2.0"/>
<unit id="org.apache.commons.text" version="1.15.0"/>
<unit id="org.apache.commons.lang3" version="3.20.0"/>
<unit id="org.apache.logging.log4j.core" version="2.25.3"/>
<unit id="org.apache.logging.log4j.api" version="2.25.3"/>
<unit id="org.apache.log4j" version="1.2.26"/> <!--use reload4j 1.2.26 for org.eclipse.xtext dependencies to log4j-->
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/release/4.39.0"/>
<unit id="junit-jupiter-api" version="5.14.3"/>
<unit id="junit-jupiter-params" version="5.14.3"/>
<unit id="junit-platform-commons" version="1.14.3"/>
<unit id="junit-platform-engine" version="1.14.3"/>
<unit id="junit-platform-launcher" version="1.14.3"/>
<unit id="junit-platform-suite-api" version="1.14.3"/>
<unit id="junit-platform-suite-engine" version="1.14.3"/>
</location>
</locations>
</target>