Author: taylor
Date: Tue May 3 04:29:12 2016
New Revision: 1742059
URL: http://svn.apache.org/viewvc?rev=1742059&view=rev
Log:
JS2-1334: changing logic in unpack resources to respect overwrite flag
Modified:
portals/jetspeed-2/portal/trunk/maven/jetspeed-maven-utils/src/main/java/org/apache/jetspeed/maven/utils/UnpackResources.java
Modified:
portals/jetspeed-2/portal/trunk/maven/jetspeed-maven-utils/src/main/java/org/apache/jetspeed/maven/utils/UnpackResources.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/maven/jetspeed-maven-utils/src/main/java/org/apache/jetspeed/maven/utils/UnpackResources.java?rev=1742059&r1=1742058&r2=1742059&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/maven/jetspeed-maven-utils/src/main/java/org/apache/jetspeed/maven/utils/UnpackResources.java
(original)
+++
portals/jetspeed-2/portal/trunk/maven/jetspeed-maven-utils/src/main/java/org/apache/jetspeed/maven/utils/UnpackResources.java
Tue May 3 04:29:12 2016
@@ -16,6 +16,11 @@
*/
package org.apache.jetspeed.maven.utils;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.logging.Log;
+import org.codehaus.plexus.util.SelectorUtils;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@@ -25,11 +30,6 @@ import java.util.Enumeration;
import java.util.StringTokenizer;
import java.util.zip.ZipFile;
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.logging.Log;
-import org.codehaus.plexus.util.SelectorUtils;
-
/**
* @version $Id$
*
@@ -430,7 +430,7 @@ public class UnpackResources
{
throw new
MojoExecutionException("Destination "+destFile.getAbsolutePath()+" already
exists and is not a file");
}
- if ( destFile.lastModified() >=
fileEntry.getTime() || !unpackResources[i].isOverwrite() )
+ if ( destFile.lastModified() >=
fileEntry.getTime() && !unpackResources[i].isOverwrite() )
{
if (verbose)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscr...@portals.apache.org
For additional commands, e-mail: jetspeed-dev-h...@portals.apache.org
