Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert PR #15 #21

Merged
merged 3 commits into from
Jan 4, 2018
Merged

Revert PR #15 #21

merged 3 commits into from
Jan 4, 2018

Conversation

melissalinkert
Copy link
Member

See #15 and https://trello.com/c/OimiHAQY/5-profile-tiff-writing-on-windows

Merging this should bring master back into a state that is usable by Bio-Formats.

@sbesson
Copy link
Member

sbesson commented Jan 4, 2018

Double checked the impact of the changes in #15 by running mvn against http://github.com/openmicroscopy/bioformats with the following local changes

diff --git a/pom.xml b/pom.xml
index ddc14bf349..3fed6a3e6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,7 @@
     <kryo.version>2.24.0</kryo.version>
     <testng.version>6.8</testng.version>
     <guava.version>17.0</guava.version>
-    <ome-common.version>5.3.2</ome-common.version>
+    <ome-common.version>5.3.3</ome-common.version>
     <ome-model.version>5.5.4</ome-model.version>
     <ome-poi.version>5.3.1</ome-poi.version>
     <ome-mdbtools.version>5.3.0</ome-mdbtools.version>

and verifying the TIFF writing unit tests fail.
Built this PR locally by running mvn locally and running mvn on Bio-Formats with the following additional change:

diff --git a/pom.xml b/pom.xml
index ddc14bf349..3fed6a3e6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,7 @@
     <kryo.version>2.24.0</kryo.version>
     <testng.version>6.8</testng.version>
     <guava.version>17.0</guava.version>
-    <ome-common.version>5.3.3</ome-common.version>
+    <ome-common.version>5.3.4-SNAPSHOT</ome-common.version>
     <ome-model.version>5.5.4</ome-model.version>
     <ome-poi.version>5.3.1</ome-poi.version>
     <ome-mdbtools.version>5.3.0</ome-mdbtools.version>

All unit tests pass as expected. The diff of this repo since v5.3.3 also looks good.

Pushed 409e34c to document these changes in the top-level NEWS file. Once the last commit is approved by @melissalinkert, I will merge and release ome-common 5.3.4.

@melissalinkert
Copy link
Member Author

Last commit looks good to me.

@sbesson sbesson merged commit 85b9e4a into ome:master Jan 4, 2018
@sbesson sbesson added this to the 5.3.4 milestone Jan 4, 2018
@melissalinkert melissalinkert deleted the revert-pr-15 branch July 11, 2018 15:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants