diff --git a/clover/plugin.jelly b/clover/plugin.jelly index ecaee0c7..8acf427a 100644 --- a/clover/plugin.jelly +++ b/clover/plugin.jelly @@ -35,19 +35,8 @@ --> - - - - - - - - - + @@ -65,9 +54,10 @@ - + - + diff --git a/clover/plugin.properties b/clover/plugin.properties index 4e90f4e7..7650eba1 100644 --- a/clover/plugin.properties +++ b/clover/plugin.properties @@ -34,11 +34,6 @@ maven.clover.orderBy = PcCoveredAsc # Whether tests should be instrumented by Clover or not maven.clover.instrument.tests = false -# Allows the user to override the Clover jar. This is especially useful -# as some Clover jars are license-signed for a specific project so you -# might want to use different jars for different projects. -#maven.clover.jar = ${maven.repo.local}/clover/jars/clover-myproject-1.2.3.jar - # Location of the Clover license. Users can override this property to point to # their own Clover license. By default uses an eval license valid for open # source projects. Set it to an empty value if you wish to use Clover's other diff --git a/clover/src/plugin-test/testCustomCloverLicense/maven.xml b/clover/src/plugin-test/testCustomCloverLicense/maven.xml new file mode 100644 index 00000000..c51d4e53 --- /dev/null +++ b/clover/src/plugin-test/testCustomCloverLicense/maven.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/clover/src/plugin-test/testCustomCloverLicense/project.properties b/clover/src/plugin-test/testCustomCloverLicense/project.properties new file mode 100644 index 00000000..915375e2 --- /dev/null +++ b/clover/src/plugin-test/testCustomCloverLicense/project.properties @@ -0,0 +1,17 @@ +# ------------------------------------------------------------------- +# Copyright 2005 The Apache Software Foundation. +# +# Licensed 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. +# ------------------------------------------------------------------- + +maven.clover.license.path = ${maven.build.dir}/clover-test.license diff --git a/clover/src/plugin-test/testCustomCloverLicense/project.xml b/clover/src/plugin-test/testCustomCloverLicense/project.xml new file mode 100644 index 00000000..52b6e92f --- /dev/null +++ b/clover/src/plugin-test/testCustomCloverLicense/project.xml @@ -0,0 +1,25 @@ + + + + + + ${basedir}/../project.xml + testCustomCloverLicense + testCustomCloverLicense + diff --git a/clover/xdocs/changes.xml b/clover/xdocs/changes.xml index ab4d9894..f5aa0e3b 100644 --- a/clover/xdocs/changes.xml +++ b/clover/xdocs/changes.xml @@ -26,6 +26,13 @@ + + Removed the maven.clover.jar property that was used to + override the default Clover jar. This property was not working + (it requires Ant 1.6) and is no needed anymore as Cenqua has cleanly + separated the Clover jar from the Clover license. You only need to + point maven.clover.license.path to your license file. + Added a quick usage guide in the documentation. diff --git a/clover/xdocs/faq.fml b/clover/xdocs/faq.fml index 1c18131d..73dfda06 100644 --- a/clover/xdocs/faq.fml +++ b/clover/xdocs/faq.fml @@ -28,15 +28,11 @@

- If you have a licensed clover JAR, or you want to upgrade the version used by the plugin, you will - need to use a jar override to force the clover plugin to use the updated JAR. -

-

eg: To use a local copy of clover-1.2.4-registered.jar, add this to project.properties:

- maven.jar.override=on -maven.jar.clover=lib/clover-1.2.4-registered.jar -

eg: To use version 1.2.5 from the repository, add this to project.properties:

- maven.jar.override=on -maven.jar.clover=1.2.5 + You don't! Clover has now separated the Clover jar from it's license and thus + there's now no need to provide a custom jar. However you'll still need to provide + your own license (unless you're using this plugin on an open source project). You + specify your own license using the maven.clover.license.path property. + maven.clover.license.path = /some/path/to/my/clover.license
diff --git a/clover/xdocs/properties.xml b/clover/xdocs/properties.xml index 70a56add..786921ed 100644 --- a/clover/xdocs/properties.xml +++ b/clover/xdocs/properties.xml @@ -106,19 +106,6 @@ ${maven.clover.build}/database/clover_coverage.db - - maven.clover.jar - Yes - - Allows the user to override the Clover jar. This is especially useful - as some Clover jars are license-signed for a specific project so you - might want to use different jars for different projects. - - - If not defined, the plugin uses a 30 day eval Clover jar which is - valid for open source projects. - - maven.clover.license.path Yes