diff --git a/maven-surefire-common/pom.xml b/maven-surefire-common/pom.xml index 805b24769f..7e3c65c001 100644 --- a/maven-surefire-common/pom.xml +++ b/maven-surefire-common/pom.xml @@ -74,7 +74,7 @@ org.apache.maven.surefire surefire-shared-utils - 3.0.0-M4 + ${project.version} com.google.code.findbugs diff --git a/pom.xml b/pom.xml index 633946f5df..990f6ab6c9 100644 --- a/pom.xml +++ b/pom.xml @@ -48,6 +48,7 @@ + surefire-shared surefire-logger-api surefire-api surefire-extensions-api @@ -62,7 +63,6 @@ maven-failsafe-plugin maven-surefire-report-plugin surefire-its - surefire-shared-utils @@ -667,12 +667,6 @@ org.jacoco jacoco-maven-plugin - - maven-deploy-plugin - - true - - diff --git a/surefire-api/pom.xml b/surefire-api/pom.xml index 158c88a8cd..d82b57e303 100644 --- a/surefire-api/pom.xml +++ b/surefire-api/pom.xml @@ -40,7 +40,7 @@ org.apache.maven.surefire surefire-shared-utils - 3.0.0-M4 + ${project.version} com.google.code.findbugs diff --git a/surefire-extensions-api/pom.xml b/surefire-extensions-api/pom.xml index ee086111df..5e56286fe3 100644 --- a/surefire-extensions-api/pom.xml +++ b/surefire-extensions-api/pom.xml @@ -45,7 +45,7 @@ org.apache.maven.surefire surefire-shared-utils - 3.0.0-M4 + ${project.version} org.mockito diff --git a/surefire-providers/common-java5/pom.xml b/surefire-providers/common-java5/pom.xml index f76659e361..acf37c51d1 100644 --- a/surefire-providers/common-java5/pom.xml +++ b/surefire-providers/common-java5/pom.xml @@ -35,7 +35,7 @@ org.apache.maven.surefire surefire-shared-utils - 3.0.0-M4 + ${project.version} diff --git a/surefire-report-parser/pom.xml b/surefire-report-parser/pom.xml index b452bd701c..f31d9ec672 100644 --- a/surefire-report-parser/pom.xml +++ b/surefire-report-parser/pom.xml @@ -41,7 +41,7 @@ org.apache.maven.surefire surefire-shared-utils - 3.0.0-M4 + ${project.version} org.apache.maven.reporting diff --git a/surefire-shared-utils/pom.xml b/surefire-shared/pom.xml similarity index 65% rename from surefire-shared-utils/pom.xml rename to surefire-shared/pom.xml index c845f5c4d1..27d7376d8b 100644 --- a/surefire-shared-utils/pom.xml +++ b/surefire-shared/pom.xml @@ -27,9 +27,11 @@ 3.0.0-M6-SNAPSHOT - surefire-shared-utils + surefire-shared Surefire Shared Utils - Relocated Java packages of maven-shared-utils in Surefire + + Relocated Java packages of maven-shared-utils and several Apache Commons utilities in Surefire. + @@ -39,6 +41,11 @@ + + ${distributionManagement.snapshotRepository.id} + ${distributionManagement.snapshotRepository.url} + + org.apache.maven.shared @@ -98,7 +105,53 @@ + + maven-install-plugin + + + install-jar + install + + install-file + + + surefire-shared-utils + target/${project.build.finalName}.jar + + + + + + maven-deploy-plugin + + + deploy-jar + deploy + + deploy-file + + + ${project.groupId} + surefire-shared-utils + ${project.version} + target/${project.build.finalName}.jar + ${distRepoUrl} + ${distRepoId} + + + + + + + apache-release + + ${distributionManagement.repository.id} + ${distributionManagement.repository.url} + + + +