From c9c6db8e4c84c98564c39ed6f7ca27a4bfc7cd7d Mon Sep 17 00:00:00 2001
From: Eyck Jentzsch <eyck@minres.com>
Date: Mon, 16 May 2022 21:07:32 +0200
Subject: [PATCH] update target platform to release 21-12

---
 .../build.properties                           |  2 --
 .../e4/application/handlers/EnableHover.java   |  1 -
 .../application/handlers/EnableTxDetails.java  |  1 -
 .../e4/application/parts/WaveformViewer.java   |  1 -
 pom.xml                                        | 18 +++++-------------
 .../com.minres.scviewer.target.target          | 10 +++++-----
 6 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/plugins/com.minres.scviewer.e4.application.help/build.properties b/plugins/com.minres.scviewer.e4.application.help/build.properties
index b439b53..1a5e3ad 100644
--- a/plugins/com.minres.scviewer.e4.application.help/build.properties
+++ b/plugins/com.minres.scviewer.e4.application.help/build.properties
@@ -1,5 +1,3 @@
-source.. = src/
-output.. = bin/
 bin.includes = plugin.xml,\
                META-INF/,\
                .,\
diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/EnableHover.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/EnableHover.java
index f5494a8..3526b17 100644
--- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/EnableHover.java
+++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/EnableHover.java
@@ -17,7 +17,6 @@ import org.osgi.service.prefs.BackingStoreException;
 
 import com.minres.scviewer.e4.application.preferences.PreferenceConstants;
 
-@SuppressWarnings("restriction")
 public class EnableHover {
 	static final String TAG_NAME = "EnableHover"; //$NON-NLS-1$
 
diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/EnableTxDetails.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/EnableTxDetails.java
index 217c1dc..46f9897 100644
--- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/EnableTxDetails.java
+++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/EnableTxDetails.java
@@ -18,7 +18,6 @@ import org.osgi.service.prefs.BackingStoreException;
 
 import com.minres.scviewer.e4.application.preferences.PreferenceConstants;
 
-@SuppressWarnings("restriction")
 public class EnableTxDetails {
 	static final String TAG_NAME = "EnableTxDetails"; //$NON-NLS-1$
 
diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java
index 04a1584..2b280b9 100644
--- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java
+++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java
@@ -109,7 +109,6 @@ import com.minres.scviewer.e4.application.preferences.PreferenceConstants;
 /**
  * The Class WaveformViewerPart.
  */
-@SuppressWarnings("restriction")
 public class WaveformViewer implements IFileChangeListener, IPreferenceChangeListener, DisposeListener {
 
 	/** The Constant ACTIVE_WAVEFORMVIEW. */
diff --git a/pom.xml b/pom.xml
index 47be6d9..b673097 100644
--- a/pom.xml
+++ b/pom.xml
@@ -108,24 +108,13 @@
 							<goal>plugin-source</goal>
 						</goals>
 					</execution>
-				</executions>
-			</plugin>
-
-			<plugin>
-				<groupId>org.eclipse.tycho.extras</groupId>
-				<artifactId>tycho-source-feature-plugin</artifactId>
-				<version>${tycho-version}</version>
-
-				<executions>
 					<execution>
-						<id>source-feature</id>
-						<phase>package</phase>
+						<id>feature-source</id>
 						<goals>
-							<goal>source-feature</goal>
+							<goal>feature-source</goal>
 						</goals>
 					</execution>
 				</executions>
-
 				<configuration>
 					<excludes>
 						<plugin id="com.google.guava" />
@@ -135,9 +124,12 @@
 						<plugin id="org.eclipse.core.filesystem.linux.x86_64" />
 						<plugin id="org.eclipse.core.filesystem.win32.x86_64" />
 						<plugin id="com.opcoach.e4.preferences" />
+						<plugin id="javax.servlet" />
+						<feature id="com.minres.scviewer.e4.help.feature"/>
 					</excludes>
 				</configuration>
 			</plugin>
+
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-p2-plugin</artifactId>
diff --git a/releng/com.minres.scviewer.target/com.minres.scviewer.target.target b/releng/com.minres.scviewer.target/com.minres.scviewer.target.target
index f16827f..e77999c 100644
--- a/releng/com.minres.scviewer.target/com.minres.scviewer.target.target
+++ b/releng/com.minres.scviewer.target/com.minres.scviewer.target.target
@@ -3,7 +3,7 @@
 <target name="com.minres.scviewer.target" sequenceNumber="138">
 <locations>
 	<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-		<repository location="http://download.eclipse.org/releases/2021-09/"/>
+		<repository location="http://download.eclipse.org/releases/2021-12/"/>
 		<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
 		<unit id="org.eclipse.equinox.p2.sdk.feature.jar" version="0.0.0"/> <!-- needed by Linux exectable-->
 		<unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
@@ -14,7 +14,7 @@
 		<unit id="javax.servlet" version="0.0.0"/>
 	</location>
 	<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-		<repository location="https://www.opcoach.com/repository/2021-09/"/>
+		<repository location="https://www.opcoach.com/repository/2021-12/"/>
 		<unit id="com.opcoach.e4.preferences.feature.feature.group" version="0.0.0"/>
 	</location>
 	<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
@@ -38,9 +38,9 @@
 		<unit id="org.eclipse.justj.openjdk.hotspot.jre.minimal.stripped.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/2021-09"/>
-		<unit id="org.apache.commons.compress" version="1.20.0.v20210713-1928"/>
-		<unit id="org.apache.commons.compress.source" version="1.20.0.v20210713-1928"/>
+		<repository location="https://download.eclipse.org/tools/orbit/downloads/2021-12"/>
+		<unit id="org.apache.commons.compress" version="0.0.0"/>
+		<unit id="org.apache.commons.compress.source" version="0.0.0"/>
 	</location>
 </locations>
 	<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-15"/>