You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2019/03/26 17:49:28 UTC
[commons-imaging] branch master updated: Update Apache Commons
Parent from 47 to 48.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-imaging.git
The following commit(s) were added to refs/heads/master by this push:
new 0a310d3 Update Apache Commons Parent from 47 to 48.
0a310d3 is described below
commit 0a310d35804d6871c38aa7a410395ca5c24003da
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Mar 26 13:49:01 2019 -0400
Update Apache Commons Parent from 47 to 48.
---
pom.xml | 17 +++++++----------
.../imaging/formats/jpeg/decoder/JpegDecoderTest.java | 2 +-
...eout-48eb4251935b4ca8b26d1859ea525c1b42ae0c78.jpeg} | Bin
3 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/pom.xml b/pom.xml
index ab167b5..ccd09f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,13 +26,11 @@
<parent>
<groupId>org.apache.commons</groupId>
<artifactId>commons-parent</artifactId>
- <version>47</version>
+ <version>48</version>
</parent>
- <groupId>org.apache.commons</groupId>
<artifactId>commons-imaging</artifactId>
<name>Apache Commons Imaging</name>
-
<version>1.0-SNAPSHOT</version>
<!--
@@ -190,13 +188,12 @@
<artifactId>apache-rat-plugin</artifactId>
<configuration>
<excludes>
- <exclude>src/test/data/images/xpm/1/symbolic.xpm</exclude>
- <exclude>src/test/data/images/xpm/1/Oregon Scientific DS6639 - DSC_0307 - small.xpm</exclude>
- <exclude>src/test/data/images/pbm/2/5x5-grayscale.pam</exclude>
- <exclude>src/test/data/images/pbm/2/5x5-bw.pam</exclude>
- <exclude>src/test/data/images/pbm/1/Oregon Scientific DS6639 - DSC_0307 - small.pgm</exclude>
- <exclude>src/test/data/images/xbm/1/Oregon Scientific DS6639 - DSC_0307 - small.xbm</exclude>
- <exclude>src/test/data/images/xbm/1/Oregon Scientific DS6639 - DSC_0307 - small X10.xbm</exclude>
+ <exclude>src/test/data/**/*.xpm</exclude>
+ <exclude>src/test/data/**/*.pam</exclude>
+ <exclude>src/test/data/**/*.pbm</exclude>
+ <exclude>src/test/data/**/*.pgm</exclude>
+ <exclude>src/test/data/**/*.ppm</exclude>
+ <exclude>src/test/data/**/*.xbm</exclude>
<exclude>src/main/resources/org/apache/commons/imaging/formats/xpm/rgb.txt</exclude>
</excludes>
</configuration>
diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/decoder/JpegDecoderTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/decoder/JpegDecoderTest.java
index 20459a2..e613649 100644
--- a/src/test/java/org/apache/commons/imaging/formats/jpeg/decoder/JpegDecoderTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/decoder/JpegDecoderTest.java
@@ -39,7 +39,7 @@ public class JpegDecoderTest {
public void testDecodeBadFile() throws ImageReadException, IOException {
// From IMAGING-220
File inputFile = new File(
- JpegDecoderTest.class.getResource("/IMAGING-220/timeout-48eb4251935b4ca8b26d1859ea525c1b42ae0c78")
+ JpegDecoderTest.class.getResource("/IMAGING-220/timeout-48eb4251935b4ca8b26d1859ea525c1b42ae0c78.jpeg")
.getFile());
ByteSourceFile byteSourceFile = new ByteSourceFile(inputFile);
new JpegDecoder().decode(byteSourceFile);
diff --git a/src/test/resources/IMAGING-220/timeout-48eb4251935b4ca8b26d1859ea525c1b42ae0c78 b/src/test/resources/IMAGING-220/timeout-48eb4251935b4ca8b26d1859ea525c1b42ae0c78.jpeg
similarity index 100%
rename from src/test/resources/IMAGING-220/timeout-48eb4251935b4ca8b26d1859ea525c1b42ae0c78
rename to src/test/resources/IMAGING-220/timeout-48eb4251935b4ca8b26d1859ea525c1b42ae0c78.jpeg