Skip to content

Commit 8fa98cf

Browse files
committed
[client] Improve build compatibility and UI customization
Fix Eclipse 2024-03 XML parsing issues and add UI preference settings
1 parent 637b033 commit 8fa98cf

3 files changed

Lines changed: 20 additions & 1 deletion

File tree

build_client.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,7 @@ if [ -z "$MVN" ]; then
1919
echo maven not found.
2020
exit 1
2121
else
22+
# Increase XML entity size limit for Eclipse 2024-03 metadata
23+
export MAVEN_OPTS="-Djdk.xml.maxGeneralEntitySizeLimit=0 -Djdk.xml.totalEntitySizeLimit=0"
2224
$MVN -Dtycho.debug.resolver=true -X -f ./scouter.client.build/pom.xml clean package
2325
fi

scouter.client.build/pom.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,20 @@
111111
<goal>build-qualifier-aggregator</goal>
112112
<goal>validate-id</goal>
113113
<goal>validate-version</goal>
114+
<goal>package-plugin</goal>
115+
</goals>
116+
</pluginExecutionFilter>
117+
<action>
118+
<ignore/>
119+
</action>
120+
</pluginExecution>
121+
<pluginExecution>
122+
<pluginExecutionFilter>
123+
<groupId>org.eclipse.tycho</groupId>
124+
<artifactId>tycho-bnd-plugin</artifactId>
125+
<versionRange>[4.0.0,)</versionRange>
126+
<goals>
127+
<goal>process</goal>
114128
</goals>
115129
</pluginExecutionFilter>
116130
<action>
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
org.eclipse.ui/DOCK_PERSPECTIVE_BAR=topLeft
22
org.eclipse.ui/SHOW_TEXT_ON_PERSPECTIVE_BAR=true
3+
org.eclipse.ui/SHOW_OPEN_ON_PERSPECTIVE_BAR=true
4+
org.eclipse.ui/PERSPECTIVE_BAR_EXTRAS=*
35
org.eclipse.ui/initialFastViewBarLocation=bottom
46
org.eclipse.ui/SHOW_TRADITIONAL_STYLE_TABS=false
57
org.eclipse.ui/SHOW_PROGRESS_ON_STARTUP = true
68
org.eclipse.ui/KEY_CONFIGURATION_ID=scouter
7-
org.eclipse.ui/SHOW_MEMORY_MONITOR=true
9+
org.eclipse.ui/SHOW_MEMORY_MONITOR=true
10+
org.eclipse.ui.workbench/SHOW_TOOLBAR=false

0 commit comments

Comments
 (0)