diff --git a/clover/plugin.properties b/clover/plugin.properties index f20998e8..cdd46932 100644 --- a/clover/plugin.properties +++ b/clover/plugin.properties @@ -40,11 +40,11 @@ maven.clover.instrument.tests = false #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 a 30 day eval license valid for -# open source projects. Set it to an empty value if you wish to use Clover's -# other license loading mechanisms (Clover looks next to clover.jar on the -# filesystem and in the classpath). -maven.clover.license.path = ${plugin.getDependencyPath('clover:clover-license')} +# 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 +# license loading mechanisms (Clover looks next to clover.jar on the filesystem +# and in the classpath). +maven.clover.license.path = ${plugin.resources}/clover.license # What are the reports that should be generated maven.clover.report.html = true diff --git a/clover/project.xml b/clover/project.xml index e299c221..1a1cbd9f 100644 --- a/clover/project.xml +++ b/clover/project.xml @@ -118,15 +118,5 @@ root - - - - clover - clover-license - 20060130 - license - diff --git a/clover/src/plugin-resources/clover.license b/clover/src/plugin-resources/clover.license new file mode 100644 index 00000000..56e003ef --- /dev/null +++ b/clover/src/plugin-resources/clover.license @@ -0,0 +1,103 @@ +Product: Clover +License: Maven License, 0.x, 1.x +Issued: Thu Jul 8 2004 05:37:52 CDT +Expiry: Mon Jan 30 2006 00:00:00 CST +Key: 47764fcf23b689940f3ba6d5c +Name: Vincent Massol +Org: Maven +Certificate: AAACTG+Ow8B7/zEbxOMqqKwwrdpP+b9RI3QpJp1p5GYetnEZ1bTfFsNcI +BFgt6wjsr7mkJwsqpdgk/yEZJj3job+JBdaXy0D57q4LR5IvOBFb4CejKlB7R0tBLMtZB1 +z8E40a4RpZPEs1unqS5oRKOLDDsuZMK6fVZK9RnYiEzfIO6UjDvImCYDyjkq8SSYBJdTpP +KHHttTJZrrTOMq/onTG48fHvG9PJns/HPb08BUDW+OhGX392JfAVPEJPR3tJ3kJbsdNe3K +DbyXxMdbmpVPTFD/p1UWP4Cm+zU6apE12fkU37zazJkv0Q1mB4tJAqEQhAQ/S6nzk9O2Tn +DT+ximDifg12vrD0qZlAXBEKQfxvfcPV0+w/UJ4483M11T7WD4VomRiDCuTbzprhHVk0j6 +Ep9dayhgp7tJPmblx0dVbkPZXJGRGHdo/rjJB9SwUkfaaQ8NEOwdg0+53r++0nZ0grZdlq +bzhJ8Lq2tameBZtGDgQ8LnxDxZfsOFYN97H0NAR8xErGa03c0Qm0lF7c45sZP0nhu73Wt5 +ZUO/STYf9K6nKWPmzTjosV2XZP9Y4R/U9WYHi0kCoRCEBD9H0ceToo8WCfenUJcaos2WGt +5uU9zlfZyB/QrPe+w4ZX7jtQjfaw9zCQvpYPhWwLWJEJsdWKyfONDPvKNjk4FHLAjupxU+ +G4Cu0n1KRv0I/fwN2jDa1M0voOkyBpJlDu1s7C2ud8nShxbzP2nHorTzKr+s6xeqM1rpoA +zlxJRG/58gDfUOw/UJi/sLVnlf+FDsZyR8RwmD+fHwbu0HYo1tFZPllK3uIkrSZuzCSty6 +dPbbN/f/WOkayBlykYmjrR/W3s5L5qWKiU8g1+hxCTmvTu8wv2CYFNauUWjP2EvQfmWv6M +VKkNsU8CTrzUvBKHEd/cv7dpTyGwd/4j7Hm3vbGeYgnuny14B4IgpanSMTU+qLC +License Agreement: CENQUA CLOVER EVALUATION SOFTWARE LICENSE AGREEMENT + +CENQUA IS WILLING TO LICENSE CLOVER AND ACCOMPANYING DOCUMENTATION +(THE "SOFTWARE") TO YOU (THE "EVALUATOR") FOR EVALUATION PURPOSES ONLY +UPON THE CONDITION THAT YOU ACCEPT ALL OF THE TERMS OF THIS LICENSE +AGREEMENT. PLEASE READ THESE TERMS CAREFULLY BEFORE INSTALLING OR +USING THE SOFTWARE. BY INSTALLING OR USING THE SOFTWARE, YOU ARE +CONSENTING TO BE BOUND BY AND ARE BECOMING A PARTY TO THIS AGREEMENT. + +1. Software: The licensed Software is "Clover Evaluation Edition". + +2. Grant of License: Cortex eBusiness Pty Ltd ("Cenqua") hereby + grants to Evaluator, for 30 days (the "Evaluation Period") + following the execution of this Agreement (the "Agreement"), a + limited, nontransferable, nonexclusive, nonsublicensable, + revocable, worldwide license to use the Software for the purposes + of internal evaluation and testing for suitability for commercial + licensing ("Evaluation") by Evaluator. Title to the Software shall + remain with Cenqua at all times. + +3. Exclusions: Evaluator shall not: a. copy any part of the Software + except to make one copy for back-up purposes only; b. reverse + compile or reverse assemble any portion of the Software where the + source code is not freely accessible; c. distribute, disclose, + market, rent, lease, or transfer the Software; d. export the + Software; or e. allow others to make or obtain copies of the + Software. + +4. Support: Cenqua may, during the Evaluation Period, make + available updates, enhancements, and/or modifications to the + Software and may provide such updates to Evaluator, but is under no + obligation to do so. The provision by Cenqua to Evaluator of + such updates, enhancements, and/or modifications to the Software + shall be subject to all terms and conditions of this Agreement and + shall expire at the end of the Evaluation Period. + +5. Specific Disclaimer of Warranty and Limitation of Liability: + +THE SOFTWARE IS PROVIDED WITHOUT WARRANTY OF ANY KIND. CENQUA +DISCLAIMS ALL WARRANTIES, EXPRESSED OR IMPLIED, INCLUDING BUT NOT +LIMITED TO THE WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE. CENQUA WILL NOT BE LIABLE FOR ANY DAMAGES +ASSOCIATED WITH THE SOFTWARE, INCLUDING, WITHOUT LIMITATION, ORDINARY, +INCIDENTAL, INDIRECT, OR CONSEQUENTIAL DAMAGES OF ANY KIND, INCLUDING +BUT NOT LIMITED TO DAMAGES RELATING TO LOST DATA OR LOST PROFITS, EVEN +IF CENQUA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +6. Termination: Evaluator's license to use the Software shall + terminate on the earlier of (i) written notice by either Cenqua + or Evaluator, or (ii) expiration of the Evaluation Period. Upon + termination of the license as provided above, Evaluator shall + promptly destroy the Software and any back-up copy of the Software + made during the Evaluation Period. Evaluator shall also promptly + return all materials provided by Cenqua in connection with the + Software. + +7. Warranties and Representations; Indemnification. Evaluator warrants + and represents that Evaluator's actions with regard to the Software + will be in compliance with all applicable laws; and Evaluator will + indemnify, defend, and hold Cenqua harmless from and against any + and all liabilities, damages, losses, claims, costs, and expenses + (including legal fees) arising out of or resulting from Evaluator's + failure to observe the use restrictions set forth herein. + +8. Governing Law: This Agreement shall be governed by the laws of New + South Wales, Australia. + +9.Independent Contractors; Assignment: The parties are independent + contractors with respect to each other, and nothing in this + Agreement shall be construed as creating an employer-employee + relationship, a partnership, agency relationship or a joint venture + between the parties. This Agreement is not assignable or + transferable by Evaluator. + +10.Entire Agreement: This Agreement constitutes the entire agreement + between the parties concerning Evaluator's use of the + Software. This Agreement supersedes any prior verbal understanding + between the parties and any Evaluator purchase order or other + ordering document, regardless of whether such document is received + by Cenqua before or after execution of this Agreement. This + Agreement may be amended only in writing by Cenqua. + diff --git a/clover/xdocs/changes.xml b/clover/xdocs/changes.xml index b349f807..13b7aaf2 100644 --- a/clover/xdocs/changes.xml +++ b/clover/xdocs/changes.xml @@ -26,6 +26,12 @@ + + Changed the location of the default license. It is now bundled in the + plugin and the plugin no longer downloads it from your remote + repository. As before if you wish to use your own license use the + maven.clover.license.path property. + Do not create a Clover report link when the project has no tests. diff --git a/clover/xdocs/properties.xml b/clover/xdocs/properties.xml index 96039319..4e771b34 100644 --- a/clover/xdocs/properties.xml +++ b/clover/xdocs/properties.xml @@ -114,13 +114,13 @@ Yes Location of the Clover license. Users can override this property to - point to their own Clover license. By default uses a 30 day eval + 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 license loading mechanisms (Clover looks next to clover.jar on the filesystem and in the classpath). - ${plugin.getDependencyPath('clover:clover-license')} + ${plugin.resources}/clover.license