From 04709ea7e168dca24b2ec7b55fdf2152b737ae7c Mon Sep 17 00:00:00 2001
From: Viktor Kovtun <viktor.kovtun@id.ethz.ch>
Date: Fri, 19 Aug 2022 09:23:05 +0200
Subject: [PATCH] Revert "SSDM-12747 Fixing failing dependency on node-gradle
plugin."
This reverts commit 5a92f5860254601d0feb7bffa157d3027667b450.
---
openbis_ng_ui/build.gradle | 21 +++------------------
openbis_standard_technologies/build.gradle | 15 ++++++++-------
2 files changed, 11 insertions(+), 25 deletions(-)
diff --git a/openbis_ng_ui/build.gradle b/openbis_ng_ui/build.gradle
index 64c960cd5cd..666ac1f1eeb 100644
--- a/openbis_ng_ui/build.gradle
+++ b/openbis_ng_ui/build.gradle
@@ -1,30 +1,15 @@
-buildscript {
- apply from: '../gradle/repository.gradle'
-
- repositories {
- ivy {
- ivyPattern "https://sissource.ethz.ch/openbis/openbis-public/openbis-ivy/-/raw/main/[organisation]/[module]/[revision]/ivy.xml"
- artifactPattern "https://sissource.ethz.ch/openbis/openbis-public/openbis-ivy/-/raw/main/[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"
- }
- }
-
- dependencies {
- classpath 'com.fasterxml.jackson.core:jackson-core:2.13.3',
- 'com.fasterxml.jackson.core:jackson-databind:2.13.3',
- 'com.github.node-gradle:gradle-node-plugin:3.2.1'
- }
+plugins {
+ id "com.github.node-gradle.node" version "3.2.1"
}
configure(allprojects) {
apply plugin:'base'
-
+
repositories {
mavenCentral()
}
}
-apply plugin: "com.github.node-gradle.node"
-
node {
download = true
version = '10.22.0'
diff --git a/openbis_standard_technologies/build.gradle b/openbis_standard_technologies/build.gradle
index 0d555b171aa..0be100146ae 100644
--- a/openbis_standard_technologies/build.gradle
+++ b/openbis_standard_technologies/build.gradle
@@ -3,17 +3,18 @@ buildscript {
repositories repositoryConfig
- dependencies {
- classpath 'apache:commons-codec:1.10',
- 'owasp:dependency-check-gradle:6.2.2',
- 'paleozogt:symzip-plugin:0.10.1',
- 'com.github.node-gradle:gradle-node-plugin:3.2.1'
- }
+ dependencies {
+ classpath 'apache:commons-codec:1.10',
+ 'owasp:dependency-check-gradle:6.2.2',
+ 'paleozogt:symzip-plugin:0.10.1'
+ }
}
+plugins {
+ id "com.github.node-gradle.node" version "3.2.1"
+}
apply plugin: org.owasp.dependencycheck.gradle.DependencyCheckPlugin
apply plugin: "org.paleozogt.symzip"
-apply plugin: "com.github.node-gradle.node"
dependencyCheck {
failBuildOnCVSS = 7 // 0 - 4 = low, 4 - 7 = medium, 7 - 9 = high, 9-10 = critical
--
GitLab