Skip to content

Commit

Permalink
Merge pull request #9 from NeuroML/development
Browse files Browse the repository at this point in the history
NeuroML 2.2 release
  • Loading branch information
pgleeson authored Dec 16, 2021
2 parents b144c2a + c65643c commit b6fa28e
Show file tree
Hide file tree
Showing 8 changed files with 55 additions and 81 deletions.
31 changes: 0 additions & 31 deletions .classpath

This file was deleted.

35 changes: 35 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# 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, osb* ]
pull_request:
branches: [ master, development, experimental, osb* ]

jobs:
build_and_test:

runs-on: ${{ matrix.runs-on }}
strategy:
fail-fast: false
matrix:
java: [ '8', '11', '16', '17' ]
runs-on: [ubuntu-latest, macos-11, windows-latest]

name: Test on Java ${{ matrix.Java }} on ${{ matrix.runs-on }}
steps:
- uses: actions/checkout@v2
- name: Set up JDK ${{ matrix.Java }}
uses: actions/setup-java@v2
with:
java-version: ${{ matrix.Java }}
distribution: 'temurin'
- name: Test with Maven
run: mvn install
- name: Further tests
run: |
pwd
mvn dependency:tree
29 changes: 0 additions & 29 deletions .project

This file was deleted.

5 changes: 0 additions & 5 deletions .settings/org.eclipse.jdt.core.prefs

This file was deleted.

4 changes: 0 additions & 4 deletions .settings/org.eclipse.m2e.core.prefs

This file was deleted.

3 changes: 0 additions & 3 deletions .settings/org.eclipse.wst.common.project.facet.core.xml

This file was deleted.

3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
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)
[![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.
Expand Down
26 changes: 18 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,28 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.neuroml.model.injectingplugin</groupId>
<artifactId>org.neuroml.model.injectingplugin</artifactId>
<version>1.7.2</version>
<version>1.8.1</version>
<packaging>bundle</packaging>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<version.org.jvnet.jaxb2_commons>0.12.0</version.org.jvnet.jaxb2_commons>
<version.org.jvnet.jaxb2.maven2>0.14.0</version.org.jvnet.jaxb2.maven2>
<!--<version.org.jvnet.jaxb2.maven2>0.14.0</version.org.jvnet.jaxb2.maven2>-->

<!-- These versions will work with Geppetto
<version.org.jvnet.jaxb2_commons>0.9.3</version.org.jvnet.jaxb2_commons>
<version.org.jvnet.jaxb2.maven2>0.12.3</version.org.jvnet.jaxb2.maven2>
-->
</properties>

<!--
<profiles>
<profile>
<id>geppetto-env-variable-set</id>
<activation>
<property>
<name>geppetto</name> <!-- Activate this using env var: mvn install -Dgeppetto (this is required so all dependencies will have env variable set)-->
<name>geppetto</name> <!- Activate this using env var: mvn install -Dgeppetto (this is required so all dependencies will have env variable set) ->
</property>
</activation>
Expand All @@ -32,19 +33,28 @@
<version.org.jvnet.jaxb2.maven2>0.12.3</version.org.jvnet.jaxb2.maven2>
</properties>
</profile>
</profiles>
</profiles>-->

<dependencies>
<dependency>
<groupId>org.jvnet.jaxb2_commons</groupId>
<artifactId>jaxb2-basics</artifactId>
<version>${version.org.jvnet.jaxb2_commons}</version>
<exclusions>
<exclusion>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-xjc</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin</artifactId>
<version>${version.org.jvnet.jaxb2.maven2}</version>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-ri</artifactId>
<version>2.3.5</version>
<type>pom</type>
</dependency>

</dependencies>


Expand Down Expand Up @@ -81,7 +91,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>2.3.7</version>
<version>5.1.2</version>
<extensions>true</extensions>
<configuration>
<manifestLocation>src/main/java/META-INF</manifestLocation>
Expand Down

0 comments on commit b6fa28e

Please sign in to comment.