From a6051144d0b6a2c35252753e264651cd088d7bee Mon Sep 17 00:00:00 2001
From: Wim Jongman <wim.jongman@remainsoftware.com>
Date: Sat, 1 Jan 2022 13:07:00 +0100
Subject: [PATCH 1/3] sloeber.target is out of sync #1428

Fixed
---
 io.sloeber.product/sloeber.target | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/io.sloeber.product/sloeber.target b/io.sloeber.product/sloeber.target
index 22ffd665d..95140b1bb 100644
--- a/io.sloeber.product/sloeber.target
+++ b/io.sloeber.product/sloeber.target
@@ -11,11 +11,11 @@
 		</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"/>
@@ -23,8 +23,8 @@
 		</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>
\ No newline at end of file

From 5c3debecbf60505249bafae072dc9fa5cd5f189d Mon Sep 17 00:00:00 2001
From: Wim Jongman <wim.jongman@remainsoftware.com>
Date: Sat, 1 Jan 2022 13:43:06 +0100
Subject: [PATCH 2/3] Let Sloeber run on Java 17 #1430

Added j17 update site
---
 io.sloeber.product/arduino.product | 4 ++--
 io.sloeber.updatesite/category.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/io.sloeber.product/arduino.product b/io.sloeber.product/arduino.product
index 77ded1d7a..ce2a3a24c 100644
--- a/io.sloeber.product/arduino.product
+++ b/io.sloeber.product/arduino.product
@@ -257,8 +257,8 @@ 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>
@@ -267,8 +267,8 @@ United States, other countries, or both.
       <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" />
    </repositories>
 
    <preferencesInfo>
diff --git a/io.sloeber.updatesite/category.xml b/io.sloeber.updatesite/category.xml
index ec43ebb02..76e4fdec3 100644
--- a/io.sloeber.updatesite/category.xml
+++ b/io.sloeber.updatesite/category.xml
@@ -18,7 +18,7 @@
    </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" />
 </site>

From 52025560d064994c769333ca6c198d21fd87a664 Mon Sep 17 00:00:00 2001
From: Wim Jongman <wim.jongman@remainsoftware.com>
Date: Sat, 1 Jan 2022 23:23:39 +0100
Subject: [PATCH 3/3] Let Sloeber run on Java 17 #1430

Added j17 update site
---
 io.sloeber.feature/feature.xml     | 2 +-
 io.sloeber.parent/pom.xml          | 4 ++--
 io.sloeber.product/arduino.product | 2 +-
 io.sloeber.updatesite/category.xml | 4 +++-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/io.sloeber.feature/feature.xml b/io.sloeber.feature/feature.xml
index 1a9e94f97..be50b2b35 100644
--- a/io.sloeber.feature/feature.xml
+++ b/io.sloeber.feature/feature.xml
@@ -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
diff --git a/io.sloeber.parent/pom.xml b/io.sloeber.parent/pom.xml
index f0677679d..f9e3d0194 100644
--- a/io.sloeber.parent/pom.xml
+++ b/io.sloeber.parent/pom.xml
@@ -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>
@@ -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>
diff --git a/io.sloeber.product/arduino.product b/io.sloeber.product/arduino.product
index ce2a3a24c..1838fe64e 100644
--- a/io.sloeber.product/arduino.product
+++ b/io.sloeber.product/arduino.product
@@ -262,13 +262,13 @@ United States, other countries, or both.
    </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/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>
diff --git a/io.sloeber.updatesite/category.xml b/io.sloeber.updatesite/category.xml
index 76e4fdec3..fa300a455 100644
--- a/io.sloeber.updatesite/category.xml
+++ b/io.sloeber.updatesite/category.xml
@@ -19,6 +19,8 @@
    <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/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>