This is an automated email from the ASF dual-hosted git repository.
tiagobento pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-kie-tools.git
The following commit(s) were added to refs/heads/main by this push:
new 047127b4756 kie-issues#1207: serverless-workflow-diagram-editor get
ECONNREFUSED on bootstrap with a proxy (#2420)
047127b4756 is described below
commit 047127b4756b5d62ff942fab9de07cf14297fc1d
Author: Fabrizio Antonangeli <[email protected]>
AuthorDate: Wed Jun 12 14:29:40 2024 +0200
kie-issues#1207: serverless-workflow-diagram-editor get ECONNREFUSED on
bootstrap with a proxy (#2420)
---
.../env/index.js | 5 -
.../serverless-workflow-diagram-editor/install.js | 138 ---------------------
.../kie-wb-common-stunner-lienzo/pom.xml | 125 +++++++++++++++++++
.../package.json | 2 -
.../serverless-workflow-diagram-editor/pom.xml | 5 +
pnpm-lock.yaml | 6 -
6 files changed, 130 insertions(+), 151 deletions(-)
diff --git a/packages/serverless-workflow-diagram-editor/env/index.js
b/packages/serverless-workflow-diagram-editor/env/index.js
index 946cb6c96eb..160d41c6c1d 100644
--- a/packages/serverless-workflow-diagram-editor/env/index.js
+++ b/packages/serverless-workflow-diagram-editor/env/index.js
@@ -25,11 +25,6 @@ module.exports =
composeEnv([require("@kie-tools/root-env/env")], {
return {
swfDiagramEditor: {
version: require("../package.json").version,
- UBERFIRE__version: "7.74.1.Final",
- ANIMATE_CSS__version: "3.5.2",
- BOOTSTRAP__version: "3.4.1",
- FONT_AWESOME__version: "4.7.0",
- GWTBOOTSTRAP3__version: "1.0.1",
},
};
},
diff --git a/packages/serverless-workflow-diagram-editor/install.js
b/packages/serverless-workflow-diagram-editor/install.js
index 95167e71c9e..3f2131f2de3 100644
--- a/packages/serverless-workflow-diagram-editor/install.js
+++ b/packages/serverless-workflow-diagram-editor/install.js
@@ -20,144 +20,6 @@
const buildEnv = require("./env");
const { setup } = require("@kie-tools/maven-config-setup-helper");
-const fs = require("fs").promises;
-const path = require("path");
-const download = require("mvn-artifact-download").default;
-const AdmZip = require("adm-zip");
-
-const stunner_lienzo_path =
"kie-wb-common-stunner/kie-wb-common-stunner-client/kie-wb-common-stunner-lienzo/";
-const tempPath = stunner_lienzo_path + "target/external-deps";
-const resources_path =
- stunner_lienzo_path +
"src/main/resources/org/kie/workbench/common/stunner/client/lienzo/resources";
-
setup(`
-Drevision=${buildEnv.env.swfDiagramEditor.version}
`);
-
-console.info("[serverless-workflow-diagram-editor] Download maven
resources...");
-
-const artifacts = new Map([
- [
- {
- groupId: "org.uberfire",
- artifactId: "uberfire-workbench-client-views-patternfly",
- version: buildEnv.env.swfDiagramEditor.UBERFIRE__version,
- },
- [
- {
- path: "org/uberfire/client/views/static/js/patternfly.min.js",
- type: "js",
- },
- {
- path:
"org/uberfire/client/views/static/bootstrap-select/js/bootstrap-select.min.js",
- type: "js",
- },
- {
- path:
"org/uberfire/client/views/static/css/patternfly-additions.min.css",
- type: "css",
- },
- {
- path: "org/uberfire/client/views/static/css/patternfly.min.css",
- type: "css",
- },
- {
- path: "org/uberfire/client/views/static/uberfire-patternfly.css",
- type: "css",
- },
- ],
- ],
- [
- {
- groupId: "org.webjars",
- artifactId: "font-awesome",
- version: buildEnv.env.swfDiagramEditor.FONT_AWESOME__version,
- },
- [
- {
- path:
- "META-INF/resources/webjars/font-awesome/" +
- buildEnv.env.swfDiagramEditor.FONT_AWESOME__version +
- "/css/font-awesome.min.css",
- type: "css",
- },
- ],
- ],
- [
- {
- groupId: "org.gwtbootstrap3",
- artifactId: "gwtbootstrap3",
- version: buildEnv.env.swfDiagramEditor.GWTBOOTSTRAP3__version,
- },
- [
- {
- path:
"org/gwtbootstrap3/client/resource/js/jquery-1.12.4.min.cache.js",
- type: "js",
- },
- {
- path: "org/gwtbootstrap3/client/resource/js/gwtbootstrap3.js",
- type: "js",
- },
- ],
- ],
- [
- {
- groupId: "org.webjars",
- artifactId: "bootstrap",
- version: buildEnv.env.swfDiagramEditor.BOOTSTRAP__version,
- },
- [
- {
- path:
- "META-INF/resources/webjars/bootstrap/" +
- buildEnv.env.swfDiagramEditor.BOOTSTRAP__version +
- "/js/bootstrap.min.js",
- type: "js",
- },
- ],
- ],
- [
- {
- groupId: "org.webjars",
- artifactId: "animate.css",
- version: buildEnv.env.swfDiagramEditor.ANIMATE_CSS__version,
- },
- [
- {
- path:
- "META-INF/resources/webjars/animate.css/" +
- buildEnv.env.swfDiagramEditor.ANIMATE_CSS__version +
- "/animate.min.css",
- type: "css",
- },
- ],
- ],
-]);
-
-processMavenDependencies();
-
-async function prepareFolders() {
- try {
- await fs.mkdir(tempPath, { recursive: true });
- await fs.mkdir(resources_path + "/js", { recursive: true });
- await fs.mkdir(resources_path + "/css", { recursive: true });
- } catch (err) {
- console.error(err);
- }
-}
-
-async function processMavenDependencies() {
- await prepareFolders(tempPath);
- artifacts.forEach((resources, artifact) => {
- download(artifact, tempPath).then((jarPath) => {
- var zip = new AdmZip(jarPath);
- resources.forEach((resource) => {
- let fileName = path.basename(resource.path);
- if (resource.type === "js") {
- zip.extractEntryTo(resource.path, resources_path + "/js/", false,
true, false, fileName + ".noproc");
- } else if (resource.type === "css") {
- zip.extractEntryTo(resource.path, resources_path + "/css/", false,
true);
- }
- });
- });
- });
-}
diff --git
a/packages/serverless-workflow-diagram-editor/kie-wb-common-stunner/kie-wb-common-stunner-client/kie-wb-common-stunner-lienzo/pom.xml
b/packages/serverless-workflow-diagram-editor/kie-wb-common-stunner/kie-wb-common-stunner-client/kie-wb-common-stunner-lienzo/pom.xml
index ce97b645efb..0ef848b5deb 100644
---
a/packages/serverless-workflow-diagram-editor/kie-wb-common-stunner/kie-wb-common-stunner-client/kie-wb-common-stunner-lienzo/pom.xml
+++
b/packages/serverless-workflow-diagram-editor/kie-wb-common-stunner/kie-wb-common-stunner-client/kie-wb-common-stunner-lienzo/pom.xml
@@ -165,6 +165,131 @@
<directory>src/main/resources</directory>
</resource>
</resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-external-dependencies</id>
+ <!-- Please use generate-sources instead of
generate-resources to download the libraries before the build -->
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+
<outputDirectory>${project.build.directory}/external-deps</outputDirectory>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.uberfire</groupId>
+
<artifactId>uberfire-workbench-client-views-patternfly</artifactId>
+ <version>${version.uberfire}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.webjars</groupId>
+ <artifactId>font-awesome</artifactId>
+ <version>${version.font_awesome}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.gwtbootstrap3</groupId>
+ <artifactId>gwtbootstrap3</artifactId>
+ <version>${version.gwtbootstrap3}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.webjars</groupId>
+ <artifactId>bootstrap</artifactId>
+ <version>${version.bootstrap}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.webjars</groupId>
+ <artifactId>animate.css</artifactId>
+ <version>${version.animate_css}</version>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>com.coderplus.maven.plugins</groupId>
+ <artifactId>copy-rename-maven-plugin</artifactId>
+ <version>1.0.1</version>
+ <executions>
+ <execution>
+ <id>rename-files</id>
+ <!-- Please use process-sources instead of
process-resources to process the libraries before the build -->
+ <phase>process-sources</phase>
+ <goals>
+ <goal>rename</goal>
+ </goals>
+ <configuration>
+ <fileSets>
+ <fileSet>
+ <sourceFile
+
>${project.build.directory}/external-deps/org/uberfire/client/views/static/js/patternfly.min.js</sourceFile>
+ <destinationFile
+
>${project.basedir}/src/main/resources/org/kie/workbench/common/stunner/client/lienzo/resources/js/patternfly.min.js.noproc</destinationFile>
+ </fileSet>
+ <fileSet>
+ <sourceFile
+
>${project.build.directory}/external-deps/org/uberfire/client/views/static/bootstrap-select/js/bootstrap-select.min.js</sourceFile>
+ <destinationFile
+
>${project.basedir}/src/main/resources/org/kie/workbench/common/stunner/client/lienzo/resources/js/bootstrap-select.min.js.noproc</destinationFile>
+ </fileSet>
+ <fileSet>
+ <sourceFile
+
>${project.build.directory}/external-deps/org/gwtbootstrap3/client/resource/js/jquery-1.12.4.min.cache.js</sourceFile>
+ <destinationFile
+
>${project.basedir}/src/main/resources/org/kie/workbench/common/stunner/client/lienzo/resources/js/jquery-1.12.4.min.cache.js.noproc</destinationFile>
+ </fileSet>
+ <fileSet>
+ <sourceFile
+
>${project.build.directory}/external-deps/org/gwtbootstrap3/client/resource/js/gwtbootstrap3.js</sourceFile>
+ <destinationFile
+
>${project.basedir}/src/main/resources/org/kie/workbench/common/stunner/client/lienzo/resources/js/gwtbootstrap3.js.noproc</destinationFile>
+ </fileSet>
+ <fileSet>
+ <sourceFile
+
>${project.build.directory}/external-deps/META-INF/resources/webjars/bootstrap/${version.bootstrap}/js/bootstrap.min.js</sourceFile>
+ <destinationFile
+
>${project.basedir}/src/main/resources/org/kie/workbench/common/stunner/client/lienzo/resources/js/bootstrap.min.js.noproc</destinationFile>
+ </fileSet>
+ <fileSet>
+ <sourceFile
+
>${project.build.directory}/external-deps/org/uberfire/client/views/static/css/patternfly-additions.min.css</sourceFile>
+ <destinationFile
+
>${project.basedir}/src/main/resources/org/kie/workbench/common/stunner/client/lienzo/resources/css/patternfly-additions.min.css</destinationFile>
+ </fileSet>
+ <fileSet>
+ <sourceFile
+
>${project.build.directory}/external-deps/org/uberfire/client/views/static/css/patternfly.min.css</sourceFile>
+ <destinationFile
+
>${project.basedir}/src/main/resources/org/kie/workbench/common/stunner/client/lienzo/resources/css/patternfly.min.css</destinationFile>
+ </fileSet>
+ <fileSet>
+ <sourceFile
+
>${project.build.directory}/external-deps/org/uberfire/client/views/static/uberfire-patternfly.css</sourceFile>
+ <destinationFile
+
>${project.basedir}/src/main/resources/org/kie/workbench/common/stunner/client/lienzo/resources/css/uberfire-patternfly.css</destinationFile>
+ </fileSet>
+ <fileSet>
+ <sourceFile
+
>${project.build.directory}/external-deps/META-INF/resources/webjars/font-awesome/${version.font_awesome}/css/font-awesome.min.css</sourceFile>
+ <destinationFile
+
>${project.basedir}/src/main/resources/org/kie/workbench/common/stunner/client/lienzo/resources/css/font-awesome.min.css</destinationFile>
+ </fileSet>
+ <fileSet>
+ <sourceFile
+
>${project.build.directory}/external-deps/META-INF/resources/webjars/animate.css/${version.animate_css}/animate.min.css</sourceFile>
+ <destinationFile
+
>${project.basedir}/src/main/resources/org/kie/workbench/common/stunner/client/lienzo/resources/css/animate.min.css</destinationFile>
+ </fileSet>
+ </fileSets>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
diff --git a/packages/serverless-workflow-diagram-editor/package.json
b/packages/serverless-workflow-diagram-editor/package.json
index cd60a9e8af4..37c9200cce0 100644
--- a/packages/serverless-workflow-diagram-editor/package.json
+++ b/packages/serverless-workflow-diagram-editor/package.json
@@ -30,9 +30,7 @@
"devDependencies": {
"@kie-tools/maven-config-setup-helper": "workspace:*",
"@kie-tools/root-env": "workspace:*",
- "adm-zip": "^0.5.10",
"cpr": "^3.0.1",
- "mvn-artifact-download": "6.1.1",
"rimraf": "^3.0.2",
"run-script-os": "^1.1.6",
"symlink-dir": "^5.0.1"
diff --git a/packages/serverless-workflow-diagram-editor/pom.xml
b/packages/serverless-workflow-diagram-editor/pom.xml
index b8cb68dcf58..186e12898c6 100644
--- a/packages/serverless-workflow-diagram-editor/pom.xml
+++ b/packages/serverless-workflow-diagram-editor/pom.xml
@@ -250,6 +250,11 @@
<version.org.xmlunit>2.10.0</version.org.xmlunit>
<version.net.javacrumbs.json-unit>2.35.0</version.net.javacrumbs.json-unit>
<version.org.glassfish.jakarta.json>2.0.1</version.org.glassfish.jakarta.json>
+ <version.uberfire>7.74.1.Final</version.uberfire>
+ <version.font_awesome>4.7.0</version.font_awesome>
+ <version.gwtbootstrap3>1.0.1</version.gwtbootstrap3>
+ <version.bootstrap>3.4.1</version.bootstrap>
+ <version.animate_css>3.5.2</version.animate_css>
</properties>
<dependencyManagement>
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c1e2fea3f49..ad82bd3644f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -10187,15 +10187,9 @@ importers:
"@kie-tools/root-env":
specifier: workspace:*
version: link:../root-env
- adm-zip:
- specifier: ^0.5.10
- version: 0.5.10
cpr:
specifier: ^3.0.1
version: 3.0.1
- mvn-artifact-download:
- specifier: 6.1.1
- version: 6.1.1
rimraf:
specifier: ^3.0.2
version: 3.0.2
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
