Skip to content

Commit

Permalink
Update Eclipse platform versions
Browse files Browse the repository at this point in the history
This updates everything to the 12/2025 release versions. It also
resolves issue #12782 in which graphics were messed up on Mac,
preventing the ability to do interactive debugging.
  • Loading branch information
leviathan747 committed Jan 8, 2025
1 parent b51761d commit b87e6c4
Show file tree
Hide file tree
Showing 14 changed files with 25 additions and 26 deletions.
2 changes: 1 addition & 1 deletion releng/org.xtuml.bp.mctools.parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<packaging>pom</packaging>

<properties>
<tycho-version>4.0.4</tycho-version>
<tycho-version>4.0.9</tycho-version>
</properties>

<modules>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@

<repositories>
<repository location="http://download.eclipse.org/technology/m2e/releases" enabled="false" />
<repository location="https://download.eclipse.org/releases/2020-06/" enabled="true" />
<repository location="https://download.eclipse.org/releases/2024-12/" enabled="true" />
</repositories>

<preferencesInfo>
Expand Down
4 changes: 2 additions & 2 deletions releng/org.xtuml.bp.releng.parent.product-dev/p2.inf
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
instructions.configure = \
chmod(targetDir:${installFolder}/plugins/org.apache.ant_1.10.14.v20230922-1200/bin,targetFile:ant,permissions:755); \
chmod(targetDir:${installFolder}/plugins/org.apache.ant_1.10.14.v20230922-1200/bin,targetFile:antRun,permissions:755);
chmod(targetDir:${installFolder}/plugins/org.apache.ant_1.10.15.v20240901-1000/bin,targetFile:ant,permissions:755); \
chmod(targetDir:${installFolder}/plugins/org.apache.ant_1.10.15.v20240901-1000/bin,targetFile:antRun,permissions:755);
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
</configurations>

<repositories>
<repository location="https://download.eclipse.org/releases/2020-06/" enabled="true" />
<repository location="https://download.eclipse.org/releases/2024-12/" enabled="true" />
</repositories>

<preferencesInfo>
Expand Down
4 changes: 2 additions & 2 deletions releng/org.xtuml.bp.releng.parent.product/p2.inf
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
instructions.configure = \
chmod(targetDir:${installFolder}/plugins/org.apache.ant_1.10.14.v20230922-1200/bin,targetFile:ant,permissions:755); \
chmod(targetDir:${installFolder}/plugins/org.apache.ant_1.10.14.v20230922-1200/bin,targetFile:antRun,permissions:755);
chmod(targetDir:${installFolder}/plugins/org.apache.ant_1.10.15.v20240901-1000/bin,targetFile:ant,permissions:755); \
chmod(targetDir:${installFolder}/plugins/org.apache.ant_1.10.15.v20240901-1000/bin,targetFile:antRun,permissions:755);
15 changes: 7 additions & 8 deletions releng/org.xtuml.bp.releng.parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<packaging>pom</packaging>

<properties>
<tycho-version>4.0.4</tycho-version>
<tycho-version>4.0.9</tycho-version>
<ant-home-path>${env.ANT_HOME}</ant-home-path>
<eclipse-home-path>${env.bp_install_dir}</eclipse-home-path>
<mcj_path>../../src/MC-Java</mcj_path>
Expand All @@ -20,25 +20,24 @@

<repositories>
<repository>
<id>2022-06</id>
<id>2024-12</id>
<layout>p2</layout>
<url>https://download.eclipse.org/releases/2023-12/</url>
<url>https://download.eclipse.org/releases/2024-12/</url>
</repository>
<repository>
<id>4.30-update</id>
<id>4.34-update</id>
<layout>p2</layout>
<url>https://download.eclipse.org/eclipse/updates/4.30/</url>
<url>https://download.eclipse.org/eclipse/updates/4.34/</url>
</repository>
<repository>
<id>antlr</id>
<layout>p2</layout>
<!--<url>file:////build/buildmt/repository</url>-->
<url>https://s3.amazonaws.com/1f-outgoing/antlr_upsite/</url>
</repository>
<repository>
<id>cdt-11.4.0</id>
<id>cdt-11.6</id>
<layout>p2</layout>
<url>https://download.eclipse.org/tools/cdt/releases/11.4/</url>
<url>https://download.eclipse.org/tools/cdt/releases/11.6/</url>
</repository>
</repositories>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ protected Command getMoveBendpointCommand(BendpointRequest request) {
}

@Override
protected List<?> createSelectionHandles() {
protected List createSelectionHandles() {
List<BendpointHandle> list = new ArrayList<BendpointHandle>();
ConnectionEditPart connEP = (ConnectionEditPart) getHost();
PointList points = getConnection().getPoints();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public ConnectorEndpointEditPolicy(int configuredLineWidth) {
}

@Override
protected List<?> createSelectionHandles() {
protected List createSelectionHandles() {
fPreviousLineWidth = ((PolylineConnection) getHostFigure())
.getLineWidth();
if (fPreviousLineWidth == 0) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ public void eraseSourceFeedback(Request request) {
}

@Override
protected List<?> createSelectionHandles() {
protected List createSelectionHandles() {
return Collections.EMPTY_LIST;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ protected Rectangle getInitialFeedbackBounds() {
}

@Override
protected List<Handle> createSelectionHandles() {
protected List createSelectionHandles() {
List<Handle> list = new ArrayList<Handle>();
MoveHandle moveHandle = new MoveHandle((GraphicalEditPart) getHost());
moveHandle.setDragTracker(new TextDragEditPartsTracker(getHost()));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,15 @@ protected void snapPoint(ChangeBoundsRequest request) {
}

@Override
protected List<Object> createOperationSet() {
protected List createOperationSet() {
if (getCurrentViewer() != null) {
List<?> list = ToolUtilities
.getSelectionWithoutDependants(getCurrentViewer());
// add any text edit parts if existing
// they are always selected along with
// the parent, but as a secondary selection
// according to GEF
List<Object> additionalSelection = new ArrayList<Object>();
List additionalSelection = new ArrayList<Object>();
additionalSelection.addAll(list);
for (Object selected : list) {
EditPart part = (EditPart) selected;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,13 @@ public TextResizeTracker(GraphicalEditPart owner, int direction) {
}

@Override
protected List<?> createOperationSet() {
protected List createOperationSet() {
List<?> list = getCurrentViewer().getSelectedEditParts();
// add any text edit parts if existing
// they are always selected along with
// the parent, but as a secondary selection
// according to GEF
List<Object> additionalSelection = new ArrayList<Object>();
List additionalSelection = new ArrayList<Object>();
additionalSelection.addAll(list);
for (Object selected : list) {
EditPart part = (EditPart) selected;
Expand Down Expand Up @@ -166,4 +166,4 @@ protected void updateSourceRequest() {
request.getExtendedData().clear();
}

}
}
2 changes: 1 addition & 1 deletion src/org.xtuml.bp.xtext.masl.parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@


<properties>
<tycho-version>4.0.4</tycho-version>
<tycho-version>4.0.9</tycho-version>
<xtextVersion>2.33.0</xtextVersion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion src/org.xtuml.canvas.language.parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<mwe2Version>2.16.0</mwe2Version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- Tycho settings -->
<tycho-version>4.0.4</tycho-version>
<tycho-version>4.0.9</tycho-version>
<!-- Define overridable properties for tycho-surefire-plugin -->
<platformSystemProperties></platformSystemProperties>
<moduleProperties></moduleProperties>
Expand Down

0 comments on commit b87e6c4

Please sign in to comment.