Skip to content
Browse files

1. Fixed assembly build (tlddoc and some sources where missing)

2. The generate-assembly profile is now automatically activated when performRelease=true
(merged from trunk)

git-svn-id: https://svn.apache.org/repos/asf/myfaces/core/branches/1_1_5@507359 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
1 parent 091ac7a commit 323516bc85600c858226cc9dd8c307ef24c2c121 Manfred Geiler committed Feb 14, 2007
Showing with 42 additions and 35 deletions.
  1. +7 −1 api/pom.xml
  2. +23 −29 assembly/pom.xml
  3. +4 −4 assembly/src/main/assembly/bin.xml
  4. +1 −1 assembly/src/main/assembly/src.xml
  5. +7 −0 impl/pom.xml
View
8 api/pom.xml
@@ -20,6 +20,12 @@
<profiles>
<profile>
<id>generate-assembly</id>
+ <activation>
+ <property>
+ <name>performRelease</name>
+ <value>true</value>
+ </property>
+ </activation>
<build>
<plugins>
<plugin>
@@ -212,4 +218,4 @@
</plugin>
</plugins>
</reporting>
-</project>
+</project>
View
52 assembly/pom.xml
@@ -1,19 +1,20 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <artifactId>myfaces-core-assembly</artifactId>
- <packaging>pom</packaging>
- <name>Core Assembly</name>
- <description>
- This is the MyFaces Assembly [INSERT MORE STUFF HERE]
- </description>
<parent>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-core-project</artifactId>
<version>1.1.5</version>
</parent>
+ <artifactId>myfaces-core-assembly</artifactId>
+ <packaging>pom</packaging>
+ <name>Core Assembly</name>
+ <description>
+ This is the MyFaces Assembly [INSERT MORE STUFF HERE]
+ </description>
+
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/core/trunk/assembly</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/core/trunk/assembly</developerConnection>
@@ -24,57 +25,54 @@
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>dependency-maven-plugin</artifactId>
+ <artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>copy-javadoc</id>
<phase>package</phase>
<goals>
- <goal>copy</goal>
+ <goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
-
<artifactItem>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
<version>${version}</version>
<classifier>javadoc</classifier>
+ <outputDirectory>${project.build.directory}/javadoc/api</outputDirectory>
</artifactItem>
-
<artifactItem>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
<version>${version}</version>
<classifier>javadoc</classifier>
+ <outputDirectory>${project.build.directory}/javadoc/impl</outputDirectory>
</artifactItem>
-
</artifactItems>
- <outputDirectory>${project.build.directory}/javadoc</outputDirectory>
</configuration>
</execution>
+
<execution>
<id>copy-tlddoc</id>
<phase>package</phase>
<goals>
- <goal>copy</goal>
+ <goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
-
<artifactItem>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
<version>${version}</version>
<classifier>tlddoc</classifier>
</artifactItem>
-
</artifactItems>
<outputDirectory>${project.build.directory}/tlddoc</outputDirectory>
</configuration>
- </execution>
+ </execution>
+
<execution>
<id>copy-source</id>
<phase>package</phase>
@@ -83,28 +81,24 @@
</goals>
<configuration>
<artifactItems>
- <artifactItem>
+ <artifactItem>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
<version>${version}</version>
- <classifier>sources</classifier>
+ <classifier>sources</classifier>
</artifactItem>
-
<artifactItem>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
<version>${version}</version>
- <classifier>sources</classifier>
+ <classifier>sources</classifier>
</artifactItem>
-
- <artifactItem>
+ <artifactItem>
<groupId>org.apache.myfaces.shared</groupId>
<artifactId>myfaces-shared-impl</artifactId>
<version>2.0.5</version>
- <classifier>sources</classifier>
+ <classifier>sources</classifier>
</artifactItem>
-
-
</artifactItems>
<outputDirectory>${project.build.directory}/src</outputDirectory>
</configuration>
@@ -116,10 +110,10 @@
<artifactId>maven-assembly-plugin</artifactId>
<version>2.0.1</version>
<configuration>
- <descriptors>
+ <descriptors>
<descriptor>src/main/assembly/bin.xml</descriptor>
- <descriptor>src/main/assembly/src.xml</descriptor>
- </descriptors>
+ <descriptor>src/main/assembly/src.xml</descriptor>
+ </descriptors>
<finalName>myfaces-core-${version}</finalName>
<outputDirectory>target/assembly/out</outputDirectory>
<workDirectory>target/assembly/work</workDirectory>
View
8 assembly/src/main/assembly/bin.xml
@@ -24,15 +24,15 @@
<fileSet>
<directory>target/javadoc</directory>
<outputDirectory>javadoc</outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
+ <excludes>
+ <exclude>META-INF/*</exclude>
+ </excludes>
</fileSet>
<fileSet>
<directory>target/tlddoc</directory>
<outputDirectory>tlddoc</outputDirectory>
<includes>
- <include>*.jar</include>
+ <include>**/*</include>
</includes>
</fileSet>
View
2 assembly/src/main/assembly/src.xml
@@ -17,7 +17,7 @@
</fileSet>
<fileSet>
<directory>target/src</directory>
- <outputDirectory>source</outputDirectory>
+ <outputDirectory>src</outputDirectory>
</fileSet>
</fileSets>
</assembly>
View
7 impl/pom.xml
@@ -159,8 +159,15 @@
</plugins>
</reporting>
</profile>
+
<profile>
<id>generate-assembly</id>
+ <activation>
+ <property>
+ <name>performRelease</name>
+ <value>true</value>
+ </property>
+ </activation>
<build>
<plugins>
<plugin>

0 comments on commit 323516b

Please sign in to comment.
Something went wrong with that request. Please try again.