Merge pull request #64 from oracle/release-2.4.8

Release 2.4.8

Author: moreaut

.gitignore

@@ -71,3 +71,9 @@ hugo/*/.hugo_build.lock
 # These are side effects of the WKTUI tests
 frontend/wktui-tests/node_modules/**
 weblogic-toolkit-ui/
+
+upload
+upload/**
+
+wls-remote-console-helper-war/signin/package-lock.json
+wls-remote-console-helper-war/ui/package-lock.json

THIRD_PARTY_LICENSES.txt

@@ -2,7 +2,7 @@
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
 <!--
-    Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+    Copyright (c) 2020, 2023, Oracle and/or its affiliates.
     The Universal Permissive License (UPL), Version 1.0
 -->
   <id>zip</id>
@@ -18,6 +18,7 @@
       <directory>../frontend/web</directory>
       <excludes>
         <exclude>index.html</exclude>
+        <exclude>resources/**</exclude>
       </excludes>
       <outputDirectory>frontend</outputDirectory> <!-- remove the "web" folder -->
     </fileSet>

assembly/assembly/jar.xml

@@ -9,7 +9,7 @@
   <parent>
     <artifactId>console-backend</artifactId>
     <groupId>com.oracle.weblogic</groupId>
-    <version>2.4.7</version>
+    <version>2.4.8</version>
   </parent>
 
   <packaging>pom</packaging>

assembly/pom.xml

@@ -1,19 +1,33 @@
 #!/bin/bash
 
-# Copyright 2021, 2023, Oracle Corporation and/or its affiliates.  All rights reserved.
+# Copyright 2021, 2024, Oracle Corporation and/or its affiliates.  All rights reserved.
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 
 set -e
 
 # Run the command via "." to get the DOCKER_ID variable
 . ./run-this-in-docker.sh builder "
 ./prep.sh build
+. ./prep-paths.sh
 chown -R oracle /build
-su oracle -c make
+su oracle -c \"make $*\"
 "
 
 rm -rf runnable installer/target frontend/web
 mkdir -p runnable installer/target frontend/web
-docker cp $DOCKER_ID:/build/runnable/. runnable
+if ! docker cp $DOCKER_ID:/build/runnable/. runnable
+then
+  # Seems to be a timing issue intermittently in podman,
+  # so try again
+  sleep 3
+  docker cp $DOCKER_ID:/build/runnable/. runnable
+fi
 docker cp $DOCKER_ID:/build/installer/target/. installer/target
 docker cp $DOCKER_ID:/build/frontend/web/. frontend/web
+docker cp $DOCKER_ID:/build/on-weblogic/target on-weblogic || true
+docker cp $DOCKER_ID:/build/console-rest-ext/target console-rest-ext || true
+docker cp $DOCKER_ID:/build/wls-remote-console-helper-war/war/target wls-remote-console-helper-war/war || true
+if [ -f console-rest-ext/target/*.war ]
+then
+  cp console-rest-ext/target/*.war runnable || true
+fi

build-console-with-docker.sh

@@ -189,7 +189,7 @@ then
 fi
 
 # Make a Custom JRE (if we had modules, we could do more, but this is fine)
-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
+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
 
 mkdir -p "$extra"/backend
 cp -rp ../runnable/* "$extra"/backend
@@ -224,7 +224,7 @@ do
   shift
 done
 
-"$(npm bin)/electron-builder" -p never "$@"
+npx electron-builder -p never "$@"
 
 case "$os" in
 darwin)

build-electron.sh

@@ -5,7 +5,16 @@
 
 set -e
 
-CHECKSTYLE_JAR="target/checkstyle.jar"
+case "$0" in
+*/*)
+  BTDIR="${0%/*}"
+  ;;
+*)
+  BTDIR="./build-tools"
+esac
+
+CHECKSTYLE_JAR="${CHECKSTYLE_JAR:-${BTDIR}/download-bin/checkstyle.jar}"
+
 DOWNLOAD_CHECKSTYLE_URL=${DOWNLOAD_CHECKSTYLE_URL:-https://github.com/checkstyle/checkstyle/releases/download/checkstyle-10.11.0/checkstyle-10.11.0-all.jar}
 if ! unzip -v "$CHECKSTYLE_JAR" > /dev/null 2>&1
 then
@@ -17,17 +26,14 @@ then
   fi
 fi
 
+if [ "$1" = --download ]
+then
+  exit 0
+fi
+
 tmp="/tmp/checkstyle.out"
 rm -f "$tmp"
 
-case "$0" in
-*/*)
-  BTDIR="${0%/*}"
-  ;;
-*)
-  BTDIR="./build-tools"
-esac
-
 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"
 then
   cat $tmp

build-tools/checkstyle.sh

@@ -1,14 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2020, 2023, Oracle Corporation and/or its affiliates.  All rights reserved.
+<!-- Copyright 2020, 2024, Oracle Corporation and/or its affiliates.  All rights reserved.
      Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.  -->
 <project>
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>com.oracle.weblogic.console-backend</groupId>
   <artifactId>build-tools</artifactId>
-  <version>2.4.7</version>
+  <version>2.4.8</version>
   <name>Build Tools</name>
 
+  <parent>
+      <groupId>com.oracle.weblogic</groupId>
+      <artifactId>console-backend</artifactId>
+      <version>2.4.8</version>
+  </parent>
+
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>

build-tools/pom.xml

@@ -27,12 +27,6 @@
   <module name="BeforeExecutionExclusionFileFilter">
     <property name="fileNamePattern" value="module\-info\.java$"/>
   </module>
-  <!-- https://checkstyle.org/config_filters.html#SuppressionFilter -->
-  <module name="SuppressionFilter">
-    <property name="file" value="${org.checkstyle.google.suppressionfilter.config}"
-              default="build-tools/src/main/resources/checkstyle/suppressions.xml" />
-    <property name="optional" value="false"/>
-  </module>
 
   <!-- Checks for whitespace                               -->
   <!-- See http://checkstyle.org/config_whitespace.html -->

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

@@ -0,0 +1,74 @@
+{
+  "appId": "remote.console",
+  "files": [
+    "app/main.js",
+    "app/js/auto-prefs-json.js",
+    "app/js/auto-update-utils.js",
+    "app/js/config-json.js",
+    "app/js/console-logger.js",
+    "app/js/core-utils.js",
+    "app/js/error-utils.js",
+    "app/js/file-utils.js",
+    "app/js/i18n-utils.js",
+    "app/js/ipcRendererPreload.js",
+    "app/js/os-utils.js",
+    "app/js/settings-editor.js",
+    "app/js/project-management.js",
+    "app/js/user-prefs-json.js",
+    "app/js/user-projects-json.js",
+    "app/js/watcher.js",
+    "app/js/window-management.js",
+    "package.json",
+    "node_modules"
+  ],
+  "rpm": {
+    "fpm": [
+      "--rpm-rpmbuild-define",
+      "_build_id_links none"
+    ]
+  },
+  "mac": {
+    "category": "Utility",
+    "target": "default",
+    "darkModeSupport": false,
+    "type": "distribution",
+    "hardenedRuntime": true,
+    "gatekeeperAssess": false,
+    "artifactName": "${productName}-${buildVersion}-${arch}-${os}.${ext}",
+    "entitlements": "./entitlements.mac.plist"
+  },
+  "linux": {
+    "target": [
+      {
+        "target": "rpm"
+      },
+      {
+        "target": "deb"
+      },
+      {
+        "target": "appimage"
+      },
+      {
+        "target": "zip"
+      }
+    ],
+    "artifactName": "${productName}-${buildVersion}-${os}.${ext}",
+    "category": "Utility"
+  },
+  "win": {
+    "artifactName": "${productName}-${buildVersion}-${os}.${ext}",
+    "target": [
+      "nsis",
+      "zip"
+    ]
+  },
+  "nsis": {
+    "runAfterFinish": "false",
+    "oneClick": false,
+    "allowToChangeInstallationDirectory": true
+  },
+  "extraFiles": {
+    "from": "extraFiles/.",
+    "to": "."
+  }
+}