You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2008/12/10 14:37:29 UTC

svn commit: r725279 - in /activemq/camel/branches/camel-1.x: ./ tooling/camel-manual/pom.xml

Author: janstey
Date: Wed Dec 10 05:37:29 2008
New Revision: 725279

URL: http://svn.apache.org/viewvc?rev=725279&view=rev
Log:
Merged revisions 725277 via svnmerge from 
https://svn.apache.org/repos/asf/activemq/camel/trunk

........
  r725277 | janstey | 2008-12-10 10:03:20 -0330 (Wed, 10 Dec 2008) | 1 line
  
  CAMEL-1170 - Get HTML manuals deploying again
........

Modified:
    activemq/camel/branches/camel-1.x/   (props changed)
    activemq/camel/branches/camel-1.x/tooling/camel-manual/pom.xml

Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: activemq/camel/branches/camel-1.x/tooling/camel-manual/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/tooling/camel-manual/pom.xml?rev=725279&r1=725278&r2=725279&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/tooling/camel-manual/pom.xml (original)
+++ activemq/camel/branches/camel-1.x/tooling/camel-manual/pom.xml Wed Dec 10 05:37:29 2008
@@ -61,41 +61,30 @@
           ]]></head>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-artifacts</id>
+            <phase>package</phase>
+            <goals>
+              <goal>attach-artifact</goal>
+            </goals>
+            <configuration>
+              <artifacts>
+                <!-- Don't need to attach PDF here because the html-to-pdf plugin did that already -->
+                <artifact>
+                  <file>${project.build.directory}/site/manual/camel-manual-${project.version}.html</file>
+                  <type>html</type>
+                </artifact>
+              </artifacts>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>      
     </plugins>
   </build>
 
-  <profiles>
-    <profile>
-      <id>deploy</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>build-helper-maven-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>attach-artifacts</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>attach-artifact</goal>
-                </goals>
-                <configuration>
-                  <artifacts>
-                    <artifact>
-                      <file>${project.build.directory}/site/manual/camel-manual-${project.version}.pdf</file>
-                      <type>pdf</type>
-                    </artifact>
-                    <artifact>
-                      <file>${project.build.directory}/site/manual/camel-manual-${project.version}.html</file>
-                      <type>html</type>
-                    </artifact>
-                  </artifacts>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
+
 </project>