From 900ec91e4fa25cbfb71dd50887fbcfcf915de264 Mon Sep 17 00:00:00 2001
From: Fabio Zadrozny <fabiofz@gmail.com>
Date: Mon, 9 Oct 2023 11:15:09 -0300
Subject: [PATCH] Update tycho (bug in 2.7.5 prevented proper dep resolution).

---
 .github/workflows/release-pydev.yml           |  6 +-
 .github/workflows/tests-pydev.yml             |  2 +-
 builders/org.python.pydev.build/build_cmd.bat |  2 +-
 features/org.python.pydev.feature/pom.xml     | 10 +--
 .../core/TestDependent.github.properties      |  4 +-
 .../build-test.xml                            | 64 -------------------
 pom.xml                                       |  3 +-
 7 files changed, 13 insertions(+), 78 deletions(-)
 delete mode 100644 plugins/org.python.pydev.refactoring/build-test.xml

diff --git a/.github/workflows/release-pydev.yml b/.github/workflows/release-pydev.yml
index 0ee55d7834..6cbe0edd0b 100644
--- a/.github/workflows/release-pydev.yml
+++ b/.github/workflows/release-pydev.yml
@@ -14,10 +14,10 @@ jobs:
         with:
           submodules: recursive
           
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt'
           cache: 'maven'
           
@@ -46,7 +46,7 @@ jobs:
             which java
             which mvn
             echo ---- rt.jar should be listed below
-            find /opt/hostedtoolcache/Java_Adopt_jdk/11.0.20-101/x64/ -name "*.jar"
+            find /opt/hostedtoolcache/Java_Adopt_jdk/17.0.8-101/x64/ -name "*.jar"
             
       - name: xvfb
         shell: bash
diff --git a/.github/workflows/tests-pydev.yml b/.github/workflows/tests-pydev.yml
index cdefd10229..5a1afbdf55 100644
--- a/.github/workflows/tests-pydev.yml
+++ b/.github/workflows/tests-pydev.yml
@@ -43,7 +43,7 @@ jobs:
             which java
             which mvn
             echo ---- rt.jar should be listed below
-            find /opt/hostedtoolcache/Java_Adopt_jdk/11.0.20-101/x64/ -name "*.jar"
+            find /opt/hostedtoolcache/Java_Adopt_jdk/17.0.8-101/x64/ -name "*.jar"
             
       - name: xvfb
         shell: bash
diff --git a/builders/org.python.pydev.build/build_cmd.bat b/builders/org.python.pydev.build/build_cmd.bat
index 8468416bbc..51278b9797 100644
--- a/builders/org.python.pydev.build/build_cmd.bat
+++ b/builders/org.python.pydev.build/build_cmd.bat
@@ -18,7 +18,7 @@ set BASE_LOCAL_PYDEV_GIT=X:\liclipsews\liclipsews\Pydev
 set BUILD_DIR=X:\pydev_build\build_dir
 set DEPLOY_DIR=X:\pydev_build\deploy_dir
 set JAVA_HOME=D:\bin\jdk-17.0.8.1+1
-set MAVEN_BIN=X:\liclipsews\maven\apache-maven-3.8.6\bin
+set MAVEN_BIN=X:\liclipsews\maven\apache-maven-3.9.5\bin
 set GIT_EXECUTABLE="C:\Program Files\Git\bin\git.exe"
 @echo Expected in env var: SIGN_KEYPASS
 @echo Expected in env var: SIGN_STOREPASS
diff --git a/features/org.python.pydev.feature/pom.xml b/features/org.python.pydev.feature/pom.xml
index e41db5bfd1..47f763428a 100644
--- a/features/org.python.pydev.feature/pom.xml
+++ b/features/org.python.pydev.feature/pom.xml
@@ -25,15 +25,15 @@
   <build>
       <plugins>
         <plugin>
-          <groupId>org.eclipse.tycho.extras</groupId>
-          <artifactId>tycho-source-feature-plugin</artifactId>
-          <version>${tycho-extras-version}</version>
+          <groupId>org.eclipse.tycho</groupId>
+          <artifactId>tycho-source-plugin</artifactId>
+          <version>${tycho-version}</version>
           <executions>
             <execution>
-              <id>source-feature</id>
+              <id>feature-source</id>
               <phase>package</phase>
               <goals>
-                <goal>source-feature</goal>
+                <goal>feature-source</goal>
               </goals>
               <configuration>
                 <excludes>
diff --git a/plugins/org.python.pydev.core/tests/org/python/pydev/core/TestDependent.github.properties b/plugins/org.python.pydev.core/tests/org/python/pydev/core/TestDependent.github.properties
index 9fafe0c21f..28a4af45b9 100644
--- a/plugins/org.python.pydev.core/tests/org/python/pydev/core/TestDependent.github.properties
+++ b/plugins/org.python.pydev.core/tests/org/python/pydev/core/TestDependent.github.properties
@@ -19,8 +19,8 @@ TEST_PYDEV_BASE_LOC=/home/runner/work/Pydev/Pydev/plugins/
 PYTHON_LIB=/opt/hostedtoolcache/Python/3.8.12/x64/lib/python3.8/
 
 #java info
-JAVA_LOCATION=/opt/hostedtoolcache/Java_Adopt_jdk/11.0.20-101/x64/bin/java
-JAVA_RT_JAR_LOCATION=/opt/hostedtoolcache/Java_Adopt_jdk/11.0.20-101/x64/lib/rt.jar
+JAVA_LOCATION=/opt/hostedtoolcache/Java_Adopt_jdk/17.0.8-101/x64/bin/java
+JAVA_RT_JAR_LOCATION=/opt/hostedtoolcache/Java_Adopt_jdk/17.0.8-101/x64/lib/rt.jar
 
 #Jython
 JYTHON_JAR_LOCATION=/home/runner/work/Pydev/jython_install_dir/jython.jar
diff --git a/plugins/org.python.pydev.refactoring/build-test.xml b/plugins/org.python.pydev.refactoring/build-test.xml
deleted file mode 100644
index 5a921539bc..0000000000
--- a/plugins/org.python.pydev.refactoring/build-test.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project basedir="." default="test" name="org.python.pydev.refactoring.tests">
-	<property name="eclipse.home" value="/opt/eclipse" />
-	<property name="junit.output.dir" value="test" />
-	<property name="target" value="1.5" />
-	<property name="source" value="1.5" />
-
-	<path id="project.classpath">
-		<fileset dir="${eclipse.home}/plugins">
-			<include name="*.jar" />
-		</fileset>
-		<fileset dir="${eclipse.home}/plugins/org.junit_3.8.1">
-			<include name="junit.jar" />
-		</fileset>
-		<fileset dir="tests/lib">
-			<include name="*.jar" />
-		</fileset>
-		<fileset dir="../org.python.pydev.jython">
-			<include name="jython.jar" />
-		</fileset>
-		<fileset dir=".">
-			<include name="refactoring.jar"/>
-		</fileset>
-		<pathelement location="bintest" />
-                <fileset dir="../org.python.pydev">
-                        <include name="pydev.jar" />
-                </fileset>
-                <fileset dir="../org.python.pydev.core">
-                        <include name="core.jar" />
-                </fileset>
-                <fileset dir="../org.python.pydev.parser">
-                        <include name="parser.jar" />
-                </fileset>
-	</path>
-
-	<target name="init">
-		<mkdir dir="${junit.output.dir}" />
-		<mkdir dir="bintest" />
-		<mkdir dir="bintest/tests/python"/>
-
-		<!-- <ant antfile="build.xml" dir="../org.python.pydev.feature"/> -->
-
-		<javac destdir="bintest" srcdir="tests" source="${source}" target="${target}">
-			<classpath refid="project.classpath" />
-		</javac>
-		<copy todir="bintest/tests/python">
-			<fileset dir="tests/python"/>
-		</copy>
-	</target>
-
-	<target name="clean">
-		<delete dir="test" />
-		<delete dir="bintest"/>
-	</target>
-
-	<target name="test" depends="init">
-		<junit fork="yes" haltonfailure="true" dir="${basedir}">
-			<formatter type="xml" />
-			<formatter type="plain" usefile="true" />
-			<classpath refid="project.classpath" />
-			<test name="org.python.pydev.refactoring.tests.AllTests" todir="${junit.output.dir}" />
-		</junit>
-	</target>
-</project>
diff --git a/pom.xml b/pom.xml
index 219cf085e2..46d9e8ee64 100644
--- a/pom.xml
+++ b/pom.xml
@@ -124,8 +124,7 @@
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <properties>
-    <tycho-version>2.7.5</tycho-version>
-    <tycho-extras-version>2.7.5</tycho-extras-version>
+    <tycho-version>4.0.3</tycho-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <repository.id>eclipse-2023-09</repository.id>
     <repository.url>https://download.eclipse.org/releases/2023-09/</repository.url>