From 48d1e632eef866718c8fcb7e631d694ca4cd92b9 Mon Sep 17 00:00:00 2001
From: Ondrej Dockal <odockal@redhat.com>
Date: Mon, 13 Sep 2021 08:49:22 +0200
Subject: [PATCH] Add reference of the dependent update sites for reddeer p2
 update site, fixes #2142

Signed-off-by: Ondrej Dockal <odockal@redhat.com>
---
 archetype/pom.xml                             |  2 +-
 .../feature.xml                               | 15 -------
 .../feature.xml                               | 10 -----
 .../feature.xml                               | 20 ----------
 .../feature.xml                               | 15 -------
 .../feature.xml                               | 40 -------------------
 pom.xml                                       |  8 ++--
 site/category.xml                             |  5 +++
 8 files changed, 10 insertions(+), 105 deletions(-)

diff --git a/archetype/pom.xml b/archetype/pom.xml
index c251f08913..503f4c4b0d 100644
--- a/archetype/pom.xml
+++ b/archetype/pom.xml
@@ -57,7 +57,7 @@
 	</developers>
 	
 	<properties>
-		<tycho-version>2.2.0</tycho-version>
+		<tycho-version>2.4.0</tycho-version>
 	</properties>
 
 	<build>
diff --git a/features/org.eclipse.reddeer.eclipse.feature/feature.xml b/features/org.eclipse.reddeer.eclipse.feature/feature.xml
index 956c9818c7..5db232a96c 100755
--- a/features/org.eclipse.reddeer.eclipse.feature/feature.xml
+++ b/features/org.eclipse.reddeer.eclipse.feature/feature.xml
@@ -30,21 +30,6 @@
       %license
    </license>
    
-   <plugin
-         id="com.fasterxml.jackson.core.jackson-core"
-         version="0.0.0"
-         unpack="false"/>
-   
-   <plugin
-         id="com.fasterxml.jackson.core.jackson-databind"
-         version="0.0.0"
-         unpack="false"/>
-   
-   <plugin
-         id="com.fasterxml.jackson.core.jackson-annotations"
-         version="0.0.0"
-         unpack="false"/>
-   
    <plugin
          id="org.eclipse.reddeer.swt"
          download-size="0"
diff --git a/features/org.eclipse.reddeer.gef.spy.feature/feature.xml b/features/org.eclipse.reddeer.gef.spy.feature/feature.xml
index bcde6d056d..aea69e2478 100755
--- a/features/org.eclipse.reddeer.gef.spy.feature/feature.xml
+++ b/features/org.eclipse.reddeer.gef.spy.feature/feature.xml
@@ -28,16 +28,6 @@
    <license url="%licenseURL">
       %license
    </license>
-
-   <plugin
-         id="org.eclipse.emf.validation"
-         version="0.0.0"
-         unpack="false"/>
-   
-   <plugin
-         id="org.eclipse.emf.workspace"
-         version="0.0.0"
-         unpack="false"/>
    
    <plugin
          id="org.eclipse.reddeer.gef.spy"
diff --git a/features/org.eclipse.reddeer.graphiti.feature/feature.xml b/features/org.eclipse.reddeer.graphiti.feature/feature.xml
index fcc2ef2930..8cc6793166 100755
--- a/features/org.eclipse.reddeer.graphiti.feature/feature.xml
+++ b/features/org.eclipse.reddeer.graphiti.feature/feature.xml
@@ -29,26 +29,6 @@
       %license
    </license>
    
-   <plugin
-         id="org.eclipse.graphiti"
-         version="0.0.0"
-         unpack="false"/>
-   
-   <plugin
-         id="org.eclipse.graphiti.mm"
-         version="0.0.0"
-         unpack="false"/>
-   
-   <plugin
-         id="org.eclipse.graphiti.ui"
-         version="0.0.0"
-         unpack="false"/>
-   
-   <plugin
-         id="org.eclipse.emf.transaction"
-         version="0.0.0"
-         unpack="false"/>
-   
    <plugin
          id="org.eclipse.reddeer.swt"
          download-size="0"
diff --git a/features/org.eclipse.reddeer.recorder.feature/feature.xml b/features/org.eclipse.reddeer.recorder.feature/feature.xml
index 964ae3ee08..96210c7ebf 100755
--- a/features/org.eclipse.reddeer.recorder.feature/feature.xml
+++ b/features/org.eclipse.reddeer.recorder.feature/feature.xml
@@ -29,21 +29,6 @@
    <license url="%licenseURL">
       %license
    </license>
-
-   <plugin
-         id="org.eclipse.swtbot.generator"
-         version="0.0.0"
-         unpack="false"/>
-   
-       <plugin
-         id="org.eclipse.swtbot.generator.ui"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.swtbot.generator.jdt"
-         version="0.0.0"
-         unpack="false"/>
    
    <plugin
          id="org.eclipse.reddeer.recorder"
diff --git a/features/org.eclipse.reddeer.tests.feature/feature.xml b/features/org.eclipse.reddeer.tests.feature/feature.xml
index 8a97794cc4..1ad364197f 100755
--- a/features/org.eclipse.reddeer.tests.feature/feature.xml
+++ b/features/org.eclipse.reddeer.tests.feature/feature.xml
@@ -29,46 +29,6 @@
       %license
    </license>
    
-   <plugin
-         id="org.mockito"
-         version="0.0.0"
-         unpack="false"/>
-   
-   <plugin
-         id="org.objenesis"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="net.bytebuddy.byte-buddy"
-         version="0.0.0"
-         unpack="false"/>   
-   
-   <plugin
-         id="net.bytebuddy.byte-buddy-agent"
-         version="0.0.0"
-         unpack="false"/>
-   
-   <plugin
-         id="org.json"
-         version="0.0.0"
-         unpack="false"/>
-   
-   <plugin
-         id="org.yaml.snakeyaml"
-         version="0.0.0"
-         unpack="false"/>
-   
-   <plugin
-         id="org.hamcrest.core"
-         version="0.0.0"
-         unpack="false"/>
-
-    <plugin
-         id="org.hamcrest.library"
-         version="0.0.0"
-         unpack="false"/>
-   
    <plugin
          id="org.eclipse.reddeer.eclipse.test"
          download-size="0"
diff --git a/pom.xml b/pom.xml
index 062a8a1ca4..9c88dd841c 100755
--- a/pom.xml
+++ b/pom.xml
@@ -20,13 +20,13 @@
 	<packaging>pom</packaging>
 
 	<properties>
-		<tycho-version>2.2.0</tycho-version>
+		<tycho-version>2.4.0</tycho-version>
 		<tychoExtrasVersion>${tycho-version}</tychoExtrasVersion>
 		<eclipse-target-site>https://download.eclipse.org/releases/2021-09/</eclipse-target-site>
 		<swtbot-update-site>https://download.eclipse.org/technology/swtbot/snapshots/</swtbot-update-site>
         <!-- when making final release, switch from S to R latest update site - https://github.com/eclipse/reddeer/issues/2100 -->
-        <eclipse-orbit-update-site>https://download.eclipse.org/tools/orbit/downloads/latest-R/</eclipse-orbit-update-site>
-		<!--eclipse-orbit-update-site>https://download.eclipse.org/tools/orbit/downloads/latest-S/</eclipse-orbit-update-site-->
+        <!--eclipse-orbit-update-site>https://download.eclipse.org/tools/orbit/downloads/latest-R/</eclipse-orbit-update-site-->
+		<eclipse-orbit-update-site>https://download.eclipse.org/tools/orbit/downloads/latest-S/</eclipse-orbit-update-site>
 		<cbi-repo-site>https://repo.eclipse.org/content/repositories/cbi-releases/</cbi-repo-site>
 		<download-plugin-version>1.2.1</download-plugin-version>
 		<java.target.version>11</java.target.version>
@@ -41,7 +41,7 @@
 		<maven.compiler.source>${java.target.version}</maven.compiler.source>
 		<maven.compiler.target>${java.target.version}</maven.compiler.target>
 		<!-- Java Code Coverage -->
-		<jacoco-version>0.8.2</jacoco-version>
+		<jacoco-version>0.8.7</jacoco-version>
 		<!-- Sonar Properties -->
 		<sonar.code.codeCoveragePlugin>jacoco</sonar.code.codeCoveragePlugin>
 		<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
diff --git a/site/category.xml b/site/category.xml
index 61a02328e8..44855a635e 100644
--- a/site/category.xml
+++ b/site/category.xml
@@ -110,4 +110,9 @@
     <feature url="org.eclipse.reddeer.e4.feature.qualifier" id="org.eclipse.reddeer.e4.feature" version="0.0.0">
         <category name="E4Features"/>
     </feature>
+    
+    <!--Change the site to releases once doing final release -->
+    <!--repository-reference location="http://download.eclipse.org/releases/2021-12/" enabled="true" /-->
+    <repository-reference location="http://download.eclipse.org/staging/2021-12/" enabled="true" />
+    <repository-reference location="http://download.eclipse.org/eclipse/updates/4.22" enabled="true" />
 </site>