Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#4150 - Upgrade dependencies #4157

Merged
merged 2 commits into from
Aug 24, 2023
Merged

#4150 - Upgrade dependencies #4157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9ee98c
#4150 - Upgrade dependencies
reckart Aug 23, 2023
20aed6b
#4150 - Upgrade dependencies
reckart Aug 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ config = [
agentLabel: '',
maven: 'Maven 3',
jdk: 'Zulu 11',
extraMavenArguments: '',
extraMavenArguments: '-U -Ddkpro.core.testCachePath="${WORKSPACE}/cache/dkpro-core-datasets" -Dmaven.artifact.threads=15',
wipeWorkspaceBeforeBuild: true,
wipeWorkspaceAfterBuild: true
]
Expand Down Expand Up @@ -97,7 +97,7 @@ pipeline {
script {
def mavenCommand = 'mvn ' +
params.extraMavenArguments +
' -B -Dmaven.test.failure.ignore=true clean verify';
' -B -Dmaven.test.failure.ignore=true -T 4 -Pjacoco clean verify javadoc:javadoc';

if (isUnix()) {
sh script: mavenCommand
Expand Down Expand Up @@ -130,7 +130,7 @@ pipeline {
script {
def mavenCommand = 'mvn ' +
params.extraMavenArguments +
' -B -Dmaven.test.failure.ignore=true clean verify'
' -B -Dmaven.test.failure.ignore=true -Pjacoco,full-tests clean verify javadoc:javadoc'

if (isUnix()) {
sh script: mavenCommand
Expand Down
225 changes: 121 additions & 104 deletions inception/inception-bootstrap/src/main/ts_template/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

48 changes: 27 additions & 21 deletions inception/inception-brat-editor/src/main/ts/build.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ const argv = yargs(hideBin(process.argv)).argv
const packagePath = 'de/tudarmstadt/ukp/clarin/webanno/brat/resource'

let outbase = `../../../target/js/${packagePath}`
if (argv.live) {
outbase = `../../../target/classes/${packagePath}`
}

const defaults = {
bundle: true,
Expand All @@ -53,27 +56,30 @@ const defaults = {
]
}

fs.mkdirsSync(`${outbase}`)
fs.emptyDirSync(outbase)

if (argv.live) {
defaults.watch = {
onRebuild (error, result) {
if (error) console.error('watch build failed:', error)
else console.log('watch build succeeded:', result)
}
}
outbase = `../../../target/classes/${packagePath}`
const context1 = await esbuild.context(Object.assign({
entryPoints: ['src/brat.ts'],
outfile: `${outbase}/brat.min.js`,
globalName: 'Brat'
}, defaults))
const context2 = await esbuild.context(Object.assign({
entryPoints: ['src/brat_curation.ts'],
outfile: `${outbase}/brat_curation.min.js`,
globalName: 'BratCuration'
}, defaults))
await Promise.all([context1.watch(), context2.watch()])
} else {
fs.emptyDirSync(outbase)
esbuild.build(Object.assign({
entryPoints: ['src/brat.ts'],
outfile: `${outbase}/brat.min.js`,
globalName: 'Brat'
}, defaults))
esbuild.build(Object.assign({
entryPoints: ['src/brat_curation.ts'],
outfile: `${outbase}/brat_curation.min.js`,
globalName: 'BratCuration'
}, defaults))
}
fs.mkdirsSync(`${outbase}`)

esbuild.build(Object.assign({
entryPoints: ['src/brat.ts'],
outfile: `${outbase}/brat.min.js`,
globalName: 'Brat'
}, defaults))

esbuild.build(Object.assign({
entryPoints: ['src/brat_curation.ts'],
outfile: `${outbase}/brat_curation.min.js`,
globalName: 'BratCuration'
}, defaults))
Loading