turbine-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sgoes...@apache.org
Subject svn commit: r667566 - in /turbine/fulcrum/trunk/parent: LICENSE.txt NOTICE.txt pom.xml src/ src/site/ src/site/site.xml
Date Fri, 13 Jun 2008 15:16:47 GMT
Author: sgoeschl
Date: Fri Jun 13 08:16:47 2008
New Revision: 667566

URL: http://svn.apache.org/viewvc?rev=667566&view=rev
Log:
Tweaking the M2 build to do something helpful other than failing ....

Added:
    turbine/fulcrum/trunk/parent/LICENSE.txt
    turbine/fulcrum/trunk/parent/NOTICE.txt
    turbine/fulcrum/trunk/parent/src/
    turbine/fulcrum/trunk/parent/src/site/
    turbine/fulcrum/trunk/parent/src/site/site.xml
Modified:
    turbine/fulcrum/trunk/parent/pom.xml

Added: turbine/fulcrum/trunk/parent/LICENSE.txt
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/parent/LICENSE.txt?rev=667566&view=auto
==============================================================================
--- turbine/fulcrum/trunk/parent/LICENSE.txt (added)
+++ turbine/fulcrum/trunk/parent/LICENSE.txt Fri Jun 13 08:16:47 2008
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.

Added: turbine/fulcrum/trunk/parent/NOTICE.txt
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/parent/NOTICE.txt?rev=667566&view=auto
==============================================================================
--- turbine/fulcrum/trunk/parent/NOTICE.txt (added)
+++ turbine/fulcrum/trunk/parent/NOTICE.txt Fri Jun 13 08:16:47 2008
@@ -0,0 +1,5 @@
+Turbine Fulcrum Parent
+Copyright 2006-2008 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).

Modified: turbine/fulcrum/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/parent/pom.xml?rev=667566&r1=667565&r2=667566&view=diff
==============================================================================
--- turbine/fulcrum/trunk/parent/pom.xml (original)
+++ turbine/fulcrum/trunk/parent/pom.xml Fri Jun 13 08:16:47 2008
@@ -115,7 +115,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.4.2</version>
+          <version>2.4.3</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -130,7 +130,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
-          <version>2.3</version>
+          <version>2.4</version>
           <configuration>
             <encoding>${fulcrum.encoding}</encoding>
             <docEncoding>${fulcrum.docEncoding}</docEncoding>
@@ -152,12 +152,6 @@
           <version>1.1</version>
         </plugin>
         <plugin>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>maven-bundle-plugin</artifactId>
-          <version>1.4.0</version>
-          <inherited>true</inherited>
-        </plugin>
-        <plugin>
           <groupId>org.apache.commons</groupId>
           <artifactId>commons-build-plugin</artifactId>
           <version>1.0</version>
@@ -235,6 +229,19 @@
         </executions>
       </plugin>
       <plugin>
+        <!-- attach the source code when building a jar -->
+        <artifactId>maven-source-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>create-source-jar</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+            <phase>package</phase>
+          </execution>
+        </executions>
+      </plugin>      
+      <plugin>
         <!-- build the source and binary distribution packages -->
         <artifactId>maven-assembly-plugin</artifactId>
         <configuration>
@@ -258,12 +265,16 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.3</version>
+        <version>2.4</version>
         <configuration> 
-          <aggregate>true</aggregate>
+          <aggregate>false</aggregate>
           <source>${maven.compile.source}</source>
           <encoding>${fulcrum.encoding}</encoding>
           <docEncoding>${fulcrum.docEncoding}</docEncoding>
+          <linksource>true</linksource>
+          <links>
+            <link>http://java.sun.com/javase/6/docs/api/</link>
+          </links>
         </configuration> 
       </plugin>
       <plugin>
@@ -290,7 +301,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-report-plugin</artifactId>
-        <version>2.4.2</version>
+        <version>2.4.3</version>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
@@ -369,22 +380,6 @@
 
   <profiles>
     <profile>
-      <id>ci</id>
-      <distributionManagement>
-        <repository>
-          <id>apache.snapshots</id>
-          <name>Apache Development Snapshot Repository</name>
-          <url>${fulcrum.deployment.protocol}://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
-        </repository>
-        <snapshotRepository>
-          <id>apache.snapshots</id>
-          <name>Apache Development Snapshot Repository</name>
-          <url>${fulcrum.deployment.protocol}://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
-        </snapshotRepository>
-      </distributionManagement>
-    </profile>
-
-    <profile>
       <id>release</id>
       <distributionManagement>
         <repository>
@@ -418,18 +413,6 @@
             </configuration>
           </plugin>
           <plugin>
-            <artifactId>maven-source-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>create-source-jar</id>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-                <phase>package</phase>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
             <artifactId>maven-release-plugin</artifactId>
             <configuration>
               <!-- Pass these arguments to the deploy plugin. -->
@@ -461,7 +444,7 @@
         <repository>
           <id>apache.snapshots</id>
           <name>Apache Development Snapshot Repository</name>
-          <url>${fulcrum.deployment.protocol}://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
+          <url>${fulcrum.deployment.protocol}://people.apache.org/www/turbine.apache.org/builds/turbine/fulcrum/${fulcrum.componentid}/${fulcrum.release.version}/${fulcrum.rc.version}/staged</url>
         </repository>
         <snapshotRepository>
           <id>apache.snapshots</id>
@@ -505,18 +488,6 @@
             </executions>
           </plugin>
           <plugin>
-            <artifactId>maven-source-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>create-source-jar</id>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-                <phase>package</phase>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
             <artifactId>maven-release-plugin</artifactId>
             <configuration>
               <!-- Pass these arguments to the deploy plugin. -->
@@ -567,6 +538,9 @@
     <!-- Fulcrum Component Id -->
     <fulcrum.componentid>${project.artifactId}</fulcrum.componentid>
     
+    <!-- The RC version used in the staging repository URL. -->
+    <fulcrum.rc.version>RC1</fulcrum.rc.version>
+
     <!--
       Make the deployment protocol pluggable. This allows to switch to
       other protocols like scpexe, which some users prefer over scp.

Added: turbine/fulcrum/trunk/parent/src/site/site.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/parent/src/site/site.xml?rev=667566&view=auto
==============================================================================
--- turbine/fulcrum/trunk/parent/src/site/site.xml (added)
+++ turbine/fulcrum/trunk/parent/src/site/site.xml Fri Jun 13 08:16:47 2008
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project name="Apache Turbine Fulcrum">
+  <bannerLeft>
+    <name>Apache Turbine Fulcrum</name>
+    <src>http://turbine.apache.org/images/turbine-project.png</src>
+    <href>http://turbine.apache.org/fulcrum/</href>
+  </bannerLeft>
+  <publishDate format="dd MMMM yyyy" position="left" />
+  <version position="left" />
+  <body>
+    <links>
+      <item name="Apache"  href="http://www.apache.org"/>
+      <item name="Turbine" href="http://turbine.apache.org/" />      
+      <item name="Fulcrum" href="http://turbine.apache.org/fulcrum" />
+    </links>
+    <menu ref="reports" inherit="bottom" />
+    <menu name="ASF" inherit="bottom">
+      <item name="Sponsorship"           href="http://www.apache.org/foundation/sponsorship.html"
/>
+      <item name="Thanks"                href="http://www.apache.org/foundation/thanks.html"
/>
+    </menu>
+  </body>
+</project>



Mime
View raw message