Skip to content

Let sloeber run on java 17 #1430 #1431

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

Merged
merged 3 commits into from
Jan 2, 2022
Merged

Let sloeber run on java 17 #1430 #1431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a605114
sloeber.target is out of sync #1428
wimjongman Jan 1, 2022
5c3debe
Let Sloeber run on Java 17 #1430
wimjongman Jan 1, 2022
5202556
Let Sloeber run on Java 17 #1430
wimjongman Jan 1, 2022
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
2 changes: 1 addition & 1 deletion io.sloeber.feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ If you do not agree with this policy, please do not install this software.

<requires>
<import feature="org.eclipse.cdt" version="9.5.0" match="greaterOrEqual"/>
<import feature="org.eclipse.nebula.widgets.oscilloscope.feature" version="1.0.0" match="greaterOrEqual"/>
<import feature="org.eclipse.nebula.widgets.oscilloscope.feature" version="0.0.0" match="greaterOrEqual"/>
</requires>

<plugin
Expand Down
4 changes: 2 additions & 2 deletions io.sloeber.parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
<!--
<source>11</source>
<target>11</target> -->
<executionEnvironment>org.eclipse.justj.openjdk.hotspot.jre.full-15</executionEnvironment>
<executionEnvironment>org.eclipse.justj.openjdk.hotspot.jre.full-17</executionEnvironment>

</configuration>
</plugin>
Expand Down Expand Up @@ -354,7 +354,7 @@
<repository>
<id>justj</id>
<layout>p2</layout>
<url>https://download.eclipse.org/justj/jres/15/updates/release/latest/</url>
<url>https://download.eclipse.org/justj/jres/17/updates/release/latest/</url>
</repository>

<repository>
Expand Down
6 changes: 3 additions & 3 deletions io.sloeber.product/arduino.product
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,18 +257,18 @@ United States, other countries, or both.
<plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
<plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
<property name="osgi.instance.area.default" value="@user.home/Documents/sloeber-workspace" os="win32" />
<property name="org.eclipse.oomph.setup.ui/enable.preference.recorder" value="false" />
<property name="osgi.instance.area.default" value="@user.home/Documents/sloeber-workspace" os="win32" />
</configurations>

<repositories>
<repository location="https://download.eclipse.org/nebula/releases/latest/" enabled="true" />
<repository location="https://eclipse.baeyens.it/update/V4/nightly/" enabled="false" />
<repository location="https://eclipse.baeyens.it/update/V4/stable/" enabled="true" />
<repository location="https://download.eclipse.org/releases/latest/" enabled="true" />
<repository location="https://download.eclipse.org/technology/babel/update-site/latest/" enabled="true" />
<repository location="https://download.eclipse.org/justj/jres/15/updates/release/latest/" enabled="true" />
<repository location="https://download.eclipse.org/eclipse/updates/latest" enabled="true" />
<repository location="https://download.eclipse.org/justj/jres/17/updates/release/latest/" enabled="true" />
<repository location="https://download.eclipse.org/nebula/snapshot" enabled="true" />
</repositories>

<preferencesInfo>
Expand Down
10 changes: 5 additions & 5 deletions io.sloeber.product/sloeber.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,20 @@
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="http://download.eclipse.org/releases/latest"/>
<unit id="org.eclipse.cdt.sdk.feature.group" version="10.3.0.202106080120"/>
<unit id="org.eclipse.embedcdt.debug.gdbjtag.openocd.feature.group" version="6.1.2.202102181132"/>
<unit id="org.eclipse.cdt.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.embedcdt.debug.gdbjtag.openocd.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/downloads/drops/R20200224183213/repository"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/latest-R/"/>
<unit id="org.apache.commons.lang" version="0.0.0"/>
<unit id="org.apache.commons.lang.source" version="0.0.0"/>
<unit id="org.apache.commons.compress" version="0.0.0"/>
<unit id="org.apache.commons.compress.source" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/nebula/releases/latest/"/>
<unit id="org.eclipse.nebula.widgets.oscilloscope.css.feature.feature.group" version="1.4.0.202011020719"/>
<unit id="org.eclipse.nebula.widgets.oscilloscope.feature.feature.group" version="1.4.0.202011020719"/>
<unit id="org.eclipse.nebula.widgets.oscilloscope.css.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.nebula.widgets.oscilloscope.feature.feature.group" version="0.0.0"/>
</location>
</locations>
</target>
6 changes: 4 additions & 2 deletions io.sloeber.updatesite/category.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@
</category-def>
<repository-reference location="https://download.eclipse.org/releases/latest/" enabled="true" />
<repository-reference location="https://download.eclipse.org/eclipse/updates/latest" enabled="true" />
<repository-reference location="https://download.eclipse.org/justj/jres/15/updates/release/latest/" enabled="true" />
<repository-reference location="https://download.eclipse.org/technology/babel/update-site/latest/" enabled="true" />
<repository-reference location="https://download.eclipse.org/nebula/releases/latest/" enabled="true" />
<repository-reference location="https://download.eclipse.org/justj/jres/17/updates/release/latest/" enabled="true" />
<repository-reference location="https://download.eclipse.org/nebula/snapshot/" enabled="true" />
<repository-reference location="https://eclipse.baeyens.it/update/V4/stable/" enabled="false" />
<repository-reference location="https://eclipse.baeyens.it/update/V4/nightly/" enabled="true" />
</site>