Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GLSP-1127: Update to Java17 as minimum version #91

Merged
merged 1 commit into from
Oct 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,11 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v2

- uses: actions/setup-java@v1
with:
java-version: 17


# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ kind: Pod
spec:
containers:
- name: ci
image: eclipseglsp/ci:alpine-v4.0
image: eclipseglsp/ci:alpine-v5.0
resources:
limits:
memory: "2Gi"
Expand Down
3 changes: 1 addition & 2 deletions client/examples/workflow-webapp/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
"extends": "@eclipse-glsp/ts-config/tsconfig.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "lib",
"baseUrl": "."
"outDir": "lib"
},
"include": ["src"]
}
2 changes: 1 addition & 1 deletion client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"watch": "lerna run --parallel watch"
},
"devDependencies": {
"@eclipse-glsp/dev": "next",
"@eclipse-glsp/dev": "^1.1.0-next.cbae4df.145",
"@types/node": "16.x",
"copyfiles": "^2.4.1",
"inversify": "6.0.1",
Expand Down
5 changes: 2 additions & 3 deletions client/packages/ide/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{
"extends": "@eclipse-glsp/ts-config/tsconfig.json",
"extends": "@eclipse-glsp/ts-config",
"compilerOptions": {
"rootDir": "src",
"outDir": "lib",
"baseUrl": "."
"outDir": "lib"
},
"include": ["src"]
}
835 changes: 401 additions & 434 deletions client/yarn.lock

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/"/>
<classpathentry kind="output" path="target/classes"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ Import-Package: javax.servlet;version="[4.0.0,5.0.0)",
Eclipse-BundleShape: dir
Automatic-Module-Name: com.eclipsesource.glsp.example.workflow
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-RequiredExecutionEnvironment: JavaSE-17
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<booleanAttribute key="pde.generated.config" value="false"/>
Expand Down
2 changes: 1 addition & 1 deletion server/plugins/org.eclipse.glsp.ide.editor/.classpath
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/"/>
<classpathentry kind="output" path="target/classes"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Bundle-ActivationPolicy: lazy
Bundle-Version: 1.1.0.qualifier
Bundle-Vendor: Eclipse GLSP
Automatic-Module-Name: com.eclipsesource.glsp.editor
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-RequiredExecutionEnvironment: JavaSE-17
Require-Bundle: org.eclipse.ui.ide;bundle-version="3.18.0",
org.eclipse.swt;bundle-version="3.116.0",
org.eclipse.ui.workbench;bundle-version="3.122.100",
Expand Down
4 changes: 2 additions & 2 deletions server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.source>11</java.source>
<java.target>11</java.target>
<java.source>17</java.source>
<java.target>17</java.target>
<project.build.java.target>1.8</project.build.java.target>
<tycho-version>2.7.5</tycho-version>
<maven-antrun-plugin.version>3.0.0</maven-antrun-plugin.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ location "mvn:org.eclipse.jetty:jetty-p2:10.0.13:zip:p2site" {
org.eclipse.jetty.websocket.javax.server
}

location "https://download.eclipse.org/glsp/server/p2/nightly/1.1/1.1.0.202309200810/" {
location "https://download.eclipse.org/glsp/server/p2/nightly/1.1/1.1.0.202310110716/" {
org.eclipse.glsp.feature.feature.group lazy
org.eclipse.glsp.feature.source.feature.group lazy
org.eclipse.glsp.server.websocket lazy
Expand Down
3 changes: 2 additions & 1 deletion server/releng/org.eclipse.glsp.ide.repository/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<artifactId>tycho-p2-publisher-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<profiles>JavaSE-11</profiles>
<profiles>JavaSE-17</profiles>
</configuration>
</plugin>
<!-- Skip cleaning of this module otherwise the release build is not working
Expand Down Expand Up @@ -94,6 +94,7 @@
<artifactId>tycho-eclipserun-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<executionEnvironment>JavaSE-11</executionEnvironment>
<!-- IMPORTANT: DO NOT split the arg line -->
<appArgLine>-application org.eclipse.ant.core.antRunner -buildfile packaging-p2composite.ant p2.composite.add -Dsite.label="Eclipse GLSP IDE Integration Nightly Updatesite" -Dproject.build.directory=${project.build.directory} -DunqualifiedVersion=${unqualifiedVersion} -DbuildQualifier=${buildQualifier} -Dsoftware.download.area=${rsync.local.dir}</appArgLine>
<repositories>
Expand Down