You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ld...@apache.org on 2011/03/25 16:37:58 UTC
svn commit: r1085430 -
/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/pom.xml
Author: ldywicki
Date: Fri Mar 25 15:37:58 2011
New Revision: 1085430
URL: http://svn.apache.org/viewvc?rev=1085430&view=rev
Log:
[KARAF-533] Fix 2.2.1 build. Move dependency to manual to separate profile (named manual). It will be included during release procedure.
Modified:
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/pom.xml
Modified: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/pom.xml?rev=1085430&r1=1085429&r2=1085430&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/assemblies/apache-karaf/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/assemblies/apache-karaf/pom.xml Fri Mar 25 15:37:58 2011
@@ -37,17 +37,7 @@
</properties>
<dependencies>
- <dependency>
- <groupId>org.apache.karaf</groupId>
- <artifactId>manual</artifactId>
- <type>pdf</type>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf</groupId>
- <artifactId>manual</artifactId>
- <type>html</type>
- </dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.karaf</groupId>
<artifactId>org.apache.karaf.main</artifactId>
</dependency>
@@ -461,20 +451,6 @@
<outputDirectory>target/dependencies/lib</outputDirectory>
<destFileName>karaf-jaas-boot.jar</destFileName>
</artifactItem>
- <artifactItem>
- <groupId>org.apache.karaf</groupId>
- <artifactId>manual</artifactId>
- <type>pdf</type>
- <outputDirectory>target/dependencies</outputDirectory>
- <destFileName>karaf-manual-${project.version}.pdf</destFileName>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.karaf</groupId>
- <artifactId>manual</artifactId>
- <type>html</type>
- <outputDirectory>target/dependencies</outputDirectory>
- <destFileName>karaf-manual-${project.version}.html</destFileName>
- </artifactItem>
</artifactItems>
</configuration>
</execution>
@@ -628,6 +604,59 @@
<profiles>
<profile>
+ <id>manual</id>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>manual</artifactId>
+ <type>pdf</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>manual</artifactId>
+ <type>html</type>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-manual</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>manual</artifactId>
+ <type>pdf</type>
+ <outputDirectory>target/dependencies</outputDirectory>
+ <destFileName>karaf-manual-${project.version}.pdf</destFileName>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>manual</artifactId>
+ <type>html</type>
+ <outputDirectory>target/dependencies</outputDirectory>
+ <destFileName>karaf-manual-${project.version}.html</destFileName>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
<id>assembly-src</id>
<build>
<plugins>