Skip to content

Commit e473764

Browse files
ctruedenctrueden
authored
Merge pull request #19 from ctrueden/master
Update to latest release of imglib2
2 parents 9cf6431 + dac2b96 commit e473764

File tree

9 files changed

+126
-136
lines changed

9 files changed

+126
-136
lines changed

.travis/build.sh renamed to .github/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/sh
2-
curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/master/travis-build.sh
3-
sh travis-build.sh
2+
curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/main/ci-build.sh
3+
sh ci-build.sh

‎.github/setup.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/sh
2+
curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/main/ci-setup-github-actions.sh
3+
sh ci-setup-github-actions.sh

‎.github/workflows/build-main.yml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: build
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
tags:
8+
- "*-[0-9]+.*"
9+
10+
jobs:
11+
build:
12+
runs-on: ubuntu-latest
13+
14+
steps:
15+
- uses: actions/checkout@v2
16+
- name: Cache local Maven repository
17+
uses: actions/cache@v2
18+
env:
19+
cache-name: cache-m2
20+
with:
21+
path: ~/.m2/repository
22+
key: ${{ runner.os }}-build-${{ env.cache-name }}
23+
restore-keys: |
24+
${{ runner.os }}-build-${{ env.cache-name }}-
25+
${{ runner.os }}-build-
26+
${{ runner.os }}-
27+
- name: Set up Java
28+
uses: actions/setup-java@v2
29+
with:
30+
java-version: '8'
31+
distribution: 'zulu'
32+
- name: Set up CI environment
33+
run: .github/setup.sh
34+
- name: Execute the build
35+
run: .github/build.sh
36+
env:
37+
GPG_KEY_NAME: ${{ secrets.GPG_KEY_NAME }}
38+
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
39+
MAVEN_USER: ${{ secrets.MAVEN_USER }}
40+
MAVEN_PASS: ${{ secrets.MAVEN_PASS }}
41+
OSSRH_PASS: ${{ secrets.OSSRH_PASS }}
42+
SIGNING_ASC: ${{ secrets.SIGNING_ASC }}

‎.github/workflows/build-pr.yml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: build PR
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- master
7+
8+
jobs:
9+
build:
10+
runs-on: ubuntu-latest
11+
12+
steps:
13+
- uses: actions/checkout@v2
14+
- name: Cache local Maven repository
15+
uses: actions/cache@v2
16+
env:
17+
cache-name: cache-m2
18+
with:
19+
path: ~/.m2/repository
20+
key: ${{ runner.os }}-build-${{ env.cache-name }}
21+
restore-keys: |
22+
${{ runner.os }}-build-${{ env.cache-name }}-
23+
${{ runner.os }}-build-
24+
${{ runner.os }}-
25+
- name: Set up Java
26+
uses: actions/setup-java@v2
27+
with:
28+
java-version: '8'
29+
distribution: 'zulu'
30+
- name: Set up CI environment
31+
run: .github/setup.sh
32+
- name: Execute the build
33+
run: .github/build.sh

‎.travis.yml‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎.travis/signingkey.asc.enc‎

-9.41 KB
Binary file not shown.

‎README.md‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
[![](https://travis-ci.com/ClearVolume/imglib2-clearvolume.svg?branch=master)](https://travis-ci.com/ClearVolume/imglib2-clearvolume)
1+
[![](https://github.com/ClearVolume/imglib2-clearvolume/actions/workflows/build-main.yml/badge.svg)](https://github.com/ClearVolume/imglib2-clearvolume/actions/workflows/build-main.yml)
22

33
# ImgLib2 support for ClearVolume
44

5-
[![Build Status](https://travis-ci.org/ClearVolume/imglib2-clearvolume.svg?branch=master)](https://travis-ci.org/ClearVolume/imglib2-clearvolume)
6-
75
This repository contains
86
* all functionalities to bridge from loaded imglib2 image containers to ClearVolume.
97
* a ImageJ2/Fiji plugin that embedds [ClearVolume](http://clearvolume.github.io/) in a usable way.

‎pom.xml‎

Lines changed: 19 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
<parent>
66
<groupId>org.scijava</groupId>
77
<artifactId>pom-scijava</artifactId>
8-
<version>28.0.0</version>
8+
<version>31.1.0</version>
99
<relativePath />
1010
</parent>
1111

1212
<groupId>sc.fiji</groupId>
13-
<artifactId>imglib-clearvolume</artifactId>
14-
<version>1.4.2</version>
13+
<artifactId>imglib2-clearvolume</artifactId>
14+
<version>1.4.3-SNAPSHOT</version>
1515

1616
<name>ClearVolume ImageJ plugins</name>
1717
<description>ClearVolume plugins for ImageJ.</description>
@@ -40,25 +40,30 @@
4040
<developer>
4141
<id>fjug</id>
4242
<name>Florian Jug</name>
43-
<url>https://imagej.net/User:Jug</url>
43+
<url>https://imagej.net/people/fjug</url>
4444
<roles>
4545
<role>founder</role>
4646
<role>lead</role>
47-
<role>developer</role>
48-
<role>debugger</role>
49-
<role>reviewer</role>
50-
<role>support</role>
47+
</roles>
48+
</developer>
49+
<developer>
50+
<id>ctrueden</id>
51+
<name>Curtis Rueden</name>
52+
<url>https://imagej.net/people/ctrueden</url>
53+
<roles>
5154
<role>maintainer</role>
5255
</roles>
5356
</developer>
5457
</developers>
5558
<contributors>
5659
<contributor>
5760
<name>Loic Alain Royer</name>
61+
<url>https://imagej.net/people/royerloic</url>
5862
<properties><id>royerloic</id></properties>
5963
</contributor>
6064
<contributor>
6165
<name>Martin Weigert</name>
66+
<url>https://imagej.net/people/maweigert</url>
6267
<properties><id>maweigert</id></properties>
6368
</contributor>
6469
<contributor>
@@ -67,14 +72,9 @@
6772
</contributor>
6873
<contributor>
6974
<name>Ulrik Guenther</name>
70-
<url>https://imagej.net/User:Skalarproduktraum</url>
75+
<url>https://imagej.net/people/skalarproduktraum</url>
7176
<properties><id>skalarproduktraum</id></properties>
7277
</contributor>
73-
<contributor>
74-
<name>Curtis Rueden</name>
75-
<url>https://imagej.net/User:Rueden</url>
76-
<properties><id>ctrueden</id></properties>
77-
</contributor>
7878
</contributors>
7979

8080
<scm>
@@ -88,8 +88,8 @@
8888
<url>https://github.com/ClearVolume/imglib2-clearvolume/issues</url>
8989
</issueManagement>
9090
<ciManagement>
91-
<system>Travis CI</system>
92-
<url>https://travis-ci.org/ClearVolume/imglib2-clearvolume</url>
91+
<system>GitHub Actions</system>
92+
<url>https://github.com/ClearVolume/imglib2-clearvolume/actions</url>
9393
</ciManagement>
9494

9595
<properties>
@@ -107,16 +107,13 @@ Cell Biology and Genetics.</license.copyrightOwners>
107107
For now, let's ignore this issue, since it may not be safe
108108
to exclude javacl as a whole...
109109
-->
110-
<allowedDuplicateClasses>com.nativelibs4java.opencl.*,com.nativelibs4java.util.*,com.ochafik.util.string.StringUtils,org.bridj.*</allowedDuplicateClasses>
110+
<allowedDuplicateClasses>${scijava.allowedDuplicateClasses},com.nativelibs4java.opencl.*,com.nativelibs4java.util.*,com.ochafik.util.string.StringUtils,org.bridj.*</allowedDuplicateClasses>
111111

112112
<!-- NB: Deploy releases to the SciJava Maven repository. -->
113-
<releaseProfiles>deploy-to-scijava</releaseProfiles>
113+
<releaseProfiles>sign,deploy-to-scijava</releaseProfiles>
114114

115115
<clearcl.version>0.5.2</clearcl.version>
116116
<clearvolume.version>1.4.2</clearvolume.version>
117-
<coremem.version>0.4.6</coremem.version>
118-
119-
<miglayout-swing.version>5.2</miglayout-swing.version>
120117
<orange-extensions.version>1.3.0</orange-extensions.version>
121118
</properties>
122119

@@ -184,7 +181,6 @@ Cell Biology and Genetics.</license.copyrightOwners>
184181
<dependency>
185182
<groupId>net.clearcontrol</groupId>
186183
<artifactId>coremem</artifactId>
187-
<version>${coremem.version}</version>
188184
</dependency>
189185

190186
<!-- Other dependencies -->
@@ -235,12 +231,6 @@ Cell Biology and Genetics.</license.copyrightOwners>
235231
<groupId>net.imagej</groupId>
236232
<artifactId>imagej</artifactId>
237233
<scope>test</scope>
238-
<exclusions>
239-
<exclusion>
240-
<groupId>com.miglayout</groupId>
241-
<artifactId>miglayout</artifactId>
242-
</exclusion>
243-
</exclusions>
244234
</dependency>
245235
</dependencies>
246236

@@ -253,7 +243,7 @@ Cell Biology and Genetics.</license.copyrightOwners>
253243
</properties>
254244
</profile>
255245
</profiles>
256-
246+
257247
<build>
258248
<plugins>
259249
<plugin>

0 commit comments

Comments
 (0)