diff --git a/CHANGELOG.md b/CHANGELOG.md index 2829d4a8e3..b6aa70766d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -436,7 +436,8 @@ on the right-hand rule when exporting data in Json format Changes so far have been documented in the [hale help](http://hale.igd.fraunhofer.de/2.9.4/help/topic/eu.esdihumboldt.hale.doc.user/html/new/2_9_0.xhtml?cp=2_1_0). -[Unreleased]: https://github.com/halestudio/hale/compare/4.1.0...HEAD +[Unreleased]: https://github.com/halestudio/hale/compare/5.0.0...HEAD +[5.0.0]: https://github.com/halestudio/hale/compare/4.1.0...5.0.0 [4.1.0]: https://github.com/halestudio/hale/compare/4.0.0...4.1.0 [4.0.0]: https://github.com/halestudio/hale/compare/3.5.0...4.0.0 [3.5.0]: https://github.com/halestudio/hale/compare/3.4.1...3.5.0 diff --git a/app/plugins/eu.esdihumboldt.hale.app.cli.commands/META-INF/MANIFEST.MF b/app/plugins/eu.esdihumboldt.hale.app.cli.commands/META-INF/MANIFEST.MF index 3ff7ce9fa8..6771ecde05 100644 --- a/app/plugins/eu.esdihumboldt.hale.app.cli.commands/META-INF/MANIFEST.MF +++ b/app/plugins/eu.esdihumboldt.hale.app.cli.commands/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: hale CLI Default Commands Bundle-SymbolicName: eu.esdihumboldt.hale.app.cli.commands;singleton:=true -Bundle-Version: 5.0.0.qualifier +Bundle-Version: 5.1.0.qualifier Bundle-Vendor: wetransform GmbH Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: eu.esdihumboldt.util.cli;bundle-version="2.9.5", diff --git a/app/plugins/eu.esdihumboldt.hale.app.cli.commands/src/eu/esdihumboldt/hale/app/cli/commands/alignment/ExportJsonCommand.groovy b/app/plugins/eu.esdihumboldt.hale.app.cli.commands/src/eu/esdihumboldt/hale/app/cli/commands/alignment/ExportJsonCommand.groovy index f4a09668a1..4199d17d2a 100644 --- a/app/plugins/eu.esdihumboldt.hale.app.cli.commands/src/eu/esdihumboldt/hale/app/cli/commands/alignment/ExportJsonCommand.groovy +++ b/app/plugins/eu.esdihumboldt.hale.app.cli.commands/src/eu/esdihumboldt/hale/app/cli/commands/alignment/ExportJsonCommand.groovy @@ -22,6 +22,7 @@ import eu.esdihumboldt.hale.common.core.report.ReportHandler import eu.esdihumboldt.hale.common.headless.impl.ProjectTransformationEnvironment import eu.esdihumboldt.hale.io.html.svg.mapping.json.JsonMappingExporter import eu.esdihumboldt.util.cli.CommandContext +import groovy.cli.picocli.OptionAccessor import groovy.transform.CompileStatic /** diff --git a/app/plugins/eu.esdihumboldt.hale.app.cli.commands/src/eu/esdihumboldt/hale/app/cli/commands/alignment/MappingTableCommand.groovy b/app/plugins/eu.esdihumboldt.hale.app.cli.commands/src/eu/esdihumboldt/hale/app/cli/commands/alignment/MappingTableCommand.groovy index 62eef95d88..464b675bfb 100644 --- a/app/plugins/eu.esdihumboldt.hale.app.cli.commands/src/eu/esdihumboldt/hale/app/cli/commands/alignment/MappingTableCommand.groovy +++ b/app/plugins/eu.esdihumboldt.hale.app.cli.commands/src/eu/esdihumboldt/hale/app/cli/commands/alignment/MappingTableCommand.groovy @@ -26,6 +26,7 @@ import eu.esdihumboldt.hale.common.core.report.ReportHandler import eu.esdihumboldt.hale.common.headless.impl.ProjectTransformationEnvironment import eu.esdihumboldt.hale.io.xls.writer.XLSAlignmentMappingWriter import eu.esdihumboldt.util.cli.CommandContext +import groovy.cli.picocli.OptionAccessor import groovy.transform.CompileStatic /** diff --git a/app/plugins/eu.esdihumboldt.hale.app.cli.commands/src/eu/esdihumboldt/hale/app/cli/commands/alignment/SvgDocumentationCommand.groovy b/app/plugins/eu.esdihumboldt.hale.app.cli.commands/src/eu/esdihumboldt/hale/app/cli/commands/alignment/SvgDocumentationCommand.groovy index 99e98a6ee8..a8b2f734a9 100644 --- a/app/plugins/eu.esdihumboldt.hale.app.cli.commands/src/eu/esdihumboldt/hale/app/cli/commands/alignment/SvgDocumentationCommand.groovy +++ b/app/plugins/eu.esdihumboldt.hale.app.cli.commands/src/eu/esdihumboldt/hale/app/cli/commands/alignment/SvgDocumentationCommand.groovy @@ -22,8 +22,8 @@ import eu.esdihumboldt.hale.common.core.report.ReportHandler import eu.esdihumboldt.hale.common.headless.impl.ProjectTransformationEnvironment import eu.esdihumboldt.hale.io.html.svg.mapping.MappingExporter import eu.esdihumboldt.util.cli.CommandContext +import groovy.cli.picocli.OptionAccessor import groovy.transform.CompileStatic - /** * Command that exports HTML+SVG documentation for an alignment. * diff --git a/app/plugins/eu.esdihumboldt.hale.app.cli/META-INF/MANIFEST.MF b/app/plugins/eu.esdihumboldt.hale.app.cli/META-INF/MANIFEST.MF index 60a26fbfdc..2f0b089dd2 100644 --- a/app/plugins/eu.esdihumboldt.hale.app.cli/META-INF/MANIFEST.MF +++ b/app/plugins/eu.esdihumboldt.hale.app.cli/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: hale CLI application Bundle-SymbolicName: eu.esdihumboldt.hale.app.cli;singleton:=true -Bundle-Version: 5.0.0.qualifier +Bundle-Version: 5.1.0.qualifier Bundle-Vendor: wetransform GmbH Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: eu.esdihumboldt.hale.common.core, diff --git a/app/plugins/eu.esdihumboldt.hale.app.transform.test/META-INF/MANIFEST.MF b/app/plugins/eu.esdihumboldt.hale.app.transform.test/META-INF/MANIFEST.MF index da58b15723..79d490fc97 100644 --- a/app/plugins/eu.esdihumboldt.hale.app.transform.test/META-INF/MANIFEST.MF +++ b/app/plugins/eu.esdihumboldt.hale.app.transform.test/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Transformation Application Tests Bundle-SymbolicName: eu.esdihumboldt.hale.app.transform.test -Bundle-Version: 5.0.0.qualifier +Bundle-Version: 5.1.0.qualifier Bundle-Vendor: data harmonisation panel Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: eu.esdihumboldt.hale.app.transform;bundle-version="2.9.0", diff --git a/app/plugins/eu.esdihumboldt.hale.app.transform/META-INF/MANIFEST.MF b/app/plugins/eu.esdihumboldt.hale.app.transform/META-INF/MANIFEST.MF index bc5650b206..de7da91e84 100644 --- a/app/plugins/eu.esdihumboldt.hale.app.transform/META-INF/MANIFEST.MF +++ b/app/plugins/eu.esdihumboldt.hale.app.transform/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Application for command line transformation Bundle-SymbolicName: eu.esdihumboldt.hale.app.transform;singleton:=true -Bundle-Version: 5.0.0.qualifier +Bundle-Version: 5.1.0.qualifier Bundle-Vendor: data harmonisation panel Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0", diff --git a/build/ant/asm-9.4.jar b/build/ant/asm-9.4.jar new file mode 100644 index 0000000000..01cb52ee3a Binary files /dev/null and b/build/ant/asm-9.4.jar differ diff --git a/build/ant/asm-commons-9.4.jar b/build/ant/asm-commons-9.4.jar new file mode 100644 index 0000000000..593621ac9b Binary files /dev/null and b/build/ant/asm-commons-9.4.jar differ diff --git a/build/ant/asm-tree-9.4.jar b/build/ant/asm-tree-9.4.jar new file mode 100644 index 0000000000..c56030525e Binary files /dev/null and b/build/ant/asm-tree-9.4.jar differ diff --git a/build/ant/asm-util-9.4.jar b/build/ant/asm-util-9.4.jar new file mode 100644 index 0000000000..fbe1fcbe0f Binary files /dev/null and b/build/ant/asm-util-9.4.jar differ diff --git a/build/ant/build-msi.xml b/build/ant/build-msi.xml index e7d4a40f7f..aa33cab658 100644 --- a/build/ant/build-msi.xml +++ b/build/ant/build-msi.xml @@ -148,7 +148,7 @@ components which shall be installed --> - -