Commit 40902cc4 authored by Jasper Koehorst's avatar Jasper Koehorst
Browse files

build config fix for unable to start

parent 09c45d92
Pipeline #35930 passed with stage
in 3 minutes
#
# NOTICE: this is an auto-generated file
#
# This file sets the default parameters for manual `pnpm install`.
#
shamefully-hoist=true
plugins {
id 'org.springframework.boot' version '2.6.1'
id 'org.springframework.boot' version '2.6.2'
id 'io.spring.dependency-management' version '1.0.11.RELEASE'
id 'java'
id 'com.vaadin' version '0.14.6.0'
id 'com.vaadin' version '0.14.7.3'
}
defaultTasks("clean", "build")
......@@ -10,42 +10,18 @@ defaultTasks("clean", "build")
group = 'nl.munlock'
version = '1.0.1'
java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(11))
}
}
sourceCompatibility = JavaVersion.VERSION_17
repositories {
mavenCentral()
mavenLocal()
maven { url "https://repo.gradle.org/gradle/libs-releases" }
maven { url "https://plugins.gradle.org/m2/" }
maven { url "https://maven.vaadin.com/vaadin-addons" }
}
ext {
set('vaadinVersion', "14.8.0")
set('log4j2Version', "2.16.0")
}
configurations {
developmentOnly
runtimeClasspath {
extendsFrom developmentOnly
}
all {
resolutionStrategy.eachDependency { details ->
if (details.requested.group == 'org.apache.logging.log4j') {
details.useVersion '2.16.0'
details.because 'zero-day-exploits'
}
}
exclude group: 'log4j'
}
}
// Function to download and include URL jar files
......@@ -62,14 +38,11 @@ def urlFile = { url, name ->
files(file.absolutePath)
}
test {
useJUnitPlatform()
}
dependencies {
implementation('com.vaadin:vaadin-spring-boot-starter') {
// Webjars are only needed when running in Vaadin 13 compatibility mode
["spring-boot-starter-logging", "com.vaadin.webjar", "org.webjars.bowergithub.insites",
["com.vaadin.webjar", "org.webjars.bowergithub.insites",
"org.webjars.bowergithub.polymer", "org.webjars.bowergithub.polymerelements",
"org.webjars.bowergithub.vaadin", "org.webjars.bowergithub.webcomponents"]
.forEach { group -> exclude(group: group) }
......@@ -91,11 +64,9 @@ dependencies {
implementation 'com.google.guava:guava:31.0.1-jre'
// irods dependency obtained locally
// implementation 'jargon:core:4.3.0.2' // now using direct download versus build.sh script
implementation urlFile('https://github.com/DICE-UNC/jargon/releases/download/4.3.0.2-RELEASE/jargon-core-4.3.0.2-RELEASE-jar-with-dependencies.jar', 'jargon-core-4.3.0.2-RELEASE-jar-with-dependencies')
// unlock ontology obtained locally
// implementation 'nl.munlock:unlockapi:1.0.1' // now using direct download versus build.sh script
implementation urlFile('http://download.systemsbiology.nl/unlock/UnlockOntology.jar', 'UnlockOntology')
// kubernetes api
......@@ -117,13 +88,11 @@ dependencies {
// https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core
implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.16.0'
}
dependencyManagement {
imports {
mavenBom "com.vaadin:vaadin-bom:${vaadinVersion}"
mavenBom "com.vaadin:vaadin-bom:$vaadinVersion"
}
}
......@@ -132,7 +101,5 @@ test {
}
vaadin {
pnpmEnable = true
optimizeBundle = false
productionMode = false
pnpmEnable = false
}
\ No newline at end of file
{
"name": "no-name",
"license": "UNLICENSED",
"vaadin": {
"dependencies": {
"@polymer/iron-a11y-announcer": "3.0.2",
"@polymer/iron-a11y-keys-behavior": "3.0.1",
"@polymer/iron-fit-behavior": "3.0.2",
"@polymer/iron-flex-layout": "3.0.1",
"@polymer/iron-icon": "3.0.1",
"@polymer/iron-iconset-svg": "3.0.1",
"@polymer/iron-list": "3.1.0",
"@polymer/iron-media-query": "3.0.1",
"@polymer/iron-meta": "3.0.1",
"@polymer/iron-overlay-behavior": "3.0.3",
"@polymer/iron-resizable-behavior": "3.0.1",
"@polymer/iron-scroll-target-behavior": "3.0.1",
"@polymer/polymer": "3.2.0",
"@vaadin/vaadin-accordion": "1.2.0",
"@vaadin/vaadin-app-layout": "2.2.0",
"@vaadin/vaadin-avatar": "1.0.4",
"@vaadin/vaadin-board": "2.2.0",
"@vaadin/vaadin-button": "2.4.0",
"@vaadin/vaadin-charts": "6.3.3",
"@vaadin/vaadin-checkbox": "2.5.1",
"@vaadin/vaadin-combo-box": "5.4.8",
"@vaadin/vaadin-confirm-dialog": "1.3.0",
"@vaadin/vaadin-context-menu": "4.5.0",
"@vaadin/vaadin-control-state-mixin": "2.2.4",
"@vaadin/vaadin-cookie-consent": "1.2.0",
"@vaadin/vaadin-core-shrinkwrap": "14.7.3",
"@vaadin/vaadin-crud": "1.3.1",
"@vaadin/vaadin-custom-field": "1.3.1",
"@vaadin/vaadin-date-picker": "4.4.1",
"@vaadin/vaadin-date-time-picker": "1.4.0",
"@vaadin/vaadin-details": "1.2.0",
"@vaadin/vaadin-development-mode-detector": "2.0.4",
"@vaadin/vaadin-dialog": "2.5.2",
"@vaadin/vaadin-element-mixin": "2.4.2",
"@vaadin/vaadin-form-layout": "2.3.0",
"@vaadin/vaadin-grid": "5.8.4",
"@vaadin/vaadin-grid-pro": "2.3.0",
"@vaadin/vaadin-icons": "4.3.2",
"@vaadin/vaadin-item": "2.3.0",
"@vaadin/vaadin-list-box": "1.4.0",
"@vaadin/vaadin-list-mixin": "2.5.1",
"@vaadin/vaadin-login": "1.2.0",
"@vaadin/vaadin-lumo-styles": "1.6.1",
"@vaadin/vaadin-material-styles": "1.3.2",
"@vaadin/vaadin-menu-bar": "1.2.2",
"@vaadin/vaadin-messages": "1.0.1",
"@vaadin/vaadin-notification": "1.6.1",
"@vaadin/vaadin-ordered-layout": "1.4.0",
"@vaadin/vaadin-overlay": "3.5.1",
"@vaadin/vaadin-progress-bar": "1.3.0",
"@vaadin/vaadin-radio-button": "1.5.4",
"@vaadin/vaadin-rich-text-editor": "1.3.0",
"@vaadin/vaadin-select": "2.4.1",
"@vaadin/vaadin-split-layout": "4.3.0",
"@vaadin/vaadin-tabs": "3.2.0",
"@vaadin/vaadin-text-field": "2.8.6",
"@vaadin/vaadin-themable-mixin": "1.6.2",
"@vaadin/vaadin-time-picker": "2.4.0",
"@vaadin/vaadin-upload": "4.4.2",
"@vaadin/vaadin-usage-statistics": "2.1.0",
"@webcomponents/shadycss": "1.8.0",
"@webcomponents/webcomponentsjs": "^2.2.10",
"construct-style-sheets-polyfill": "2.4.16",
"lit-element": "2.5.1",
"lit-html": "1.4.1"
},
"devDependencies": {
"babel-loader": "8.2.2",
"chokidar": "^3.5.0",
"compression-webpack-plugin": "4.0.1",
"copy-webpack-plugin": "5.1.2",
"css-loader": "4.2.1",
"extra-watch-webpack-plugin": "1.0.3",
"extract-loader": "5.1.0",
"file-loader": "6.1.0",
"html-webpack-plugin": "4.5.2",
"lit-css-loader": "0.0.4",
"raw-loader": "3.1.0",
"ts-loader": "8.0.12",
"typescript": "4.0.3",
"webpack": "4.42.0",
"webpack-babel-multi-target-plugin": "2.5.0",
"webpack-cli": "3.3.11",
"webpack-dev-server": "3.11.0",
"webpack-merge": "4.2.2"
},
"hash": "025619f43d07b9298a4ab29162b4ad8ab5773e0519593e770440e059a2542f7f"
},
"dependencies": {
"@polymer/iron-a11y-announcer": "3.0.2",
"@polymer/iron-a11y-keys-behavior": "3.0.1",
"@polymer/iron-fit-behavior": "3.0.2",
"@polymer/iron-flex-layout": "3.0.1",
"@polymer/iron-icon": "3.0.1",
"@polymer/iron-iconset-svg": "3.0.1",
"@polymer/iron-list": "3.1.0",
"@polymer/iron-media-query": "3.0.1",
"@polymer/iron-meta": "3.0.1",
"@polymer/iron-overlay-behavior": "3.0.3",
"@polymer/iron-resizable-behavior": "3.0.1",
"@polymer/iron-scroll-target-behavior": "3.0.1",
"@polymer/polymer": "3.2.0",
"@vaadin/vaadin-accordion": "1.2.0",
"@vaadin/vaadin-app-layout": "2.2.0",
"@vaadin/vaadin-avatar": "1.0.4",
"@vaadin/vaadin-board": "2.2.0",
"@vaadin/vaadin-button": "2.4.0",
"@vaadin/vaadin-charts": "6.3.3",
"@vaadin/vaadin-checkbox": "2.5.1",
"@vaadin/vaadin-combo-box": "5.4.8",
"@vaadin/vaadin-confirm-dialog": "1.3.0",
"@vaadin/vaadin-context-menu": "4.5.0",
"@vaadin/vaadin-control-state-mixin": "2.2.4",
"@vaadin/vaadin-cookie-consent": "1.2.0",
"@vaadin/vaadin-core-shrinkwrap": "14.7.3",
"@vaadin/vaadin-crud": "1.3.1",
"@vaadin/vaadin-custom-field": "1.3.1",
"@vaadin/vaadin-date-picker": "4.4.1",
"@vaadin/vaadin-date-time-picker": "1.4.0",
"@vaadin/vaadin-details": "1.2.0",
"@vaadin/vaadin-development-mode-detector": "2.0.4",
"@vaadin/vaadin-dialog": "2.5.2",
"@vaadin/vaadin-element-mixin": "2.4.2",
"@vaadin/vaadin-form-layout": "2.3.0",
"@vaadin/vaadin-grid": "5.8.4",
"@vaadin/vaadin-grid-pro": "2.3.0",
"@vaadin/vaadin-icons": "4.3.2",
"@vaadin/vaadin-item": "2.3.0",
"@vaadin/vaadin-list-box": "1.4.0",
"@vaadin/vaadin-list-mixin": "2.5.1",
"@vaadin/vaadin-login": "1.2.0",
"@vaadin/vaadin-lumo-styles": "1.6.1",
"@vaadin/vaadin-material-styles": "1.3.2",
"@vaadin/vaadin-menu-bar": "1.2.2",
"@vaadin/vaadin-messages": "1.0.1",
"@vaadin/vaadin-notification": "1.6.1",
"@vaadin/vaadin-ordered-layout": "1.4.0",
"@vaadin/vaadin-overlay": "3.5.1",
"@vaadin/vaadin-progress-bar": "1.3.0",
"@vaadin/vaadin-radio-button": "1.5.4",
"@vaadin/vaadin-rich-text-editor": "1.3.0",
"@vaadin/vaadin-select": "2.4.1",
"@vaadin/vaadin-split-layout": "4.3.0",
"@vaadin/vaadin-tabs": "3.2.0",
"@vaadin/vaadin-text-field": "2.8.6",
"@vaadin/vaadin-themable-mixin": "1.6.2",
"@vaadin/vaadin-time-picker": "2.4.0",
"@vaadin/vaadin-upload": "4.4.2",
"@vaadin/vaadin-usage-statistics": "2.1.0",
"@webcomponents/shadycss": "1.8.0",
"@webcomponents/webcomponentsjs": "^2.2.10",
"construct-style-sheets-polyfill": "2.4.16",
"lit-element": "2.5.1",
"lit-html": "1.4.1"
},
"devDependencies": {
"babel-loader": "8.2.2",
"chokidar": "^3.5.0",
"compression-webpack-plugin": "4.0.1",
"copy-webpack-plugin": "5.1.2",
"css-loader": "4.2.1",
"extra-watch-webpack-plugin": "1.0.3",
"extract-loader": "5.1.0",
"file-loader": "6.1.0",
"html-webpack-plugin": "4.5.2",
"lit-css-loader": "0.0.4",
"raw-loader": "3.1.0",
"ts-loader": "8.0.12",
"typescript": "4.0.3",
"webpack": "4.42.0",
"webpack-babel-multi-target-plugin": "2.5.0",
"webpack-cli": "3.3.11",
"webpack-dev-server": "3.11.0",
"webpack-merge": "4.2.2"
}
}
/**
* NOTICE: this is an auto-generated file
*
* This file has been generated for `pnpm install` task.
* It is used to pin client side dependencies.
* This file will be overwritten on every run.
*/
const fs = require('fs');
const versionsFile = require('path').resolve(__dirname, 'build/frontend/versions.json');
if (!fs.existsSync(versionsFile)) {
return;
}
const versions = JSON.parse(fs.readFileSync(versionsFile, 'utf-8'));
module.exports = {
hooks: {
readPackage
}
};
function readPackage(pkg) {
const { dependencies } = pkg;
if (dependencies) {
for (let k in versions) {
if (dependencies[k] && dependencies[k] !== versions[k]) {
pkg.dependencies[k] = versions[k];
}
}
}
// Forcing chokidar version for now until new babel version is available
// check out https://github.com/babel/babel/issues/11488
if (pkg.dependencies.chokidar) {
pkg.dependencies.chokidar = '^3.4.0';
}
return pkg;
}
██████╗ █████╗ ████████╗ █████╗
██╔══██╗██╔══██╗╚══██╔══╝██╔══██╗
██║ ██║███████║ ██║ ███████║
██║ ██║██╔══██║ ██║ ██╔══██║
██████╔╝██║ ██║ ██║ ██║ ██║
╚═════╝ ╚═╝ ╚═╝ ╚═╝ ╚═╝ ╚═╝
███╗ ███╗ █████╗ ███╗ ██╗ █████╗ ██████╗ ███████╗██████╗
████╗ ████║██╔══██╗████╗ ██║██╔══██╗██╔════╝ ██╔════╝██╔══██╗
██╔████╔██║███████║██╔██╗ ██║███████║██║ ███╗█████╗ ██████╔╝
██║╚██╔╝██║██╔══██║██║╚██╗██║██╔══██║██║ ██║██╔══╝ ██╔══██╗
██║ ╚═╝ ██║██║ ██║██║ ╚████║██║ ██║╚██████╔╝███████╗██║ ██║
╚═╝ ╚═╝╚═╝ ╚═╝╚═╝ ╚═══╝╚═╝ ╚═╝ ╚═════╝ ╚══════╝╚═╝ ╚═╝
\ No newline at end of file
███████╗ █████╗ ██╗██████╗ ██████╗ ███████╗
██╔════╝██╔══██╗██║██╔══██╗██╔══██╗██╔════╝
█████╗ ███████║██║██████╔╝██║ ██║███████╗
██╔══╝ ██╔══██║██║██╔══██╗██║ ██║╚════██║
██║ ██║ ██║██║██║ ██║██████╔╝███████║
╚═╝ ╚═╝ ╚═╝╚═╝╚═╝ ╚═╝╚═════╝ ╚══════╝
\ No newline at end of file
/**
* This file has been autogenerated as it didn't exist or was made for an older incompatible version.
* This file can be used for manual configuration will not be modified if the flowDefaults constant exists.
*/
const merge = require('webpack-merge');
const flowDefaults = require('./webpack.generated.js');
module.exports = merge(flowDefaults, {
});
/**
* This file can be used to configure the flow plugin defaults.
* <code>
* // Add a custom plugin
* flowDefaults.plugins.push(new MyPlugin());
*
* // Update the rules to also transpile `.mjs` files
* if (!flowDefaults.module.rules[0].test) {
* throw "Unexpected structure in generated webpack config";
* }
* flowDefaults.module.rules[0].test = /\.m?js$/
*
* // Include a custom JS in the entry point in addition to generated-flow-imports.js
* if (typeof flowDefaults.entry.index != "string") {
* throw "Unexpected structure in generated webpack config";
* }
* flowDefaults.entry.index = [flowDefaults.entry.index, "myCustomFile.js"];
* </code>
* or add new configuration in the merge block.
* <code>
* module.exports = merge(flowDefaults, {
* mode: 'development',
* devtool: 'inline-source-map'
* });
* </code>
*/
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment