Merge pull request #36 from oracle/release-2.4.2

Release 2.4.2

Author: lfeigen

.gitignore

@@ -14,8 +14,10 @@ target
 **/.settings
 **/.settings/*
 release.properties
+release-info
 **/pom.xml.releaseBackup
 *.hold
+*.log
 .flattened-pom.xml
 CBE*.out
 console-0.9-*
@@ -39,14 +41,21 @@ frontend/electron-test/NewWDTModelFile.yml
 frontend/electron-test/electronTest.log
 frontend/electron-test/node_modules/
 frontend/electron-test/package-lock.json
+frontend/electron-test/newPropFile.prop
+frontend/electron-test/newUC001BWDTModelFile.yml
+frontend/electron-test/newUC002BWDTModelFile.yml
+frontend/electron-test/newUC003BWDTModelFile.yml
+frontend/electron-test/newUC017BWDTModelFile.yml
+frontend/electron-test/newWDTModelTokenFile.yml
 .vscode/*
 client.log.*
-/bin/
+bin/*
 weblogic-bean-info-harvester/build-*
 run/work
 fortify-output/**
 owasp-output/**
 frontend/seleniumTest.log
+everypage-oracle-tests/
 
 electron/dist/**
 electron/extraFiles/**
@@ -55,3 +64,5 @@ electron/node_modules/**
 hugo/*/docs/
 hugo/*/.vscode/
 hugo/*/.hugo_build.lock
+
+*start-weblogic.out

Makefile

@@ -1,11 +1,12 @@
-# Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+# Copyright (c) 2020, 2023, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 MAVEN_TARGET = clean install
 
 all:
-	[ -z "$$https_proxy" ] || export ELECTRON_GET_USE_PROXY=true GLOBAL_AGENT_HTTPS_PROXY=$$https_proxy; \
-	  mvn -B ${MAVEN_TARGET} ${MAVEN_FLAGS}
+	[ -z "$$https_proxy" ] || export ELECTRON_GET_USE_PROXY=true GLOBAL_AGENT_HTTPS_PROXY=$$https_proxy GLOBAL_AGENT_NO_PROXY="$$no_proxy"; \
+	export PUPPETEER_SKIP_DOWNLOAD=true CHROMEDRIVER_SKIP_DOWNLOAD=true; \
+	mvn -B ${MAVEN_TARGET} ${MAVEN_FLAGS}
 	rm -rf runnable
 	unzip -q -d runnable installer/target/console.zip
 	mv runnable/console/* runnable

README.md

@@ -34,5 +34,5 @@ See the following list of [Known Issues](https://oracle.github.io/weblogic-remot
 
 We have a **public Slack channel** where you can get in touch with us to ask questions about using the WebLogic Remote Console or give us feedback
 or suggestions about what features and improvements you would like to see.  We would love to hear from you. To join our channel,
-please [visit this site to get an invitation](https://weblogic-slack-inviter.herokuapp.com/). The invitation email will include
+please [visit this site to get an invitation](https://join.slack.com/t/oracle-weblogic/shared_invite/zt-1lnz4kpci-WdY2gWfeJc5jS_a_1Z06MA). The invitation email will include
 details of how to access our Slack workspace.  After you are logged in, please come to `#remote-console` and say, "hello!"

THIRD_PARTY_LICENSES.txt

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2020, 2022, Oracle and/or its affiliates.
+<!-- Copyright 2020, 2023, Oracle and/or its affiliates.
      Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -9,7 +9,7 @@
   <parent>
     <artifactId>console-backend</artifactId>
     <groupId>com.oracle.weblogic</groupId>
-    <version>2.4.1</version>
+    <version>2.4.2</version>
   </parent>
 
   <packaging>pom</packaging>

assembly/pom.xml

@@ -1,14 +1,15 @@
 #!/bin/bash
 
-# Copyright 2021, Oracle Corporation and/or its affiliates.  All rights reserved.
+# Copyright 2021, 2023, 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 "
+. ./run-this-in-docker.sh builder "
 ./prep.sh build
-make
+chown -R oracle /build
+su oracle -c make
 "
 
 rm -rf runnable installer/target frontend/web

build-console-with-docker.sh

@@ -5,6 +5,8 @@ doit_docker() {
   cat > $tmp/script <<!
 #!/bin/bash
 $NPM_PREP_COMMANDS
+export DOWNLOAD_JAVA_URL=$DOWNLOAD_JAVA_URL
+export DOWNLOAD_NODE_URL=$DOWNLOAD_NODE_URL
 set -e
 [ -z "$DEBUG" ] || export DEBUG="$DEBUG"
 [ -n "$FPM_DEBUG" ] || export DEBUG="$FPM_DEBUG"
@@ -13,7 +15,7 @@ export https_proxy=$https_proxy
 export no_proxy=$no_proxy
 if [ -n "$https_proxy" ]
 then
-  export ELECTRON_GET_USE_PROXY=true GLOBAL_AGENT_HTTPS_PROXY=$https_proxy
+  export ELECTRON_GET_USE_PROXY=true GLOBAL_AGENT_HTTPS_PROXY=$https_proxy GLOBAL_AGENT_NO_PROXY="$no_proxy" GLOBAL_AGENT_HTTP_PROXY="$http_proxy"
 fi
 umask 000
 cp -rp /build.in/. /build
@@ -48,7 +50,14 @@ fi
 case "$(uname -a)" in
 *indow*|*Msys*)
   os=windows
-  pathsep=';'
+  # It depends on what shell you are running
+  case "$PATH" in
+  *';'*';'*)
+    pathsep=';'
+    ;;
+  *)
+    pathsep=:
+  esac
   ;;
 *arwin*)
   os=darwin
@@ -59,7 +68,12 @@ case "$(uname -a)" in
   pathsep=:
 esac
 
-tmp=/tmp/${0##*/}.$$
+if [ -d /tmp/rancher-desktop ]
+then
+  tmp="/tmp/rancher-desktop/${0##*/}.$$"
+else
+  tmp="/tmp/${0##*/}.$$"
+fi
 if [ "$PWD" = /build ]
 then
   trap copyout EXIT

build-electron.sh

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2020, 2022, Oracle Corporation and/or its affiliates.  All rights reserved.
+<!-- Copyright 2020, 2023, 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.1</version>
+  <version>2.4.2</version>
   <name>Build Tools</name>
 
   <properties>

build-tools/pom.xml

@@ -0,0 +1,40 @@
+"use strict";
+
+module.exports = {
+  env: {
+    "amd": true,
+    "browser": true,
+    "commonjs": true,
+    "es2021": true,
+    "es6": true, // es6 is the same as es2015
+    "jquery": true,
+    "mocha": true,
+    "node": true
+  },
+  extends: "eslint:recommended",
+  parserOptions: {
+    "ecmaVersion": 12
+  },
+  overrides: [
+    {
+      files: [
+        "main.js"
+      ],
+      rules: {
+        "strict": "off",
+        "no-undef": "off"
+      }
+    }
+  ],
+  rules: {
+    "strict": "error",
+    "no-unused-vars": "off",
+    "no-console": "off",
+    "no-fallthrough": "off",
+    "no-prototype-builtins": "off",
+    "quotes": [
+      "error",
+      "single"
+    ]
+  }
+};

electron/.eslintrc.js

@@ -14,7 +14,7 @@
  * @example
  *  AutoPrefs.read(`${app.getPath('appData')}/weblogic-remote-console`);
  *  let props = {
- *    version: '2.4.1',
+ *    version: '2.4.2',
  *    location: '/Applications/WebLogic Remote Console.app/Contents/MacOS/WebLogic Remote Console'
  *  };
  *  AutoPrefs.set(props);
@@ -166,4 +166,4 @@ const AutoPrefs = (() => {
 
 })();
 
-module.exports = AutoPrefs;
+module.exports = AutoPrefs;