Skip to content

Commit

Permalink
WIP Upgrade to pom-scijava 29 #41
Browse files Browse the repository at this point in the history
- upgrade pom-scijava to 29.2.1
- upgrade dropwizard from 1.2.0 to 2.0.9
- upgrade jersey-media-multipart from 2.23.2 to 2.31
- use jackson version 2.11.2
- delete DefaultTableIOPlugin, use TableIOService instead
- make TableIOPluginTest use new options API for reading and writing
tables
- use BytesHandle instead of ByteArrayHandle
  • Loading branch information
frauzufall committed Aug 13, 2020
1 parent 9d37189 commit 219bcea
Show file tree
Hide file tree
Showing 5 changed files with 191 additions and 493 deletions.
54 changes: 42 additions & 12 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.scijava</groupId>
<artifactId>pom-scijava</artifactId>
<version>29.0.0-beta-2</version>
<version>29.2.1</version>
<relativePath />
</parent>

Expand Down Expand Up @@ -93,11 +93,16 @@
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>
<dropwizard.version>2.0.9</dropwizard.version>
<jackson.version>2.11.2</jackson.version>
<jersey-media-multipart.version>2.31</jersey-media-multipart.version>
<scijava-table.version>0.6.2-frauzufall</scijava-table.version>
<scijava-plugins-io-table.version>0.3.1-frauzufall</scijava-plugins-io-table.version>
<scijava-common.version>2.84.0-frauzufall</scijava-common.version>

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

</properties>

<repositories>
Expand All @@ -121,18 +126,47 @@ 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>
</exclusions>
</dependency>
<dependency>
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-core</artifactId>
<version>${dropwizard.version}</version>
<exclusions>
<!-- <exclusion>-->
<!-- <groupId>jakarta.servlet</groupId>-->
<!-- <artifactId>jakarta.servlet-api</artifactId>-->
<!-- </exclusion>-->
</exclusions>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-multipart</artifactId>
<version>${jersey-media-multipart.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down Expand Up @@ -164,21 +198,17 @@ Wisconsin-Madison.</license.copyrightOwners>
<dependency>
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-testing</artifactId>
<version>${dropwizard.version}</version>
<exclusions>
<exclusion>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-debug-all</artifactId>
</exclusion>
<!-- <exclusion>-->
<!-- <groupId>jakarta.servlet</groupId>-->
<!-- <artifactId>jakarta.servlet-api</artifactId>-->
<!-- </exclusion>-->
</exclusions>
</dependency>
</dependencies>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-testing</artifactId>
<version>${dropwizard.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
</project>
Loading

0 comments on commit 219bcea

Please sign in to comment.