Author: apetrelli
Date: Fri Mar 30 03:42:05 2007
New Revision: 524035
URL: http://svn.apache.org/viewvc?view=rev&rev=524035
Log:
TILES-146
Using different assembly descriptors during release.
Changed staging repository in the framework pom.
Added:
tiles/framework/trunk/assembly/src/main/assembly/bin_release.xml (with
props)
tiles/framework/trunk/assembly/src/main/assembly/src_release.xml (with
props)
Modified:
tiles/framework/trunk/assembly/pom.xml
tiles/framework/trunk/pom.xml
Modified: tiles/framework/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/assembly/pom.xml?view=diff&rev=524035&r1=524034&r2=524035
==============================================================================
--- tiles/framework/trunk/assembly/pom.xml (original)
+++ tiles/framework/trunk/assembly/pom.xml Fri Mar 30 03:42:05 2007
@@ -40,11 +40,20 @@
<url>http://svn.apache.org/viewcvs.cgi/tiles/framework/trunk/assembly</url>
</scm>
+ <!-- FIXME Due to some bugs in assembly plugin 2.0.1 and 2.1, we needed to do
+ some workaraound. This is the situation:
+ 2.0.1: has no "attached" goal; does not use the module directory during
+ deployment.
+ 2.1: does not include dependencies correctly, so it is unusable.
+ So we are using the 2.0.1 version with a "trick", using different assembly
+ descriptors during release so it points to the correct directory.
+ Hopefully when 2.2 will be released, all these workarounds can be removed.-->
<build>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.0.1</version>
+ <!-- <version>2.2</version> -->
<configuration>
<descriptors>
<descriptor>src/main/assembly/bin.xml</descriptor>
@@ -65,19 +74,24 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>2.0.1</version>
+ <!-- <version>2.2</version> -->
<executions>
<execution>
<id>make-assembly</id>
<goals>
<goal>assembly</goal>
+ <!-- <goal>attached</goal> -->
</goals>
<phase>package</phase>
</execution>
</executions>
<configuration>
<descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- <descriptor>src/main/assembly/src.xml</descriptor>
+ <descriptor>src/main/assembly/bin_release.xml</descriptor>
+ <descriptor>src/main/assembly/src_release.xml</descriptor>
+ <!-- <descriptor>src/main/assembly/bin.xml</descriptor>
+ <descriptor>src/main/assembly/src.xml</descriptor> -->
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
Added: tiles/framework/trunk/assembly/src/main/assembly/bin_release.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/assembly/src/main/assembly/bin_release.xml?view=auto&rev=524035
==============================================================================
--- tiles/framework/trunk/assembly/src/main/assembly/bin_release.xml (added)
+++ tiles/framework/trunk/assembly/src/main/assembly/bin_release.xml Fri Mar 30
03:42:05 2007
@@ -0,0 +1,72 @@
+<!--
+ 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.
+-->
+<assembly>
+ <id>bin</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <includeSiteDirectory>false</includeSiteDirectory>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>/lib</outputDirectory>
+ <excludes>
+ <exclude>org.apache.tiles:tiles-api</exclude>
+ <exclude>org.apache.tiles:tiles-core</exclude>
+ <exclude>org.apache.tiles:tiles-jsp</exclude>
+ <exclude>org.apache.tiles:tiles-test</exclude>
+ </excludes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>org.apache.tiles:tiles-api</include>
+ <include>org.apache.tiles:tiles-core</include>
+ <include>org.apache.tiles:tiles-jsp</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/examples</outputDirectory>
+ <includes>
+ <include>org.apache.tiles:tiles-test</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
+ <fileSets>
+ <fileSet>
+ <directory>.</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>./target/site/apidocs</directory>
+ <outputDirectory>apidocs</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>./tiles-core/target/site/dtddoc</directory>
+ <outputDirectory>dtddoc</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>./tiles-jsp/target/site/tlddoc</directory>
+ <outputDirectory>tlddoc</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
Propchange: tiles/framework/trunk/assembly/src/main/assembly/bin_release.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/framework/trunk/assembly/src/main/assembly/bin_release.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: tiles/framework/trunk/assembly/src/main/assembly/src_release.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/assembly/src/main/assembly/src_release.xml?view=auto&rev=524035
==============================================================================
--- tiles/framework/trunk/assembly/src/main/assembly/src_release.xml (added)
+++ tiles/framework/trunk/assembly/src/main/assembly/src_release.xml Fri Mar 30
03:42:05 2007
@@ -0,0 +1,81 @@
+<!--
+ 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.
+-->
+<assembly>
+ <id>src</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>./</directory>
+ <outputDirectory>src/</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>./</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>./tiles-core</directory>
+ <outputDirectory>src/tiles-core</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>./tiles-api</directory>
+ <outputDirectory>src/tiles-api</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>./tiles-jsp</directory>
+ <outputDirectory>src/tiles-jsp</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>./tiles-test</directory>
+ <outputDirectory>src/tiles-test</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>./assembly</directory>
+ <outputDirectory>src/assembly</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
Propchange: tiles/framework/trunk/assembly/src/main/assembly/src_release.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/framework/trunk/assembly/src/main/assembly/src_release.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: tiles/framework/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/pom.xml?view=diff&rev=524035&r1=524034&r2=524035
==============================================================================
--- tiles/framework/trunk/pom.xml (original)
+++ tiles/framework/trunk/pom.xml Fri Mar 30 03:42:05 2007
@@ -31,6 +31,11 @@
</modules>
<distributionManagement>
+ <repository>
+ <id>tiles-staging</id>
+ <name>Apache Tiles Staging Repository</name>
+
<url>scp://people.apache.org/www/people.apache.org/builds/tiles/${pom.version}/m2-staging-repository</url>
+ </repository>
<site>
<id>apache-site</id>
<url>scp://people.apache.org/www/tiles.apache.org/framework</url>
@@ -195,7 +200,7 @@
</repository>
<repository>
<id>tiles.build</id>
-
<url>http://people.apache.org/builds/tiles/m2-staging-repository/</url>
+
<url>http://people.apache.org/builds/tiles/${pom.version}/m2-staging-repository/</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
