From 0e3b90488377249fbe4d92c9bd3e605587f6224a Mon Sep 17 00:00:00 2001
From: Roger Leigh <rleigh@codelibre.net>
Date: Fri, 2 Mar 2018 22:34:59 +0000
Subject: [PATCH] Package only bioformats_package.jar

Fetch the current versioned jar, and drop the version to
recreate the unversioned jar.
---
 matlab-assembly.xml | 14 +++++++-------
 pom.xml             | 46 ++++++++++++++++++++++++++++-----------------
 2 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/matlab-assembly.xml b/matlab-assembly.xml
index bbed327..4934208 100644
--- a/matlab-assembly.xml
+++ b/matlab-assembly.xml
@@ -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>
diff --git a/pom.xml b/pom.xml
index 13ac313..459915b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 
   <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>
@@ -15,19 +15,6 @@
   <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.
@@ -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>
@@ -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>