geronimo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jason Dillon <ja...@planet57.com>
Subject Re: svn commit: r635187 - in /geronimo/genesis/trunk: ./ config/checkstyle-config/ config/geronimo-skin/ config/logging-config/ config/project-config/ legal-bundle/src/main/resources/META-INF/ plugins/ plugins/maven-maven-plugin/ plugins/tools-maven-plugin/
Date Sun, 09 Mar 2008 08:13:56 GMT
Yay :-)

--jason


On Mar 9, 2008, at 2:58 PM, djencks@apache.org wrote:

> Author: djencks
> Date: Sat Mar  8 23:58:37 2008
> New Revision: 635187
>
> URL: http://svn.apache.org/viewvc?rev=635187&view=rev
> Log:
> Modify legal-bundle to closer to current apparent apache policy.   
> Set up site generation better.  Remove now-obsolete legal files
>
> Added:
>    geronimo/genesis/trunk/legal-bundle/src/main/resources/META-INF/ 
> DEPENDENCIES.vm
>      - copied, changed from r634861, geronimo/genesis/trunk/legal- 
> bundle/src/main/resources/META-INF/NOTICE.vm
> Removed:
>    geronimo/genesis/trunk/config/checkstyle-config/LICENSE.txt
>    geronimo/genesis/trunk/config/checkstyle-config/NOTICE.txt
>    geronimo/genesis/trunk/config/geronimo-skin/LICENSE.txt
>    geronimo/genesis/trunk/config/geronimo-skin/NOTICE.txt
>    geronimo/genesis/trunk/config/logging-config/LICENSE.txt
>    geronimo/genesis/trunk/config/logging-config/NOTICE.txt
>    geronimo/genesis/trunk/config/project-config/LICENSE.txt
>    geronimo/genesis/trunk/config/project-config/NOTICE.txt
>    geronimo/genesis/trunk/plugins/maven-maven-plugin/LICENSE.txt
>    geronimo/genesis/trunk/plugins/tools-maven-plugin/LICENSE.txt
> Modified:
>    geronimo/genesis/trunk/NOTICE.txt
>    geronimo/genesis/trunk/config/project-config/pom.xml
>    geronimo/genesis/trunk/legal-bundle/src/main/resources/META-INF/ 
> NOTICE.vm
>    geronimo/genesis/trunk/plugins/pom.xml
>    geronimo/genesis/trunk/pom.xml
>
> Modified: geronimo/genesis/trunk/NOTICE.txt
> URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/NOTICE.txt?rev=635187&r1=635186&r2=635187&view=diff
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- geronimo/genesis/trunk/NOTICE.txt (original)
> +++ geronimo/genesis/trunk/NOTICE.txt Sat Mar  8 23:58:37 2008
> @@ -1,5 +1,5 @@
> Apache Geronimo
> -Copyright 2006 The Apache Software Foundation
> +Copyright 2003-2008 The Apache Software Foundation
>
> This product includes software developed at
> The Apache Software Foundation (http://www.apache.org/).
>
> Modified: geronimo/genesis/trunk/config/project-config/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/config/project-config/pom.xml?rev=635187&r1=635186&r2=635187&view=diff
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- geronimo/genesis/trunk/config/project-config/pom.xml (original)
> +++ geronimo/genesis/trunk/config/project-config/pom.xml Sat Mar  8  
> 23:58:37 2008
> @@ -325,6 +325,23 @@
>                     <artifactId>maven-maven-plugin</artifactId>
>                     <version>1.4-SNAPSHOT</version>
>                 </plugin>
> +                <plugin>
> +                    <groupId>org.apache.maven.plugins</groupId>
> +                    <artifactId>maven-remote-resources-plugin</ 
> artifactId>
> +                    <version>1.0-beta-2</version>
> +                    <executions>
> +                      <execution>
> +                        <goals>
> +                          <goal>process</goal>
> +                        </goals>
> +                        <configuration>
> +                          <resourceBundles>
> +                               
> <resourceBundle>org.apache.geronimo.genesis:legal-bundle:${version}</ 
> resourceBundle>
> +                          </resourceBundles>
> +                        </configuration>
> +                      </execution>
> +                    </executions>
> +                </plugin>
>             </plugins>
>         </pluginManagement>
>
> @@ -350,14 +367,11 @@
>                 </configuration>
>             </plugin>
>
> +            -->
>             <plugin>
>                 <groupId>org.apache.maven.plugins</groupId>
> -                <artifactId>maven-release-plugin</artifactId>
> -                <configuration>
> -                    <tagBase>https://svn.apache.org/repos/asf/geronimo/tags 
> </tagBase>
> -                </configuration>
> +                <artifactId>maven-remote-resources-plugin</ 
> artifactId>
>             </plugin>
> -            -->
>          </plugins>
>     </build>
>
>
> Copied: geronimo/genesis/trunk/legal-bundle/src/main/resources/META- 
> INF/DEPENDENCIES.vm (from r634861, geronimo/genesis/trunk/legal- 
> bundle/src/main/resources/META-INF/NOTICE.vm)
> URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/legal-bundle/src/main/resources/META-INF/DEPENDENCIES.vm?p2=geronimo/genesis/trunk/legal-bundle/src/main/resources/META-INF/DEPENDENCIES.vm&p1=geronimo/genesis/trunk/legal-bundle/src/main/resources/META-INF/NOTICE.vm&r1=634861&r2=635187&rev=635187&view=diff
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- geronimo/genesis/trunk/legal-bundle/src/main/resources/META-INF/ 
> NOTICE.vm (original)
> +++ geronimo/genesis/trunk/legal-bundle/src/main/resources/META-INF/ 
> DEPENDENCIES.vm Sat Mar  8 23:58:37 2008
> @@ -19,41 +19,21 @@
> ## $Date$ $Rev$
> ##
> // ------------------------------------------------------------------
> -// NOTICE file corresponding to the section 4d of The Apache License,
> -// Version 2.0, in this case for #if ($projectName)$projectName#else 
> ${project.name}#end
> -
> +// Transitive dependencies of this project determined from the
> +// maven pom organized by organization.
> // ------------------------------------------------------------------
>
> #if ($projectName)$projectName#else${project.name}#end
>
> -Copyright ${projectTimespan}#if($project.organization.name)  
> $project.organization.name#else The Apache Software Foundation#end
> -
> -
> -This product includes software developed at
> -Apache Software Foundation (http://www.apache.org/).
> -
> -#if($preProjectText)
> -$preProjectText
> -#end
> -
> -#if($includeProjectDependencies)
> #foreach ( $organizationName in  
> $projectsSortedByOrganization.keySet() )
> -This product includes/uses software(s) developed by  
> '$organizationName.name'#if($organizationName.url)  
> ($organizationName.url)#end
> +From: '$organizationName.name'#if($organizationName.url)  
> ($organizationName.url)#end
>
> #foreach ( $project in  
> $projectsSortedByOrganization.get( $organizationName ) )
> -  - $project.name#if ($addVersion) (version  
> $project.version)#end#if ($addArtifact)  
> ($project.artifact)#end#if($project.url) ($project.url)#end
> -#if ($addLicense)#foreach ( $license in $project.licenses)
> -
> +  - $project.name ($project.url) $project.artifact
> +#foreach ( $license in $project.licenses)
>       License: $license.name #if ($license.url) ($license.url)#end
> #end
> +
> #end
>
> -#end
> -
> -#end
> -
> -#end
> -
> -#if($postProjectText)
> -$postProjectText
> #end
>
> Modified: geronimo/genesis/trunk/legal-bundle/src/main/resources/ 
> META-INF/NOTICE.vm
> URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/legal-bundle/src/main/resources/META-INF/NOTICE.vm?rev=635187&r1=635186&r2=635187&view=diff
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- geronimo/genesis/trunk/legal-bundle/src/main/resources/META-INF/ 
> NOTICE.vm (original)
> +++ geronimo/genesis/trunk/legal-bundle/src/main/resources/META-INF/ 
> NOTICE.vm Sat Mar  8 23:58:37 2008
> @@ -18,42 +18,9 @@
> ##
> ## $Date$ $Rev$
> ##
> -// ------------------------------------------------------------------
> -// NOTICE file corresponding to the section 4d of The Apache License,
> -// Version 2.0, in this case for #if ($projectName)$projectName#else 
> ${project.name}#end
> -
> -// ------------------------------------------------------------------
> -
> #if ($projectName)$projectName#else${project.name}#end
>
> Copyright ${projectTimespan}#if($project.organization.name)  
> $project.organization.name#else The Apache Software Foundation#end
>
> -
> This product includes software developed at
> Apache Software Foundation (http://www.apache.org/).
> -
> -#if($preProjectText)
> -$preProjectText
> -#end
> -
> -#if($includeProjectDependencies)
> -#foreach ( $organizationName in  
> $projectsSortedByOrganization.keySet() )
> -This product includes/uses software(s) developed by  
> '$organizationName.name'#if($organizationName.url)  
> ($organizationName.url)#end
> -
> -#foreach ( $project in  
> $projectsSortedByOrganization.get( $organizationName ) )
> -  - $project.name#if ($addVersion) (version  
> $project.version)#end#if ($addArtifact)  
> ($project.artifact)#end#if($project.url) ($project.url)#end
> -#if ($addLicense)#foreach ( $license in $project.licenses)
> -
> -      License: $license.name #if ($license.url) ($license.url)#end
> -#end
> -#end
> -
> -#end
> -
> -#end
> -
> -#end
> -
> -#if($postProjectText)
> -$postProjectText
> -#end
>
> Modified: geronimo/genesis/trunk/plugins/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/plugins/pom.xml?rev=635187&r1=635186&r2=635187&view=diff
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- geronimo/genesis/trunk/plugins/pom.xml (original)
> +++ geronimo/genesis/trunk/plugins/pom.xml Sat Mar  8 23:58:37 2008
> @@ -98,8 +98,31 @@
>                     <artifactId>maven-plugin-plugin</artifactId>
>                     <version>2.3</version>
>                 </plugin>
> +                <plugin>
> +                    <groupId>org.apache.maven.plugins</groupId>
> +                    <artifactId>maven-remote-resources-plugin</ 
> artifactId>
> +                    <version>1.0-beta-2</version>
> +                    <executions>
> +                      <execution>
> +                        <goals>
> +                          <goal>process</goal>
> +                        </goals>
> +                        <configuration>
> +                          <resourceBundles>
> +                               
> <resourceBundle>org.apache.geronimo.genesis:legal-bundle:${version}</ 
> resourceBundle>
> +                          </resourceBundles>
> +                        </configuration>
> +                      </execution>
> +                    </executions>
> +                </plugin>
>             </plugins>
>         </pluginManagement>
> +        <plugins>
> +            <plugin>
> +                <groupId>org.apache.maven.plugins</groupId>
> +                <artifactId>maven-remote-resources-plugin</ 
> artifactId>
> +            </plugin>
> +        </plugins>
>     </build>
>
>     <modules>
>
> Modified: geronimo/genesis/trunk/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/pom.xml?rev=635187&r1=635186&r2=635187&view=diff
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- geronimo/genesis/trunk/pom.xml (original)
> +++ geronimo/genesis/trunk/pom.xml Sat Mar  8 23:58:37 2008
> @@ -51,6 +51,11 @@
>         <url>http://svn.apache.org/viewvc/geronimo/genesis/trunk</url>
>     </scm>
>
> +    <properties>
> +        <!-- set siteId to artifactId for any "top level" project  
> rooting a website -->
> +        <siteId>genesis</siteId>
> +    </properties>
> +
>     <build>
>         <defaultGoal>install</defaultGoal>
>
> @@ -96,12 +101,6 @@
>
>                 <plugin>
>                     <groupId>org.apache.maven.plugins</groupId>
> -                    <artifactId>maven-remote-resources-plugin</ 
> artifactId>
> -                    <version>1.0-beta-1</version>
> -                </plugin>
> -
> -                <plugin>
> -                    <groupId>org.apache.maven.plugins</groupId>
>                     <artifactId>maven-install-plugin</artifactId>
>                     <version>2.2</version>
>                 </plugin>
> @@ -146,7 +145,8 @@
>     <distributionManagement>
>         <site>
>             <id>geronimo-website</id>
> -            <url>scp://people.apache.org/www/geronimo.apache.org/ 
> maven/genesis</url>
> +            <!--<url>${staging.siteURL}/genesis/${version}</url>-->
> +            <url>${staging.siteURL}/${siteId}/${version}</url>
>         </site>
>     </distributionManagement>
>
> @@ -191,6 +191,7 @@
>
>             <build>
>                 <plugins>
> +
>                     <plugin>
>                         <groupId>org.apache.maven.plugins</groupId>
>                         <artifactId>maven-release-plugin</artifactId>
>
>


Mime
View raw message