You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2011/02/09 10:15:18 UTC
svn commit: r1068800 - in /karaf/trunk: assembly/pom.xml pom.xml
Author: jbonofre
Date: Wed Feb 9 09:15:18 2011
New Revision: 1068800
URL: http://svn.apache.org/viewvc?rev=1068800&view=rev
Log:
[KARAF-451] Fix the broken build by commenting the manual resources in the assembly.
Modified:
karaf/trunk/assembly/pom.xml
karaf/trunk/pom.xml
Modified: karaf/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/pom.xml?rev=1068800&r1=1068799&r2=1068800&view=diff
==============================================================================
--- karaf/trunk/assembly/pom.xml (original)
+++ karaf/trunk/assembly/pom.xml Wed Feb 9 09:15:18 2011
@@ -37,6 +37,7 @@
</properties>
<dependencies>
+ <!--
<dependency>
<groupId>org.apache.karaf</groupId>
<artifactId>manual</artifactId>
@@ -47,6 +48,7 @@
<artifactId>manual</artifactId>
<type>html</type>
</dependency>
+ -->
<dependency>
<groupId>org.apache.karaf</groupId>
<artifactId>org.apache.karaf.main</artifactId>
@@ -461,6 +463,7 @@
<outputDirectory>target/dependencies/lib</outputDirectory>
<destFileName>karaf-jaas-boot.jar</destFileName>
</artifactItem>
+ <!--
<artifactItem>
<groupId>org.apache.karaf</groupId>
<artifactId>manual</artifactId>
@@ -475,6 +478,7 @@
<outputDirectory>target/dependencies</outputDirectory>
<destFileName>karaf-manual-${project.version}.html</destFileName>
</artifactItem>
+ -->
</artifactItems>
</configuration>
</execution>
Modified: karaf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1068800&r1=1068799&r2=1068800&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Wed Feb 9 09:15:18 2011
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
<!--