Skip to content

Commit 934f652

Browse files
committed
Move Wild Web Developer to Java 17
1 parent 8a81d3f commit 934f652

File tree

46 files changed

+105
-125
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+105
-125
lines changed

.github/workflows/licensecheck.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ jobs:
2020

2121
steps:
2222
- uses: actions/checkout@v2
23-
- name: Set up JDK 11
23+
- name: Set up JDK 17
2424
uses: actions/setup-java@v2
2525
with:
26-
java-version: '11'
26+
java-version: '17'
2727
distribution: 'adopt'
2828
- name: Cache local Maven repository
2929
uses: actions/cache@v2

.github/workflows/windowsPR.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ jobs:
1010

1111
steps:
1212
- uses: actions/checkout@v1
13-
- name: Set up JDK 11
13+
- name: Set up JDK 17
1414
uses: actions/setup-java@v1
1515
with:
16-
java-version: 11
16+
java-version: 17
1717
- uses: actions/setup-node@v1
1818
with:
1919
node-version: '16'

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ kind: Pod
1313
spec:
1414
containers:
1515
- name: container
16-
image: docker.io/vrubezhny/fedora-gtk3-mutter-java-node:6
16+
image: docker.io/mickaelistria/fedora-gtk3-mutter-java-node:java-17
1717
imagePullPolicy: Always
1818
tty: true
1919
command: [ "uid_entrypoint", "cat" ]

docker/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
FROM eclipsecbi/fedora-gtk3-mutter:34-gtk3.24
1+
FROM eclipsecbi/fedora-gtk3-mutter:36-gtk3.24
22

33
# Back to root for install
44
USER 0
55
RUN dnf -y update && dnf -y install \
6-
java-11-openjdk-devel maven git
6+
java-17-openjdk-devel maven git
77
RUN dnf -y update && dnf -y install \
88
nodejs npm
99
RUN dnf -y install xz
1010

1111
RUN curl -L https://nodejs.org/dist/v16.13.0/node-v16.13.0-linux-x64.tar.xz | tar -xJ
1212

13-
ENV PATH=/node-v16.13.0-linux-x64/bin:/usr/lib/jvm/java-11/bin:$PATH
14-
ENV JAVA_HOME=/usr/lib/jvm/java-11
13+
ENV PATH=/node-v16.13.0-linux-x64/bin:/usr/lib/jvm/java-17/bin:$PATH
14+
ENV JAVA_HOME=/usr/lib/jvm/java-17
1515

1616
#Back to named user
1717
USER 10001

org.eclipse.wildwebdeveloper.embedder.node.feature/feature.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<feature
33
id="org.eclipse.wildwebdeveloper.embedder.node.feature"
44
label="%name"
5-
version="0.2.9.qualifier"
5+
version="0.3.0.qualifier"
66
provider-name="Eclipse Wild Web Developer project"
77
license-feature="org.eclipse.license"
88
license-feature-version="0.0.0">

org.eclipse.wildwebdeveloper.embedder.node.feature/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<version>0.5.0-SNAPSHOT</version>
88
</parent>
99
<packaging>eclipse-feature</packaging>
10-
<version>0.2.9-SNAPSHOT</version>
10+
<version>0.3.0-SNAPSHOT</version>
1111
<build>
1212
<plugins>
1313
<plugin>

org.eclipse.wildwebdeveloper.embedder.node/.classpath

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
44
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
55
<classpathentry kind="src" path="src"/>
66
<classpathentry kind="output" path="bin"/>

org.eclipse.wildwebdeveloper.embedder.node/META-INF/MANIFEST.MF

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: Manager for embedded Node.js
44
Bundle-SymbolicName: org.eclipse.wildwebdeveloper.embedder.node
5-
Bundle-Version: 0.2.3.qualifier
5+
Bundle-Version: 0.3.0.qualifier
66
Bundle-Vendor: Eclipse Wild Web Developer
77
Automatic-Module-Name: org.eclipse.wildwebdeveloper.embedder.node
8-
Bundle-RequiredExecutionEnvironment: JavaSE-11
8+
Bundle-RequiredExecutionEnvironment: JavaSE-17
99
Require-Bundle: org.eclipse.ui,
1010
org.eclipse.ui.workbench,
1111
org.eclipse.swt,

org.eclipse.wildwebdeveloper.embedder.node/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<version>0.5.0-SNAPSHOT</version>
88
</parent>
99
<packaging>eclipse-plugin</packaging>
10-
<version>0.2.3-SNAPSHOT</version>
10+
<version>0.3.0-SNAPSHOT</version>
1111

1212
<build>
1313
<plugins>

org.eclipse.wildwebdeveloper.embedder.node/src/org/eclipse/wildwebdeveloper/embedder/node/CompressUtils.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ private static void extractArchive(ArchiveInputStream in, File destination) thro
7575
}
7676
File f = new File(destination, entry.getName());
7777
f.delete();
78-
boolean symlink = entry instanceof TarArchiveEntry && ((TarArchiveEntry)entry).isSymbolicLink();
78+
boolean symlink = entry instanceof TarArchiveEntry tarEntry && tarEntry.isSymbolicLink();
7979
if (entry.isDirectory()) {
8080
if (!f.isDirectory() && !f.mkdirs()) {
8181
throw new IOException("failed to create directory " + f);
@@ -93,8 +93,8 @@ private static void extractArchive(ArchiveInputStream in, File destination) thro
9393
IOUtils.copy(in, o);
9494
}
9595
}
96-
if (entry instanceof TarArchiveEntry) {
97-
f.setExecutable((((TarArchiveEntry)entry).getMode() & 256) != 0);
96+
if (entry instanceof TarArchiveEntry tarEntry) {
97+
f.setExecutable((tarEntry.getMode() & 256) != 0);
9898
}
9999
}
100100
}

0 commit comments

Comments
 (0)