diff --git a/pom.xml b/pom.xml index eeb2a63c8e16b004d2cea4fc8c8c235f6d32da9d..efb938e88a3a894bca7c2d4fc5064b9545d7eb61 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>sc.fiji</groupId> <artifactId>pom-bigdataviewer</artifactId> - <version>1.0.0</version> + <version>1.0.1</version> </parent> <artifactId>bigdataviewer_fiji</artifactId> @@ -37,12 +37,7 @@ <dependency> <groupId>sc.fiji</groupId> <artifactId>SPIM_Registration</artifactId> - <version>2.0.0-SNAPSHOT</version> </dependency> - <!-- The following dependencies are added to deal with old SPIM_Registration - version currently deployed in maven.imagej.net. They will be removed, once - the new spimreconstruction stuff (currently in branch revised-spimdata) is - deployed --> <dependency> <groupId>java3d</groupId> <artifactId>vecmath</artifactId> @@ -78,4 +73,63 @@ <tag>HEAD</tag> <url>https://github.com/tpietzsch/spimviewer</url> </scm> + + <build> + <plugins> + <plugin> + <artifactId>maven-enforcer-plugin</artifactId> + <configuration> + <rules> + <banDuplicateClasses> + <dependencies> + <dependency> + <artifactId>imglib2-algorithm</artifactId> + <ignoreClasses> + <ignoreClass>net/imglib2/algorithm/region/localneighborhood/*</ignoreClass> + </ignoreClasses> + </dependency> + <dependency> + <artifactId>slf4j-log4j12</artifactId> + <ignoreClasses> + <ignoreClass>org/slf4j/impl/*</ignoreClass> + </ignoreClasses> + </dependency> + <dependency> + <artifactId>slf4j-api</artifactId> + <ignoreClasses> + <ignoreClass>org/slf4j/*</ignoreClass> + </ignoreClasses> + </dependency> + <dependency> + <artifactId>jcodings</artifactId> + <ignoreClasses> + <ignoreClass>org/jcodings/*</ignoreClass> + </ignoreClasses> + </dependency> + <dependency> + <artifactId>jnr-constants</artifactId> + <ignoreClasses> + <ignoreClass>com/kenai/constantine/*</ignoreClass> + <ignoreClass>jnr/constants/*</ignoreClass> + </ignoreClasses> + </dependency> + <dependency> + <artifactId>jnr-ffi</artifactId> + <ignoreClasses> + <ignoreClass>jnr/ffi/*</ignoreClass> + </ignoreClasses> + </dependency> + <dependency> + <artifactId>joda-time</artifactId> + <ignoreClasses> + <ignoreClass>*</ignoreClass> + </ignoreClasses> + </dependency> + </dependencies> + </banDuplicateClasses> + </rules> + </configuration> + </plugin> + </plugins> + </build> </project>