Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions .github/workflows/ant.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ jobs:
build:
strategy:
matrix:
java: [8, 11, 17]
java: [11, 17, 21, 25]
os: [ubuntu-latest, windows-latest]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
java-version: ${{ matrix.java }}
distribution: 'zulu'
Expand All @@ -23,8 +23,8 @@ jobs:
ant docs
- name: Upload artifacts
# upload just one set of artifacts for easier PR review
if: matrix.os == 'ubuntu-latest' && matrix.java == '8'
uses: actions/upload-artifact@v4
if: matrix.os == 'ubuntu-latest' && matrix.java == '21'
uses: actions/upload-artifact@v7
with:
path: artifacts/
retention-days: 30
18 changes: 9 additions & 9 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
build:
strategy:
matrix:
java: [8, 11, 17]
java: [11, 17, 21, 25]
os: [ubuntu-latest, windows-latest, macos-latest]
include:
- java: '21'
Expand All @@ -22,9 +22,9 @@ jobs:
env:
maven_commands: install # default is install
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
java-version: ${{ matrix.java }}
distribution: 'zulu'
Expand All @@ -36,7 +36,7 @@ jobs:
needs: build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: Retrieve version
id: get_version
run: |
Expand All @@ -51,9 +51,9 @@ jobs:
echo server='ome.releases' >> $GITHUB_OUTPUT
fi
- name: Set up Repository
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
java-version: 8
java-version: 21
distribution: 'zulu'
server-id: ${{ steps.set_server.outputs.server }}
server-username: MAVEN_USERNAME
Expand All @@ -69,7 +69,7 @@ jobs:
needs: build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: Retrieve version
id: get_version
run: |
Expand All @@ -84,9 +84,9 @@ jobs:
echo server='ome.releases' >> $GITHUB_OUTPUT
fi
- name: Set up Repository
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
java-version: 8
java-version: 21
distribution: 'zulu'
server-id: ${{ steps.set_server.outputs.server }}
server-username: MAVEN_USERNAME
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ jobs:
name: Release artifacts
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: Set up JDK
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
java-version: 8
java-version: 21
distribution: 'zulu'
- name: Build artifacts
run: |
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,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 > 11
* run the unit tests (```ant test```) and correct any failures
* test at least one file in each affected format, using the ```showinf```
command
Expand Down
4 changes: 2 additions & 2 deletions ant/java.xml
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ your FindBugs installation's lib directory. E.g.:
<fileset dir="${utils.dir}" includes="**/*.class"/>
</delete>
<javac debug="true" includeantruntime="false" fork="true"
deprecation="true" source="1.8" target="1.8"
deprecation="true" source="11" target="11"
encoding="UTF-8"
srcdir="${utils.dir}" includes="**/*.java"
classpath="${artifact.dir}/${component.jar}">
Expand All @@ -293,7 +293,7 @@ your FindBugs installation's lib directory. E.g.:
<classpath refid="runtime.classpath"/>
<doctitle><![CDATA[<h1>Bio-Formats</h1>]]></doctitle>
<bottom><![CDATA[${copyright.begin} ${YEAR} ${copyright.end}]]></bottom>
<link href="http://docs.oracle.com/javase/8/docs/api/"/>
<link href="https://docs.oracle.com/en/java/javase/11/docs/api/"/>
<link href="https://imagej.net/developer/api/"
offline="true" packagelistLoc="${root.dir}/ant/package-list"/>
</javadoc>
Expand Down
2 changes: 1 addition & 1 deletion components/bio-formats-plugins/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
component.name = bio-formats_plugins
component.jar = bio-formats_plugins.jar
component.version = ${release.version}
component.java-version = 1.8
component.java-version = 11
component.deprecation = true

component.resources-bin =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,9 @@ public static void checkLibrary(String className,

/** Checks for a new enough version of the Java Runtime Environment. */
public static boolean checkJava() {
if (!IJ.isJava18()) {
if (IJ.javaVersion() < 11) {
IJ.error("Bio-Formats Plugins",
"Sorry, the Bio-Formats plugins require Java 1.8 or later.");
"Sorry, the Bio-Formats plugins require Java 11 or later.");
return false;
}
return true;
Expand Down
2 changes: 1 addition & 1 deletion components/bio-formats-tools/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
component.name = bio-formats-tools
component.jar = bio-formats-tools.jar
component.version = ${release.version}
component.java-version = 1.8
component.java-version = 11
component.deprecation = true

component.resources-bin =
Expand Down
2 changes: 1 addition & 1 deletion components/bundles/bioformats_package/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Type "ant -p" for a list of targets.
<classpath refid="runtime.classpath"/>
<doctitle><![CDATA[<h1>Bio-Formats</h1>]]></doctitle>
<bottom><![CDATA[${copyright.begin} ${YEAR} ${copyright.end}]]></bottom>
<link href="http://docs.oracle.com/javase/8/docs/api/"/>
<link href="https://docs.oracle.com/en/java/javase/11/docs/api/"/>
<link href="https://imagej.net/developer/api/"
offline="true" packagelistLoc="${root.dir}/ant/package-list"/>
</javadoc>
Expand Down
2 changes: 1 addition & 1 deletion components/forks/turbojpeg/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
component.name = turbojpeg
component.jar = turbojpeg.jar
component.version = 1.2.1
component.java-version = 1.8
component.java-version = 11
component.deprecation = true

component.resources-bin =
Expand Down
2 changes: 1 addition & 1 deletion components/formats-api/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
component.name = formats-api
component.jar = formats-api.jar
component.version = ${release.version}
component.java-version = 1.8
component.java-version = 11
component.deprecation = true

component.resources-bin =
Expand Down
2 changes: 1 addition & 1 deletion components/formats-bsd/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
component.name = formats-bsd
component.jar = formats-bsd.jar
component.version = ${release.version}
component.java-version = 1.8
component.java-version = 11
component.deprecation = true

component.resources-bin = loci/formats/bio-formats-logo.png \
Expand Down
2 changes: 1 addition & 1 deletion components/formats-gpl/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
component.name = formats-gpl
component.jar = formats-gpl.jar
component.version = ${release.version}
component.java-version = 1.8
component.java-version = 11
component.deprecation = true

component.resources-bin = loci/formats/bio-formats-logo.png \
Expand Down
2 changes: 1 addition & 1 deletion components/test-suite/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
component.name = bio-formats-testing-framework
component.jar = bio-formats-testing-framework.jar
component.version = 1.0.0
component.java-version = 1.8
component.java-version = 11
component.deprecation = true

component.resources-bin =
Expand Down
6 changes: 3 additions & 3 deletions config/BFSourceFormat.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
<setting id="org.eclipse.jdt.core.compiler.source" value="1.8"/>
<setting id="org.eclipse.jdt.core.compiler.source" value="11"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="false"/>
Expand Down Expand Up @@ -164,7 +164,7 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.8"/>
<setting id="org.eclipse.jdt.core.compiler.compliance" value="11"/>
<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
Expand Down Expand Up @@ -237,7 +237,7 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="do not insert"/>
<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.8"/>
<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="11"/>
<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member" value="insert"/>
Expand Down
14 changes: 7 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<sqlite.version>3.49.1.0</sqlite.version>

<!-- Maven plugin versions -->
<maven-javadoc-plugin.version>3.0.1</maven-javadoc-plugin.version>
<maven-javadoc-plugin.version>3.12.0</maven-javadoc-plugin.version>

<!-- NB: Avoid platform encoding warning when copying resources. -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down Expand Up @@ -211,11 +211,11 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.14.0</version>
<!-- Require the Java 8 platform. -->
<!-- Require the Java 11 platform. -->
<configuration>
<source>8</source>
<target>8</target>
<release>8</release>
<source>11</source>
<target>11</target>
<release>11</release>
</configuration>
</plugin>

Expand Down Expand Up @@ -278,8 +278,8 @@
http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=5101868 -->
<use>false</use>
<links>
<!-- Java 8 -->
<link>http://docs.oracle.com/javase/8/docs/api/</link>
<!-- Java 11 -->
<link>https://docs.oracle.com/en/java/javase/11/docs/api/</link>

<!-- ImageJ1 -->
<link>http://jenkins.imagej.net/job/ImageJ1-javadoc/javadoc/</link>
Expand Down
Loading