Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

V

VIPSCore
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

4dca4654

Commit 4dca4654 authored 5 years ago by Tor-Einar Skog

Downloads
- Plain Diff

Merge branch 'develop' into 'master'

Develop

See merge request !5

parents 145e58f3 f97e0899

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

Jenkinsfile 24 additions, 0 deletions

Jenkinsfile
nb-configuration.xml 1 addition, 0 deletions

nb-configuration.xml
pom.xml 14 additions, 2 deletions

pom.xml
src/main/java/no/nibio/vips/core/VIPSCoreApplication.java 2 additions, 6 deletions

src/main/java/no/nibio/vips/core/VIPSCoreApplication.java
src/main/java/no/nibio/vips/core/config/JacksonConfig.java 8 additions, 0 deletions

src/main/java/no/nibio/vips/core/config/JacksonConfig.java
src/main/java/no/nibio/vips/core/service/ModelResourceImpl.java 24 additions, 2 deletions

...in/java/no/nibio/vips/core/service/ModelResourceImpl.java
src/main/webapp/WEB-INF/jboss-deployment-structure.xml 1 addition, 0 deletions

src/main/webapp/WEB-INF/jboss-deployment-structure.xml

with 74 additions and 10 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment