Skip to content

upgrade eclipse platform to 2025-12 #1035

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.

Sign up for GitHub

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

Open
zbum wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

upgrade eclipse platform to 2025-12 #1035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions build_client.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
# download maven from :
# https://maven.apache.org

if [ ! -z "${JAVA_11_HOME}" ]; then
echo JAVA_11_HOME: ${JAVA_11_HOME}
JAVA_HOME=${JAVA_11_HOME}
if [ ! -z "${JAVA_21_HOME}" ]; then
echo JAVA_21_HOME: ${JAVA_21_HOME}
JAVA_HOME=${JAVA_21_HOME}
fi

MVN="`which mvn`"
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>io.github.scouter-project</groupId>
<artifactId>scouter-parent</artifactId>
<version>2.20.0</version> <!--scouter-->
<version>2.21.1</version> <!--scouter-->
<packaging>pom</packaging>

<name>SCOUTER APM</name>
Expand Down
2 changes: 1 addition & 1 deletion scouter.agent.batch/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.github.scouter-project</groupId>
<artifactId>scouter-parent</artifactId>
<version>2.20.0</version> <!--scouter-->
<version>2.21.1</version> <!--scouter-->
</parent>

<artifactId>scouter-agent-batch</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion scouter.agent.host/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.github.scouter-project</groupId>
<artifactId>scouter-parent</artifactId>
<version>2.20.0</version> <!--scouter-->
<version>2.21.1</version> <!--scouter-->
</parent>

<artifactId>scouter-agent-host</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion scouter.agent.java/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.github.scouter-project</groupId>
<artifactId>scouter-parent</artifactId>
<version>2.20.0</version> <!--scouter-->
<version>2.21.1</version> <!--scouter-->
</parent>

<artifactId>scouter-agent-java</artifactId>
Expand Down
14 changes: 7 additions & 7 deletions scouter.client.build/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>scouter.client</groupId>
Expand All @@ -13,15 +13,15 @@
<module>../scouter.client.product</module>
</modules>
<properties>
<tycho-version>2.7.0</tycho-version>
<tycho-version>5.0.1</tycho-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<repositories>
<repository>
<id>eclipse-simultaneous-2022-03</id>
<layout>p2</layout>
<url>https://download.eclipse.org/releases/2022-03/</url>
</repository>
<repository>
<id>eclipse-2025-12</id>
<layout>p2</layout>
<url>https://download.eclipse.org/releases/2025-12/</url>
</repository>
</repositories>

<build>
Expand Down
7 changes: 0 additions & 7 deletions scouter.client.feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,6 @@
[Enter License Description here.]
</license>

<plugin
id="javax.servlet"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="org.eclipse.compare.core"
download-size="0"
Expand Down
10 changes: 8 additions & 2 deletions scouter.client.product/scouter.client.product
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<vmArgs>-Xms128m
-Xmx1024m
-XX:+UseG1GC
-Dosgi.requiredJavaVersion=11
-Dosgi.requiredJavaVersion=21
</vmArgs>
<vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
</vmArgsMac>
Expand All @@ -52,10 +52,16 @@
</vm>

<plugins>
<plugin id="org.eclipse.equinox.launcher"/>
<plugin id="org.eclipse.equinox.launcher.cocoa.macosx.x86_64" fragment="true"/>
<plugin id="org.eclipse.equinox.launcher.cocoa.macosx.aarch64" fragment="true"/>
<plugin id="org.eclipse.equinox.launcher.gtk.linux.x86_64" fragment="true"/>
<plugin id="org.eclipse.equinox.launcher.win32.win32.x86_64" fragment="true"/>
</plugins>

<features>
<feature id="org.eclipse.rcp"/>
<feature id="org.eclipse.platform"/>
<feature id="org.eclipse.equinox.executable"/>
<feature id="scouter.client.feature"/>
<feature id="org.eclipse.emf.ecore"/>
<feature id="org.eclipse.emf.common"/>
Expand Down
2 changes: 1 addition & 1 deletion scouter.client/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Require-Bundle:
org.eclipse.swt,
org.eclipse.e4.core.commands,
org.eclipse.e4.ui.services
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .,
lib/scouter.common.jar,
Expand Down
6 changes: 3 additions & 3 deletions scouter.client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" >
<modelVersion>4.0.0</modelVersion>

Expand All @@ -20,8 +20,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>11</source>
<target>11</target>
<source>21</source>
<target>21</target>
</configuration>
</plugin>
</plugins>
Expand Down
2 changes: 1 addition & 1 deletion scouter.common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.github.scouter-project</groupId>
<artifactId>scouter-parent</artifactId>
<version>2.20.0</version> <!--scouter-->
<version>2.21.1</version> <!--scouter-->
</parent>

<artifactId>scouter-common</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion scouter.deploy/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.github.scouter-project</groupId>
<artifactId>scouter-parent</artifactId>
<version>2.20.0</version> <!--scouter-->
<version>2.21.1</version> <!--scouter-->
</parent>

<artifactId>scouter-deploy</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion scouter.extra.java20/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.github.scouter-project</groupId>
<artifactId>scouter-parent</artifactId>
<version>2.20.0</version> <!--scouter-->
<version>2.21.1</version> <!--scouter-->
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion scouter.server.boot/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.github.scouter-project</groupId>
<artifactId>scouter-parent</artifactId>
<version>2.20.0</version> <!--scouter-->
<version>2.21.1</version> <!--scouter-->
</parent>

<artifactId>scouter-server-boot</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion scouter.server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.github.scouter-project</groupId>
<artifactId>scouter-parent</artifactId>
<version>2.20.0</version> <!--scouter-->
<version>2.21.1</version> <!--scouter-->
</parent>

<artifactId>scouter-server</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion scouter.weaver/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.github.scouter-project</groupId>
<artifactId>scouter-parent</artifactId>
<version>2.20.0</version> <!--scouter-->
<version>2.21.1</version> <!--scouter-->
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion scouter.webapp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>io.github.scouter-project</groupId>
<artifactId>scouter-parent</artifactId>
<version>2.20.0</version> <!--scouter-->
<version>2.21.1</version> <!--scouter-->
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down