Skip to content
This repository was archived by the owner on Jan 11, 2022. It is now read-only.

Package only bioformats_package.jar #2

Merged
joshmoore merged 1 commit into from
Mar 23, 2018
Merged

Package only bioformats_package.jar #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions matlab-assembly.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<dependencySets>
<dependencySet>
<outputDirectory>bio-formats-matlab-${project.version}/jar</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<scope>runtime</scope>
</dependencySet>
</dependencySets>
<fileSets>
<fileSet>
<directory>target/package-jars</directory>
<outputDirectory>bio-formats-matlab-${project.version}</outputDirectory>
<includes>
<include>*.jar</include>
</includes>
</fileSet>
<fileSet>
<directory>src</directory>
<outputDirectory>bio-formats-matlab-${project.version}</outputDirectory>
Expand Down
46 changes: 29 additions & 17 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,27 +7,14 @@

<groupId>ome</groupId>
<artifactId>bio-formats-matlab</artifactId>
<version>5.7.4-SNAPSHOT</version>
<version>5.8.1-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Bio-Formats bundle collection</name>
<description>Create matlab of Bio-Formats jars and tools for distribution.</description>
<url>https://www.openmicroscopy.org/bio-formats</url>
<inceptionYear>2005</inceptionYear>

<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>bio-formats_plugins</artifactId>
<version>${bio-formats_plugins.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>bio-formats-tools</artifactId>
<version>${bio-formats-tools.version}</version>
</dependency>
</dependencies>

<properties>
<!-- If two artifacts on the classpath use two different versions of the
same dependency, behavior is inconsistent at best, and often broken.
Expand All @@ -39,9 +26,8 @@
<date>${maven.build.timestamp}</date>
<year>2018</year>
<project.rootdir>${basedir}</project.rootdir>
<bioformats.version>5.7.3</bioformats.version>
<bio-formats_plugins.version>${bioformats.version}</bio-formats_plugins.version>
<bio-formats-tools.version>${bioformats.version}</bio-formats-tools.version>
<bioformats.version>5.8.1-SNAPSHOT</bioformats.version>
<bio-formats_package.version>${bioformats.version}</bio-formats_package.version>
<imagej1.version>1.48s</imagej1.version>
<log4j.version>1.2.17</log4j.version>
<slf4j.version>1.7.6</slf4j.version>
Expand Down Expand Up @@ -147,6 +133,32 @@
<version>2.5</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>unpack-ome-xml</id>
<phase>generate-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>bioformats_package</artifactId>
<version>${bio-formats_package.version}</version>
<type>jar</type>
<outputDirectory>${project.build.directory}/package-jars</outputDirectory>
<destFileName>bioformats_package.jar</destFileName>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.1.0</version>
Expand Down