From 1e67652b5a3617f4514a6c25190061475b196c4c Mon Sep 17 00:00:00 2001 From: Padraig Gleeson Date: Tue, 3 Oct 2017 11:26:57 +0100 Subject: [PATCH 1/8] Using latest jaxb libs --- pom.xml | 386 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 195 insertions(+), 191 deletions(-) diff --git a/pom.xml b/pom.xml index b1f57e8..ae96b0c 100644 --- a/pom.xml +++ b/pom.xml @@ -1,61 +1,65 @@ - 4.0.0 - org.lemsml.model - org.lemsml.model - 0.0.5 - bundle - - 0.9.0 - UTF-8 - - - - de.twentyeleven.skysail - org.antlr.stringtemplate-osgi - 4.0.2 - - - org.jvnet.jaxb2_commons - jaxb2-basics - 0.9.3 - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + org.lemsml.model + org.lemsml.model + 0.0.5 + bundle + + 0.9.0 + UTF-8 + + + + de.twentyeleven.skysail + org.antlr.stringtemplate-osgi + 4.0.2 + + + + org.jvnet.jaxb2_commons + jaxb2-basics + 1.11.1 + + - - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin - 0.12.3 - - - org.jvnet.jaxb2_commons - jaxb2-fluent-api - 3.0 - - - junit - junit - 4.11 - - - org.lemsml.exprparser - org.lemsml.exprparser - 0.0.5 - - - ch.qos.logback - logback-classic - 1.1.3 - - - com.google.guava - guava - 18.0 - - - org.xmlunit - xmlunit-core - 2.2.1 - + + org.jvnet.jaxb2.maven2 + maven-jaxb2-plugin + 0.13.2 + + + + + org.jvnet.jaxb2_commons + jaxb2-fluent-api + 3.0 + + + junit + junit + 4.11 + + + org.lemsml.exprparser + org.lemsml.exprparser + 0.0.5 + + + ch.qos.logback + logback-classic + 1.1.3 + + + com.google.guava + guava + 18.0 + + + org.xmlunit + xmlunit-core + 2.2.1 + @@ -66,146 +70,146 @@ - + - - - - maven-assembly-plugin - - - jar-with-dependencies - - - - - org.apache.maven.plugins - maven-dependency-plugin - - ${project.build.outputDirectory}/lib - runtime - provided - - - - copy-dependencies - generate-resources - - copy-dependencies - - - - - - org.apache.felix - maven-bundle-plugin - 2.3.7 - true - - src/main/java/META-INF - - jar - bundle - - - ${project.artifactId} - ${project.version} - - - - - true - org.apache.maven.plugins - maven-compiler-plugin - 3.0 - - 1.7 - 1.7 - - - - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin - 0.12.3 - - - LEMSML - - generate - - - 2.2 - true - - -Xinheritance - -XtoString - -Xsimplify - -Xsimplify-usePluralForm=true - -Xvisitor - -Xvisitor-package:org.lemsml.visitors - -Xfluent-api - - src/main/resources/Schemas - - LEMS_v${build.version2}.xjb - - src/main/resources/Schemas - ${project.build.directory}/generated-sources/LEMS - - LEMS_v${build.version2}.xsd - - - + + + + maven-assembly-plugin + + + jar-with-dependencies + + + + + org.apache.maven.plugins + maven-dependency-plugin + + ${project.build.outputDirectory}/lib + runtime + provided + + + + copy-dependencies + generate-resources + + copy-dependencies + + + + + + org.apache.felix + maven-bundle-plugin + 2.3.7 + true + + src/main/java/META-INF + + jar + bundle + + + ${project.artifactId} + ${project.version} + + + + + true + org.apache.maven.plugins + maven-compiler-plugin + 3.0 + + 1.7 + 1.7 + + + + org.jvnet.jaxb2.maven2 + maven-jaxb2-plugin + 0.13.2 + + + LEMSML + + generate + + + 2.2 + true + + -Xinheritance + -XtoString + -Xsimplify + -Xsimplify-usePluralForm=true + -Xvisitor + -Xvisitor-package:org.lemsml.visitors + -Xfluent-api + + src/main/resources/Schemas + + LEMS_v${build.version2}.xjb + + src/main/resources/Schemas + ${project.build.directory}/generated-sources/LEMS + + LEMS_v${build.version2}.xsd + + + com.massfords jaxb-visitor 2.3 - - - org.jvnet.jaxb2_commons - jaxb2-basics - 0.9.3 - - - org.jvnet.jaxb2_commons - jaxb2-fluent-api - 3.0 - - - - - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.apache.maven.plugins - maven-dependency-plugin - [2.0,) - - copy-dependencies - - - - - - - - - - - - - + + + org.jvnet.jaxb2_commons + jaxb2-basics + 1.11.1 + + + org.jvnet.jaxb2_commons + jaxb2-fluent-api + 3.0 + + + + + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.apache.maven.plugins + maven-dependency-plugin + [2.0,) + + copy-dependencies + + + + + + + + + + + + + From f3253877819d8852a41eaeebee3bc866fa0777aa Mon Sep 17 00:00:00 2001 From: Padraig Gleeson Date: Tue, 3 Oct 2017 18:57:39 +0100 Subject: [PATCH 2/8] Back to usual versions of jaxb --- pom.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index ae96b0c..43c4d46 100644 --- a/pom.xml +++ b/pom.xml @@ -15,20 +15,20 @@ org.antlr.stringtemplate-osgi 4.0.2 - + org.jvnet.jaxb2_commons jaxb2-basics - 1.11.1 + 0.9.3 - - + + org.jvnet.jaxb2.maven2 maven-jaxb2-plugin - 0.13.2 + 0.12.3 - + org.jvnet.jaxb2_commons @@ -132,7 +132,7 @@ org.jvnet.jaxb2.maven2 maven-jaxb2-plugin - 0.13.2 + 0.12.3 LEMSML @@ -169,7 +169,7 @@ org.jvnet.jaxb2_commons jaxb2-basics - 1.11.1 + 0.9.3 org.jvnet.jaxb2_commons From 5ce321e35d2e290f6d92207a54fbafc6e87a4646 Mon Sep 17 00:00:00 2001 From: Padraig Gleeson Date: Mon, 30 Oct 2017 14:23:43 +0000 Subject: [PATCH 3/8] Remove temp files --- .../java/org/lemsml/model/compiler/parser/XMLUtils.java | 8 ++++++-- .../java/org/lemsml/model/test/HindmarshRoseTest.java | 3 ++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/lemsml/model/compiler/parser/XMLUtils.java b/src/main/java/org/lemsml/model/compiler/parser/XMLUtils.java index 09c4962..881a3fc 100644 --- a/src/main/java/org/lemsml/model/compiler/parser/XMLUtils.java +++ b/src/main/java/org/lemsml/model/compiler/parser/XMLUtils.java @@ -59,13 +59,17 @@ public static boolean validate(File document, File schema) { * @param transformation * @return */ - public static File transform(File document, File transformation) { + public static File transform(File document, File transformation) throws IOException { logger.info("Applying XSLT " + transformation.getName() + " to file " + document.getName() + "... "); String orig_name = document.getPath(); + String transf_name = orig_name.substring(0, orig_name.lastIndexOf('.')) + "_transformed.xml"; - File outputFile = new File(transf_name); + + File outputFile = File.createTempFile(transf_name, ".tmp"); + outputFile.deleteOnExit(); + TransformerFactory factory = TransformerFactory.newInstance(); Source xslt = new StreamSource(transformation); Transformer transformer; diff --git a/src/test/java/org/lemsml/model/test/HindmarshRoseTest.java b/src/test/java/org/lemsml/model/test/HindmarshRoseTest.java index fdcb4d7..f944aa7 100644 --- a/src/test/java/org/lemsml/model/test/HindmarshRoseTest.java +++ b/src/test/java/org/lemsml/model/test/HindmarshRoseTest.java @@ -20,6 +20,7 @@ import ch.qos.logback.classic.Level; import ch.qos.logback.classic.Logger; +import java.io.IOException; /** * @author borismarin @@ -55,7 +56,7 @@ public void validateSimulation() { } @Test - public void testCanonicalize() { + public void testCanonicalize() throws IOException { File xslt = getLocalFile("/Schemas/canonical.xslt"); logger.info("Asserting that a noncanonical file fails to validate..."); assertFalse(XMLUtils.validate(nonCanonHindMarshRoseSimFile, From f7d5a07963255e26610917dca42db7bf0329882a Mon Sep 17 00:00:00 2001 From: Padraig Gleeson Date: Thu, 16 Aug 2018 13:40:04 +0100 Subject: [PATCH 4/8] Update .travis.yml --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 69e4b89..3832bf2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,4 @@ -dist: precise - +dist: trusty sudo: false language: java @@ -8,11 +7,12 @@ before_install: # Temp workaround to remove old references to codehaus repos - rm ~/.m2/settings.xml + jdk: - # - openjdk6 - #### - openjdk7 temp... - - oraclejdk7 + - openjdk7 + - openjdk8 - oraclejdk8 + - oraclejdk9 install: From fdfc41f09c3d8918f0615c593dc4fdd17282a6b1 Mon Sep 17 00:00:00 2001 From: Padraig Gleeson Date: Thu, 16 Aug 2018 13:46:32 +0100 Subject: [PATCH 5/8] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3832bf2..b5810c6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ jdk: - openjdk7 - openjdk8 - oraclejdk8 - - oraclejdk9 + # - oraclejdk9 # error with com/sun/codemodel/CodeWriter install: From ca3b55a9041504f15e83ac38af65cddb2da8573a Mon Sep 17 00:00:00 2001 From: Padraig Gleeson Date: Tue, 26 Jan 2021 14:50:11 +0000 Subject: [PATCH 6/8] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e7667c9..01ccdf1 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Build Status](https://travis-ci.org/LEMS/org.lemsml.model.svg?branch=master)](https://travis-ci.org/LEMS/org.lemsml.model) +[![Build Status](https://travis-ci.com/LEMS/org.lemsml.model.svg?branch=master)](https://travis-ci.com/LEMS/org.lemsml.model) org.lemsml.model ================ From 3b9625a82f18cf855e926ab4ffe137fbcd783a5b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 26 Jan 2021 14:50:37 +0000 Subject: [PATCH 7/8] Bump junit from 4.11 to 4.13.1 Bumps [junit](https://github.com/junit-team/junit4) from 4.11 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.11.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.11...r4.13.1) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 43c4d46..5b8c303 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ junit junit - 4.11 + 4.13.1 org.lemsml.exprparser From 030dc6030bed8785bd33b06c949b97d79b9abc0d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Jun 2021 17:01:14 +0000 Subject: [PATCH 8/8] Bump logback-classic from 1.1.3 to 1.2.0 Bumps logback-classic from 1.1.3 to 1.2.0. --- updated-dependencies: - dependency-name: ch.qos.logback:logback-classic dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5b8c303..bc10509 100644 --- a/pom.xml +++ b/pom.xml @@ -48,7 +48,7 @@ ch.qos.logback logback-classic - 1.1.3 + 1.2.0 com.google.guava