split itest from buildInfo gradle project

build.gradle

@@ -36,7 +36,7 @@ import org.apache.tools.ant.filters.ReplaceTokens
 
 // Root project version should not be used
 project.version = '2'
-project.ext.baseProjectNames = ['build-info-api', 'build-info-client', 'build-info-extractor', 'build-info-vcs', 'itest']
+project.ext.baseProjectNames = ['build-info-api', 'build-info-client', 'build-info-extractor', 'build-info-vcs']
 
 defaultTasks 'clean', 'build', 'install'
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed May 06 12:16:06 IDT 2015
+#Thu May 14 14:10:48 IDT 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-all.zip

itest/.gitignore

@@ -0,0 +1,11 @@
+.idea
+.gradle
+*.iml
+/out
+/build
+/*/build
+/*/out
+build-info.ipr
+build-info.iws
+atlassian-*.xml
+/.nb-gradle/private

itest/build.gradle

@@ -1,28 +1,70 @@
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath(group: 'eu.appsatori', name: 'gradle-fatjar-plugin', version: '0.3')
+    }
+}
+
 apply plugin: 'java'
 apply plugin: 'groovy'
+apply plugin: 'eu.appsatori.fatjar'
 
 version = '1.0'
 description = 'Build Info itest'
 println description
 
-repositories {
-    mavenCentral()
-}
 
-dependencies {
-    compile 'org.jfrog.artifactory.client:artifactory-java-client-api:0.18-SNAPSHOT'
-    compile 'org.jfrog.artifactory.client:artifactory-java-client-services:0.18-SNAPSHOT'
-    testCompile(group: 'org.spockframework', name: 'spock-core', version: '1.0-groovy-2.3')
-    testCompile(group: 'org.apache.ant', name: 'ant', version: '1.9.2')
-    compile "com.google.guava:guava:15.0"
+allprojects {
+    sourceCompatibility = 1.7
+    targetCompatibility = 1.7
+
+    repositories {
+        maven { url "https://oss.jfrog.org/jfrog-dependencies" }
+        jcenter()
+    }
+
+/*    task jarAll(type: Jar) {
+        dependsOn jar
+        //Add the directory of the archive as the input files for this task
+        classifier = 'uber'
+    }*/
+
+   /* fatJar{
+        classifier = 'all'
+        //from configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
+    }*/
+
+    dependencies {
+        testCompile(group: 'org.jfrog.buildinfo', name: 'build-info-extractor-ivy', version: '2.5.x-SNAPSHOT'){
+            exclude group: 'org.codehaus.groovy', module:'groovy-all'
+        }
+        testCompile(group: 'org.jfrog.buildinfo', name: 'build-info-extractor-maven3', version: '2.5.x-SNAPSHOT'){
+            exclude group: 'org.codehaus.groovy', module:'groovy-all'
+        }
+        testCompile 'org.jfrog.artifactory.client:artifactory-java-client-api:0.18-SNAPSHOT'
+        testCompile 'org.jfrog.artifactory.client:artifactory-java-client-services:0.18-SNAPSHOT'
+        testCompile(group: 'org.spockframework', name: 'spock-core', version: '1.0-groovy-2.3') {
+                    exclude group: 'org.codehaus.groovy', module:'groovy-all'
+        }
+        testCompile(group: 'org.apache.ant', name: 'ant', version: '1.9.2')
+        testCompile 'org.codehaus.groovy:groovy-all:2.3.6'
+    }
+
 }
 
-/*test {
+test {
     //Spoke run with JUnit (the parent uses TestNG)
     test.useJUnit()
     testLogging {
         exceptionFormat "full"
         events "started", "passed", "skipped", "failed", "standardOut", "standardError"
         minGranularity 0
     }
-}*/
+}
+
+task wrapper(type: Wrapper) {
+    description = 'Generates gradlew[.bat] scripts'
+    gradleVersion = '2.1'
+}

itest/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#Thu May 14 14:28:26 IDT 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-bin.zip

wrapper/dists/gradle-1.8-bin/vruqmccc8532n7gr46qavsii8/gradle-1.8/bin/gradle → itest/gradlew

@@ -61,11 +61,11 @@ while [ -h "$PRG" ] ; do
     fi
 done
 SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/.." >&-
+cd "`dirname \"$PRG\"`/" >&-
 APP_HOME="`pwd -P`"
 cd "$SAVED" >&-
 
-CLASSPATH=$APP_HOME/lib/gradle-launcher-1.8.jar
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
@@ -161,4 +161,4 @@ function splitJvmOpts() {
 eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
 JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.launcher.GradleMain "$@"
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

wrapper/dists/gradle-1.8-bin/vruqmccc8532n7gr46qavsii8/gradle-1.8/bin/gradle.bat → itest/gradlew.bat

@@ -1,90 +1,90 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%..
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\lib\gradle-launcher-1.8.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.launcher.GradleMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

itest/src/test/groovy/org/jfrog/build/launcher/Launcher.groovy

@@ -2,7 +2,7 @@ package org.jfrog.build.launcher
 
 import com.google.common.collect.Maps
 import com.google.common.collect.Sets
-import com.google.inject.internal.Lists
+import com.google.common.collect.Lists
 
 /**
  * @author Lior Hasson

itest/src/test/groovy/org/jfrog/build/utils/TestSetup.groovy

@@ -54,6 +54,7 @@ class TestSetup {
         createRepo(TestConstants.repoKey, buildName + "_", timestamp)
         createRepo(TestConstants.snapshotRepoKey, buildName + "_snapshot_", timestamp)
 
+        //TODO
         buildProperties.put(TestConstants.resolveSnapshotKey, "remote-repos")
         buildProperties.put(TestConstants.resolveRepokey, "remote-repos")
         //createRepo(TestConstants.resolveSnapshotKey, buildName + "_resolve_snapshot_", timestamp)

itest/src/test/resources/org/jfrog/build/testConfigurations/testConfigGradle.groovy

@@ -1,8 +1,11 @@
 package org.jfrog.build.testConfigurations
 
+
 artifacts {
-    mappings{
-        input=["(.+).jar"]
+    buildArtifacts{
+        mappings=[[input:"(.+).jar"], [input:"(.+)-SNAPSHOT.jar"]]
+
+
     }
 
     artifactNames=["", ""]

settings.gradle

@@ -22,7 +22,6 @@ include 'build-info-extractor-gradle'
 include 'build-info-extractor-ivy'
 include 'build-info-extractor-maven3'
 include 'build-info-extractor-maven3-plugin'
-include 'itest'
 
 rootProject.name = 'build-info'
 project( ':build-info-extractor-maven3-plugin' ).name = 'artifactory-maven-plugin'