Skip to content

Commit

Permalink
update maven pom files to use org.scijava:pom-scijava parent and bump…
Browse files Browse the repository at this point in the history 
… render version to 2.3.0
  • Loading branch information
@trautmane
trautmane committed Aug 8, 2020
1 parent f4e3f86 commit b69d548
Show file tree
Hide file tree
Showing 7 changed files with 354 additions and 131 deletions.
23 changes: 21 additions & 2 deletions docs/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@
<parent>
<artifactId>modules-root</artifactId>
<groupId>org.janelia.render</groupId>
<version>2.1.1-SNAPSHOT</version>
<version>2.3.0</version>
</parent>

<name>Render Documents</name>
<description>Render Toolkit documentation.</description>
<artifactId>docs</artifactId>

<build>
Expand Down Expand Up @@ -39,7 +40,6 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava-version}</version>
</dependency>

<dependency>
Expand All @@ -50,4 +50,23 @@

</dependencies>

<!--
Administrative elements required by org.scijava.maven.plugin.enforcer.RequireElements
that have to be copied. Too bad they can't just be taken from parent pom.
-->
<url>https://github.com/saalfeldlab/render</url>
<inceptionYear>2014</inceptionYear>
<organization><name>see parent</name></organization>
<licenses><license><name>see parent</name></license></licenses>
<developers><developer><name>see parent</name></developer></developers>
<contributors><contributor><name>see parent</name></contributor></contributors>
<mailingLists><mailingList><name>None</name></mailingList></mailingLists>
<scm><tag>see parent</tag></scm>
<issueManagement><system>see parent</system></issueManagement>
<ciManagement><system>see parent</system></ciManagement>
<properties>
<license.licenseName>gpl_v2</license.licenseName>
<license.copyrightOwners>Howard Hughes Medical Institute</license.copyrightOwners>
</properties>

</project>
186 changes: 124 additions & 62 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,94 @@

<modelVersion>4.0.0</modelVersion>

<name>Janelia Rendering Utilities</name>
<parent>
<groupId>org.scijava</groupId>
<artifactId>pom-scijava</artifactId>
<version>29.2.1</version>
<relativePath />
</parent>

<name>Janelia Render Tools And Services</name>
<groupId>org.janelia.render</groupId>
<artifactId>modules-root</artifactId>
<version>2.1.1-SNAPSHOT</version>
<version>2.3.0</version>

<description>A collection of tools and HTTP services (APIs) for rendering transformed image tiles.</description>
<url>https://github.com/saalfeldlab/render</url>
<inceptionYear>2014</inceptionYear>
<organization>
<name>Janelia Research Campus</name>
<url>https://www.janelia.org/lab/saalfeld-lab</url>
</organization>
<licenses>
<license>
<name>GNU General Public License v2+</name>
<url>https://www.gnu.org/licenses/old-licenses/gpl-2.0.html</url>
<distribution>repo</distribution>
</license>
</licenses>

<developers>
<developer>
<id>axtimwalde</id>
<name>Stephan Saalfeld</name>
<url>https://imagej.net/User:Saalfeld</url>
<roles>
<role>founder</role>
<role>lead</role>
<role>developer</role>
<role>reviewer</role>
</roles>
</developer>
<developer>
<id>trautmane</id>
<name>Eric T. Trautman</name>
<url>https://www.janelia.org/people/eric-trautman</url>
<roles>
<role>lead</role>
<role>developer</role>
<role>debugger</role>
<role>reviewer</role>
<role>support</role>
<role>maintainer</role>
</roles>
</developer>
</developers>

<contributors>
<contributor>
<name>Eric Perlman</name>
<properties><id>perlman</id></properties>
</contributor>
<contributor>
<name>Forrest Collman</name>
<properties><id>fcollman</id></properties>
</contributor>
<contributor>
<name>Russel Torres</name>
<properties><id>RussTorres</id></properties>
</contributor>
</contributors>

<mailingLists>
<mailingList>
<name>None</name>
</mailingList>
</mailingLists>

<scm>
<url>https://github.com/saalfeldlab/render</url>
</scm>

<issueManagement>
<system>GitHub Issues</system>
<url>https://github.com/saalfeldlab/render/issues</url>
</issueManagement>

<ciManagement>
<system>Travis CI</system>
<url>https://travis-ci.org/saalfeldlab/render</url>
</ciManagement>

<packaging>pom</packaging>

Expand All @@ -22,89 +106,55 @@
<repositories>
<!-- NB: for project parent -->
<repository>
<id>imagej.public</id>
<id>scijava.public</id>
<url>https://maven.scijava.org/content/groups/public</url>
</repository>
</repositories>

<dependencyManagement>
<dependencies>

<dependency>
<groupId>net.imagej</groupId>
<artifactId>ij</artifactId>
<version>1.52d</version>
</dependency>

<dependency>
<groupId>net.imglib2</groupId>
<artifactId>imglib2</artifactId>
<version>5.3.0</version>
</dependency>

<dependency>
<groupId>net.imglib2</groupId>
<artifactId>imglib2-realtransform</artifactId>
<version>2.0.0</version>
</dependency>

<dependency>
<groupId>mpicbg</groupId>
<artifactId>mpicbg</artifactId>
<version>1.0.1</version>
</dependency>

<dependency>
<groupId>mpicbg</groupId>
<artifactId>mpicbg_</artifactId>
<version>1.0.1</version>
</dependency>

<dependency>
<groupId>sc.fiji</groupId>
<artifactId>trakem2_tps</artifactId>
<version>1.1.1</version>
</dependency>

<dependency>
<groupId>jitk</groupId>
<artifactId>jitk-tps</artifactId>
<version>1.3.2</version>
</dependency>

<dependency>
<groupId>sc.fiji</groupId>
<artifactId>mpicbg-trakem2</artifactId>
<version>1.2.2</version>
</dependency>
</dependencies>

</dependencyManagement>

<dependencies>

<!-- SciJava Dependencies -->

<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${logback-version}</version>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.5</version>
<scope>test</scope>
</dependency>

<!-- Overridden SciJava Dependencies -->

<!--
Use older version of jackson to keep consistent with
render-ws jackson-jaxrs-json-provider version.
Declaring here to prevent confusing errors when forgetting to
override this in sub-module pom.xml files.
-->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson-version}</version>
</dependency>

</dependencies>

<properties>
<guava-version>19.0</guava-version>
<render-version>2.3.0</render-version>

<!-- NOTE: need old version of jitk-tps before John removed mpicbg dependency -->
<jitk-tps-with-mpicbg.version>1.3.2</jitk-tps-with-mpicbg.version>

<!-- TODO: see if newer 2.11.0 version specified in scijava will work for render-ws -->
<jackson-version>2.6.7</jackson-version>
<logback-version>1.1.2</logback-version>
<render-version>2.1.1-SNAPSHOT</render-version>

<swagger-version>1.5.12</swagger-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<license.licenseName>gpl_v2</license.licenseName>
<license.copyrightOwners>Howard Hughes Medical Institute</license.copyrightOwners>
</properties>

<build>
Expand All @@ -118,6 +168,18 @@
<target>1.8</target>
</configuration>
</plugin>
<!--
Uncomment plugin block below to disable maven-enforcer-plugin rules from scijava.
-->
<!-- <plugin>-->
<!-- <artifactId>maven-enforcer-plugin</artifactId>-->
<!-- <executions>-->
<!-- <execution>-->
<!-- <id>enforce-rules</id>-->
<!-- <phase>none</phase>-->
<!-- </execution>-->
<!-- </executions>-->
<!-- </plugin>-->
</plugins>
</pluginManagement>
</build>
Expand Down

0 comments on commit b69d548

Please sign in to comment.