Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to pom-scijava 29 #42

Merged
merged 4 commits into from
Aug 16, 2020
Merged

Upgrade to pom-scijava 29 #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
789f923
Upgrade to pom-scijava 29 #41
ctrueden Jun 6, 2020
a0b9037
README: fix curl command URLs
ctrueden Aug 16, 2020
69d73f5
POM: clean up dependencies
ctrueden Aug 16, 2020
7fbfd74
Add integration tests using cram
ctrueden Aug 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,14 +163,14 @@ Compilation and execution (development)

Lists all object IDs available on imagej-server.

`$ curl localhost:8080/io/objects`
`$ curl localhost:8080/objects`

- __GET__ /objects/*{id}*

Shows the information of an object.

```
$ curl localhost:8080/io/objects/object:1234567890abcdef
$ curl localhost:8080/objects/object:1234567890abcdef
{"class":"net.imagej.DefaultDataset","created_at":"Sun Jan 01 00:00:00 CST 2017"}
```

Expand All @@ -185,7 +185,7 @@ Compilation and execution (development)
Uploads a file to server. A 16-bit lowercase alphanumeric ID prefixed with `object:` will be returned as a JSON string. The ID can be used in module execution to represent the file. Currently only supports uploading images and tables in text. An optional query parameter `type` could be provided as hint to file type. If it is empty, filename would be used for guessing.

```
$ curl -F "file=@src/test/resources/imgs/about4.tif" localhost:8080/objects/
$ curl -F "file=@src/test/resources/imgs/about4.tif" localhost:8080/objects/upload
{"id":"object:0123456789abcdef"}
```

Expand Down
89 changes: 42 additions & 47 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.scijava</groupId>
<artifactId>pom-scijava</artifactId>
<version>26.0.0</version>
<version>29.2.1</version>
<relativePath />
</parent>

Expand Down Expand Up @@ -93,22 +93,21 @@
Wisconsin-Madison.</license.copyrightOwners>
<license.projectName>ImageJ server for RESTful access to ImageJ.</license.projectName>

<dropwizard.version>1.2.0</dropwizard.version>
<jersey-media-multipart.version>2.23.2</jersey-media-multipart.version>
<scifio.version>0.37.5</scifio.version>

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

<repositories>
<repository>
<id>scijava.public</id>
<url>https://maven.scijava.org/content/groups/public</url>
</repository>
</repositories>
<dropwizard.version>2.0.9</dropwizard.version>
<dropwizard-core.version>${dropwizard.version}</dropwizard-core.version>
<dropwizard-testing.version>${dropwizard.version}</dropwizard-testing.version>
<jersey-media-multipart.version>2.31</jersey-media-multipart.version>

<scijava-table.version>0.7.0</scijava-table.version>
<scijava-plugins-io-table.version>0.4.0</scijava-plugins-io-table.version>
<scijava-common.version>2.84.0</scijava-common.version>
</properties>

<dependencies>
<!-- ImageJ dependencies -->
<dependency>
<groupId>net.imagej</groupId>
<artifactId>imagej</artifactId>
Expand All @@ -122,18 +121,38 @@ Wisconsin-Madison.</license.copyrightOwners>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<!--
NB: Conflicts with jakarta.servlet:jakarta.servlet-api which is brought in by
io.dropwizard:dropwizard-core and io.dropwizard:dropwizard-testing.
-->
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</exclusion>
<!--
NB: Conflicts with org.slf4j:log4j-over-slf4j which is brought in by
io.dropwizard:dropwizard-logging via io.dropwizard:dropwizard-core.
-->
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- Dropwizard dependencies -->
<dependency>
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-core</artifactId>
<version>${dropwizard.version}</version>
<version>${dropwizard-core.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-multipart</artifactId>
<version>${jersey-media-multipart.version}</version>
</dependency>

<!-- Test scope dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand All @@ -144,42 +163,18 @@ Wisconsin-Madison.</license.copyrightOwners>
<artifactId>junit-benchmarks</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.imagej</groupId>
<artifactId>imagej-ops</artifactId>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.scijava</groupId>
<artifactId>scijava-common</artifactId>
</dependency>
<dependency>
<groupId>org.scijava</groupId>
<artifactId>scijava-table</artifactId>
</dependency>
<dependency>
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-testing</artifactId>
<exclusions>
<exclusion>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-debug-all</artifactId>
</exclusion>
</exclusions>
<version>${dropwizard-testing.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-testing</artifactId>
<version>${dropwizard.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

<repositories>
<repository>
<id>scijava.public</id>
<url>https://maven.scijava.org/content/groups/public</url>
</repository>
</repositories>
</project>
Loading