This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-archetype.git
commit 902e1c73791cdbe630de677d84018259d2372381 Author: Sylwester Lachiewicz <[email protected]> AuthorDate: Sat Oct 31 11:21:50 2026 +0000 Move the BeanShell verify script rejection IT to a unit test --- .../archetype.properties | 18 ------ .../invoker.properties | 19 ------ .../verify-script-beanshell-rejected/pom.xml | 71 ---------------------- .../META-INF/maven/archetype-metadata.xml | 34 ----------- .../src/main/resources/archetype-resources/pom.xml | 39 ------------ .../archetype-resources/src/main/java/App.java | 36 ----------- .../resources/projects/archetype.pom.properties | 21 ------- .../test/resources/projects/archetype.properties | 21 ------- .../resources/projects/basic/archetype.properties | 21 ------- .../src/test/resources/projects/basic/goal.txt | 1 - .../resources/projects/basic/reference/pom.xml | 39 ------------ .../src/main/java/build/archetype/App.java | 36 ----------- .../src/test/resources/projects/basic/verify.bsh | 21 ------- .../test-settings.xml | 59 ------------------ .../verify-script-beanshell-rejected/verify.groovy | 23 ------- .../archetype/mojos/VerifyScriptRunnerTest.java | 14 +++++ 16 files changed, 14 insertions(+), 459 deletions(-) diff --git a/maven-archetype-plugin/src/it/projects/verify-script-beanshell-rejected/archetype.properties b/maven-archetype-plugin/src/it/projects/verify-script-beanshell-rejected/archetype.properties deleted file mode 100644 index 74cf9cb4..00000000 --- a/maven-archetype-plugin/src/it/projects/verify-script-beanshell-rejected/archetype.properties +++ /dev/null @@ -1,18 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -excludePatterns=build.log,invoker.properties,verify.groovy diff --git a/maven-archetype-plugin/src/it/projects/verify-script-beanshell-rejected/invoker.properties b/maven-archetype-plugin/src/it/projects/verify-script-beanshell-rejected/invoker.properties deleted file mode 100644 index c8bf0731..00000000 --- a/maven-archetype-plugin/src/it/projects/verify-script-beanshell-rejected/invoker.properties +++ /dev/null @@ -1,19 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -invoker.goals = clean integration-test -invoker.buildResult = failure diff --git a/maven-archetype-plugin/src/it/projects/verify-script-beanshell-rejected/pom.xml b/maven-archetype-plugin/src/it/projects/verify-script-beanshell-rejected/pom.xml deleted file mode 100644 index a0fff7d9..00000000 --- a/maven-archetype-plugin/src/it/projects/verify-script-beanshell-rejected/pom.xml +++ /dev/null @@ -1,71 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <groupId>org.apache.maven.plugins.archetype.its</groupId> - <artifactId>verify-script-beanshell-rejected</artifactId> - <version>1.0-SNAPSHOT</version> - <packaging>maven-archetype</packaging> - - <name>verify-script-beanshell-rejected</name> - <description>packages an archetype then runs IT (archetype:integration-test) within a Maven Project being created through another archetype</description> - - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> - - <build> - <extensions> - <extension> - <groupId>org.apache.maven.archetype</groupId> - <artifactId>archetype-packaging</artifactId> - <version>@project.version@</version> - </extension> - </extensions> - - <pluginManagement> - <plugins> - <plugin> - <artifactId>maven-archetype-plugin</artifactId> - <version>@project.version@</version> - <configuration> - <settingsFile>${basedir}/test-settings.xml</settingsFile> - <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath> - <ignoreEOLStyle>true</ignoreEOLStyle> - <properties> - <maven.compiler.source>${maven.compiler.source}</maven.compiler.source> - <maven.compiler.target>${maven.compiler.target}</maven.compiler.target> - </properties> - </configuration> - </plugin> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <configuration> - <includeEmptyDirs>true</includeEmptyDirs> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> -</project> diff --git a/maven-archetype-plugin/src/it/projects/verify-script-beanshell-rejected/src/main/resources/META-INF/maven/archetype-metadata.xml b/maven-archetype-plugin/src/it/projects/verify-script-beanshell-rejected/src/main/resources/META-INF/maven/archetype-metadata.xml deleted file mode 100644 index 28ff4bfd..00000000 --- a/maven-archetype-plugin/src/it/projects/verify-script-beanshell-rejected/src/main/resources/META-INF/maven/archetype-metadata.xml +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> - -<archetype-descriptor xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd" - name="build-archetype-IT"> - <fileSets> - <fileSet filtered="true" packaged="true" encoding="UTF-8"> - <directory>src/main/java</directory> - <includes> - <include>**/*.java</include> - </includes> - </fileSet> - </fileSets> -</archetype-descriptor> diff --git a/maven-archetype-plugin/src/it/projects/verify-script-beanshell-rejected/src/main/resources/archetype-resources/pom.xml b/maven-archetype-plugin/src/it/projects/verify-script-beanshell-rejected/src/main/resources/archetype-resources/pom.xml deleted file mode 100644 index 2933fac4..00000000 --- a/maven-archetype-plugin/src/it/projects/verify-script-beanshell-rejected/src/main/resources/archetype-resources/pom.xml +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> -## There should be no parent specified, as it should be set automatically - - <groupId>${groupId}</groupId> - <artifactId>${artifactId}</artifactId> - <version>${version}</version> - - <name>archetype build IT</name> - - <properties> - <javaVersion>8</javaVersion> - <maven.compiler.source>1.${javaVersion}</maven.compiler.source> - <maven.compiler.target>1.${javaVersion}</maven.compiler.target> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> -</project> diff --git a/maven-archetype-plugin/src/it/projects/verify-script-beanshell-rejected/src/main/resources/archetype-resources/src/main/java/App.java b/maven-archetype-plugin/src/it/projects/verify-script-beanshell-rejected/src/main/resources/archetype-resources/src/main/java/App.java deleted file mode 100644 index eb9b6c73..00000000 --- a/maven-archetype-plugin/src/it/projects/verify-script-beanshell-rejected/src/main/resources/archetype-resources/src/main/java/App.java +++ /dev/null @@ -1,36 +0,0 @@ -package ${package}; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -/** - * Hello world! - * - */ -public class App -{ - public static void main( String[] args ) - { - System.out.println( "Hello World!" ); - System.out.println( "groupId = ${groupId}" ); - System.out.println( "artifactId = ${artifactId}" ); - System.out.println( "package = ${package}" ); - System.out.println( "packageInPathFormat = ${packageInPathFormat}" ); - } -} diff --git a/maven-archetype-plugin/src/it/projects/verify-script-beanshell-rejected/src/test/resources/projects/archetype.pom.properties b/maven-archetype-plugin/src/it/projects/verify-script-beanshell-rejected/src/test/resources/projects/archetype.pom.properties deleted file mode 100644 index 627146f8..00000000 --- a/maven-archetype-plugin/src/it/projects/verify-script-beanshell-rejected/src/test/resources/projects/archetype.pom.properties +++ /dev/null @@ -1,21 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -# https://github.com/mojohaus/pom-root, creates simple pom with packaging pom -groupId=org.codehaus.mojo.archetypes -artifactId=pom-root -version=1.1 diff --git a/maven-archetype-plugin/src/it/projects/verify-script-beanshell-rejected/src/test/resources/projects/archetype.properties b/maven-archetype-plugin/src/it/projects/verify-script-beanshell-rejected/src/test/resources/projects/archetype.properties deleted file mode 100644 index 75a95e18..00000000 --- a/maven-archetype-plugin/src/it/projects/verify-script-beanshell-rejected/src/test/resources/projects/archetype.properties +++ /dev/null @@ -1,21 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -groupId=com.company -artifactId=project -version=1.0-SNAPSHOT -package=com.company.project diff --git a/maven-archetype-plugin/src/it/projects/verify-script-beanshell-rejected/src/test/resources/projects/basic/archetype.properties b/maven-archetype-plugin/src/it/projects/verify-script-beanshell-rejected/src/test/resources/projects/basic/archetype.properties deleted file mode 100644 index 3560bb4a..00000000 --- a/maven-archetype-plugin/src/it/projects/verify-script-beanshell-rejected/src/test/resources/projects/basic/archetype.properties +++ /dev/null @@ -1,21 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -version=0.1-SNAPSHOT -groupId=archetype.it -artifactId=basic -package=build.archetype diff --git a/maven-archetype-plugin/src/it/projects/verify-script-beanshell-rejected/src/test/resources/projects/basic/goal.txt b/maven-archetype-plugin/src/it/projects/verify-script-beanshell-rejected/src/test/resources/projects/basic/goal.txt deleted file mode 100644 index f8808bab..00000000 --- a/maven-archetype-plugin/src/it/projects/verify-script-beanshell-rejected/src/test/resources/projects/basic/goal.txt +++ /dev/null @@ -1 +0,0 @@ -compile \ No newline at end of file diff --git a/maven-archetype-plugin/src/it/projects/verify-script-beanshell-rejected/src/test/resources/projects/basic/reference/pom.xml b/maven-archetype-plugin/src/it/projects/verify-script-beanshell-rejected/src/test/resources/projects/basic/reference/pom.xml deleted file mode 100644 index f3f0df32..00000000 --- a/maven-archetype-plugin/src/it/projects/verify-script-beanshell-rejected/src/test/resources/projects/basic/reference/pom.xml +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>project</artifactId> - <groupId>com.company</groupId> - <version>1.0-SNAPSHOT</version> - </parent> - - <groupId>archetype.it</groupId> - <artifactId>basic</artifactId> - <version>0.1-SNAPSHOT</version> - - <name>archetype build IT</name> - - <properties> - <javaVersion>8</javaVersion> - <maven.compiler.source>1.${javaVersion}</maven.compiler.source> - <maven.compiler.target>1.${javaVersion}</maven.compiler.target> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> -</project> diff --git a/maven-archetype-plugin/src/it/projects/verify-script-beanshell-rejected/src/test/resources/projects/basic/reference/src/main/java/build/archetype/App.java b/maven-archetype-plugin/src/it/projects/verify-script-beanshell-rejected/src/test/resources/projects/basic/reference/src/main/java/build/archetype/App.java deleted file mode 100644 index d507638f..00000000 --- a/maven-archetype-plugin/src/it/projects/verify-script-beanshell-rejected/src/test/resources/projects/basic/reference/src/main/java/build/archetype/App.java +++ /dev/null @@ -1,36 +0,0 @@ -package build.archetype; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -/** - * Hello world! - * - */ -public class App -{ - public static void main( String[] args ) - { - System.out.println( "Hello World!" ); - System.out.println( "groupId = archetype.it" ); - System.out.println( "artifactId = basic" ); - System.out.println( "package = build.archetype" ); - System.out.println( "packageInPathFormat = build/archetype" ); - } -} diff --git a/maven-archetype-plugin/src/it/projects/verify-script-beanshell-rejected/src/test/resources/projects/basic/verify.bsh b/maven-archetype-plugin/src/it/projects/verify-script-beanshell-rejected/src/test/resources/projects/basic/verify.bsh deleted file mode 100644 index 02d9429d..00000000 --- a/maven-archetype-plugin/src/it/projects/verify-script-beanshell-rejected/src/test/resources/projects/basic/verify.bsh +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -println( 'Yeah Baby, it rocks!' ) -System.out.flush() diff --git a/maven-archetype-plugin/src/it/projects/verify-script-beanshell-rejected/test-settings.xml b/maven-archetype-plugin/src/it/projects/verify-script-beanshell-rejected/test-settings.xml deleted file mode 100644 index cb295a6b..00000000 --- a/maven-archetype-plugin/src/it/projects/verify-script-beanshell-rejected/test-settings.xml +++ /dev/null @@ -1,59 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> - -<settings> - <profiles> - <profile> - <id>it-repo</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <repositories> - <repository> - <id>local.central</id> - <url>@localRepositoryUrl@</url> - <releases> - <enabled>true</enabled> - <checksumPolicy>ignore</checksumPolicy> - </releases> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>ignore</checksumPolicy> - </snapshots> - </repository> - </repositories> - <pluginRepositories> - <pluginRepository> - <id>local.central</id> - <url>@localRepositoryUrl@</url> - <releases> - <enabled>true</enabled> - <checksumPolicy>ignore</checksumPolicy> - </releases> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>ignore</checksumPolicy> - </snapshots> - </pluginRepository> - </pluginRepositories> - </profile> - </profiles> -</settings> \ No newline at end of file diff --git a/maven-archetype-plugin/src/it/projects/verify-script-beanshell-rejected/verify.groovy b/maven-archetype-plugin/src/it/projects/verify-script-beanshell-rejected/verify.groovy deleted file mode 100644 index 2466ba55..00000000 --- a/maven-archetype-plugin/src/it/projects/verify-script-beanshell-rejected/verify.groovy +++ /dev/null @@ -1,23 +0,0 @@ - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -File buildLog = new File( basedir, "../../logs/verify-script-beanshell-rejected/build.log" ) -assert buildLog.text.contains("BeanShell verify scripts are no longer supported, port") -assert buildLog.text.contains("verify.bsh to Groovy") diff --git a/maven-archetype-plugin/src/test/java/org/apache/maven/archetype/mojos/VerifyScriptRunnerTest.java b/maven-archetype-plugin/src/test/java/org/apache/maven/archetype/mojos/VerifyScriptRunnerTest.java index 26fe0cbd..9eff177a 100644 --- a/maven-archetype-plugin/src/test/java/org/apache/maven/archetype/mojos/VerifyScriptRunnerTest.java +++ b/maven-archetype-plugin/src/test/java/org/apache/maven/archetype/mojos/VerifyScriptRunnerTest.java @@ -91,6 +91,20 @@ class VerifyScriptRunnerTest { assertTrue( failure.getMessage().contains("port " + new File(dir, "verify.bsh") + " to Groovy"), failure.getMessage()); + assertTrue( + failure.getMessage().contains("BeanShell verify scripts are no longer supported, port"), + failure.getMessage()); + assertTrue(failure.getMessage().contains("verify.bsh to Groovy"), failure.getMessage()); + } + + @Test + void beanShellScriptNamedWithItsExtensionIsRefusedToo() throws Exception { + write("verify.bsh", "return true;"); + IntegrationTestFailure failure = assertThrows( + IntegrationTestFailure.class, () -> runner.run(dir, "verify.bsh", Collections.emptyMap(), null)); + assertTrue( + failure.getMessage().contains("BeanShell verify scripts are no longer supported, port"), + failure.getMessage()); } @Test
