Skip to content

Commit

Permalink
Update to Orbit/EMF m3
Browse files Browse the repository at this point in the history
eclipse-platform#1197
eclipse-platform#1199

Use version of com.sun.jna with signed libraries:

eclipse-orbit/orbit-simrel#7

Update net.bytebuddy to 1.14.6
  • Loading branch information
merks committed Aug 15, 2023
1 parent bb805d3 commit 01a80e7
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 15 deletions.
26 changes: 11 additions & 15 deletions eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,13 @@
<unit id="org.jdom" version="1.1.3.v20230812-1600"/>
<unit id="org.jdom.source" version="1.1.3.v20230812-1600"/>

<!-- This version contains with notarized *.jnilib -->
<unit id="com.sun.jna" version="5.13.0.v20230812-1000"/>

<!-- This is the "normal" Orbit repository. During development on Bug 568936 this repo is the EBR (git)
sourced bundles of Orbit from 2022-06. This is the sub-p2-repo of the 2022-06 recommended build.
This is the repo that is expected to be updated on milestones based on Orbit deliveries. -->
<repository location="https://download.eclipse.org/tools/orbit/simrel/maven-bnd/nightly/latest"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/milestone/S202307260741"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/milestone/S202308151256"/>
</location>
<location includeAllPlatforms="true" includeMode="slicer" type="InstallableUnit">

Expand Down Expand Up @@ -77,10 +79,10 @@

<location includeAllPlatforms="true" includeMode="slicer" type="InstallableUnit">
<!-- Check version in "<EMF>/features" directory -->
<unit id="org.eclipse.emf.common.feature.group" version="2.29.0.v20230614-0642"/>
<unit id="org.eclipse.emf.common.source.feature.group" version="2.29.0.v20230614-0642"/>
<unit id="org.eclipse.emf.ecore.feature.group" version="2.35.0.v20230801-1141"/>
<unit id="org.eclipse.emf.ecore.source.feature.group" version="2.35.0.v20230801-1141"/>
<unit id="org.eclipse.emf.common.feature.group" version="2.30.0.v20230810-0713"/>
<unit id="org.eclipse.emf.common.source.feature.group" version="2.30.0.v20230810-0713"/>
<unit id="org.eclipse.emf.ecore.feature.group" version="2.35.0.v20230810-0713"/>
<unit id="org.eclipse.emf.ecore.source.feature.group" version="2.35.0.v20230810-0713"/>
<!-- For org.eclipse.ui.tools, and PDE's spy dependencies as of Eclipse 4.22 -->
<!-- Check version in "<EMF>/features" directory -->
<unit id="org.eclipse.emf.edit.feature.group" version="2.19.0.v20230211-1150"/>
Expand All @@ -89,7 +91,7 @@
<unit id="org.eclipse.emf.databinding.source.feature.group" version="1.10.0.v20230211-1150"/>
<unit id="org.eclipse.emf.databinding.edit.feature.group" version="1.10.0.v20230211-1150"/>
<unit id="org.eclipse.emf.databinding.edit.source.feature.group" version="1.10.0.v20230211-1150"/>
<repository location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202308011208"/>
<repository location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202308100734"/>
</location>

<location includeAllPlatforms="true" includeMode="slicer" type="InstallableUnit">
Expand Down Expand Up @@ -188,12 +190,6 @@
<version>5.13.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
<version>5.13.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.aries.spifly</groupId>
<artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId>
Expand Down Expand Up @@ -355,13 +351,13 @@
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy-agent</artifactId>
<version>1.14.5</version>
<version>1.14.6</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<version>1.14.5</version>
<version>1.14.6</version>
<type>jar</type>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,4 @@ Update target platform versions https://github.com/eclipse-platform/eclipse.plat
Update target platform versions for junit https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/pull/1050
Update Mockito to 5.4.0 https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/pull/1163
Update Junit versions https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/pull/1231
Update bytebuddy to 1.14.6 https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/pull/1253

0 comments on commit 01a80e7

Please sign in to comment.