Skip to content

Commit f53fb36

Browse files
committed
add itest module
1 parent 8d16b4d commit f53fb36

File tree

458 files changed

+382
-18831
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

458 files changed

+382
-18831
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@ build-info.ipr
1515
build-info.iws
1616
atlassian-*.xml
1717
/.nb-gradle/private/
18+
/itest/src/test/resources/cache

build-info-extractor-gradle/src/test/groovy/org/jfrog/build/org/jfrog/build/lancher/MavenLauncher.groovy

-15
This file was deleted.

build.gradle

+24-7
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import org.apache.tools.ant.filters.ReplaceTokens
3737

3838
// Root project version should not be used
3939
project.version = '2'
40-
project.ext.baseProjectNames = ['build-info-api', 'build-info-client', 'build-info-extractor', 'build-info-vcs']
40+
project.ext.baseProjectNames = ['build-info-api', 'build-info-client', 'build-info-extractor', 'build-info-vcs', 'itest']
4141

4242
defaultTasks 'clean', 'build', 'install'
4343

@@ -84,8 +84,8 @@ subprojects {
8484
mavenLocal()
8585
}
8686

87-
sourceCompatibility = 1.6
88-
targetCompatibility = 1.6
87+
sourceCompatibility = 1.7
88+
targetCompatibility = 1.7
8989
ext.buildInfoVersion = new Version(rootProject, baseProjectNames)
9090

9191
configurations {
@@ -303,6 +303,8 @@ project('build-info-extractor') {
303303
dependencies {
304304
compile project(':build-info-client')
305305
testCompile "org.easymock:easymockclassextension:2.5.2"
306+
testCompile(group: 'org.spockframework', name: 'spock-core', version: '1.0-groovy-2.3')
307+
testCompile(group: 'org.apache.ant', name: 'ant', version: '1.9.2')
306308
}
307309
}
308310

@@ -345,8 +347,8 @@ project('build-info-extractor-gradle') {
345347
"com.google.code.findbugs:jsr305:1.3.9"
346348
uberJar group: 'org.apache.ivy', name: 'ivy', version: '2.2.0'
347349
compile localGroovy()
348-
testCompile(group: 'org.spockframework', name: 'spock-core', version: '0.5-groovy-1.8') {
349-
transitive = false
350+
testCompile(group: 'org.spockframework', name: 'spock-core', version: '1.0-groovy-2.3') {
351+
transitive = true
350352
}
351353
testCompile(group: 'net.java.dev.jna', name: 'jna', version: '3.2.2')
352354
}
@@ -373,7 +375,7 @@ project('build-info-extractor-maven3') {
373375

374376
dependencies {
375377
compile 'org.jdom:jdom:1.1.1',
376-
'org.codehaus.groovy:groovy-all:2.1.6',
378+
'org.codehaus.groovy:groovy-all:2.3.2',
377379
'plexus:plexus-container-default:1.0-alpha-6',
378380
'org.apache.maven:maven-core:3.1.0',
379381
'org.sonatype.aether:aether-api:1.13.1',
@@ -387,6 +389,21 @@ project('build-info-extractor-maven3') {
387389
testCompile 'org.easymock:easymockclassextension:2.5.2'
388390
}
389391

392+
393+
/*** For integration test purposes ***/
394+
task copyToLib(type: Copy) {
395+
into "$rootDir/itest/src/test/resources/cache/artifactory-plugin"
396+
from project.jar
397+
}
398+
399+
task copyDeps(type: Copy) {
400+
into "$rootDir/itest/src/test/resources/cache/artifactory-plugin"
401+
from configurations.runtime
402+
}
403+
404+
build.dependsOn copyToLib
405+
copyToLib.dependsOn copyDeps
406+
390407
configure(install.repositories.mavenInstaller) {
391408
pom.project {
392409
issueManagement {
@@ -414,7 +431,7 @@ project('artifactory-maven-plugin') {
414431
compile ( project( ':build-info-extractor-maven3' )) { exclude group: 'org.jdom', module: 'jdom' }
415432
compile ( 'org.codehaus.gmaven:gmaven-mojo:1.5' ) { exclude group: 'org.codehaus.groovy', module: 'groovy-all-minimal' }
416433

417-
testCompile 'org.spockframework:spock-core:0.7-groovy-2.0'
434+
testCompile 'org.spockframework:spock-core:1.0-groovy-2.3'
418435
provided 'org.apache.maven:maven-core:3.1.0',
419436
'org.apache.maven:maven-project:2.0.11'
420437
}

caches/1.7-rc-1/scripts/build_4lqscshernhk97qc95molb48mm/ProjectScript/buildscript/cache.properties

-3
This file was deleted.

caches/1.7-rc-1/scripts/build_4lqscshernhk97qc95molb48mm/ProjectScript/buildscript/cache.properties.lock

-1
This file was deleted.

caches/1.7-rc-1/scripts/build_4lqscshernhk97qc95molb48mm/ProjectScript/no_buildscript/cache.properties

-3
This file was deleted.

caches/1.7-rc-1/scripts/build_4lqscshernhk97qc95molb48mm/ProjectScript/no_buildscript/cache.properties.lock

-1
This file was deleted.

caches/1.7-rc-1/scripts/build_74rs2dejkmqks7isbib16vqfqg/ProjectScript/buildscript/cache.properties

-3
This file was deleted.

caches/1.7-rc-1/scripts/build_74rs2dejkmqks7isbib16vqfqg/ProjectScript/buildscript/cache.properties.lock

-1
This file was deleted.

caches/1.7-rc-1/scripts/build_74rs2dejkmqks7isbib16vqfqg/ProjectScript/buildscript/classes/emptyScript.txt

Whitespace-only changes.

caches/1.7-rc-1/scripts/build_74rs2dejkmqks7isbib16vqfqg/ProjectScript/no_buildscript/cache.properties

-3
This file was deleted.

caches/1.7-rc-1/scripts/build_74rs2dejkmqks7isbib16vqfqg/ProjectScript/no_buildscript/cache.properties.lock

-1
This file was deleted.

caches/1.7-rc-1/scripts/defaultBuildSourceScript_1hokfcn2ohikg6fmkg7ogqng78/DefaultScript/buildscript/cache.properties

-3
This file was deleted.

caches/1.7-rc-1/scripts/defaultBuildSourceScript_1hokfcn2ohikg6fmkg7ogqng78/DefaultScript/buildscript/cache.properties.lock

-1
This file was deleted.

caches/1.7-rc-1/scripts/defaultBuildSourceScript_1hokfcn2ohikg6fmkg7ogqng78/DefaultScript/buildscript/classes/emptyScript.txt

Whitespace-only changes.

caches/1.7-rc-1/scripts/defaultBuildSourceScript_1hokfcn2ohikg6fmkg7ogqng78/DefaultScript/no_buildscript/cache.properties

-3
This file was deleted.

caches/1.7-rc-1/scripts/defaultBuildSourceScript_1hokfcn2ohikg6fmkg7ogqng78/DefaultScript/no_buildscript/cache.properties.lock

-1
This file was deleted.

caches/1.7-rc-1/scripts/settings_50v36fnaes61mqf406cud754sv/SettingsScript/buildscript/cache.properties

-3
This file was deleted.

caches/1.7-rc-1/scripts/settings_50v36fnaes61mqf406cud754sv/SettingsScript/buildscript/cache.properties.lock

-1
This file was deleted.

caches/1.7-rc-1/scripts/settings_50v36fnaes61mqf406cud754sv/SettingsScript/buildscript/classes/emptyScript.txt

Whitespace-only changes.

caches/1.7-rc-1/scripts/settings_50v36fnaes61mqf406cud754sv/SettingsScript/no_buildscript/cache.properties

-3
This file was deleted.

caches/1.7-rc-1/scripts/settings_50v36fnaes61mqf406cud754sv/SettingsScript/no_buildscript/cache.properties.lock

-1
This file was deleted.

caches/1.7-rc-1/workerMain/cache.properties

-1
This file was deleted.

caches/1.7-rc-1/workerMain/cache.properties.lock

-1
This file was deleted.
-7.15 KB
Binary file not shown.

caches/1.8/scripts/build_4lqscshernhk97qc95molb48mm/ProjectScript/buildscript/cache.properties

-3
This file was deleted.

caches/1.8/scripts/build_4lqscshernhk97qc95molb48mm/ProjectScript/buildscript/cache.properties.lock

-1
This file was deleted.

caches/1.8/scripts/build_4lqscshernhk97qc95molb48mm/ProjectScript/no_buildscript/cache.properties

-3
This file was deleted.

caches/1.8/scripts/build_4lqscshernhk97qc95molb48mm/ProjectScript/no_buildscript/cache.properties.lock

-1
This file was deleted.

caches/1.8/scripts/build_74rs2dejkmqks7isbib16vqfqg/ProjectScript/buildscript/cache.properties

-3
This file was deleted.

caches/1.8/scripts/build_74rs2dejkmqks7isbib16vqfqg/ProjectScript/buildscript/cache.properties.lock

-1
This file was deleted.

caches/1.8/scripts/build_74rs2dejkmqks7isbib16vqfqg/ProjectScript/buildscript/classes/emptyScript.txt

Whitespace-only changes.

caches/1.8/scripts/build_74rs2dejkmqks7isbib16vqfqg/ProjectScript/no_buildscript/cache.properties

-3
This file was deleted.

caches/1.8/scripts/build_74rs2dejkmqks7isbib16vqfqg/ProjectScript/no_buildscript/cache.properties.lock

-1
This file was deleted.

caches/1.8/scripts/defaultBuildSourceScript_11o36alm5oiv1j36llhun3o281/DefaultScript/buildscript/cache.properties

-3
This file was deleted.

caches/1.8/scripts/defaultBuildSourceScript_11o36alm5oiv1j36llhun3o281/DefaultScript/buildscript/cache.properties.lock

-1
This file was deleted.

caches/1.8/scripts/defaultBuildSourceScript_11o36alm5oiv1j36llhun3o281/DefaultScript/buildscript/classes/emptyScript.txt

Whitespace-only changes.

caches/1.8/scripts/defaultBuildSourceScript_11o36alm5oiv1j36llhun3o281/DefaultScript/no_buildscript/cache.properties

-3
This file was deleted.

caches/1.8/scripts/defaultBuildSourceScript_11o36alm5oiv1j36llhun3o281/DefaultScript/no_buildscript/cache.properties.lock

-1
This file was deleted.

caches/1.8/scripts/settings_50v36fnaes61mqf406cud754sv/SettingsScript/buildscript/cache.properties

-3
This file was deleted.

caches/1.8/scripts/settings_50v36fnaes61mqf406cud754sv/SettingsScript/buildscript/cache.properties.lock

-1
This file was deleted.

caches/1.8/scripts/settings_50v36fnaes61mqf406cud754sv/SettingsScript/buildscript/classes/emptyScript.txt

Whitespace-only changes.

caches/1.8/scripts/settings_50v36fnaes61mqf406cud754sv/SettingsScript/no_buildscript/cache.properties

-3
This file was deleted.

caches/1.8/scripts/settings_50v36fnaes61mqf406cud754sv/SettingsScript/no_buildscript/cache.properties.lock

-1
This file was deleted.

caches/1.8/workerMain/cache.properties

-1
This file was deleted.

caches/1.8/workerMain/cache.properties.lock

-1
This file was deleted.
-7.16 KB
Binary file not shown.
-32.6 KB
Binary file not shown.
-178 KB
Binary file not shown.

caches/artifacts-26/artifacts-26.lock

-1
This file was deleted.
-18.1 KB
Binary file not shown.

caches/artifacts-26/filestore/cglib/cglib-nodep/2.2/pom/551686e31fdd0e6a8cf3a2b8e45be0fb911f643e/cglib-nodep-2.2.pom

-28
This file was deleted.

caches/artifacts-26/filestore/com.google.guava/guava/r08/pom/a1541e65b48b6fd76395666517b94f00bf268871/guava-r08.pom

-91
This file was deleted.

0 commit comments

Comments
 (0)