Skip to content

Commit f0f6866

Browse files
gunlee01gunlee01
authored
Merge pull request #1034 from scouter-project/develop
Develop
2 parents 644acdf + 0e50072 commit f0f6866

30 files changed

Lines changed: 1030 additions & 452 deletions

File tree

‎README_kr.md‎

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

99
## 어플리케이션 성능 모니터링
1010

11-
오픈소스 APM인 Scouter는 JVM(WAS, Standalone application)을 사용하는 어플리케이션 및 OS 자원에 대한 모니터링 모니터링 기능을 제공한다.
11+
오픈소스 APM인 Scouter는 JVM(WAS, Standalone application)을 사용하는 어플리케이션 및 OS 자원에 대한 모니터링 기능을 제공한다.
1212
- **APM** : Application performance montoring / application performance management
1313
- 모니터링 대상 (전용 agent)
1414
- Java Agent : Web application (on Tomcat, JBoss, Resin ...), Standalone java application

‎build_package.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ if [ -z "$MVN" ]; then
1515
exit 1
1616
else
1717
$MVN -Dmaven.test.skip=true clean install
18-
# $MVN -Dmaven.test.skip=true -f ./scouter.agent.java/pom.xml -Pjava-legacy clean package
18+
$MVN -Dmaven.test.skip=true -f ./scouter.agent.java/pom.xml -Pjava-21-plus clean package
1919
$MVN -Dmaven.test.skip=true -f ./scouter.deploy/pom.xml clean package
2020
fi

‎pom.xml‎

Lines changed: 32 additions & 90 deletions
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.20.0</version> <!--scouter-->
7+
<version>2.21.0</version> <!--scouter-->
88
<packaging>pom</packaging>
99

1010
<name>SCOUTER APM</name>
@@ -23,6 +23,7 @@
2323
<module>scouter.agent.java</module>
2424
<module>scouter.agent.batch</module>
2525
<module>scouter.extra.java20</module>
26+
<module>scouter.extra.java20dummy</module>
2627
</modules>
2728

2829
<properties>
@@ -41,20 +42,20 @@
4142
<jetty.version>9.4.6.v20170531</jetty.version>
4243
<jersey.version>2.27</jersey.version>
4344
<slf4j.version>1.7.25</slf4j.version>
44-
<logback.version>1.2.3</logback.version>
45+
<logback.version>1.2.13</logback.version>
4546
</properties>
4647

47-
<repositories>
48-
<repository>
49-
<id>local-maven-repo</id>
50-
<url>file:///${project.basedir}/../local-maven-repo</url>
51-
</repository>
52-
<repository>
53-
<id>redhat.com</id>
54-
<name>redhat maven Repository</name>
55-
<url>https://maven.repository.redhat.com/ga</url>
56-
</repository>
57-
</repositories>
48+
<!-- <repositories>-->
49+
<!-- <repository>-->
50+
<!-- <id>local-maven-repo</id>-->
51+
<!-- <url>file:///${project.basedir}/../local-maven-repo</url>-->
52+
<!-- </repository>-->
53+
<!-- <repository>-->
54+
<!-- <id>redhat.com</id>-->
55+
<!-- <name>redhat maven Repository</name>-->
56+
<!-- <url>https://maven.repository.redhat.com/ga</url>-->
57+
<!-- </repository>-->
58+
<!-- </repositories>-->
5859

5960
<licenses>
6061
<license>
@@ -91,20 +92,17 @@
9192
<tag>HEAD</tag>
9293
</scm>
9394

94-
<distributionManagement>
95-
<snapshotRepository>
96-
<id>ossrh</id>
97-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
98-
</snapshotRepository>
99-
<repository>
100-
<id>ossrh</id>
101-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
102-
</repository>
103-
</distributionManagement>
104-
10595
<build>
10696
<pluginManagement>
10797
<plugins>
98+
<plugin>
99+
<groupId>org.apache.maven.plugins</groupId>
100+
<artifactId>maven-surefire-plugin</artifactId>
101+
<version>2.12.1</version>
102+
<configuration>
103+
<skipTests>true</skipTests>
104+
</configuration>
105+
</plugin>
108106
<plugin>
109107
<groupId>org.apache.maven.plugins</groupId>
110108
<artifactId>maven-source-plugin</artifactId>
@@ -133,17 +131,6 @@
133131
</execution>
134132
</executions>
135133
</plugin>
136-
<plugin>
137-
<groupId>org.sonatype.plugins</groupId>
138-
<artifactId>nexus-staging-maven-plugin</artifactId>
139-
<version>1.6.7</version>
140-
<extensions>true</extensions>
141-
<configuration>
142-
<serverId>ossrh</serverId>
143-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
144-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
145-
</configuration>
146-
</plugin>
147134
<plugin>
148135
<groupId>org.apache.maven.plugins</groupId>
149136
<artifactId>maven-gpg-plugin</artifactId>
@@ -158,15 +145,6 @@
158145
</execution>
159146
</executions>
160147
</plugin>
161-
<!--<plugin>-->
162-
<!--<groupId>org.apache.maven.plugins</groupId>-->
163-
<!--<artifactId>maven-release-plugin</artifactId>-->
164-
<!--<version>2.5.3</version>-->
165-
<!--<configuration>-->
166-
<!--<mavenExecutorId>forked-path</mavenExecutorId>-->
167-
<!--<tagNameFormat>v@{project.version}</tagNameFormat>-->
168-
<!--</configuration>-->
169-
<!--</plugin>-->
170148
</plugins>
171149
</pluginManagement>
172150
<plugins>
@@ -179,56 +157,20 @@
179157
<artifactId>maven-javadoc-plugin</artifactId>
180158
<version>3.5.0</version>
181159
</plugin>
182-
<plugin>
183-
<groupId>org.sonatype.plugins</groupId>
184-
<artifactId>nexus-staging-maven-plugin</artifactId>
185-
</plugin>
186160
<plugin>
187161
<groupId>org.apache.maven.plugins</groupId>
188162
<artifactId>maven-gpg-plugin</artifactId>
189163
</plugin>
190-
<!--<plugin>-->
191-
<!--<groupId>org.apache.maven.plugins</groupId>-->
192-
<!--<artifactId>maven-release-plugin</artifactId>-->
193-
<!--<version>2.5.3</version>-->
194-
<!--<configuration>-->
195-
<!--<autoVersionSubmodules>true</autoVersionSubmodules>-->
196-
<!--<useReleaseProfile>false</useReleaseProfile>-->
197-
<!--<releaseProfiles>release</releaseProfiles>-->
198-
<!--<goals>deploy</goals>-->
199-
<!--</configuration>-->
200-
<!--</plugin>-->
164+
<plugin>
165+
<groupId>org.sonatype.central</groupId>
166+
<artifactId>central-publishing-maven-plugin</artifactId>
167+
<version>0.9.0</version>
168+
<extensions>true</extensions>
169+
<configuration>
170+
<publishingServerId>central</publishingServerId>
171+
<autoPublish>true</autoPublish>
172+
</configuration>
173+
</plugin>
201174
</plugins>
202175
</build>
203-
204-
<!--<profiles>-->
205-
<!--<profile>-->
206-
<!--<id>release-sign-artifacts</id>-->
207-
<!--<activation>-->
208-
<!--<property>-->
209-
<!--<name>performRelease</name>-->
210-
<!--<value>true</value>-->
211-
<!--</property>-->
212-
<!--</activation>-->
213-
<!--<build>-->
214-
<!--<plugins>-->
215-
<!--<plugin>-->
216-
<!--<groupId>org.apache.maven.plugins</groupId>-->
217-
<!--<artifactId>maven-gpg-plugin</artifactId>-->
218-
<!--<version>1.4</version>-->
219-
<!--<executions>-->
220-
<!--<execution>-->
221-
<!--<id>sign-artifacts</id>-->
222-
<!--<phase>verify</phase>-->
223-
<!--<goals>-->
224-
<!--<goal>sign</goal>-->
225-
<!--</goals>-->
226-
<!--</execution>-->
227-
<!--</executions>-->
228-
<!--</plugin>-->
229-
<!--</plugins>-->
230-
<!--</build>-->
231-
<!--</profile>-->
232-
<!--</profiles>-->
233-
234176
</project>

‎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.20.0</version> <!--scouter-->
8+
<version>2.21.0</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.20.0</version> <!--scouter-->
7+
<version>2.21.0</version> <!--scouter-->
88
</parent>
99

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

0 commit comments

Comments
 (0)