Skip to content

Commit

Permalink
Merge branch 'master' of github.com:saalfeldlab/bigwarp
Browse files Browse the repository at this point in the history
  • Loading branch information
bogovicj committed Oct 26, 2017
2 parents 0b77560 + cf8c2b7 commit 4e84fb4
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 17 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
language: java
jdk: oraclejdk8
branches:
only: master
only:
- master
- "/.*-[0-9]+\\..*/"
install: true
script: ".travis/build.sh"
after_success: ".travis/notify.sh Travis-Success"
after_failure: ".travis/notify.sh Travis-Failure"
env:
global:
- secure: ZWYDLUo/634wSyvOvvLl7i1FSs6Md3YVohQ2HyB/pv4fFFj5CQJnEJJKRbYKZKui0mHzdvci8uE6RQU5Lm0L9n0p1AIz59ODRn3V7sAslUOQUapE2PZFxUVE3ByUU1UQbN3r/HsGB4lGuV6TdnEVotk/PfwVWlYdwwMgHoqZdIE2X0RzWbHPsdiE3TtBqe0cHutvGyENKfvyGmOQ7y8zED/UNcG7ZPSvfBhMdqj/wFT+T54NJ2m/PaRJH+DGIScyXBBjzd2oyJbzVVnCP9bwD7iRsnHCpuZJMECCzWiNWx1+7sE+BKPv0+X7WMXmDcv9+15lKBbxtHP8u+jpPbNhC6YNpR0ps/+WqFvIx2jw7vWoIHwOhmoxzJXSPOB0EN8b370dfk+b3xsSrT40lVmIb0mSLDHPqV2n4H+QUJV4y5LE9dOwUqZvXbnkY34fmiMAjsdhnfDim6Hag7UeabjbrMwQKgHZb4ZVsZ8D+mcDcMm+yairHoW0+i7sqxPFnBN+MOZ26CjWvmKFvWCFfq4MUuX50YzEGvG02kFepnnGDbu6VNhKt2r6UnHNA58yLW0SoxrvWdxEss5JBddMiGET5S98BU0u+psPYmNyXibxT5pI9vU4Gaynoq6j1gC3AMBM/0KjAkGdSW+uC/ajSVuwmG8AlmvGiTTULzH2X58R4Yk=
Expand Down
11 changes: 2 additions & 9 deletions .travis/build.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
#!/bin/sh
dir="$(dirname "$0")"
if [ "$TRAVIS_SECURE_ENV_VARS" = true \
-a "$TRAVIS_PULL_REQUEST" = false \
-a "$TRAVIS_BRANCH" = master ]
then
mvn -Pdeploy-to-imagej deploy --settings "$dir/settings.xml"
else
mvn install
fi
curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/master/travis-build.sh
sh travis-build.sh
2 changes: 0 additions & 2 deletions .travis/notify.sh

This file was deleted.

10 changes: 7 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
<parent>
<groupId>org.scijava</groupId>
<artifactId>pom-scijava</artifactId>
<version>16.1.0</version>
<version>17.1.1</version>
<relativePath />
</parent>

<groupId>sc.fiji</groupId>
<artifactId>bigwarp_fiji</artifactId>
<version>3.0.1-SNAPSHOT</version>
<version>3.0.2-SNAPSHOT</version>

<name>BigWarp plugin for Fiji</name>
<description>A tool for manual pointwise deformable registration using bigdataviewer.</description>
Expand Down Expand Up @@ -101,6 +101,11 @@

<ejml.version>0.24</ejml.version>
<jcommander.version>1.48</jcommander.version>

<jitk-tps.version>3.0.0</jitk-tps.version>

<!-- NB: Deploy releases to the ImageJ Maven repository. -->
<releaseProfiles>deploy-to-imagej</releaseProfiles>
</properties>

<repositories>
Expand Down Expand Up @@ -131,7 +136,6 @@
<dependency>
<groupId>jitk</groupId>
<artifactId>jitk-tps</artifactId>
<version>2.1.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.opencsv</groupId>
Expand Down

0 comments on commit 4e84fb4

Please sign in to comment.