You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by vs...@apache.org on 2008/01/16 04:41:26 UTC

svn commit: r612344 - in /maven/plugins/trunk/maven-shade-plugin/src/site: apt/examples.apt apt/index.apt apt/usage.apt site.xml

Author: vsiveton
Date: Tue Jan 15 19:41:26 2008
New Revision: 612344

URL: http://svn.apache.org/viewvc?rev=612344&view=rev
Log:
o fixed license

Modified:
    maven/plugins/trunk/maven-shade-plugin/src/site/apt/examples.apt
    maven/plugins/trunk/maven-shade-plugin/src/site/apt/index.apt
    maven/plugins/trunk/maven-shade-plugin/src/site/apt/usage.apt
    maven/plugins/trunk/maven-shade-plugin/src/site/site.xml

Modified: maven/plugins/trunk/maven-shade-plugin/src/site/apt/examples.apt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/site/apt/examples.apt?rev=612344&r1=612343&r2=612344&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/site/apt/examples.apt (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/site/apt/examples.apt Tue Jan 15 19:41:26 2008
@@ -3,22 +3,23 @@
  ------
  Mauro Talevi
  ------
-~~ Copyright 2007 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
+
+~~ 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
+~~   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.
-
-~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/guides/mini/guide-apt-format.html
+~~ 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.
 
  * Shade Plugin with no relocation
 
@@ -82,8 +83,8 @@
                   <exclude>jmock:jmock</exclude>
                   <exclude>xml-apis:xml-apis</exclude>
                 </excludes>
-              </artifactSet>              
-			  <relocations>
+              </artifactSet>
+              <relocations>
                 <relocation>
                   <pattern>org.codehaus.plexus.util</pattern>
                   <shadedPattern>org.shaded.plexus.util</shadedPattern>
@@ -92,7 +93,7 @@
                     <exclude>org.codehaus.plexus.util.xml.pull.*</exclude>
                   </excludes>
                 </relocation>
-              </relocations>              
+              </relocations>
               <transformers>
                 <transformer implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer"/>
               </transformers>
@@ -131,8 +132,8 @@
                   <exclude>jmock:jmock</exclude>
                   <exclude>xml-apis:xml-apis</exclude>
                 </excludes>
-              </artifactSet>              
-			  <relocations>
+              </artifactSet>
+              <relocations>
                 <relocation>
                   <pattern>org.codehaus.plexus.util</pattern>
                   <excludes>
@@ -140,7 +141,7 @@
                     <exclude>org.codehaus.plexus.util.xml.pull.*</exclude>
                   </excludes>
                 </relocation>
-              </relocations>              
+              </relocations>
               <transformers>
                 <transformer implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer"/>
               </transformers>
@@ -181,8 +182,8 @@
                   <exclude>jmock:jmock</exclude>
                   <exclude>xml-apis:xml-apis</exclude>
                 </excludes>
-              </artifactSet>                            
-			  <relocations>
+              </artifactSet>
+              <relocations>
                 <relocation>
                   <pattern>org.codehaus.plexus.util</pattern>
                   <excludes>
@@ -190,7 +191,7 @@
                     <exclude>org.codehaus.plexus.util.xml.pull.*</exclude>
                   </excludes>
                 </relocation>
-              </relocations>              
+              </relocations>
               <transformers>
                 <transformer implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer"/>
               </transformers>

Modified: maven/plugins/trunk/maven-shade-plugin/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/site/apt/index.apt?rev=612344&r1=612343&r2=612344&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/site/apt/index.apt (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/site/apt/index.apt Tue Jan 15 19:41:26 2008
@@ -3,32 +3,33 @@
  ------
  Mauro Talevi
  ------
- ~~ Copyright 2007 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
+
+~~ 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
+~~   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.
-
-~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/guides/mini/guide-apt-format.html
- 
+~~ 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.
+
 Introduction
 
- This plugin provides the capability to package the artifact in a uber-jar, including its dependencies and 
+ This plugin provides the capability to package the artifact in a uber-jar, including its dependencies and
  to "shade" - ie rename - the packages of some of the dependencies.
- 
+
  * Goals Overview
 
   The Shade Plugin has a single goal:
-  
+
   * {{{shade-mojo.html}shade:shade}} is bound to the package phase and
   is used to create a shaded jar.
 

Modified: maven/plugins/trunk/maven-shade-plugin/src/site/apt/usage.apt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/site/apt/usage.apt?rev=612344&r1=612343&r2=612344&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/site/apt/usage.apt (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/site/apt/usage.apt Tue Jan 15 19:41:26 2008
@@ -3,27 +3,28 @@
  ------
  Mauro Talevi
  ------
-~~ Copyright 2007 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
+
+~~ 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
+~~   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.
-
-~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/guides/mini/guide-apt-format.html
+~~ 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.
 
  * Creating a shaded jar
 
   The goals for the Shade Plugin are bound to the package phase in the
-  build lifecycle.  
+  build lifecycle.
 
 +-----
 mvn package

Modified: maven/plugins/trunk/maven-shade-plugin/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/site/site.xml?rev=612344&r1=612343&r2=612344&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/site/site.xml (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/site/site.xml Tue Jan 15 19:41:26 2008
@@ -1,24 +1,25 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!--
-/*
- * Copyright 2001-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.
- */
+<!--
+  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.
 -->
 
-<project name="Maven Shade Plugin">  
+<project name="Maven Shade Plugin">
   <body>
     <menu name="Overview">
       <item name="Introduction" href="index.html"/>