From d8c7399bd524e34d011a11901f9ce950c8a078ce Mon Sep 17 00:00:00 2001 From: Padraig Gleeson Date: Fri, 26 Mar 2021 11:12:01 +0000 Subject: [PATCH 01/15] Update to v1.8.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d486be6..6eca3a1 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.neuroml.model.injectingplugin org.neuroml.model.injectingplugin - 1.7.2 + 1.8.0 bundle From e808d5c2c9e035d4e1f15a194c766be09e4dd1b3 Mon Sep 17 00:00:00 2001 From: Padraig Gleeson Date: Fri, 26 Mar 2021 11:24:48 +0000 Subject: [PATCH 02/15] Remove IDE files --- .classpath | 31 ------------------- .project | 29 ----------------- .settings/org.eclipse.jdt.core.prefs | 5 --- .settings/org.eclipse.m2e.core.prefs | 4 --- ....eclipse.wst.common.project.facet.core.xml | 3 -- 5 files changed, 72 deletions(-) delete mode 100644 .classpath delete mode 100644 .project delete mode 100644 .settings/org.eclipse.jdt.core.prefs delete mode 100644 .settings/org.eclipse.m2e.core.prefs delete mode 100644 .settings/org.eclipse.wst.common.project.facet.core.xml diff --git a/.classpath b/.classpath deleted file mode 100644 index 8086218..0000000 --- a/.classpath +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.project b/.project deleted file mode 100644 index bc06de0..0000000 --- a/.project +++ /dev/null @@ -1,29 +0,0 @@ - - - org.neuroml.model.injectingplugin - - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - org.eclipse.jdt.core.javanature - org.eclipse.wst.common.project.facet.core.nature - - diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 60105c1..0000000 --- a/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f..0000000 --- a/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index 88ceb05..0000000 --- a/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - From a864d66084bb15aa583edc5a4378d687db54b502 Mon Sep 17 00:00:00 2001 From: Padraig Gleeson Date: Thu, 17 Jun 2021 12:13:05 +0100 Subject: [PATCH 03/15] Add install test --- .github/workflows/ci.yml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..93ee0ee --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,30 @@ +# This workflow will build a Java project with Maven +# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven + +name: Java CI with Maven + +on: + push: + branches: [ master, development, experimental ] + pull_request: + branches: [ master, development, experimental ] + +jobs: + build_and_test: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 11 + uses: actions/setup-java@v2 + with: + java-version: '11' + distribution: 'adopt' + - name: Test with Maven + run: mvn install + - name: Further tests + run: | + pwd + ls -alt + mvn dependency:tree From 76ff7cd95f2ed3703f22bf29bb2512845b4c7e26 Mon Sep 17 00:00:00 2001 From: Padraig Gleeson Date: Thu, 17 Jun 2021 12:19:09 +0100 Subject: [PATCH 04/15] Update ci.yml --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 93ee0ee..0d0daee 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,11 @@ jobs: build_and_test: runs-on: ubuntu-latest + strategy: + matrix: + java: [ '8', '10', '11', '13', '15' ] + name: Test on Java ${{ matrix.Java }} steps: - uses: actions/checkout@v2 - name: Set up JDK 11 From 8fe937be9ffcbcb8d0cd195581921325fd58f4c2 Mon Sep 17 00:00:00 2001 From: Padraig Gleeson Date: Thu, 17 Jun 2021 12:21:09 +0100 Subject: [PATCH 05/15] Update ci.yml --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0d0daee..4e57f6e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,15 +15,15 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: [ '8', '10', '11', '13', '15' ] + java: [ '8', '10', '11', '13', '15' ] name: Test on Java ${{ matrix.Java }} steps: - uses: actions/checkout@v2 - - name: Set up JDK 11 + - name: Set up JDK ${{ matrix.Java }} uses: actions/setup-java@v2 with: - java-version: '11' + java-version: ${{ matrix.Java }} distribution: 'adopt' - name: Test with Maven run: mvn install From e87246b606c43975f48fb03836fb096c3ec173d6 Mon Sep 17 00:00:00 2001 From: "Ankur Sinha (Ankur Sinha Gmail)" Date: Thu, 14 Oct 2021 15:59:17 +0100 Subject: [PATCH 06/15] feat: add gitter chat badge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 2013416..97117b2 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,7 @@ NeuroML JAXB Injecting Plugin [![GitHub issues](https://img.shields.io/github/issues/NeuroML/org.neuroml.model.injectingplugin)](https://github.com/NeuroML/org.neuroml.model.injectingplugin/issues) [![GitHub Org's stars](https://img.shields.io/github/stars/NeuroML?style=social)](https://github.com/NeuroML) [![Twitter Follow](https://img.shields.io/twitter/follow/NeuroML?style=social)](https://twitter.com/NeuroML) +[![Gitter](https://badges.gitter.im/NeuroML/community.svg)](https://gitter.im/NeuroML/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) This Java JAXB plugin is used to inject supplementary code to the NeuroML classes during their generation from the schema. From 5dd914ad4a439475b60e826ef3185e9a8eee1a3f Mon Sep 17 00:00:00 2001 From: Padraig Gleeson Date: Tue, 19 Oct 2021 09:36:32 +0100 Subject: [PATCH 07/15] Update ci.yml --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4e57f6e..e3932a0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,8 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: [ '8', '10', '11', '13', '15' ] + java: [ '8', '11', '13', '15' ] + fail-fast: False name: Test on Java ${{ matrix.Java }} steps: From fdf792dc9f133bbb717bedc8eca1e0cf3249a0e1 Mon Sep 17 00:00:00 2001 From: Padraig Gleeson Date: Tue, 19 Oct 2021 09:55:52 +0100 Subject: [PATCH 08/15] update ci badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 97117b2..2e11107 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ NeuroML JAXB Injecting Plugin ============================= -[![Travis CI](https://travis-ci.com/NeuroML/org.neuroml.model.injectingplugin.svg?branch=master)](https://travis-ci.com/NeuroML/org.neuroml.model.injectingplugin) +[![Java CI with Maven](https://github.com/NeuroML/org.neuroml.model.injectingplugin/actions/workflows/ci.yml/badge.svg)](https://github.com/NeuroML/org.neuroml.model.injectingplugin/actions/workflows/ci.yml) [![GitHub](https://img.shields.io/github/license/NeuroML/org.neuroml.model.injectingplugin)](https://github.com/NeuroML/org.neuroml.model.injectingplugin/blob/master/LICENSE.lesser) [![GitHub pull requests](https://img.shields.io/github/issues-pr/NeuroML/org.neuroml.model.injectingplugin)](https://github.com/NeuroML/org.neuroml.model.injectingplugin/pulls) [![GitHub issues](https://img.shields.io/github/issues/NeuroML/org.neuroml.model.injectingplugin)](https://github.com/NeuroML/org.neuroml.model.injectingplugin/issues) From f4b8b70bd235b31c469f3ee167c8225a1346c923 Mon Sep 17 00:00:00 2001 From: "Ankur Sinha (Ankur Sinha Gmail)" Date: Tue, 19 Oct 2021 14:26:06 +0100 Subject: [PATCH 09/15] ci: move java ci to temurin --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e3932a0..a82d923 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ jobs: uses: actions/setup-java@v2 with: java-version: ${{ matrix.Java }} - distribution: 'adopt' + distribution: 'temurin' - name: Test with Maven run: mvn install - name: Further tests From f0df0cf68461c127ea220a1e52927ef2c518e89f Mon Sep 17 00:00:00 2001 From: "Ankur Sinha (Ankur Sinha Gmail)" Date: Tue, 19 Oct 2021 14:34:35 +0100 Subject: [PATCH 10/15] ci: remove java 13, 15 as they are unsupported --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a82d923..478a8b0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: [ '8', '11', '13', '15' ] + java: [ '8', '11'] fail-fast: False name: Test on Java ${{ matrix.Java }} From f75316fe96a796a57fb69fffbafc6067091a8c53 Mon Sep 17 00:00:00 2001 From: Padraig Gleeson Date: Wed, 10 Nov 2021 12:46:28 +0000 Subject: [PATCH 11/15] Update ci.yml --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 478a8b0..055308c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,9 +5,9 @@ name: Java CI with Maven on: push: - branches: [ master, development, experimental ] + branches: [ master, development, experimental, osb* ] pull_request: - branches: [ master, development, experimental ] + branches: [ master, development, experimental, osb* ] jobs: build_and_test: From 6deef01715c3bce12ae6ba54eb4897af64842d88 Mon Sep 17 00:00:00 2001 From: Padraig Gleeson Date: Tue, 16 Nov 2021 16:09:48 +0000 Subject: [PATCH 12/15] Update ci.yml --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 055308c..9c62f3d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,13 +12,14 @@ on: jobs: build_and_test: - runs-on: ubuntu-latest + runs-on: ${{ matrix.runs-on }} strategy: + fail-fast: false matrix: - java: [ '8', '11'] - fail-fast: False + java: [ '8', '11', '13', '15' ] + runs-on: [ubuntu-latest, macos-11, windows-latest] - name: Test on Java ${{ matrix.Java }} + name: Test on Java ${{ matrix.Java }} on ${{ matrix.runs-on }} steps: - uses: actions/checkout@v2 - name: Set up JDK ${{ matrix.Java }} @@ -31,5 +32,4 @@ jobs: - name: Further tests run: | pwd - ls -alt mvn dependency:tree From 4b43af50702d401f2bc934124171e891b9224f45 Mon Sep 17 00:00:00 2001 From: Padraig Gleeson Date: Tue, 16 Nov 2021 16:12:46 +0000 Subject: [PATCH 13/15] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9c62f3d..59bdf52 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: strategy: fail-fast: false matrix: - java: [ '8', '11', '13', '15' ] + java: [ '8', '11', '16', '17' ] runs-on: [ubuntu-latest, macos-11, windows-latest] name: Test on Java ${{ matrix.Java }} on ${{ matrix.runs-on }} From 5911309462885de1d766f54a9b960cebdd44f9e2 Mon Sep 17 00:00:00 2001 From: Padraig Gleeson Date: Tue, 23 Nov 2021 18:12:58 +0000 Subject: [PATCH 14/15] Use jaxb-ri v2.3.5 --- pom.xml | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 6eca3a1..8ac3f83 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ UTF-8 0.12.0 - 0.14.0 + + + geppetto @@ -32,19 +33,28 @@ 0.12.3 - + --> org.jvnet.jaxb2_commons jaxb2-basics ${version.org.jvnet.jaxb2_commons} + + + com.sun.xml.bind + jaxb-xjc + + + - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin - ${version.org.jvnet.jaxb2.maven2} + com.sun.xml.bind + jaxb-ri + 2.3.5 + pom + @@ -81,7 +91,7 @@ org.apache.felix maven-bundle-plugin - 2.3.7 + 5.1.2 true src/main/java/META-INF From c65643ce699594a4c59d4c6a33963dcc34182933 Mon Sep 17 00:00:00 2001 From: Padraig Gleeson Date: Wed, 15 Dec 2021 12:37:23 +0000 Subject: [PATCH 15/15] To v1.8.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8ac3f83..a97657d 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.neuroml.model.injectingplugin org.neuroml.model.injectingplugin - 1.8.0 + 1.8.1 bundle