From 9881f92a306d1bcf94d251fb88717557b303ed71 Mon Sep 17 00:00:00 2001 From: Roger Leigh Date: Tue, 15 Nov 2016 13:20:07 +0000 Subject: [PATCH 1/5] Require Java 1.8 --- README.md | 2 +- pom.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 4132160b..6dbf562e 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ following before submitting a pull request: * verify that the branch merges cleanly into ```develop``` * verify that the branch compiles with the ```clean jars tools``` Ant targets * verify that the branch compiles using Maven - * verify that the branch does not use syntax or API specific to Java 1.8+ + * verify that the branch does not use syntax or API specific to Java 1.9+ * run the unit tests (```ant test```) and correct any failures * test at least one file in each affected format, using the ```showinf``` command diff --git a/pom.xml b/pom.xml index d29419a3..a39d20b9 100644 --- a/pom.xml +++ b/pom.xml @@ -193,10 +193,10 @@ org.apache.maven.plugins maven-compiler-plugin 3.7.0 - + - 1.7 - 1.7 + 1.8 + 1.8 From 2038f2200714c77be40d4820c4632910166bc09e Mon Sep 17 00:00:00 2001 From: Sebastien Besson Date: Thu, 29 Nov 2018 17:06:41 +0000 Subject: [PATCH 2/5] Additional updates to the top-level README --- README.md | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 6dbf562e..190457c0 100644 --- a/README.md +++ b/README.md @@ -20,18 +20,11 @@ Pull request testing We welcome pull requests from anyone, but ask that you please verify the following before submitting a pull request: - * verify that the branch merges cleanly into ```develop``` - * verify that the branch compiles with the ```clean jars tools``` Ant targets - * verify that the branch compiles using Maven + * verify that the branch merges cleanly into ```master``` + * verify that the branch builds using Maven * verify that the branch does not use syntax or API specific to Java 1.9+ - * run the unit tests (```ant test```) and correct any failures - * test at least one file in each affected format, using the ```showinf``` - command - * internal developers only: [run the data - tests](http://www.openmicroscopy.org/site/support/bio-formats/developers/commit-testing.html) - against directories corresponding to the affected format(s) - * make sure that your commits contain the correct authorship information and, - if necessary, a signed-off-by line + * run the unit tests (```mvn test```) and correct any failures + * make sure that your commits contain the correct authorship information * make sure that the commit messages or pull request comment contains sufficient information for the reviewer(s) to understand what problem was fixed and how to test it From 7c2f8a9b272d5b305dd62a9baf04c7b6de5ef16b Mon Sep 17 00:00:00 2001 From: Sebastien Besson Date: Fri, 30 Nov 2018 13:31:32 +0000 Subject: [PATCH 3/5] Update NEWS.md to cover all recent releases --- NEWS.md | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/NEWS.md b/NEWS.md index 7317e997..a2ae951f 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,40 @@ +6.0.0-m2 (2018-11-30) +--------------------- + +- Add `S3Handle` ([#33](https://github.com/ome/ome-common-java/pull/33)) + * Add `minio` as a dependency + * Add `exists()` method to `IRandomAccess` and all implementations + * Add unit tests and update Travis to start a S3 server and run all tests +- NIOFileHandle: don't read from the file to fill a trash buffer ([#34](https://github.com/ome/ome-common-java/pull/34)) +- Add initial API for downsampling images ([#29](https://github.com/ome/ome-common-java/pull/29)) + * add `IImageScaler` interface + * add `SimpleImageScaler` implementation +- Attempt to check for incorrect length after RandomAccessFile.setLength ([#29](https://github.com/ome/ome-common-java/pull/29)) +- StreamHandle: fix subtle bug when seeking more than 1 MB backward ([#22](https://github.com/ome/ome-common-java/pull/22)) +- Add `skipBytes(long)` method to `IRandomAccess` and all implementations ([#27](https://github.com/ome/ome-common-java/pull/27)) + + +5.3.7 (2018-10-12) +------------------ + +- Reduce memory usage when reading large text files ([#24](https://github.com/ome/ome-common-java/pull/24)) +- `DataTools`: fix bug in scientific notation parsing ([#30](https://github.com/ome/ome-common-java/pull/30)) +- Deprecate `CaseInsensitiveLocation`([#31](https://github.com/ome/ome-common-java/pull/31)) + + +5.3.6 (2018-08-02) +------------------ + +- Fix Javadoc warnings ([#26](https://github.com/ome/ome-common-java/pull/26)) +- Build and Maven updates ([#25](https://github.com/ome/ome-common-java/pull/25), [#28](https://github.com/ome/ome-common-java/pull/28)) + + +5.3.5 (2018-03-05) +------------------ + +- Update Maven plugin versions ([#16](https://github.com/ome/ome-common-java/pull/16)) + + 5.3.4 (2018-01-04) ------------------ From 4a80aeefb736a5e09dcaa1b9a63b091e7bd9eace Mon Sep 17 00:00:00 2001 From: Sebastien Besson Date: Fri, 30 Nov 2018 13:33:11 +0000 Subject: [PATCH 4/5] Update link --- NEWS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index a2ae951f..236385f3 100644 --- a/NEWS.md +++ b/NEWS.md @@ -6,7 +6,7 @@ * Add `exists()` method to `IRandomAccess` and all implementations * Add unit tests and update Travis to start a S3 server and run all tests - NIOFileHandle: don't read from the file to fill a trash buffer ([#34](https://github.com/ome/ome-common-java/pull/34)) -- Add initial API for downsampling images ([#29](https://github.com/ome/ome-common-java/pull/29)) +- Add initial API for downsampling images ([#35](https://github.com/ome/ome-common-java/pull/35)) * add `IImageScaler` interface * add `SimpleImageScaler` implementation - Attempt to check for incorrect length after RandomAccessFile.setLength ([#29](https://github.com/ome/ome-common-java/pull/29)) From 607d9c4065726c0ab887dc6155d7985e365a6648 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Besson?= Date: Fri, 30 Nov 2018 15:05:39 +0000 Subject: [PATCH 5/5] Update JavaSE URL --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a39d20b9..5e3d66ab 100644 --- a/pom.xml +++ b/pom.xml @@ -307,7 +307,7 @@ false - http://docs.oracle.com/javase/7/docs/api/ + http://docs.oracle.com/javase/8/docs/api/