Skip to content

Commit 959f18d

Browse files
authored
Merge pull request #1046 from scouter-project/develop
Release 2.21.3 with Eclipse 2025-12 upgrade and group search feature
2 parents 545e0b5 + 9f0d24d commit 959f18d

File tree

15 files changed

+57
-25
lines changed

15 files changed

+57
-25
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,3 +113,4 @@ scouter.agent.host/.settings/org.eclipse.core.resources.prefs
113113
scouter.agent.batch/.settings/org.eclipse.core.resources.prefs
114114
/scouter.webapp/conf/scouterConfSample3.conf
115115
scouter.server.jar
116+
AGENTS.md

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>io.github.scouter-project</groupId>
66
<artifactId>scouter-parent</artifactId>
7-
<version>2.21.2</version> <!--scouter-->
7+
<version>2.21.3</version> <!--scouter-->
88
<packaging>pom</packaging>
99

1010
<name>SCOUTER APM</name>

scouter.agent.batch/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>io.github.scouter-project</groupId>
77
<artifactId>scouter-parent</artifactId>
8-
<version>2.21.2</version> <!--scouter-->
8+
<version>2.21.3</version> <!--scouter-->
99
</parent>
1010

1111
<artifactId>scouter-agent-batch</artifactId>

scouter.agent.host/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.github.scouter-project</groupId>
66
<artifactId>scouter-parent</artifactId>
7-
<version>2.21.2</version> <!--scouter-->
7+
<version>2.21.3</version> <!--scouter-->
88
</parent>
99

1010
<artifactId>scouter-agent-host</artifactId>

scouter.agent.java/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.github.scouter-project</groupId>
66
<artifactId>scouter-parent</artifactId>
7-
<version>2.21.2</version> <!--scouter-->
7+
<version>2.21.3</version> <!--scouter-->
88
</parent>
99

1010
<artifactId>scouter-agent-java</artifactId>

scouter.client.build/pom.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,16 @@
3333
<version>${tycho-version}</version>
3434
<extensions>true</extensions>
3535
</plugin>
36-
<plugin>
37-
<groupId>org.eclipse.tycho</groupId>
38-
<artifactId>target-platform-configuration</artifactId>
39-
<version>${tycho-version}</version>
40-
<configuration>
41-
<environments>
42-
<environment>
43-
<os>win32</os>
44-
<ws>win32</ws>
45-
<arch>x86_64</arch>
36+
<plugin>
37+
<groupId>org.eclipse.tycho</groupId>
38+
<artifactId>target-platform-configuration</artifactId>
39+
<version>${tycho-version}</version>
40+
<configuration>
41+
<environments>
42+
<environment>
43+
<os>win32</os>
44+
<ws>win32</ws>
45+
<arch>x86_64</arch>
4646
</environment>
4747
<environment>
4848
<os>linux</os>

scouter.client/.classpath

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
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-17"/>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
4+
<attributes>
5+
<attribute name="maven.pomderived" value="true"/>
6+
</attributes>
7+
</classpathentry>
48
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
5-
<classpathentry kind="src" path="src/"/>
9+
<classpathentry kind="src" output="bin" path="src">
10+
<attributes>
11+
<attribute name="optional" value="true"/>
12+
<attribute name="maven.pomderived" value="true"/>
13+
</attributes>
14+
</classpathentry>
615
<classpathentry kind="lib" path="lib/scouter.common.jar" sourcepath="/scouter.common"/>
716
<classpathentry exported="true" kind="lib" path="lib/scouter.server.jar"/>
817
<classpathentry exported="true" kind="lib" path="lib/hibernate-core-3.3.2.GA.jar"/>
@@ -12,5 +21,10 @@
1221
<classpathentry exported="true" kind="lib" path="lib/jaxb-api-2.3.1.jar"/>
1322
<classpathentry exported="true" kind="lib" path="lib/jaxb-core-2.3.0.1.jar"/>
1423
<classpathentry exported="true" kind="lib" path="lib/jaxb-impl-2.3.0.1.jar"/>
15-
<classpathentry kind="output" path="target/classes"/>
24+
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
25+
<attributes>
26+
<attribute name="maven.pomderived" value="true"/>
27+
</attributes>
28+
</classpathentry>
29+
<classpathentry kind="output" path="bin"/>
1630
</classpath>

scouter.common/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.github.scouter-project</groupId>
66
<artifactId>scouter-parent</artifactId>
7-
<version>2.21.2</version> <!--scouter-->
7+
<version>2.21.3</version> <!--scouter-->
88
</parent>
99

1010
<artifactId>scouter-common</artifactId>

scouter.deploy/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.github.scouter-project</groupId>
66
<artifactId>scouter-parent</artifactId>
7-
<version>2.21.2</version> <!--scouter-->
7+
<version>2.21.3</version> <!--scouter-->
88
</parent>
99

1010
<artifactId>scouter-deploy</artifactId>

scouter.extra.java20/pom.xml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>io.github.scouter-project</groupId>
88
<artifactId>scouter-parent</artifactId>
9-
<version>2.21.2</version> <!--scouter-->
9+
<version>2.21.3</version> <!--scouter-->
1010
</parent>
1111
<modelVersion>4.0.0</modelVersion>
1212

@@ -21,6 +21,7 @@
2121
<scouter.assembly.working.dir>${project.build.directory}/assembly-working</scouter.assembly.working.dir>
2222
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2323
<scouter.extra.java11.jarName>scouter.weaver</scouter.extra.java11.jarName>
24+
<maven.compiler.release>21</maven.compiler.release>
2425
</properties>
2526

2627
<dependencies>
@@ -47,6 +48,13 @@
4748
<executable>${JAVA_21_HOME}/bin/javac</executable>
4849
</configuration>
4950
</plugin>
51+
<plugin>
52+
<groupId>org.apache.maven.plugins</groupId>
53+
<artifactId>maven-javadoc-plugin</artifactId>
54+
<configuration>
55+
<javadocExecutable>${JAVA_21_HOME}/bin/javadoc</javadocExecutable>
56+
</configuration>
57+
</plugin>
5058
<plugin>
5159
<groupId>org.apache.maven.plugins</groupId>
5260
<artifactId>maven-jar-plugin</artifactId>

0 commit comments

Comments
 (0)