geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r690323 - in /geronimo/genesis/branches/1.3.1: config/checkstyle-config/src/site/apt/usage.apt config/geronimo-skin/src/site/apt/usage.apt config/logging-config/src/site/apt/usage.apt config/project-config/pom.xml pom.xml
Date Fri, 29 Aug 2008 16:37:29 GMT
Author: dwoods
Date: Fri Aug 29 09:37:29 2008
New Revision: 690323

URL: http://svn.apache.org/viewvc?rev=690323&view=rev
Log:
update some plugin config, usage and versions to match Genesis 1.5-SNAPSHOT.  added missing
license headers discovered by rat-maven-plugin

Modified:
    geronimo/genesis/branches/1.3.1/config/checkstyle-config/src/site/apt/usage.apt
    geronimo/genesis/branches/1.3.1/config/geronimo-skin/src/site/apt/usage.apt
    geronimo/genesis/branches/1.3.1/config/logging-config/src/site/apt/usage.apt
    geronimo/genesis/branches/1.3.1/config/project-config/pom.xml
    geronimo/genesis/branches/1.3.1/pom.xml

Modified: geronimo/genesis/branches/1.3.1/config/checkstyle-config/src/site/apt/usage.apt
URL: http://svn.apache.org/viewvc/geronimo/genesis/branches/1.3.1/config/checkstyle-config/src/site/apt/usage.apt?rev=690323&r1=690322&r2=690323&view=diff
==============================================================================
--- geronimo/genesis/branches/1.3.1/config/checkstyle-config/src/site/apt/usage.apt (original)
+++ geronimo/genesis/branches/1.3.1/config/checkstyle-config/src/site/apt/usage.apt Fri Aug
29 09:37:29 2008
@@ -1,3 +1,23 @@
+
+~~
+~~ 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.
+~~
+
  ------
  Genesis Checkstyle Configuration
  ------

Modified: geronimo/genesis/branches/1.3.1/config/geronimo-skin/src/site/apt/usage.apt
URL: http://svn.apache.org/viewvc/geronimo/genesis/branches/1.3.1/config/geronimo-skin/src/site/apt/usage.apt?rev=690323&r1=690322&r2=690323&view=diff
==============================================================================
--- geronimo/genesis/branches/1.3.1/config/geronimo-skin/src/site/apt/usage.apt (original)
+++ geronimo/genesis/branches/1.3.1/config/geronimo-skin/src/site/apt/usage.apt Fri Aug 29
09:37:29 2008
@@ -1,3 +1,23 @@
+
+~~
+~~ 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.
+~~
+
  ------
  Genesis Geronimo Skin
  ------

Modified: geronimo/genesis/branches/1.3.1/config/logging-config/src/site/apt/usage.apt
URL: http://svn.apache.org/viewvc/geronimo/genesis/branches/1.3.1/config/logging-config/src/site/apt/usage.apt?rev=690323&r1=690322&r2=690323&view=diff
==============================================================================
--- geronimo/genesis/branches/1.3.1/config/logging-config/src/site/apt/usage.apt (original)
+++ geronimo/genesis/branches/1.3.1/config/logging-config/src/site/apt/usage.apt Fri Aug 29
09:37:29 2008
@@ -1,3 +1,23 @@
+
+~~
+~~ 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.
+~~
+
  ------
  Genesis Logging Configuration
  ------

Modified: geronimo/genesis/branches/1.3.1/config/project-config/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/branches/1.3.1/config/project-config/pom.xml?rev=690323&r1=690322&r2=690323&view=diff
==============================================================================
--- geronimo/genesis/branches/1.3.1/config/project-config/pom.xml (original)
+++ geronimo/genesis/branches/1.3.1/config/project-config/pom.xml Fri Aug 29 09:37:29 2008
@@ -39,8 +39,6 @@
         by all Apache Geronimo projects.
     </description>
     
-    <url>http://geronimo.apache.org</url>
-    
     <organization>
         <name>Apache Software Foundation</name>
         <url>http://www.apache.org</url>
@@ -111,21 +109,8 @@
         <url>http://issues.apache.org/jira/browse/GERONIMO</url>
     </issueManagement>
     
-    <ciManagement>
-        <system>continuum</system>
-        <notifiers>
-            <notifier>
-                <type>mail</type>
-                <sendOnError />
-                <sendOnFailure />
-                <address>dev@geronimo.apache.org</address>
-            </notifier>
-        </notifiers>
-    </ciManagement>
-    
     <dependencyManagement>
         <dependencies>
-            
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
@@ -137,7 +122,6 @@
                 <artifactId>logging-config</artifactId>
                 <version>1.3.1-SNAPSHOT</version>
             </dependency>
-            
         </dependencies>
     </dependencyManagement>
     
@@ -225,7 +209,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-one-plugin</artifactId>
-                    <version>1.1</version>
+                    <version>1.2</version>
                 </plugin>
                 
                 <plugin>
@@ -237,7 +221,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-assembly-plugin</artifactId>
-                    <version>2.1</version>
+                    <version>2.2-beta-2</version>
                     <configuration>
                         <tarLongFileMode>gnu</tarLongFileMode>
                     </configuration>
@@ -246,7 +230,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>2.3</version>
+                    <version>2.4</version>
                 </plugin>
                 
                 <plugin>
@@ -258,19 +242,13 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-release-plugin</artifactId>
-                    <version>2.0-beta-5</version>
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-one-plugin</artifactId>
-                    <version>1.1</version>
+                    <version>2.0-beta-6</version>
                 </plugin>
                 
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <version>2.1</version>
+                    <version>2.2</version>
                 </plugin>
                 
                 <plugin>
@@ -305,7 +283,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-eclipse-plugin</artifactId>
-                    <version>2.4</version>
+                    <version>2.5.1</version>
                 </plugin>
                 
                 <plugin>
@@ -329,7 +307,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-dependency-plugin</artifactId>
-                    <version>2.0-alpha-4</version>
+                    <version>2.0</version>
                 </plugin>
                 
                 <!--
@@ -500,7 +478,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.3</version>
+                <version>2.4</version>
                 <configuration>
                     <minmemory>128m</minmemory>
                     <maxmemory>512</maxmemory>
@@ -545,7 +523,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>
-                <version>2.2</version>
+                <version>2.3</version>
             </plugin>
             
             <plugin>

Modified: geronimo/genesis/branches/1.3.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/branches/1.3.1/pom.xml?rev=690323&r1=690322&r2=690323&view=diff
==============================================================================
--- geronimo/genesis/branches/1.3.1/pom.xml (original)
+++ geronimo/genesis/branches/1.3.1/pom.xml Fri Aug 29 09:37:29 2008
@@ -43,7 +43,7 @@
         and common plugins.
     </description>
     
-    <url>http://geronimo.apache.org</url>
+    <url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
     
     <scm>
         <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/genesis/branches/1.3.1</connection>
@@ -51,6 +51,11 @@
         <url>http://svn.apache.org/viewvc/geronimo/genesis/branches/1.3.1</url>
     </scm>
 
+    <properties>
+        <!-- set siteId to artifactId for any "top level" project rooting a website -->
+        <siteId>genesis</siteId>
+    </properties>
+
     <build>
         <defaultGoal>install</defaultGoal>
         
@@ -67,13 +72,34 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-release-plugin</artifactId>
-                    <version>2.0-beta-5</version>
+                    <version>2.0-beta-6</version>
                 </plugin>
                 
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-remote-resources-plugin</artifactId>
-                    <version>1.0</version>
+                    <artifactId>maven-source-plugin</artifactId>
+                    <version>2.0.4</version>
+                </plugin>
+                
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-gpg-plugin</artifactId>
+                    <version>1.0-alpha-4</version>
+                    <inherited>true</inherited>
+                </plugin>
+                
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-deploy-plugin</artifactId>
+                    <version>2.3</version>
+                    <inherited>true</inherited>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>2.4</version>
+                    <inherited>true</inherited>
                 </plugin>
                 
                 <plugin>
@@ -93,6 +119,36 @@
                     <artifactId>maven-idea-plugin</artifactId>
                     <version>2.1</version>
                 </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-remote-resources-plugin</artifactId>
+                    <version>1.0</version>
+                </plugin>
+
+                <!--
+                NOTE: The beta-6 version has a huge problem rendering links for multi-module
projects, so stick with beta-5 until its fixed.
+                -->
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-site-plugin</artifactId>
+                    <version>2.0-beta-5</version>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-stage-plugin</artifactId>
+                    <version>1.0-alpha-1</version>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>rat-maven-plugin</artifactId>
+                    <version>1.0-alpha-3</version>
+                    <configuration>
+                        <excludeSubProjects>false</excludeSubProjects>
+                    </configuration>
+                </plugin>
             </plugins>
         </pluginManagement>
         
@@ -117,11 +173,13 @@
             </plugin>
             
             <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>rat-maven-plugin</artifactId>
+            </plugin>
+
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-release-plugin</artifactId>
-                <configuration>
-                    <tagBase>https://svn.apache.org/repos/asf/geronimo/genesis/tags</tagBase>
-                </configuration>
+                <artifactId>maven-stage-plugin</artifactId>
             </plugin>
         </plugins>
     </build>
@@ -129,7 +187,7 @@
     <distributionManagement>
         <site>
             <id>geronimo-website</id>
-            <url>scp://people.apache.org/www/geronimo.apache.org/maven/genesis</url>
+            <url>${staging.siteURL}/${siteId}/${version}</url>
         </site>
         <!-- Turn off snapshot timestamps, as requested by Infra -->
         <snapshotRepository>
@@ -175,6 +233,121 @@
                 <module>config/checkstyle-config</module>
             </modules>
         </profile>
+
+        <profile>
+            <id>release</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-release-plugin</artifactId>
+                        <configuration>
+                            <useReleaseProfile>false</useReleaseProfile>
+                            <goals>deploy</goals>
+                            <arguments>-Prelease</arguments>
+                        </configuration>
+                    </plugin>
+
+                    <!-- We want a source jar -->
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-source-plugin</artifactId>
+                        <inherited>true</inherited>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <!-- We want to sign the artifact, the POM, and all attached artifacts
-->
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <inherited>true</inherited>
+                        <configuration>
+                            <passphrase>${gpg.passphrase}</passphrase>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <!-- We want to deploy the artifact to a staging location for perusal
-->
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-deploy-plugin</artifactId>
+                        <inherited>true</inherited>
+                        <configuration>
+                            <altDeploymentRepository>${deploy.altRepository}</altDeploymentRepository>
+                            <updateReleaseInfo>true</updateReleaseInfo>
+                        </configuration>
+                    </plugin>
+
+                    <!-- We want the JavaDoc JAR published with the release -->
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <inherited>true</inherited>
+                        <configuration>
+                            <source>1.5</source>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>attach-javadocs</id>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>full</id>
+            <build>
+                <plugins>
+                    <!-- We want a source jar -->
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-source-plugin</artifactId>
+                        <inherited>true</inherited>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <!-- We want the JavaDoc JAR published with the release -->
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <inherited>true</inherited>
+                        <configuration>
+                            <source>1.5</source>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 </project>
 



Mime
View raw message