Skip to content

Commit

Permalink
Fix build issues after upgrade (#977)
Browse files Browse the repository at this point in the history
* Git purge 1.8 Java.

* Fixed build issue, maybe a partition tests fails.
  • Loading branch information
soerendomroes authored Dec 6, 2023
1 parent f90a320 commit 777cfcd
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,12 @@
<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/releases/2022-09"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.google.gson" version="0.0.0"/>
<unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/eclipse/updates/4.25/R-4.25-202208311800/"/>
<repository location="http://download.eclipse.org/releases/2022-09"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.hamcrest.library" version="0.0.0"/>
<unit id="com.google.gson" version="0.0.0"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220830213456/repository/"/>
</location>
</locations>
Expand Down
7 changes: 4 additions & 3 deletions plugins/org.eclipse.elk.core.service/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@ Bundle-Version: 0.9.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
Require-Bundle: com.google.guava,
com.google.inject;bundle-version="3.0.0";visibility:=reexport,
org.eclipse.core.runtime,
org.eclipse.core.runtime;bundle-version=3.26.0,
org.eclipse.jface,
org.eclipse.ui.workbench;bundle-version="3.105.0",
org.eclipse.ui.workbench,
org.eclipse.emf.edit;bundle-version="2.5.0",
org.eclipse.elk.graph,
org.eclipse.elk.core;visibility:=reexport
org.eclipse.elk.core;visibility:=reexport,
org.eclipse.e4.ui.css.core;bundle-version="0.13.300"
Eclipse-RegisterBuddy: org.eclipse.elk.core
Bundle-RequiredExecutionEnvironment: JavaSE-11
Export-Package: org.eclipse.elk.core.service,
Expand Down
11 changes: 8 additions & 3 deletions plugins/org.eclipse.elk.core.service/pom.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2016 Kiel University and others.
Copyright (c) 2023 Kiel University and others.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License 2.0 which is available at
Expand Down Expand Up @@ -38,12 +38,17 @@
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.core.runtime</artifactId>
<version>3.13.0</version>
<version>3.26.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.e4.ui.css.core</artifactId>
<version>0.13.300</version>
</dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.ui.workbench</artifactId>
<version>3.110.0</version>
<version>3.126.0</version>
<exclusions>
<!-- exclude org.eclipse.swt here, as that in turn depends on "org.eclipse.platform:org.eclipse.swt.${osgi.platform}";
that construction is prone to result in build troubles. -->
Expand Down

0 comments on commit 777cfcd

Please sign in to comment.