You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by da...@apache.org on 2012/02/20 22:02:15 UTC

svn commit: r1291440 - in /commons/proper/sanselan/trunk: pom.xml src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcParser.java src/main/java/org/apache/commons/sanselan/formats/tiff/constants/TiffDirectoryConstants.java

Author: damjan
Date: Mon Feb 20 21:02:15 2012
New Revision: 1291440

URL: http://svn.apache.org/viewvc?rev=1291440&view=rev
Log:
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.


Modified:
    commons/proper/sanselan/trunk/pom.xml
    commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcParser.java
    commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/TiffDirectoryConstants.java

Modified: commons/proper/sanselan/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/pom.xml?rev=1291440&r1=1291439&r2=1291440&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/pom.xml (original)
+++ commons/proper/sanselan/trunk/pom.xml Mon Feb 20 21:02:15 2012
@@ -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>
 
   <!-- ====================================================================== -->

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcParser.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcParser.java?rev=1291440&r1=1291439&r2=1291440&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcParser.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcParser.java Mon Feb 20 21:02:15 2012
@@ -29,7 +29,6 @@ import java.util.Map;
 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;

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/TiffDirectoryConstants.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/TiffDirectoryConstants.java?rev=1291440&r1=1291439&r2=1291440&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/TiffDirectoryConstants.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/TiffDirectoryConstants.java Mon Feb 20 21:02:15 2012
@@ -27,7 +27,6 @@ public interface TiffDirectoryConstants
     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;