Skip to content

Commit b219d4f

Browse files
moreautmoreaut
authored
Merge pull request #64 from oracle/release-2.4.8
Release 2.4.8
2 parents 315f00e + 2bc9eea commit b219d4f

File tree

1,172 files changed

+127502
-31896
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,172 files changed

+127502
-31896
lines changed

‎.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,3 +71,9 @@ hugo/*/.hugo_build.lock
7171
# These are side effects of the WKTUI tests
7272
frontend/wktui-tests/node_modules/**
7373
weblogic-toolkit-ui/
74+
75+
upload
76+
upload/**
77+
78+
wls-remote-console-helper-war/signin/package-lock.json
79+
wls-remote-console-helper-war/ui/package-lock.json

‎THIRD_PARTY_LICENSES.txt

Lines changed: 1826 additions & 17 deletions
Large diffs are not rendered by default.

‎assembly/assembly/jar.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
44
<!--
5-
Copyright (c) 2020, 2021, Oracle and/or its affiliates.
5+
Copyright (c) 2020, 2023, Oracle and/or its affiliates.
66
The Universal Permissive License (UPL), Version 1.0
77
-->
88
<id>zip</id>
@@ -18,6 +18,7 @@
1818
<directory>../frontend/web</directory>
1919
<excludes>
2020
<exclude>index.html</exclude>
21+
<exclude>resources/**</exclude>
2122
</excludes>
2223
<outputDirectory>frontend</outputDirectory> <!-- remove the "web" folder -->
2324
</fileSet>

‎assembly/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<artifactId>console-backend</artifactId>
1111
<groupId>com.oracle.weblogic</groupId>
12-
<version>2.4.7</version>
12+
<version>2.4.8</version>
1313
</parent>
1414

1515
<packaging>pom</packaging>

‎build-console-with-docker.sh

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,33 @@
11
#!/bin/bash
22

3-
# Copyright 2021, 2023, Oracle Corporation and/or its affiliates. All rights reserved.
3+
# Copyright 2021, 2024, Oracle Corporation and/or its affiliates. All rights reserved.
44
# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
55

66
set -e
77

88
# Run the command via "." to get the DOCKER_ID variable
99
. ./run-this-in-docker.sh builder "
1010
./prep.sh build
11+
. ./prep-paths.sh
1112
chown -R oracle /build
12-
su oracle -c make
13+
su oracle -c \"make $*\"
1314
"
1415

1516
rm -rf runnable installer/target frontend/web
1617
mkdir -p runnable installer/target frontend/web
17-
docker cp $DOCKER_ID:/build/runnable/. runnable
18+
if ! docker cp $DOCKER_ID:/build/runnable/. runnable
19+
then
20+
# Seems to be a timing issue intermittently in podman,
21+
# so try again
22+
sleep 3
23+
docker cp $DOCKER_ID:/build/runnable/. runnable
24+
fi
1825
docker cp $DOCKER_ID:/build/installer/target/. installer/target
1926
docker cp $DOCKER_ID:/build/frontend/web/. frontend/web
27+
docker cp $DOCKER_ID:/build/on-weblogic/target on-weblogic || true
28+
docker cp $DOCKER_ID:/build/console-rest-ext/target console-rest-ext || true
29+
docker cp $DOCKER_ID:/build/wls-remote-console-helper-war/war/target wls-remote-console-helper-war/war || true
30+
if [ -f console-rest-ext/target/*.war ]
31+
then
32+
cp console-rest-ext/target/*.war runnable || true
33+
fi

‎build-electron.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ then
189189
fi
190190

191191
# Make a Custom JRE (if we had modules, we could do more, but this is fine)
192-
jlink --output "$extra"/customjre --no-header-files --no-man-pages --compress=2 --strip-debug --add-modules java.base,java.desktop,java.logging,java.management,java.naming,java.sql,java.xml,jdk.unsupported$extra_modules
192+
jlink --output "$extra"/customjre --no-header-files --no-man-pages --compress=zip-6 --strip-debug --add-modules java.base,java.desktop,java.logging,java.management,java.naming,java.sql,java.xml,jdk.crypto.ec,jdk.unsupported$extra_modules
193193

194194
mkdir -p "$extra"/backend
195195
cp -rp ../runnable/* "$extra"/backend
@@ -224,7 +224,7 @@ do
224224
shift
225225
done
226226

227-
"$(npm bin)/electron-builder" -p never "$@"
227+
npx electron-builder -p never "$@"
228228

229229
case "$os" in
230230
darwin)

‎build-tools/checkstyle.sh

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,16 @@
55

66
set -e
77

8-
CHECKSTYLE_JAR="target/checkstyle.jar"
8+
case "$0" in
9+
*/*)
10+
BTDIR="${0%/*}"
11+
;;
12+
*)
13+
BTDIR="./build-tools"
14+
esac
15+
16+
CHECKSTYLE_JAR="${CHECKSTYLE_JAR:-${BTDIR}/download-bin/checkstyle.jar}"
17+
918
DOWNLOAD_CHECKSTYLE_URL=${DOWNLOAD_CHECKSTYLE_URL:-https://github.com/checkstyle/checkstyle/releases/download/checkstyle-10.11.0/checkstyle-10.11.0-all.jar}
1019
if ! unzip -v "$CHECKSTYLE_JAR" > /dev/null 2>&1
1120
then
@@ -17,17 +26,14 @@ then
1726
fi
1827
fi
1928

29+
if [ "$1" = --download ]
30+
then
31+
exit 0
32+
fi
33+
2034
tmp="/tmp/checkstyle.out"
2135
rm -f "$tmp"
2236

23-
case "$0" in
24-
*/*)
25-
BTDIR="${0%/*}"
26-
;;
27-
*)
28-
BTDIR="./build-tools"
29-
esac
30-
3137
if ! java -Dorg.checkstyle.google.suppressionfilter.config="$BTDIR"/src/main/resources/checkstyle/suppressions.xml -jar "$CHECKSTYLE_JAR" -c="$BTDIR"/src/main/resources/checkstyle/customized_google_checks.xml $(find * -name '*.java') > $tmp 2>&1 || grep -q WARN "$tmp"
3238
then
3339
cat $tmp

‎build-tools/pom.xml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,20 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!-- Copyright 2020, 2023, Oracle Corporation and/or its affiliates. All rights reserved.
2+
<!-- Copyright 2020, 2024, Oracle Corporation and/or its affiliates. All rights reserved.
33
Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl. -->
44
<project>
55
<modelVersion>4.0.0</modelVersion>
66

77
<groupId>com.oracle.weblogic.console-backend</groupId>
88
<artifactId>build-tools</artifactId>
9-
<version>2.4.7</version>
9+
<version>2.4.8</version>
1010
<name>Build Tools</name>
1111

12+
<parent>
13+
<groupId>com.oracle.weblogic</groupId>
14+
<artifactId>console-backend</artifactId>
15+
<version>2.4.8</version>
16+
</parent>
17+
1218
<properties>
1319
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1420
</properties>

‎build-tools/src/main/resources/checkstyle/customized_google_checks.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,6 @@
2727
<module name="BeforeExecutionExclusionFileFilter">
2828
<property name="fileNamePattern" value="module\-info\.java$"/>
2929
</module>
30-
<!-- https://checkstyle.org/config_filters.html#SuppressionFilter -->
31-
<module name="SuppressionFilter">
32-
<property name="file" value="${org.checkstyle.google.suppressionfilter.config}"
33-
default="build-tools/src/main/resources/checkstyle/suppressions.xml" />
34-
<property name="optional" value="false"/>
35-
</module>
3630

3731
<!-- Checks for whitespace -->
3832
<!-- See http://checkstyle.org/config_whitespace.html -->

‎electron/electron-builder.json

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
{
2+
"appId": "remote.console",
3+
"files": [
4+
"app/main.js",
5+
"app/js/auto-prefs-json.js",
6+
"app/js/auto-update-utils.js",
7+
"app/js/config-json.js",
8+
"app/js/console-logger.js",
9+
"app/js/core-utils.js",
10+
"app/js/error-utils.js",
11+
"app/js/file-utils.js",
12+
"app/js/i18n-utils.js",
13+
"app/js/ipcRendererPreload.js",
14+
"app/js/os-utils.js",
15+
"app/js/settings-editor.js",
16+
"app/js/project-management.js",
17+
"app/js/user-prefs-json.js",
18+
"app/js/user-projects-json.js",
19+
"app/js/watcher.js",
20+
"app/js/window-management.js",
21+
"package.json",
22+
"node_modules"
23+
],
24+
"rpm": {
25+
"fpm": [
26+
"--rpm-rpmbuild-define",
27+
"_build_id_links none"
28+
]
29+
},
30+
"mac": {
31+
"category": "Utility",
32+
"target": "default",
33+
"darkModeSupport": false,
34+
"type": "distribution",
35+
"hardenedRuntime": true,
36+
"gatekeeperAssess": false,
37+
"artifactName": "${productName}-${buildVersion}-${arch}-${os}.${ext}",
38+
"entitlements": "./entitlements.mac.plist"
39+
},
40+
"linux": {
41+
"target": [
42+
{
43+
"target": "rpm"
44+
},
45+
{
46+
"target": "deb"
47+
},
48+
{
49+
"target": "appimage"
50+
},
51+
{
52+
"target": "zip"
53+
}
54+
],
55+
"artifactName": "${productName}-${buildVersion}-${os}.${ext}",
56+
"category": "Utility"
57+
},
58+
"win": {
59+
"artifactName": "${productName}-${buildVersion}-${os}.${ext}",
60+
"target": [
61+
"nsis",
62+
"zip"
63+
]
64+
},
65+
"nsis": {
66+
"runAfterFinish": "false",
67+
"oneClick": false,
68+
"allowToChangeInstallationDirectory": true
69+
},
70+
"extraFiles": {
71+
"from": "extraFiles/.",
72+
"to": "."
73+
}
74+
}

0 commit comments

Comments
 (0)