From 19c337cf97d0cf1a15b88b9f32b2093c733c109c Mon Sep 17 00:00:00 2001 From: Aaron Digulla Date: Fri, 25 Jan 2019 10:12:38 +0100 Subject: [PATCH] Fix #73 Class not found on mvn license:aggregate-third-party-report Cherry-picked and reworded from https://github.com/mojohaus/license-maven-plugin/pull/215 by @digulla --- pom.xml | 5 +- .../child1/pom.xml | 49 ++++++++++++++ .../child2/pom.xml | 50 ++++++++++++++ .../invoker.properties | 23 +++++++ src/it/aggregate-third-party-report/pom.xml | 65 +++++++++++++++++++ .../postbuild.groovy | 24 +++++++ 6 files changed, 213 insertions(+), 3 deletions(-) create mode 100644 src/it/aggregate-third-party-report/child1/pom.xml create mode 100644 src/it/aggregate-third-party-report/child2/pom.xml create mode 100644 src/it/aggregate-third-party-report/invoker.properties create mode 100644 src/it/aggregate-third-party-report/pom.xml create mode 100644 src/it/aggregate-third-party-report/postbuild.groovy diff --git a/pom.xml b/pom.xml index ea10bbd18..cd0d4eca2 100644 --- a/pom.xml +++ b/pom.xml @@ -116,7 +116,7 @@ 1.3 - 1.5 + 1.6 true 4.5.4 @@ -151,7 +151,6 @@ org.apache.maven maven-plugin-api - ${mavenVersion} org.apache.maven @@ -214,7 +213,7 @@ org.apache.maven.doxia doxia-site-renderer - 1.4 + ${doxiaVersion} org.codehaus.plexus diff --git a/src/it/aggregate-third-party-report/child1/pom.xml b/src/it/aggregate-third-party-report/child1/pom.xml new file mode 100644 index 000000000..16ab34215 --- /dev/null +++ b/src/it/aggregate-third-party-report/child1/pom.xml @@ -0,0 +1,49 @@ + + + + + + 4.0.0 + + + org.codehaus.mojo.license.test + test-aggregate-third-party-report + @pom.version@ + + test-aggregate-third-party-report-child1 + + License Test :: aggregate-third-party-report - child 1 + + + + commons-logging + commons-logging + 1.1.1 + + + + + + diff --git a/src/it/aggregate-third-party-report/child2/pom.xml b/src/it/aggregate-third-party-report/child2/pom.xml new file mode 100644 index 000000000..b8ef6d4a1 --- /dev/null +++ b/src/it/aggregate-third-party-report/child2/pom.xml @@ -0,0 +1,50 @@ + + + + + + 4.0.0 + + + org.codehaus.mojo.license.test + test-aggregate-third-party-report + @pom.version@ + + test-aggregate-third-party-report-child2 + + License Test :: aggregate-third-party-report - child 2 + + + + junit + junit + 4.8.1 + test + + + + + + diff --git a/src/it/aggregate-third-party-report/invoker.properties b/src/it/aggregate-third-party-report/invoker.properties new file mode 100644 index 000000000..4c3f0de5c --- /dev/null +++ b/src/it/aggregate-third-party-report/invoker.properties @@ -0,0 +1,23 @@ +### +# #%L +# License Maven Plugin +# %% +# Copyright (C) 2008 - 2011 CodeLutin, Codehaus, Tony Chemit +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# . +# #L% +### +invoker.goals=clean license:aggregate-third-party-report +invoker.failureBehavior=fail-fast \ No newline at end of file diff --git a/src/it/aggregate-third-party-report/pom.xml b/src/it/aggregate-third-party-report/pom.xml new file mode 100644 index 000000000..8456ae051 --- /dev/null +++ b/src/it/aggregate-third-party-report/pom.xml @@ -0,0 +1,65 @@ + + + + + + 4.0.0 + + org.codehaus.mojo.license.test + test-aggregate-third-party-report + @pom.version@ + + + child1 + child2 + + + License Test :: aggregate-third-party-report + + pom + + + + UTF-8 + true + true + + + + + + + + org.codehaus.mojo + license-maven-plugin + @pom.version@ + + + + + + + + diff --git a/src/it/aggregate-third-party-report/postbuild.groovy b/src/it/aggregate-third-party-report/postbuild.groovy new file mode 100644 index 000000000..0b46b72f3 --- /dev/null +++ b/src/it/aggregate-third-party-report/postbuild.groovy @@ -0,0 +1,24 @@ +/* + * #%L + * License Maven Plugin + * %% + * Copyright (C) 2008 - 2011 CodeLutin, Codehaus, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * . + * #L% + */ + +file = new File(basedir, 'target/site/aggregate-third-party-report.html'); +assert file.exists();