Skip to content

Commit 637b033

Browse files
committed
[client] Upgrade Eclipse platform to 2024-03 and Java to 17
- Upgrade Eclipse platform from 2022-03 to 2024-03 - Upgrade Tycho build plugin from 2.7.0 to 4.0.8 - Upgrade minimum Java version from 11 to 17 - Replace javax.servlet with jakarta.servlet-api for Jakarta EE compatibility
1 parent 221ad83 commit 637b033

7 files changed

Lines changed: 13 additions & 17 deletions

File tree

build_client.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
# download maven from :
55
# https://maven.apache.org
66

7-
if [ ! -z "${JAVA_11_HOME}" ]; then
8-
echo JAVA_11_HOME: ${JAVA_11_HOME}
9-
JAVA_HOME=${JAVA_11_HOME}
7+
if [ ! -z "${JAVA_21_HOME}" ]; then
8+
echo JAVA_21_HOME: ${JAVA_21_HOME}
9+
JAVA_HOME=${JAVA_21_HOME}
1010
fi
1111

1212
MVN="`which mvn`"

scouter.client.build/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
<module>../scouter.client.product</module>
1414
</modules>
1515
<properties>
16-
<tycho-version>2.7.0</tycho-version>
16+
<tycho-version>4.0.8</tycho-version>
1717
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1818
</properties>
1919
<repositories>
2020
<repository>
21-
<id>eclipse-simultaneous-2022-03</id>
21+
<id>eclipse-2024-03</id>
2222
<layout>p2</layout>
23-
<url>https://download.eclipse.org/releases/2022-03/</url>
23+
<url>https://download.eclipse.org/releases/2024-03/</url>
2424
</repository>
2525
</repositories>
2626

scouter.client.feature/feature.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</license>
2222

2323
<plugin
24-
id="javax.servlet"
24+
id="jakarta.servlet-api"
2525
download-size="0"
2626
install-size="0"
2727
version="0.0.0"

scouter.client.product/scouter.client.product

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<vmArgs>-Xms128m
2727
-Xmx1024m
2828
-XX:+UseG1GC
29-
-Dosgi.requiredJavaVersion=11
29+
-Dosgi.requiredJavaVersion=17
3030
</vmArgs>
3131
<vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
3232
</vmArgsMac>

scouter.client/.classpath

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +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">
4-
<attributes>
5-
<attribute name="module" value="true"/>
6-
</attributes>
7-
</classpathentry>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
84
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
95
<classpathentry kind="src" path="src/"/>
106
<classpathentry kind="lib" path="lib/scouter.common.jar" sourcepath="/scouter.common"/>

scouter.client/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Require-Bundle:
2525
org.eclipse.swt,
2626
org.eclipse.e4.core.commands,
2727
org.eclipse.e4.ui.services
28-
Bundle-RequiredExecutionEnvironment: JavaSE-11
28+
Bundle-RequiredExecutionEnvironment: JavaSE-17
2929
Bundle-ActivationPolicy: lazy
3030
Bundle-ClassPath: .,
3131
lib/scouter.common.jar,

scouter.client/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" >
55
<modelVersion>4.0.0</modelVersion>
66

@@ -20,8 +20,8 @@
2020
<groupId>org.apache.maven.plugins</groupId>
2121
<artifactId>maven-compiler-plugin</artifactId>
2222
<configuration>
23-
<source>11</source>
24-
<target>11</target>
23+
<source>17</source>
24+
<target>17</target>
2525
</configuration>
2626
</plugin>
2727
</plugins>

0 commit comments

Comments
 (0)