diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml index cd3c4512..065619be 100644 --- a/.github/workflows/maven-verify.yml +++ b/.github/workflows/maven-verify.yml @@ -25,4 +25,6 @@ jobs: build: name: Verify uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v4 + with: + maven4-enabled: true diff --git a/src/it/MDEPLOY-202_deployfile-with-multiple-executions/verify.groovy b/src/it/MDEPLOY-202_deployfile-with-multiple-executions/verify.groovy index 4232c455..31dede31 100644 --- a/src/it/MDEPLOY-202_deployfile-with-multiple-executions/verify.groovy +++ b/src/it/MDEPLOY-202_deployfile-with-multiple-executions/verify.groovy @@ -17,6 +17,19 @@ * under the License. */ -def buildLog = new File ( basedir, "build.log") +def expectedDeploys = [ + 'org/apache/maven/its/mdeploy-170/configperproject/1.0/configperproject-1.0.pom', + 'org/apache/maven/plugins/deploy/it/org.eclipse.equinox.common/1.0/org.eclipse.equinox.common-1.0-sources.jar', + 'org/apache/maven/plugins/deploy/it/org.eclipse.equinox.common/1.0/org.eclipse.equinox.common-1.0.jar', + 'org/apache/maven/plugins/deploy/it/org.eclipse.equinox.common/1.0/org.eclipse.equinox.common-1.0.pom', + 'org/apache/maven/plugins/deploy/it/org.eclipse.osgi/1.0/org.eclipse.osgi-1.0-sources.jar', + 'org/apache/maven/plugins/deploy/it/org.eclipse.osgi/1.0/org.eclipse.osgi-1.0.jar', + 'org/apache/maven/plugins/deploy/it/org.eclipse.osgi/1.0/org.eclipse.osgi-1.0.pom' +] + +def repoDir = new File ( basedir, 'target/repo') + +def missingDeploys = expectedDeploys.findAll { ! new File(repoDir, it).isFile() } + +assert missingDeploys.size() == 0 -assert buildLog.text =~ /Uploading.*file:target\/repo\/org\/apache\/maven\/plugins\/deploy\/it\/org\.eclipse\.osgi\/1\.0\/org\.eclipse\.osgi-1\.0-sources\.jar/