SHRINKRES-124 Embedded gradle importer - completing merge

shrinkwrap · Mar 26, 2014 · 81a3376 · 81a3376
1 parent 48ce6d3
commit 81a3376
Show file tree

Hide file tree

Showing 12 changed files with 57 additions and 104 deletions.
diff --git a/api-gradle-embedded-archive/pom.xml b/api-gradle-embedded-archive/pom.xml
@@ -43,4 +43,3 @@
     </build>
 
 </project>
-
diff --git a/...e/src/main/java/org/jboss/shrinkwrap/api/gradle/archive/importer/embedded/BuildStage.java b/...e/src/main/java/org/jboss/shrinkwrap/api/gradle/archive/importer/embedded/BuildStage.java
@@ -1,6 +1,6 @@
 /*
  * JBoss, Home of Professional Open Source
- * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2014, Red Hat Middleware LLC, and individual contributors
  * by the @authors tag. See the copyright.txt in the distribution for a
  * full listing of individual contributors.
  *

diff --git a/...in/java/org/jboss/shrinkwrap/api/gradle/archive/importer/embedded/ConfigurationStage.java b/...in/java/org/jboss/shrinkwrap/api/gradle/archive/importer/embedded/ConfigurationStage.java
@@ -1,6 +1,6 @@
 /*
  * JBoss, Home of Professional Open Source
- * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2014, Red Hat Middleware LLC, and individual contributors
  * by the @authors tag. See the copyright.txt in the distribution for a
  * full listing of individual contributors.
  *

diff --git a/...jboss/shrinkwrap/api/gradle/archive/importer/embedded/DistributionConfigurationStage.java b/...jboss/shrinkwrap/api/gradle/archive/importer/embedded/DistributionConfigurationStage.java
@@ -1,6 +1,6 @@
 /*
  * JBoss, Home of Professional Open Source
- * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2014, Red Hat Middleware LLC, and individual contributors
  * by the @authors tag. See the copyright.txt in the distribution for a
  * full listing of individual contributors.
  *

diff --git a/...ava/org/jboss/shrinkwrap/api/gradle/archive/importer/embedded/EmbeddedGradleImporter.java b/...ava/org/jboss/shrinkwrap/api/gradle/archive/importer/embedded/EmbeddedGradleImporter.java
@@ -1,6 +1,6 @@
 /*
  * JBoss, Home of Professional Open Source
- * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2014, Red Hat Middleware LLC, and individual contributors
  * by the @authors tag. See the copyright.txt in the distribution for a
  * full listing of individual contributors.
  *
@@ -33,35 +33,4 @@ public interface EmbeddedGradleImporter extends Assignable {
 
     DistributionConfigurationStage forThisProjectDirectory();
 
-//
-//    // EmbeddedGradleImporter
-//    DistributionConfigurationStage forProjectDirectory(File projectDir); //!!
-//
-//    // DistributionConfigurationStage extends ConfigurationStage
-//    ConfigurationStage useGradleVersion(String version);
-//
-//    ConfigurationStage useDistribution(URI gradleDistribution);
-//
-//    ConfigurationStage useInstallation(File gradleHome);
-//
-//    ConfigurationStage useDefaultDistribution();
-//    // shortcut to build
-//
-//    // ConfigurationStage extends BuildStage
-//    ConfigurationStage useGradleUserHomeDir(File gradleUserHomeDir);
-//
-//    ConfigurationStage forTasks(String... tasks);
-//
-//    ConfigurationStage withArguments(String... arguments);
-//
-//    ConfigurationStage setJavaHome(File javaHome);
-//
-//    ConfigurationStage setJvmArguments(String... jvmArguments);
-//    // shortcut to build
-//
-//    // BuildStage
-//    Assignable importBuildOutput();
-//
-//    // Assignable
-//    void as();
 }
diff --git a/depchain-gradle/pom.xml b/depchain-gradle/pom.xml
@@ -1,60 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>
-  <!--
-  vi:ts=2:sw=2:expandtab:
--->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
-  <!-- Parent -->
-  <parent>
-    <groupId>org.jboss.shrinkwrap.resolver</groupId>
-    <artifactId>shrinkwrap-resolver-parent</artifactId>
-    <version>2.1.1-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
-
-  <!-- Model Version -->
-  <modelVersion>4.0.0</modelVersion>
-
-  <!-- Artifact Configuration -->
-  <artifactId>shrinkwrap-resolver-gradle-depchain</artifactId>
-  <name>ShrinkWrap Resolver Gradle Dependency Chain</name>
-  <description>Single-POM Definition to export the ShrinkWrap Resolver Gradle artifacts in proper scope</description>
-  <packaging>pom</packaging>
-
-
-  <!-- Properties -->
-  <properties>
-
-    <!-- Versioning -->
-
-  </properties>
-
-  <!-- Dependencies -->
-  <dependencies>
-
-    <dependency>
-      <groupId>org.jboss.shrinkwrap.resolver</groupId>
-      <artifactId>shrinkwrap-resolver-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.shrinkwrap.resolver</groupId>
-      <artifactId>shrinkwrap-resolver-spi</artifactId>
-      <version>${project.version}</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.shrinkwrap.resolver</groupId>
-      <artifactId>shrinkwrap-resolver-api-gradle-embedded-archive</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.shrinkwrap.resolver</groupId>
-      <artifactId>shrinkwrap-resolver-impl-gradle-embedded-archive</artifactId>
-      <version>${project.version}</version>
-      <scope>runtime</scope>
-    </dependency>
-
-  </dependencies>
+    <parent>
+        <groupId>org.jboss.shrinkwrap.resolver</groupId>
+        <artifactId>shrinkwrap-resolver-parent</artifactId>
+        <version>2.1.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>shrinkwrap-resolver-gradle-depchain</artifactId>
+    <name>ShrinkWrap Resolver Gradle Dependency Chain</name>
+    <description>Single-POM Definition to export the ShrinkWrap Resolver Gradle artifacts in proper scope</description>
+    <packaging>pom</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss.shrinkwrap.resolver</groupId>
+            <artifactId>shrinkwrap-resolver-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.shrinkwrap.resolver</groupId>
+            <artifactId>shrinkwrap-resolver-spi</artifactId>
+            <version>${project.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.shrinkwrap.resolver</groupId>
+            <artifactId>shrinkwrap-resolver-api-gradle-embedded-archive</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.shrinkwrap.resolver</groupId>
+            <artifactId>shrinkwrap-resolver-impl-gradle-embedded-archive</artifactId>
+            <version>${project.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+    </dependencies>
 
 </project>
diff --git a/impl-gradle-embedded-archive/pom.xml b/impl-gradle-embedded-archive/pom.xml
@@ -58,7 +58,6 @@
             <artifactId>plexus-utils</artifactId>
             <version>${version.org.codehaus.plexus.utils}</version>
         </dependency>
-
     </dependencies>
 
     <build>

diff --git a/...rg/jboss/shrinkwrap/impl/gradle/archive/importer/embedded/EmbeddedGradleImporterImpl.java b/...rg/jboss/shrinkwrap/impl/gradle/archive/importer/embedded/EmbeddedGradleImporterImpl.java
@@ -1,6 +1,6 @@
 /*
  * JBoss, Home of Professional Open Source
- * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2014, Red Hat Middleware LLC, and individual contributors
  * by the @authors tag. See the copyright.txt in the distribution for a
  * full listing of individual contributors.
  *
@@ -17,6 +17,10 @@
 
 package org.jboss.shrinkwrap.impl.gradle.archive.importer.embedded;
 
+import java.io.File;
+import java.io.FilenameFilter;
+import java.net.URI;
+
 import org.gradle.tooling.BuildLauncher;
 import org.gradle.tooling.GradleConnector;
 import org.gradle.tooling.ProjectConnection;
@@ -30,10 +34,6 @@
 import org.jboss.shrinkwrap.api.importer.ZipImporter;
 import org.jboss.shrinkwrap.impl.base.Validate;
 
-import java.io.File;
-import java.io.FilenameFilter;
-import java.net.URI;
-
 /**
  * @author <a href="mailto:mmatloka@gmail.com">Michal Matloka</a>
  */
@@ -43,7 +43,7 @@ public class EmbeddedGradleImporterImpl implements EmbeddedGradleImporter, Distr
 
     private final GradleConnector connector = GradleConnector.newConnector();
 
-    private String[] tasks = new String[] { "clean", "build" };
+    private String[] tasks = new String[] { "build" };
     private String[] arguments = new String[] { "-x", "test" };
 
     private File projectDir;

diff --git a/...c/test/java/org/jboss/shrinkwrap/impl/gradle/archive/importer/embedded/AssertArchive.java b/...c/test/java/org/jboss/shrinkwrap/impl/gradle/archive/importer/embedded/AssertArchive.java
@@ -1,6 +1,6 @@
 /*
  * JBoss, Home of Professional Open Source
- * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2014, Red Hat Middleware LLC, and individual contributors
  * by the @authors tag. See the copyright.txt in the distribution for a
  * full listing of individual contributors.
  *

diff --git a/...s/shrinkwrap/impl/gradle/archive/importer/embedded/JarEmbeddedGradleImporterTestCase.java b/...s/shrinkwrap/impl/gradle/archive/importer/embedded/JarEmbeddedGradleImporterTestCase.java
@@ -1,6 +1,6 @@
 /*
  * JBoss, Home of Professional Open Source
- * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2014, Red Hat Middleware LLC, and individual contributors
  * by the @authors tag. See the copyright.txt in the distribution for a
  * full listing of individual contributors.
  *

diff --git a/...s/shrinkwrap/impl/gradle/archive/importer/embedded/WarEmbeddedGradleImporterTestCase.java b/...s/shrinkwrap/impl/gradle/archive/importer/embedded/WarEmbeddedGradleImporterTestCase.java
@@ -1,6 +1,6 @@
 /*
  * JBoss, Home of Professional Open Source
- * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2014, Red Hat Middleware LLC, and individual contributors
  * by the @authors tag. See the copyright.txt in the distribution for a
  * full listing of individual contributors.
  *

diff --git a/pom.xml b/pom.xml
@@ -23,6 +23,8 @@
     <!-- Properties -->
     <properties>
         <version.junit_junit>4.11</version.junit_junit>
+        <version.fest-assert>1.4</version.fest-assert>
+
         <version.org.apache.maven.plugins_maven-site-plugin>3.3</version.org.apache.maven.plugins_maven-site-plugin>
         <version.org.jboss.shrinkwrap>1.2.1</version.org.jboss.shrinkwrap>
 
@@ -42,9 +44,9 @@
 
         <!-- Aether version must be the same as used in Maven in order for plugin to work -->
         <version.org.eclipse.aether>0.9.0.M2</version.org.eclipse.aether>
-        
+
         <version.gradle-tooling-api>1.10</version.gradle-tooling-api>
-       
+
         <version.commons.io>2.0.1</version.commons.io>
         <version.fest-assert>1.4</version.fest-assert>
     </properties>
@@ -99,7 +101,8 @@
                         <dependency>
                             <groupId>org.jboss.shrinkwrap.resolver</groupId>
                             <artifactId>shrinkwrap-resolver-build-resources</artifactId>
-                            <!-- We are relying on previous build resources version, as they tend not to be changed very often and relying on SNAPSHOT version caused problem in IDE. See SHRINKRES-96 for more details -->
+                            <!-- We are relying on previous build resources version, as they tend not to be changed very often
+                                 and relying on SNAPSHOT version caused problem in IDE. See SHRINKRES-96 for more details -->
                             <version>2.0.0</version>
                         </dependency>
                     </dependencies>