| commit | 8eea7a704a6c4ba09ef7b30ab2df21e8eb27d38d | [log] [tgz] |
|---|---|---|
| author | Damjan Jovanovic <damjan@apache.org> | Mon Feb 20 21:02:15 2012 +0000 |
| committer | Damjan Jovanovic <damjan@apache.org> | Mon Feb 20 21:02:15 2012 +0000 |
| tree | 5e40fca6e3a0f61cc206df7863850e48a1d261f3 | |
| parent | 2af2d030a5c2a8f94d438ba0c8b771fb22aceb36 [diff] |
Require maven-assembly-plugin version >= 2.3, because the assembly goal fails with earlier versions due to http://jira.codehaus.org/browse/MASSEMBLY-515 which was caused by http://jira.codehaus.org/browse/PLXCOMP-195 Also some other minor code cleanups. git-svn-id: https://svn.apache.org/repos/asf/commons/proper/sanselan/trunk@1291440 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml index fcaa0fc..73e9caf 100644 --- a/pom.xml +++ b/pom.xml
@@ -79,6 +79,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> + <version>2.3</version> <configuration> <descriptors> <descriptor>src/assemble/bin.xml</descriptor> @@ -116,7 +117,6 @@ <reporting> <plugins> </plugins> - </reporting> <!-- ====================================================================== -->
diff --git a/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcParser.java b/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcParser.java index e9e86b7..e2dce53 100644 --- a/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcParser.java +++ b/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcParser.java
@@ -29,7 +29,6 @@ import org.apache.commons.sanselan.ImageReadException; import org.apache.commons.sanselan.ImageWriteException; import org.apache.commons.sanselan.SanselanConstants; -import org.apache.commons.sanselan.common.BinaryFileFunctions; import org.apache.commons.sanselan.common.BinaryFileParser; import org.apache.commons.sanselan.common.BinaryInputStream; import org.apache.commons.sanselan.common.BinaryOutputStream;
diff --git a/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/TiffDirectoryConstants.java b/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/TiffDirectoryConstants.java index 57403d6..ba90d4d 100644 --- a/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/TiffDirectoryConstants.java +++ b/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/TiffDirectoryConstants.java
@@ -27,7 +27,6 @@ public static final int DIRECTORY_TYPE_SUB2 = 3; public static final int DIRECTORY_TYPE_THUMBNAIL = 2; public static final int DIRECTORY_TYPE_EXIF = -2; - // public static final int DIRECTORY_TYPE_SUB = 5; public static final int DIRECTORY_TYPE_GPS = -3; public static final int DIRECTORY_TYPE_INTEROPERABILITY = -4; public static final int DIRECTORY_TYPE_MAKER_NOTES = -5;