Skip to content

Commit 785ab9d

Browse files
Enable build by Maven 4 on GitHub
1 parent 5f664d5 commit 785ab9d

File tree

3 files changed

+14
-6
lines changed

3 files changed

+14
-6
lines changed

.github/workflows/maven-verify.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,5 @@ jobs:
2525
build:
2626
name: Verify
2727
uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v4
28+
with:
29+
maven4-enabled: true

maven-enforcer-plugin/src/it/projects/ban-dependency-management-scope-fail/verify.groovy

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,11 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
File buildLog = new File( basedir, 'build.log' )
20-
assert buildLog.text.contains( '[ERROR] Rule 0: org.apache.maven.enforcer.rules.BanDependencyManagementScope failed with message:' )
21-
assert buildLog.text.contains( 'Scope other than \'import\' is not allowed in \'dependencyManagement\'' )
22-
assert buildLog.text.contains( 'Banned scope \'provided\' used on dependency \'org.apache.maven.plugins.enforcer.its:menforcer138_archiver:jar\' @ line 65, column 19' )
23-
assert buildLog.text.contains( 'Banned scope \'test\' used on dependency \'org.apache.maven.plugins.enforcer.its:menforcer138_utils:jar\' @ line 71, column 19' )
19+
File buildLog = new File(basedir, 'build.log')
20+
21+
def column = mavenVersion.startsWith('4.') ? '7' : '19'
22+
23+
assert buildLog.text.contains('[ERROR] Rule 0: org.apache.maven.enforcer.rules.BanDependencyManagementScope failed with message:')
24+
assert buildLog.text.contains('Scope other than \'import\' is not allowed in \'dependencyManagement\'')
25+
assert buildLog.text.contains('Banned scope \'provided\' used on dependency \'org.apache.maven.plugins.enforcer.its:menforcer138_archiver:jar\' @ line 65, column ' + column)
26+
assert buildLog.text.contains('Banned scope \'test\' used on dependency \'org.apache.maven.plugins.enforcer.its:menforcer138_utils:jar\' @ line 71, column ' + column)

maven-enforcer-plugin/src/it/projects/require-dependency-scope/verify.groovy

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,8 @@
1717
* under the License.
1818
*/
1919
File buildLog = new File(basedir, 'build.log')
20-
assert buildLog.text.contains('[ERROR] Dependency org.apache.jackrabbit.vault:vault-cli:jar @ line 65, column 21 does not have an explicit scope defined!')
20+
21+
def column = mavenVersion.startsWith('4.') ? '9' : '21'
22+
23+
assert buildLog.text.contains('[ERROR] Dependency org.apache.jackrabbit.vault:vault-cli:jar @ line 65, column ' + column + ' does not have an explicit scope defined!')
2124
assert buildLog.text.contains('Found 1 missing dependency scope. Look at the errors emitted above for the details.')

0 commit comments

Comments
 (0)