[seam-commits] Seam SVN: r14182 - in branches/community/Seam_2_3: distribution/src/main/assembly and 6 other directories.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Mon Sep 12 14:59:55 EDT 2011
Author: manaRH
Date: 2011-09-12 14:59:54 -0400 (Mon, 12 Sep 2011)
New Revision: 14182
Modified:
branches/community/Seam_2_3/distribution/pom.xml
branches/community/Seam_2_3/distribution/src/main/assembly/assembly.xml
branches/community/Seam_2_3/examples/pom.xml
branches/community/Seam_2_3/jboss-seam-parent/pom.xml
branches/community/Seam_2_3/jboss-seam-ui/pom.xml
branches/community/Seam_2_3/jboss-seam/pom.xml
branches/community/Seam_2_3/seam-integration-tests/pom.xml
branches/community/Seam_2_3/seam-reference-guide/pom.xml
Log:
some customizations for release
Modified: branches/community/Seam_2_3/distribution/pom.xml
===================================================================
--- branches/community/Seam_2_3/distribution/pom.xml 2011-09-12 18:59:32 UTC (rev 14181)
+++ branches/community/Seam_2_3/distribution/pom.xml 2011-09-12 18:59:54 UTC (rev 14182)
@@ -19,7 +19,7 @@
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
- <id>distribution</id>
+ <id>bin</id>
<phase>package</phase>
<goals>
<goal>single</goal>
Modified: branches/community/Seam_2_3/distribution/src/main/assembly/assembly.xml
===================================================================
--- branches/community/Seam_2_3/distribution/src/main/assembly/assembly.xml 2011-09-12 18:59:32 UTC (rev 14181)
+++ branches/community/Seam_2_3/distribution/src/main/assembly/assembly.xml 2011-09-12 18:59:54 UTC (rev 14182)
@@ -5,7 +5,8 @@
<id>distribution</id>
<formats>
- <format>dir</format>
+ <format>zip</format>
+ <format>tar.gz</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
@@ -44,6 +45,7 @@
</includes>
<unpack>true</unpack>
<unpackOptions>
+
<excludes>
<exclude>META-INF/**</exclude>
</excludes>
@@ -61,7 +63,7 @@
<excludes>
<exclude>org.jboss.seam:jboss-seam-gen:*:sources</exclude>
</excludes>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>${artifact.artifactId}-sources.${artifact.extension}</outputFileNameMapping>
</dependencySet>
<!-- Add necessary dependencies -->
@@ -69,11 +71,14 @@
<outputDirectory>lib</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<useTransitiveDependencies>true</useTransitiveDependencies>
+ <useTransitiveFiltering>true</useTransitiveFiltering>
+ <scope>compile</scope>
<excludes>
<exclude>org.jboss.seam:jboss-seam-gen:*:*</exclude>
<exclude>org.jboss.seam:seam-reference-guide:*:*</exclude>
<exclude>*:sources</exclude>
<exclude>*:javadoc</exclude>
+ <exclude>*:project</exclude>
<exclude>org.hibernate:hibernate-tools:jar</exclude>
<exclude>freemarker:freemarker:jar</exclude>
<exclude>org.eclipse.core:runtime:jar</exclude>
@@ -87,7 +92,6 @@
<exclude>org.jboss.seam:functional-tests:*:*</exclude>
</excludes>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- <!-- <outputFileNameMapping>${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> -->
</dependencySet>
<!-- Seam gen -->
Modified: branches/community/Seam_2_3/examples/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/pom.xml 2011-09-12 18:59:32 UTC (rev 14181)
+++ branches/community/Seam_2_3/examples/pom.xml 2011-09-12 18:59:54 UTC (rev 14182)
@@ -6,6 +6,7 @@
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-parent</artifactId>
<version>2.3.0-SNAPSHOT</version>
+ <relativePath>../jboss-seam-parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.seam</groupId>
@@ -60,6 +61,7 @@
</modules>
<build>
+ <finalName>examples</finalName>
<pluginManagement>
<plugins>
<plugin>
Modified: branches/community/Seam_2_3/jboss-seam/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam/pom.xml 2011-09-12 18:59:32 UTC (rev 14181)
+++ branches/community/Seam_2_3/jboss-seam/pom.xml 2011-09-12 18:59:54 UTC (rev 14182)
@@ -33,19 +33,30 @@
</execution>
</executions>
</plugin>
-
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.7</version>
+ <configuration>
+ <links>
+ <link>http://java.sun.com/j2se/5.0/docs/api</link>
+ </links>
+ <keywords>true</keywords>
+ <author>true</author>
+ <stylesheetfile>jdstyle.css</stylesheetfile>
+ <doctitle>JBoss Seam ${project.name} API ${version.seam}</doctitle> <!-- Used by javadoc:javadoc goal -->
+ <detectOfflineLinks>false</detectOfflineLinks>
+ </configuration>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
Modified: branches/community/Seam_2_3/jboss-seam-parent/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-parent/pom.xml 2011-09-12 18:59:32 UTC (rev 14181)
+++ branches/community/Seam_2_3/jboss-seam-parent/pom.xml 2011-09-12 18:59:54 UTC (rev 14182)
@@ -59,7 +59,6 @@
<dist.dir>${project.build.directory}/jboss-seam-${version.seam}</dist.dir>
</properties>
-
<dependencyManagement>
<!-- Used to specify which version of a dependency to use - this means
that versions are only specified here, not in sub project poms. All dependencies
@@ -1574,41 +1573,28 @@
<build>
<defaultGoal>package</defaultGoal>
-
+ <finalName>${artifactId}</finalName>
<pluginManagement>
<plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
- <configuration>
- <links>
- <link>http://java.sun.com/j2se/5.0/docs/api</link>
- </links>
- <keywords>true</keywords>
- <author>true</author>
- <stylesheetfile>jdstyle.css</stylesheetfile>
- <doctitle>JBoss Seam ${project.name} API ${version.seam}</doctitle> <!-- Used by javadoc:javadoc goal -->
- </configuration>
- </plugin>
+<!-- <plugin> -->
+<!-- <artifactId>maven-javadoc-plugin</artifactId> -->
+<!-- <version>2.7</version> -->
+<!-- <configuration> -->
+<!-- <links> -->
+<!-- <link>http://java.sun.com/j2se/5.0/docs/api</link> -->
+<!-- </links> -->
+<!-- <keywords>true</keywords> -->
+<!-- <author>true</author> -->
+<!-- <stylesheetfile>jdstyle.css</stylesheetfile> -->
+<!-- <doctitle>JBoss Seam ${project.name} API ${version.seam}</doctitle> Used by javadoc:javadoc goal -->
+<!-- <detectOfflineLinks>false</detectOfflineLinks> -->
+<!-- </configuration> -->
+<!-- </plugin> -->
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2</version>
-<!-- <executions> -->
-<!-- <execution> -->
-<!-- <id>distribution</id> -->
-<!-- <phase>package</phase> -->
-<!-- <goals> -->
-<!-- <goal>single</goal> -->
-<!-- </goals> -->
-<!-- <configuration> -->
-<!-- <descriptors> -->
-<!-- <descriptor>src/main/assembly/distribution.xml</descriptor> -->
-<!-- </descriptors> -->
-<!-- </configuration> -->
-<!-- </execution> -->
-<!-- </executions> -->
</plugin>
<!-- Building -->
@@ -1657,14 +1643,28 @@
<plugin>
<artifactId>maven-source-plugin</artifactId>
<version>2.1.2</version>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Implementation-Version>${version.seam}</Implementation-Version>
+ <Specification-Version>${version.seam}</Specification-Version>
+ <Specification-Title>${project.name}</Specification-Title>
+ <Specification-Vendor>${project.organization.name}</Specification-Vendor>
+ <Implementation-Title>${project.name}</Implementation-Title>
+ <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
+ </manifestEntries>
+ <manifestSections>
+ <manifestSection>
+ <name>Build-Information</name>
+ <manifestEntries>
+ <Java-Version>${java.version}</Java-Version>
+ <Java-Vendor>${java.vendor}</Java-Vendor>
+ <Build-Time>${maven.build.timestamp}</Build-Time>
+ </manifestEntries>
+ </manifestSection>
+ </manifestSections>
+ </archive>
+ </configuration>
</plugin>
<plugin>
@@ -1679,7 +1679,7 @@
<plugin>
<artifactId>maven-war-plugin</artifactId>
- <version>2.1-beta-1</version>
+ <version>2.1.1</version>
<inherited>true</inherited>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
@@ -1783,6 +1783,22 @@
</configuration>
</plugin></plugins>
</pluginManagement>
+
+ <plugins>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.1.2</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
<dependencies>
@@ -1831,7 +1847,7 @@
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
- <id>distribution</id>
+ <id>project-distribution</id>
<phase>package</phase>
<goals>
<goal>single</goal>
Modified: branches/community/Seam_2_3/jboss-seam-ui/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ui/pom.xml 2011-09-12 18:59:32 UTC (rev 14181)
+++ branches/community/Seam_2_3/jboss-seam-ui/pom.xml 2011-09-12 18:59:54 UTC (rev 14182)
@@ -12,7 +12,7 @@
<name>Seam UI</name>
<build>
- <finalName>jboss-seam-ui</finalName>
+<!-- <finalName>jboss-seam-ui</finalName> -->
<plugins>
<plugin>
<groupId>org.richfaces.cdk</groupId>
@@ -41,29 +41,29 @@
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.7</version>
+ <configuration>
+ <links>
+ <link>http://java.sun.com/j2se/5.0/docs/api</link>
+ </links>
+ <keywords>true</keywords>
+ <author>true</author>
+ <stylesheetfile>jdstyle.css</stylesheetfile>
+ <doctitle>JBoss Seam ${project.name} API ${version.seam}</doctitle> <!-- Used by javadoc:javadoc goal -->
+ <detectOfflineLinks>false</detectOfflineLinks>
+ </configuration>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
Modified: branches/community/Seam_2_3/seam-integration-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/seam-integration-tests/pom.xml 2011-09-12 18:59:32 UTC (rev 14181)
+++ branches/community/Seam_2_3/seam-integration-tests/pom.xml 2011-09-12 18:59:54 UTC (rev 14182)
@@ -17,6 +17,7 @@
</properties>
<build>
+ <finalName>${artifactId}</finalName>
<testResources>
<testResource>
<directory>src/test/resources</directory>
Modified: branches/community/Seam_2_3/seam-reference-guide/pom.xml
===================================================================
--- branches/community/Seam_2_3/seam-reference-guide/pom.xml 2011-09-12 18:59:32 UTC (rev 14181)
+++ branches/community/Seam_2_3/seam-reference-guide/pom.xml 2011-09-12 18:59:54 UTC (rev 14182)
@@ -5,6 +5,7 @@
<artifactId>jboss-seam-parent</artifactId>
<groupId>org.jboss.seam</groupId>
<version>2.3.0-SNAPSHOT</version>
+ <relativePath>../jboss-seam-parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.seam</groupId>
<artifactId>seam-reference-guide</artifactId>
More information about the seam-commits
mailing list