diff --git a/pom.xml b/pom.xml index cc87562d..a7c01d08 100644 --- a/pom.xml +++ b/pom.xml @@ -145,6 +145,12 @@ under the License. ${mavenVersion} provided + + org.apache.maven.resolver + maven-resolver-api + 1.4.1 + provided + org.apache.maven.resolver maven-resolver-util @@ -205,6 +211,11 @@ under the License. maven-script-interpreter 1.6 + + org.slf4j + slf4j-api + 1.7.36 + ${beanshell-groupId} @@ -236,6 +247,8 @@ under the License. org.codehaus.plexus plexus-xml + + 3.0.1 org.codehaus.plexus diff --git a/src/it/MINVOKER-351/invoker.properties b/src/it/MINVOKER-351/invoker.properties new file mode 100644 index 00000000..d3ffde37 --- /dev/null +++ b/src/it/MINVOKER-351/invoker.properties @@ -0,0 +1,21 @@ +# 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.1 = initialize +invoker.buildResult.1 = failure + +invoker.goals.2 = site diff --git a/src/it/MINVOKER-351/pom.xml b/src/it/MINVOKER-351/pom.xml new file mode 100644 index 00000000..a38261e0 --- /dev/null +++ b/src/it/MINVOKER-351/pom.xml @@ -0,0 +1,92 @@ + + + + + + 4.0.0 + + example.minvoker351 + minvoker-351 + 1.0-SNAPSHOT + pom + + Special XML chars in build-job, junit reports + + + UTF-8 + @version.maven-compiler-plugin@ + @version.maven-surefire@ + + + + + + org.apache.maven.plugins + maven-site-plugin + @version.maven-site-plugin@ + + + org.apache.maven.plugins + maven-invoker-plugin + @project.version@ + + ${project.build.directory}/it + ${project.build.directory}/local-repo + true + + + + integration-test + initialize + + install + run + + + + + + + + + + true + + + org.apache.maven.plugins + maven-surefire-report-plugin + ${version.maven-surefire} + + + ${project.build.directory}/invoker-reports-test + + + + + + report-only + + + + + + + diff --git a/src/it/MINVOKER-351/src/it/minvoker-351/pom.xml b/src/it/MINVOKER-351/src/it/minvoker-351/pom.xml new file mode 100644 index 00000000..1e327cb6 --- /dev/null +++ b/src/it/MINVOKER-351/src/it/minvoker-351/pom.xml @@ -0,0 +1,35 @@ + + + + + + 4.0.0 + + example.minvoker351 + minvoker-351 + 1.0-SNAPSHOT + pom + + + UTF-8 + + + diff --git a/src/it/MINVOKER-351/src/it/minvoker-351/postbuild.groovy b/src/it/MINVOKER-351/src/it/minvoker-351/postbuild.groovy new file mode 100644 index 00000000..cc511ba0 --- /dev/null +++ b/src/it/MINVOKER-351/src/it/minvoker-351/postbuild.groovy @@ -0,0 +1,20 @@ +/* + * 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. + */ + +throw new Exception("Special chars \tcharName=" + Character.getName(7) + ": " + (char) 7) diff --git a/src/it/MINVOKER-351/verify.groovy b/src/it/MINVOKER-351/verify.groovy new file mode 100644 index 00000000..afc487b0 --- /dev/null +++ b/src/it/MINVOKER-351/verify.groovy @@ -0,0 +1,31 @@ +/* + * 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. + */ + +// we have a special chars in build.log +def buildLog = new File(basedir, 'target/it/minvoker-351/build.log').text +buildLog.contains('Special chars \tcharName=BEL: \u0007') + +def surefireReport = new File(basedir, 'target/site/surefire-report.html').text +assert surefireReport.contains('maven.invoker.it.minvoker-351') + +// TODO remove after next release +// Due to error parsing junit-reports by Jenkins with forbidden chars +new File(basedir, 'build.log').delete() + +return true \ No newline at end of file