Skip to content

Commit

Permalink
Update tycho (bug in 2.7.5 prevented proper dep resolution).
Browse files Browse the repository at this point in the history
  • Loading branch information
fabioz committed Oct 9, 2023
1 parent ede6d14 commit 900ec91
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 78 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/release-pydev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests-pydev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion builders/org.python.pydev.build/build_cmd.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions features/org.python.pydev.feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
64 changes: 0 additions & 64 deletions plugins/org.python.pydev.refactoring/build-test.xml

This file was deleted.

3 changes: 1 addition & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 900ec91

Please sign in to comment.