diff --git a/build.gradle b/build.gradle index 133444a6..528dd7ff 100644 --- a/build.gradle +++ b/build.gradle @@ -331,7 +331,7 @@ tasks.register("integrationTestMavenOnly") { } logger.debug "Script output: $result" File integrationTestDirectory = file(INTEGRATION_TEST_DIRECTORY) - final File testIndex = new File(integrationTestDirectory, "build/reports/index.html") + final File testIndex = new File(integrationTestDirectory, "target/reports/htmlSanityCheck/index.html") assert testIndex.exists() } } @@ -407,6 +407,13 @@ integrationTest.dependsOn( ) + +integrationTest.mustRunAfter( + 'integrationTestMaven', + 'integrationTestGradle' + +) + /* * Copyright Gernot Starke and aim42 contributors. * diff --git a/integration-test/maven-plugin/pom.xml b/integration-test/maven-plugin/pom.xml index 8d1fc517..7d9581cc 100644 --- a/integration-test/maven-plugin/pom.xml +++ b/integration-test/maven-plugin/pom.xml @@ -10,22 +10,22 @@ - dorg.aim42.htmlSanityCheck + org.aim42.htmlSanityCheck htmlsanitycheck-maven-plugin - ${htmlSanityCheckVersion} + 2.0.0-rc1 compile - htmlSanityCheck + sanity-check - file-to-test.html + src/file-to-test.html - src/ + src diff --git a/integration-test/maven-plugin/settings.xml b/integration-test/maven-plugin/settings.xml index 15866f8b..7a1dae4e 100644 --- a/integration-test/maven-plugin/settings.xml +++ b/integration-test/maven-plugin/settings.xml @@ -4,143 +4,4 @@ ../../build/maven-repo - - - org.sonarsource.scanner.maven - - - - - - tc-bib-releases - ${repo.username} - ${repo.password} - - - - - true - - - - - - tc-bib-snapshots - ${repo.username} - ${repo.password} - - - - - true - - - - - - - - nexus - * - Nexus - https://nexus.apps.ocp.tc.gby.msg.team/repository/maven-public/ - - - artifactory - * - Artifactory - http://registry.ct.ocp.tc.corp/artifactory/maven-public-all/ - - - - - - - Nexus - - false - - - https://ct.hub.msg.team/cqu-sonarqube/ - - - - - central - https://nexus.apps.ocp.tc.gby.msg.team/repository/maven-public/ - - - tc-bib-snapshots - nexus Gradle-PlugIns Proxy Repository Snapshots - https://nexus.apps.ocp.tc.gby.msg.team/repository/maven-tc-bib-snapshots/ - false - true - - - tc-bib-releases - nexus Maven Plugin Repository Releases - https://nexus.apps.ocp.tc.gby.msg.team/repository/maven-tc-bib-releases/ - true - false - - - - - - - central - https://nexus.apps.ocp.tc.gby.msg.team/repository/maven-public/ - - true - always - - - true - always - - - - - - Artifactory - - false - - - - central - http://registry.ct.ocp.tc.corp/artifactory/maven-public-all/ - - - tc-bib-snapshots - artifactory Gradle-PlugIns Proxy Repository Snapshots - http://registry.ct.ocp.tc.corp/artifactory/msg-generic-maven/ - false - true - - - tc-bib-releases - artifactory Maven Plugin Repository Releases - http://registry.ct.ocp.tc.corp/artifactory/msg-generic-maven/ - true - false - - - - - - central - http://registry.ct.ocp.tc.corp/artifactory/maven-public-all/ - - true - always - - - true - always - - - - -