Pull in Shrinkwrap 2.2.x

.gitignore

@@ -10,3 +10,4 @@ build
 atlassian-ide-plugin.xml
 
 !impl-maven/src/test/resources/repository/org/jboss/shrinkwrap/test/test-pom/1.0.0/target
+!impl-maven/src/test/resources/repository/org/jboss/shrinkwrap/test/test-war-with-resources/1.0.0/target

.travis.yml

@@ -1,19 +1,11 @@
 language: java
 jdk:
     - oraclejdk8
-    - oraclejdk7
-    - openjdk6
+    - openjdk7
+dist: trusty
 branches:
     except:    
         - /^([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+[0-9A-Za-z-]+)?$/
-#before_install:
-#    # until SHRINKRES-203 is fixed, we need to build on older Maven
-#    - wget http://www.us.apache.org/dist/maven/maven-3/3.2.5/binaries/apache-maven-3.2.5-bin.tar.gz
-#    - tar xf apache-maven-3.2.5-bin.tar.gz
-#    - export M2_HOME=$PWD/apache-maven-3.2.5
-#    - export PATH=$M2_HOME/bin/:$PATH
-#    - export MAVEN_SKIP_RC=true
-#    - mvn --version
 install:
     - true
 script:

api-gradle-embedded-archive/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.jboss.shrinkwrap.resolver</groupId>
         <artifactId>shrinkwrap-resolver-parent</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>2.2.8-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

api-maven-archive/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.jboss.shrinkwrap.resolver</groupId>
         <artifactId>shrinkwrap-resolver-parent</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>2.2.8-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

api-maven/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.jboss.shrinkwrap.resolver</groupId>
         <artifactId>shrinkwrap-resolver-parent</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>2.2.8-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.jboss.shrinkwrap.resolver</groupId>
         <artifactId>shrinkwrap-resolver-parent</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>2.2.8-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

bom/pom.xml

@@ -10,7 +10,7 @@
   <!-- Artifact Configuration -->
   <groupId>org.jboss.shrinkwrap.resolver</groupId>
   <artifactId>shrinkwrap-resolver-bom</artifactId>
-  <version>3.0.0-SNAPSHOT</version>
+  <version>2.2.8-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>ShrinkWrap Resolver Bill of Materials</name>
   <description>Centralized dependencyManagement for the ShrinkWrap Resolver Project</description>

build-resources/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.jboss.shrinkwrap.resolver</groupId>
         <artifactId>shrinkwrap-resolver-parent</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>2.2.8-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

depchain-gradle/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.jboss.shrinkwrap.resolver</groupId>
         <artifactId>shrinkwrap-resolver-parent</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>2.2.8-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

depchain/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.jboss.shrinkwrap.resolver</groupId>
         <artifactId>shrinkwrap-resolver-parent</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>2.2.8-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

impl-gradle-embedded-archive/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.jboss.shrinkwrap.resolver</groupId>
         <artifactId>shrinkwrap-resolver-parent</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>2.2.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>shrinkwrap-resolver-impl-gradle-embedded-archive</artifactId>
@@ -33,11 +33,13 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.easytesting</groupId>
             <artifactId>fest-assert</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
@@ -73,7 +75,7 @@
         <repository>
             <id>jfrog</id>
             <name>jfrog</name>
-            <url>http://repo.jfrog.org/artifactory/repo</url>
+            <url>https://repo.jfrog.org/artifactory/gradle</url>
         </repository>
     </repositories>
 </project>

impl-maven-archive/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.jboss.shrinkwrap.resolver</groupId>
         <artifactId>shrinkwrap-resolver-parent</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>2.2.8-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

impl-maven-archive/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/archive/util/JarGenerator.java → impl-maven-archive/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/archive/util/JarGeneratorTestCase.java

@@ -54,7 +54,7 @@
  *
  */
 @RunWith(Parameterized.class)
-public class JarGenerator {
+public class JarGeneratorTestCase {
     private String name;
     private Class<?>[] content;
 
@@ -94,7 +94,7 @@ public static Collection<Object[]> jars() {
         return Arrays.asList(data);
     }
 
-    public JarGenerator(String name, Class<?>[] content) {
+    public JarGeneratorTestCase(String name, Class<?>[] content) {
         this.name = name;
         this.content = content;
     }

impl-maven-archive/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/archive/util/WarGenerator.java → impl-maven-archive/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/archive/util/WarGeneratorTestCase.java

@@ -36,7 +36,7 @@
  *
  */
 @RunWith(Parameterized.class)
-public class WarGenerator {
+public class WarGeneratorTestCase {
     private String name;
     private Class<?>[] classes;
     private String[] directories;
@@ -50,7 +50,7 @@ public static Collection<Object[]> jars() {
         return Arrays.asList(data);
     }
 
-    public WarGenerator(String name, Class<?>[] classes, String[] directories) {
+    public WarGeneratorTestCase(String name, Class<?>[] classes, String[] directories) {
         this.name = name;
         this.classes = classes;
         this.directories = directories;

impl-maven/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.jboss.shrinkwrap.resolver</groupId>
         <artifactId>shrinkwrap-resolver-parent</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>2.2.8-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

impl-maven/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/MavenResolvedArtifactImpl.java

@@ -31,6 +31,7 @@
 import java.util.zip.ZipOutputStream;
 
 import org.eclipse.aether.artifact.Artifact;
+import org.eclipse.aether.artifact.ArtifactProperties;
 import org.eclipse.aether.graph.DependencyNode;
 import org.eclipse.aether.resolution.ArtifactResult;
 import org.jboss.shrinkwrap.resolver.api.maven.MavenArtifactInfo;
@@ -140,11 +141,15 @@ private static File artifactToFile(final Artifact artifact) throws IllegalArgume
             String extension = artifact.getExtension();
             String classifier = artifact.getClassifier();
 
-            // SHRINKRES-102, allow test classes to be packaged as well
             File root = new File(artifact.getFile().getParentFile(), "target/classes");
             if (!Validate.isNullOrEmpty(classifier) && "tests".equals(classifier)) {
+                // SHRINKRES-102, allow test classes to be packaged as well
                 root = new File(artifact.getFile().getParentFile(), "target/test-classes");
+            } else if ("war".equals(artifact.getProperty(ArtifactProperties.TYPE, null))) {
+                // SHRINKRES-263, allow .war files to be packaged as well
+                root = new File(artifact.getFile().getParentFile(), "target/" + artifactId + "-" + artifact.getVersion());
             }
+
             try {
                 File archive = File.createTempFile(artifactId + "-", "." + extension);
                 archive.deleteOnExit();
@@ -165,7 +170,7 @@ private static File artifactToFile(final Artifact artifact) throws IllegalArgume
      *
      * @author <a href="mailto:[email protected]">Andrew Lee Rubinger</a>
      */
-    private static class PackageDirHelper {
+    static class PackageDirHelper {
 
         private PackageDirHelper() {
             throw new UnsupportedOperationException("No instances should be created; stateless class");
@@ -195,11 +200,8 @@ static void packageDirectories(final File outputFile, final File... directories)
                     FileInputStream fis = null;
                     try {
                         File fileEntry = new File(directory, entry);
-
-                        if (fileEntry.isDirectory()) {
-                            zipFile.putNextEntry(new ZipEntry(entry));
-                        }
-                        else {
+                        //Do not add zip entries for directories
+                        if (fileEntry.isFile()) {
                             fis = new FileInputStream(fileEntry);
                             zipFile.putNextEntry(new ZipEntry(entry));
                             IOUtil.copy(fis, zipFile);

impl-maven/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/MavenWorkingSessionImpl.java

@@ -108,7 +108,7 @@ public class MavenWorkingSessionImpl extends ConfigurableMavenWorkingSessionImpl
     private static final String MAVEN_CENTRAL_NAME = "central";
     // creates a link to Maven Central Repository
     private static final RemoteRepository MAVEN_CENTRAL = new RemoteRepository.Builder(MAVEN_CENTRAL_NAME, "default",
-            "http://repo1.maven.org/maven2").build();
+            "https://repo1.maven.org/maven2").build();
 
     private Model model;
 

impl-maven/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/internal/SettingsXmlProfileSelector.java

@@ -61,11 +61,12 @@ public List<Profile> getActiveProfiles(Collection<Profile> profiles, ProfileActi
             if (p.getId() != null && context.getActiveProfileIds().contains(id)
                 && !context.getInactiveProfileIds().contains(id)) {
                 activeProfiles.add(p);
+                continue;
             }
             if (p.getActivation() != null && p.getActivation().isActiveByDefault()
                 && !context.getInactiveProfileIds().contains(p.getId())) {
                 activeProfiles.add(p);
-                break;
+                continue;
             }
             for (ProfileActivator activator : activators) {
                 if (activator.isActive(p, context, problems)) {

impl-maven/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/internal/decrypt/MavenSecurityDispatcher.java

@@ -62,7 +62,7 @@ public MavenSecurityDispatcher(File securitySettings) throws InvalidConfiguratio
         this.securitySettingsPath = securitySettings;
         // settings-security is loaded only if it exists
         // error is raised later only in case that it is missing but needed
-        if (Validate.isReadable(securitySettings)) {
+        if (Validate.isReadable(securitySettings.getAbsoluteFile())) {
             try {
                 this.securitySettings = SecUtil.read(securitySettings.getAbsolutePath(), true);
             } catch (SecDispatcherException e) {

impl-maven/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/MavenModelResolverTest.java → impl-maven/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/MavenModelResolverTestCase.java

@@ -31,7 +31,7 @@
  *
  * @author <a href="mailto:[email protected]">Michal Matloka</a>
  */
-public class MavenModelResolverTest {
+public class MavenModelResolverTestCase {
 
     /**
      * Tests if newCopy() gives independent instances.

impl-maven/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/PackageDirHelperTestCase.java

@@ -0,0 +1,116 @@
+package org.jboss.shrinkwrap.resolver.impl.maven;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
+import org.apache.commons.io.FileUtils;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+import static org.junit.Assert.assertTrue;
+
+/**
+ * @author Florian Besser
+ */
+public class PackageDirHelperTestCase {
+
+    @Rule
+    public TemporaryFolder tempFolder = new TemporaryFolder();
+
+    @Test
+    public void packageDirectories_empty_canUnzip() throws Exception {
+        File output = tempFolder.newFile("output.zip");
+
+        MavenResolvedArtifactImpl.PackageDirHelper.packageDirectories(output);
+
+        File outputFolder = tempFolder.newFolder("outputFolder");
+        assertTrue(canUnzip(output, outputFolder));
+    }
+
+    @Test
+    public void packageDirectories_singleEntry_canUnzip() throws Exception {
+        File output = tempFolder.newFile("output.zip");
+
+        File inputFolder = tempFolder.newFolder("inputFolder");
+        FileUtils.forceMkdir(inputFolder);
+        File inputFile = new File(inputFolder, "exampleInput.foo");
+        FileUtils.write(inputFile, "some data");
+
+        MavenResolvedArtifactImpl.PackageDirHelper.packageDirectories(output, inputFolder);
+
+        File outputFolder = tempFolder.newFolder("outputFolder");
+        assertTrue(canUnzip(output, outputFolder));
+    }
+
+    @Test
+    public void packageDirectories_singleEntryWithSubEntries_canUnzip() throws Exception {
+        File output = tempFolder.newFile("output.zip");
+
+        File inputRootFolder = tempFolder.newFolder("inputRootFolder");
+        File inputSubFolder = new File(inputRootFolder, "inputSubFolder");
+        FileUtils.forceMkdir(inputSubFolder);
+
+        File inputFile = new File(inputSubFolder, "exampleInput.foo");
+        FileUtils.write(inputFile, "some data");
+
+        MavenResolvedArtifactImpl.PackageDirHelper.packageDirectories(output, inputRootFolder);
+
+        File outputFolder = tempFolder.newFolder("outputFolder");
+        assertTrue(canUnzip(output, outputFolder));
+    }
+
+    private boolean canUnzip(File zipFile, File outputFolder) {
+
+        byte[] buffer = new byte[1024];
+
+        ZipInputStream zis = null;
+        FileOutputStream fos = null;
+        try {
+            zis = new ZipInputStream(new FileInputStream(zipFile));
+            //get the zipped file list entry
+            ZipEntry ze = zis.getNextEntry();
+
+            while (ze != null) {
+                String fileName = ze.getName();
+                File newFile = new File(outputFolder, fileName);
+
+                //create all non exists folders
+                //else you will hit FileNotFoundException for compressed folder
+                FileUtils.forceMkdir(newFile.getParentFile());
+
+                fos = new FileOutputStream(newFile);
+                    int len;
+                    while ((len = zis.read(buffer)) > 0) {
+                        fos.write(buffer, 0, len);
+                    }
+                ze = zis.getNextEntry();
+            }
+
+            return true;
+        } catch (IOException ex) {
+            return false;
+        } finally {
+            if (zis != null) {
+                try {
+                    zis.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                } finally {
+                    if (fos != null){
+                        try {
+                            fos.close();
+                        } catch (IOException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+}