Skip to content

Commit 53a7d05

Browse files
committed
Prepare for the next release candidate
1 parent 106bf73 commit 53a7d05

File tree

7 files changed

+118
-44
lines changed

7 files changed

+118
-44
lines changed

CONTRIBUTING.md

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
(the "License"); you may not use this file except in compliance with
77
the License. You may obtain a copy of the License at
88
9-
http://www.apache.org/licenses/LICENSE-2.0
9+
https://www.apache.org/licenses/LICENSE-2.0
1010
1111
Unless required by applicable law or agreed to in writing, software
1212
distributed under the License is distributed on an "AS IS" BASIS,
@@ -41,9 +41,8 @@
4141
Contributing to Apache Commons Imaging
4242
======================
4343

44-
You have found a bug or you have an idea for a cool new feature? Contributing code is a great way to give something back to
45-
the open source community. Before you dig right into the code there are a few guidelines that we need contributors to
46-
follow so that we can have a chance of keeping on top of things.
44+
Have you found a bug or have an idea for a cool new feature? Contributing code is a great way to give something back to the open-source community.
45+
Before you dig right into the code, we need contributors to follow a few guidelines to have a chance of keeping on top of things.
4746

4847
Getting Started
4948
---------------
@@ -62,16 +61,20 @@ Making Changes
6261

6362
+ Create a _topic branch_ for your isolated work.
6463
* Usually you should base your branch from the `master` branch.
65-
* A good topic branch name can be the JIRA bug id plus a keyword, for example, `IMAGING-123-InputStream`.
64+
* A good topic branch name can be the JIRA bug ID plus a keyword, e.g. `IMAGING-123-InputStream`.
6665
* If you have submitted multiple JIRA issues, try to maintain separate branches and pull requests.
6766
+ Make commits of logical units.
6867
* Make sure your commit messages are meaningful and in the proper format. Your commit message should contain the key of the JIRA issue.
69-
* For example, `[IMAGING-123] Close input stream earlier`
68+
* For example, `[IMAGING-123] Close input stream sooner`
7069
+ Respect the original code style:
7170
+ Only use spaces for indentation; you can check for unnecessary whitespace with `git diff` before committing.
7271
+ Create minimal diffs - disable _On Save_ actions like _Reformat Source Code_ or _Organize Imports_. If you feel the source code should be reformatted create a separate PR for this change first.
73-
+ Make sure you have added the necessary tests for your changes, typically in `src/test/java`.
74-
+ Run all the tests with `mvn clean verify` to assure nothing else was accidentally broken.
72+
+ Write unit tests that match behavioral changes, where the tests fail if the changes to the runtime are not applied. This may not always be possible but is a best-practice.
73+
Unit tests are typically in the `src/test/java` directory.
74+
+ Run a successful build using the default [Maven](https://maven.apache.org/) goal with `mvn`; that's `mvn` on the command line by itself.
75+
+ Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
76+
+ Each commit in the pull request should have a meaningful subject line and body. Note that commits might be squashed by a maintainer on merge.
77+
7578

7679
Making Trivial Changes
7780
----------------------

README.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
(the "License"); you may not use this file except in compliance with
77
the License. You may obtain a copy of the License at
88
9-
http://www.apache.org/licenses/LICENSE-2.0
9+
https://www.apache.org/licenses/LICENSE-2.0
1010
1111
Unless required by applicable law or agreed to in writing, software
1212
distributed under the License is distributed on an "AS IS" BASIS,
@@ -45,7 +45,7 @@ Apache Commons Imaging
4545

4646
[![Java CI](https://github.com/apache/commons-imaging/actions/workflows/maven.yml/badge.svg)](https://github.com/apache/commons-imaging/actions/workflows/maven.yml)
4747
[![Maven Central](https://img.shields.io/maven-central/v/org.apache.commons/commons-imaging?label=Maven%20Central)](https://search.maven.org/artifact/org.apache.commons/commons-imaging)
48-
[![Javadocs](https://javadoc.io/badge/org.apache.commons/commons-imaging/1.0.0-alpha5.svg)](https://javadoc.io/doc/org.apache.commons/commons-imaging/1.0.0-alpha5)
48+
[![Javadocs](https://javadoc.io/badge/org.apache.commons/commons-imaging/1.0.0-alpha6.svg)](https://javadoc.io/doc/org.apache.commons/commons-imaging/1.0.0-alpha6)
4949
[![CodeQL](https://github.com/apache/commons-imaging/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/apache/commons-imaging/actions/workflows/codeql-analysis.yml)
5050
[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/apache/commons-imaging/badge)](https://api.securityscorecards.dev/projects/github.com/apache/commons-imaging)
5151

@@ -62,20 +62,20 @@ Getting the latest release
6262
--------------------------
6363
You can download source and binaries from our [download page](https://commons.apache.org/proper/commons-imaging/download_imaging.cgi).
6464

65-
Alternatively, you can pull it from the central Maven repositories:
65+
Alternatively, you can pull it from the central Maven repositories:
6666

6767
```xml
6868
<dependency>
6969
<groupId>org.apache.commons</groupId>
7070
<artifactId>commons-imaging</artifactId>
71-
<version>1.0.0-alpha5</version>
71+
<version>1.0.0-alpha6</version>
7272
</dependency>
7373
```
7474

7575
Building
7676
--------
7777

78-
Building requires a Java JDK and [Apache Maven](https://maven.apache.org/).
78+
Building requires a Java JDK and [Apache Maven](https://maven.apache.org/).
7979
The required Java version is found in the `pom.xml` as the `maven.compiler.source` property.
8080

8181
From a command shell, run `mvn` without arguments to invoke the default Maven goal to run all tests and checks.
@@ -88,7 +88,9 @@ There are some guidelines which will make applying PRs easier for us:
8888
+ No tabs! Please use spaces for indentation.
8989
+ Respect the existing code style for each file.
9090
+ Create minimal diffs - disable on save actions like reformat source code or organize imports. If you feel the source code should be reformatted create a separate PR for this change.
91-
+ Provide JUnit tests for your changes and make sure your changes don't break any existing tests by running ```mvn```.
91+
+ Provide JUnit tests for your changes and make sure your changes don't break any existing tests by running `mvn`.
92+
+ Before you pushing a PR, run `mvn` (by itself), this runs the default goal, which contains all build checks.
93+
+ To see the code coverage report, regardless of coverage failures, run `mvn clean site -Dcommons.jacoco.haltOnFailure=false -Pjacoco`
9294

9395
If you plan to contribute on a regular basis, please consider filing a [contributor license agreement](https://www.apache.org/licenses/#clas).
9496
You can learn more about contributing via GitHub in our [contribution guidelines](CONTRIBUTING.md).

RELEASE-NOTES.txt

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,66 @@
1+
Apache Commons Imaging 1.0.0-alpha6 Release Notes
2+
------------------------------------------------_
3+
4+
The Apache Commons Imaging team is pleased to announce the release of Apache Commons Imaging 1.0.0-alpha6.
5+
6+
Apache Commons Imaging (previously Sanselan) is a pure-Java image library.
7+
8+
The 1.0.0-alpha6 release requires Java 8.
9+
10+
11+
New features
12+
------------
13+
14+
* Add an Imaging-specific security page #439. Thanks to Arnout Engelen.
15+
* Add Maven property commons.taglist.version for debugging. Thanks to Gary Gregory.
16+
* Add support of GPSHPositioningError in GpsTagConstants #451. Thanks to Stefal, Gary Gregory.
17+
* Support Extensions from PNG 1.2 Specification, Version 1.5.0 #269. Thanks to Glavo.
18+
* Optionally force UTF-8 encoding for IPTC records #477. Thanks to Thomas Stieler, Gary Gregory.
19+
* Add Maven PMD check to the default build. Thanks to Gary Gregory.
20+
21+
Fixed Bugs
22+
----------
23+
24+
* Replace Locale.ENGLISH with Locale.ROOT processing file names. Thanks to Gary Gregory.
25+
* Fix PMD UnnecessaryFullyQualifiedName. Thanks to Gary Gregory.
26+
* Fix PMD TooManyStaticImports. Thanks to Gary Gregory.
27+
* Fix PMD UnusedFormalParameter. Thanks to Gary Gregory.
28+
* Fix PMD UnusedLocalVariable. Thanks to Gary Gregory.
29+
* Increase default block size in byte sources from 1024 to 8192 bytes. Thanks to Gary Gregory.
30+
* Remove double ImagingException from method signatures #462. Thanks to Sebastian Schlatow.
31+
* Fix all PMD issues. Thanks to Gary Gregory.
32+
* Fix SpotBugs CT_CONSTRUCTOR_THROW. Thanks to Gary Gregory.
33+
34+
Changes
35+
-------
36+
37+
* Bump org.apache.commons:commons-parent from 69 to 81 #400, #406, #428, #430, #436, #442, #445, #545. Thanks to Dependabot, Gary Gregory.
38+
* Bump org.apache.commons:commons-lang3 from 3.14.0 to 3.17.0 #416, #423, #431. Thanks to Dependabot.
39+
* Bump commons-io:commons-io from 2.16.1 to 2.19.0 #437, #464. Thanks to Dependabot.
40+
* Bump org.codehaus.mojo:taglist-maven-plugin from 3.1.0 to 3.2.1 #453. Thanks to Dependabot.
41+
42+
Removed
43+
-------
44+
45+
* Remove direct dependency on org.hamcrest:hamcrest. Thanks to Dependabot.
46+
* Rename methods BinaryFunctions.findNull() to indexOf0() like String. Thanks to Dependabot.
47+
* Rename method BinaryFunctions.slice() to copyOfRange() like Arrays. Thanks to Dependabot.
48+
* Rename method BinaryFunctions.head() to copyOfStart() like Arrays. Thanks to Dependabot.
49+
* Replace BinaryFunctions.startsWith(byte[], BinaryConstant) with BinaryConstant.isStartOf(byte[]). Thanks to Dependabot.
50+
51+
Historical list of changes: https://commons.apache.org/proper/commons-imaging//changes.html
52+
53+
For complete information on Apache Commons Imaging, including instructions on how to submit bug reports,
54+
patches, or suggestions for improvement, see the Apache Commons Imaging website:
55+
56+
https://commons.apache.org/proper/commons-imaging/
57+
58+
Download page: https://commons.apache.org/proper/commons-imaging//download_imaging.cgi
59+
60+
Have fun!
61+
-Apache Commons Team
62+
63+
-----------------------------------------------------------------------------
164
Apache Commons Imaging 1.0.0-alpha5 Release Notes
265
-------------------------------------------------
366

src/changes/changes.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ The <action> type attribute can be add,update,fix,remove.
4646
<title>Apache Commons Imaging Release Notes</title>
4747
</properties>
4848
<body>
49-
<release version="1.0.0-alpha6" date="YYYY-MM-DD" description="The 1.0.0-alpha6 release requires Java 8.">
49+
<release version="1.0.0-alpha6" date="2025-04-27" description="The 1.0.0-alpha6 release requires Java 8.">
5050
<!-- FIX -->
5151
<action dev="ggregory" type="fix" due-to="Gary Gregory">Replace Locale.ENGLISH with Locale.ROOT processing file names.</action>
5252
<action dev="ggregory" type="fix" due-to="Gary Gregory">Fix PMD UnnecessaryFullyQualifiedName.</action>

src/site/xdoc/download_imaging.xml

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ The ASF licenses this file to You under the Apache License, Version 2.0
77
(the "License"); you may not use this file except in compliance with
88
the License. You may obtain a copy of the License at
99
10-
http://www.apache.org/licenses/LICENSE-2.0
10+
https://www.apache.org/licenses/LICENSE-2.0
1111
1212
Unless required by applicable law or agreed to in writing, software
1313
distributed under the License is distributed on an "AS IS" BASIS,
@@ -56,10 +56,12 @@ limitations under the License.
5656
| |
5757
+======================================================================+
5858
-->
59-
<document>
59+
<document xmlns="http://maven.apache.org/XDOC/2.0"
60+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
61+
xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 https://maven.apache.org/xsd/xdoc-2.0.xsd">
6062
<properties>
6163
<title>Download Apache Commons Imaging</title>
62-
<author email="dev@commons.apache.org">Apache Commons Documentation Team</author>
64+
<author email="dev@commons.apache.org">Apache Commons Team</author>
6365
</properties>
6466
<body>
6567
<section name="Download Apache Commons Imaging">
@@ -79,7 +81,7 @@ limitations under the License.
7981
mirrors (at the end of the mirrors list) that should be
8082
available.
8183
<br></br>
82-
[if-any logo]<a href="[link]"><img align="right" src="[logo]" border="0"></img></a>[end]
84+
[if-any logo]<a href="[link]"><img align="right" src="[logo]" border="0" alt="Logo"></img></a>[end]
8385
</p>
8486

8587
<form action="[location]" method="get" id="SelectMirror">
@@ -113,32 +115,32 @@ limitations under the License.
113115
</p>
114116
</subsection>
115117
</section>
116-
<section name="Apache Commons Imaging 1.0.0-alpha5 ">
118+
<section name="Apache Commons Imaging 1.0.0-alpha6 ">
117119
<subsection name="Binaries">
118120
<table>
119121
<tr>
120-
<td><a href="[preferred]/commons/imaging/binaries/commons-imaging-1.0.0-alpha5-bin.tar.gz">commons-imaging-1.0.0-alpha5-bin.tar.gz</a></td>
121-
<td><a href="https://downloads.apache.org/commons/imaging/binaries/commons-imaging-1.0.0-alpha5-bin.tar.gz.sha512">sha512</a></td>
122-
<td><a href="https://downloads.apache.org/commons/imaging/binaries/commons-imaging-1.0.0-alpha5-bin.tar.gz.asc">pgp</a></td>
122+
<td><a href="[preferred]/commons/imaging/binaries/commons-imaging-1.0.0-alpha6-bin.tar.gz">commons-imaging-1.0.0-alpha6-bin.tar.gz</a></td>
123+
<td><a href="https://downloads.apache.org/commons/imaging/binaries/commons-imaging-1.0.0-alpha6-bin.tar.gz.sha512">sha512</a></td>
124+
<td><a href="https://downloads.apache.org/commons/imaging/binaries/commons-imaging-1.0.0-alpha6-bin.tar.gz.asc">pgp</a></td>
123125
</tr>
124126
<tr>
125-
<td><a href="[preferred]/commons/imaging/binaries/commons-imaging-1.0.0-alpha5-bin.zip">commons-imaging-1.0.0-alpha5-bin.zip</a></td>
126-
<td><a href="https://downloads.apache.org/commons/imaging/binaries/commons-imaging-1.0.0-alpha5-bin.zip.sha512">sha512</a></td>
127-
<td><a href="https://downloads.apache.org/commons/imaging/binaries/commons-imaging-1.0.0-alpha5-bin.zip.asc">pgp</a></td>
127+
<td><a href="[preferred]/commons/imaging/binaries/commons-imaging-1.0.0-alpha6-bin.zip">commons-imaging-1.0.0-alpha6-bin.zip</a></td>
128+
<td><a href="https://downloads.apache.org/commons/imaging/binaries/commons-imaging-1.0.0-alpha6-bin.zip.sha512">sha512</a></td>
129+
<td><a href="https://downloads.apache.org/commons/imaging/binaries/commons-imaging-1.0.0-alpha6-bin.zip.asc">pgp</a></td>
128130
</tr>
129131
</table>
130132
</subsection>
131133
<subsection name="Source">
132134
<table>
133135
<tr>
134-
<td><a href="[preferred]/commons/imaging/source/commons-imaging-1.0.0-alpha5-src.tar.gz">commons-imaging-1.0.0-alpha5-src.tar.gz</a></td>
135-
<td><a href="https://downloads.apache.org/commons/imaging/source/commons-imaging-1.0.0-alpha5-src.tar.gz.sha512">sha512</a></td>
136-
<td><a href="https://downloads.apache.org/commons/imaging/source/commons-imaging-1.0.0-alpha5-src.tar.gz.asc">pgp</a></td>
136+
<td><a href="[preferred]/commons/imaging/source/commons-imaging-1.0.0-alpha6-src.tar.gz">commons-imaging-1.0.0-alpha6-src.tar.gz</a></td>
137+
<td><a href="https://downloads.apache.org/commons/imaging/source/commons-imaging-1.0.0-alpha6-src.tar.gz.sha512">sha512</a></td>
138+
<td><a href="https://downloads.apache.org/commons/imaging/source/commons-imaging-1.0.0-alpha6-src.tar.gz.asc">pgp</a></td>
137139
</tr>
138140
<tr>
139-
<td><a href="[preferred]/commons/imaging/source/commons-imaging-1.0.0-alpha5-src.zip">commons-imaging-1.0.0-alpha5-src.zip</a></td>
140-
<td><a href="https://downloads.apache.org/commons/imaging/source/commons-imaging-1.0.0-alpha5-src.zip.sha512">sha512</a></td>
141-
<td><a href="https://downloads.apache.org/commons/imaging/source/commons-imaging-1.0.0-alpha5-src.zip.asc">pgp</a></td>
141+
<td><a href="[preferred]/commons/imaging/source/commons-imaging-1.0.0-alpha6-src.zip">commons-imaging-1.0.0-alpha6-src.zip</a></td>
142+
<td><a href="https://downloads.apache.org/commons/imaging/source/commons-imaging-1.0.0-alpha6-src.zip.sha512">sha512</a></td>
143+
<td><a href="https://downloads.apache.org/commons/imaging/source/commons-imaging-1.0.0-alpha6-src.zip.asc">pgp</a></td>
142144
</tr>
143145
</table>
144146
</subsection>

src/site/xdoc/issue-tracking.xml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ The ASF licenses this file to You under the Apache License, Version 2.0
77
(the "License"); you may not use this file except in compliance with
88
the License. You may obtain a copy of the License at
99
10-
http://www.apache.org/licenses/LICENSE-2.0
10+
https://www.apache.org/licenses/LICENSE-2.0
1111
1212
Unless required by applicable law or agreed to in writing, software
1313
distributed under the License is distributed on an "AS IS" BASIS,
@@ -41,10 +41,12 @@ limitations under the License.
4141
| |
4242
+======================================================================+
4343
-->
44-
<document>
44+
<document xmlns="http://maven.apache.org/XDOC/2.0"
45+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
46+
xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 https://maven.apache.org/xsd/xdoc-2.0.xsd">
4547
<properties>
4648
<title>Apache Commons Imaging Issue tracking</title>
47-
<author email="dev@commons.apache.org">Apache Commons Documentation Team</author>
49+
<author email="dev@commons.apache.org">Apache Commons Team</author>
4850
</properties>
4951
<body>
5052

@@ -64,6 +66,7 @@ limitations under the License.
6466
<p>
6567
If you would like to report a bug, or raise an enhancement request with
6668
Apache Commons Imaging please do the following:
69+
</p>
6770
<ol>
6871
<li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12313421&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=1&amp;status=3&amp;status=4">Search existing open bugs</a>.
6972
If you find your issue listed then please add a comment with your details.</li>
@@ -73,16 +76,15 @@ limitations under the License.
7376
<li>Submit either a <a href="https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12313421&amp;issuetype=1&amp;priority=4&amp;assignee=-1">bug report</a>
7477
or <a href="https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12313421&amp;issuetype=4&amp;priority=4&amp;assignee=-1">enhancement request</a>.</li>
7578
</ol>
76-
</p>
7779

7880
<p>
7981
Please also remember these points:
82+
</p>
8083
<ul>
8184
<li>the more information you provide, the better we can help you</li>
8285
<li>test cases are vital, particularly for any proposed enhancements</li>
8386
<li>the developers of Apache Commons Imaging are all unpaid volunteers</li>
8487
</ul>
85-
</p>
8688

8789
<p>
8890
For more information on creating patches see the
@@ -91,12 +93,12 @@ limitations under the License.
9193

9294
<p>
9395
You may also find these links useful:
96+
</p>
9497
<ul>
9598
<li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12313421&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=1&amp;status=3&amp;status=4">All Open Apache Commons Imaging bugs</a></li>
9699
<li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12313421&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=5&amp;status=6">All Resolved Apache Commons Imaging bugs</a></li>
97100
<li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12313421&amp;sorter/field=issuekey&amp;sorter/order=DESC">All Apache Commons Imaging bugs</a></li>
98101
</ul>
99-
</p>
100102
</section>
101103
</body>
102104
</document>

0 commit comments

Comments
 (0)