Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix issues with build dependencies and test execution #1278

Merged
merged 4 commits into from
Apr 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions archunit-junit/junit4/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,6 @@ sourcesJar {
}
}

archUnitTest {
hasSlowTests = true
}

shadowJar {
exclude 'META-INF/**'

Expand Down
4 changes: 0 additions & 4 deletions archunit-junit/junit5/engine-api/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@ dependencies {

compileJava.dependsOn project(':archunit-junit5-api').finishArchive

archUnitTest {
hasSlowTests = true
}

test {
useJUnitPlatform() {
excludeEngines 'archunit'
Expand Down
4 changes: 0 additions & 4 deletions archunit-junit/junit5/engine/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,6 @@ sourcesJar {
from project(':archunit-junit').sourceSets.main.allSource
}

archUnitTest {
hasSlowTests = true
}

test {
useJUnitPlatform() {
excludeEngines 'archunit'
Expand Down
2 changes: 1 addition & 1 deletion archunit/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ sourceSets {
java {
srcDirs = jdk9MainDirs
}
compileClasspath += sourceSets.main.compileClasspath
compileClasspath += sourceSets.main.compileClasspath + sourceSets.main.output.classesDirs
}
jdk9test {
java {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ afterEvaluate {

if (archUnitTest.hasSlowTests) {
tasks.withType(Test) {
assert !it.testFramework.class.name.contains('JUnitPlatform'): "Slow tests are not yet supported for JUnit 5 tests"
if (!project.hasProperty('allTests')) {
useJUnit {
excludeCategories 'com.tngtech.archunit.Slow'
Expand All @@ -39,8 +40,6 @@ tasks.withType(Test) {
events "failed"
exceptionFormat "full"
}

ignoreFailures = project.hasProperty('ignoreTestFailures')
}

// Add some better test failure reporting on the console
Expand Down
11 changes: 0 additions & 11 deletions ci/Dockerfile

This file was deleted.

36 changes: 0 additions & 36 deletions ci/README.md

This file was deleted.

9 changes: 0 additions & 9 deletions ci/docker-compose.yml

This file was deleted.

71 changes: 0 additions & 71 deletions ci/jobs/archunit-win/config.xml

This file was deleted.

43 changes: 0 additions & 43 deletions ci/nodes/WindowsSlave/config.xml

This file was deleted.

74 changes: 0 additions & 74 deletions ci/plugins.txt

This file was deleted.

17 changes: 0 additions & 17 deletions ci/security.groovy

This file was deleted.