camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r644142 - in /activemq/camel/trunk: camel-core/pom.xml components/camel-spring/pom.xml
Date Thu, 03 Apr 2008 02:49:02 GMT
Author: ningjiang
Date: Wed Apr  2 19:49:01 2008
New Revision: 644142

URL: http://svn.apache.org/viewvc?rev=644142&view=rev
Log:
CAMEL-428 moved the javadoc build to the release profile

Modified:
    activemq/camel/trunk/camel-core/pom.xml
    activemq/camel/trunk/components/camel-spring/pom.xml

Modified: activemq/camel/trunk/camel-core/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/pom.xml?rev=644142&r1=644141&r2=644142&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/pom.xml (original)
+++ activemq/camel/trunk/camel-core/pom.xml Wed Apr  2 19:49:01 2008
@@ -7,9 +7,9 @@
   The ASF licenses this file to You under the Apache License, Version 2.0
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
-  
+
   http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,8 +17,10 @@
   limitations under the License.
 -->
 
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
+<project
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns="http://maven.apache.org/POM/4.0.0">
 
   <modelVersion>4.0.0</modelVersion>
 
@@ -34,7 +36,9 @@
   <description>The Core Camel POJO based router</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.*</camel.osgi.export.pkg>
+    <camel.osgi.export.pkg>
+      org.apache.camel.*
+    </camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
@@ -107,77 +111,6 @@
         </configuration>
       </plugin>
 
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>package</id>
-            <phase>package</phase>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <links>
-            <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
-            <link>http://java.sun.com/j2ee/1.4/docs/api/</link>
-            <link>http://jakarta.apache.org/commons/logging/apidocs/</link>
-            <link>http://jakarta.apache.org/commons/pool/apidocs/</link>
-            <link>http://junit.sourceforge.net/javadoc/</link>
-            <link>http://logging.apache.org/log4j/docs/api/</link>
-          </links>
-          <stylesheetfile>${basedir}/../etc/css/stylesheet.css</stylesheetfile>
-          <linksource>true</linksource>
-          <maxmemory>256m</maxmemory>
-          <source>1.5</source>
-
-          <groups>
-            <group>
-              <title>Camel API</title>
-              <packages>org.apache.camel</packages>
-            </group>
-            <group>
-              <title>Fluent API (DSL) for building EIP rules</title>
-              <packages>org.apache.camel.builder:org.apache.camel.builder.*</packages>
-            </group>
-            <group>
-              <title>The bean and JAXB2 model for EIP rule definitions</title>
-              <packages>org.apache.camel.model:org.apache.camel.model.*</packages>
-            </group>
-            <group>
-              <title>Strategy APIs for implementors to extend Camel</title>
-              <packages>org.apache.camel.spi</packages>
-            </group>
-            <group>
-              <title>Language APIs and plugins for Expressions and Predicates</title>
-              <packages>org.apache.camel.language:org.apache.camel.language.*</packages>
-            </group>
-            <group>
-              <title>Processors to implement the Enterprise Integration Patterns</title>
-              <packages>org.apache.camel.processor:org.apache.camel.processor.*</packages>
-            </group>
-            <group>
-              <title>Camel Components</title>
-              <packages>org.apache.camel.component.*</packages>
-            </group>
-            <group>
-              <title>Camel Runtime</title>
-              <packages>org.apache.camel.impl:org.apache.camel.impl.*</packages>
-            </group>
-            <group>
-              <title>Type conversion helper classes</title>
-              <packages>org.apache.camel.converter:org.apache.camel.converter.*</packages>
-            </group>
-            <group>
-              <title>Utility classes</title>
-              <packages>org.apache.camel.util:org.apache.camel.util.*:org.apache.camel.view</packages>
-            </group>
-          </groups>
-        </configuration>
-      </plugin>
-
     </plugins>
   </build>
 
@@ -196,6 +129,97 @@
           <artifactId>jaxb-impl</artifactId>
         </dependency>
       </dependencies>
+    </profile>
+    <profile>
+      <id>release</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>package</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+              </execution>
+            </executions>
+            <configuration>
+              <links>
+                <link>
+                  http://java.sun.com/j2se/1.5.0/docs/api/
+                </link>
+                <link>
+                  http://java.sun.com/j2ee/1.4/docs/api/
+                </link>
+                <link>
+                  http://jakarta.apache.org/commons/logging/apidocs/
+                </link>
+                <link>
+                  http://jakarta.apache.org/commons/pool/apidocs/
+                </link>
+                <link>
+                  http://junit.sourceforge.net/javadoc/
+                </link>
+                <link>
+                  http://logging.apache.org/log4j/docs/api/
+                </link>
+              </links>
+              <stylesheetfile>
+                ${basedir}/../etc/css/stylesheet.css
+              </stylesheetfile>
+              <linksource>true</linksource>
+              <maxmemory>256m</maxmemory>
+              <source>1.5</source>
+
+              <groups>
+                <group>
+                  <title>Camel API</title>
+                  <packages>org.apache.camel</packages>
+                </group>
+                <group>
+                  <title>Fluent API (DSL) for building EIP rules</title>
+                  <packages>org.apache.camel.builder:org.apache.camel.builder.*</packages>
+                </group>
+                <group>
+                  <title>The bean and JAXB2 model for EIP rule definitions</title>
+                  <packages>org.apache.camel.model:org.apache.camel.model.*</packages>
+                </group>
+                <group>
+                  <title>Strategy APIs for implementors  extend Camel</title>
+                  <packages>org.apache.camel.spi</packages>
+                </group>
+                <group>
+                  <title>Language APIs and plugins for Expressions and Predicates</title>
+                  <packages>org.apache.camel.language:org.apache.camel.language.*	</packages>
+                </group>
+                <group>
+                  <title>Processors to implement the Enterprise Integration Patterns</title>
+                  <packages>org.apache.camel.processor:org.apache.camel.processor.*</packages>
+                </group>
+                <group>
+                  <title>Camel Components</title>
+                  <packages>org.apache.camel.component.*</packages>
+                </group>
+                <group>
+                  <title>Camel Runtime</title>
+                  <packages>org.apache.camel.impl:org.apache.camel.impl.*</packages>
+                </group>
+                <group>
+                  <title>Type conversion helper classes</title>
+                  <packages>org.apache.camel.converter:org.apache.camel.converter.*</packages>
+                </group>
+                <group>
+                  <title>Utility classes</title>
+                  <packages>org.apache.camel.util:org.apache.camel.util.*:org.apache.camel.view</packages>
+                </group>
+              </groups>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
     </profile>
   </profiles>
 </project>

Modified: activemq/camel/trunk/components/camel-spring/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/pom.xml?rev=644142&r1=644141&r2=644142&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring/pom.xml (original)
+++ activemq/camel/trunk/components/camel-spring/pom.xml Wed Apr  2 19:49:01 2008
@@ -7,9 +7,9 @@
   The ASF licenses this file to You under the Apache License, Version 2.0
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
-  
+
   http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -34,14 +34,14 @@
   <packaging>bundle</packaging>
 
   <properties>
-	<camel.osgi.export>
-	  org.apache.camel.spring.*;${camel.osgi.version},
-	  org.apache.camel.component;${camel.osgi.split.pkg};${camel.osgi.version},
-	  org.apache.camel.component.event;${camel.osgi.split.pkg};${camel.osgi.version},
-	  org.apache.camel.component.test;${camel.osgi.split.pkg};${camel.osgi.version},
-	  org.apache.camel.component.validator;${camel.osgi.split.pkg};${camel.osgi.version},
-	  org.apache.camel.component.xslt;${camel.osgi.split.pkg};${camel.osgi.version}
-	</camel.osgi.export>
+  <camel.osgi.export>
+    org.apache.camel.spring.*;${camel.osgi.version},
+    org.apache.camel.component;${camel.osgi.split.pkg};${camel.osgi.version},
+    org.apache.camel.component.event;${camel.osgi.split.pkg};${camel.osgi.version},
+    org.apache.camel.component.test;${camel.osgi.split.pkg};${camel.osgi.version},
+    org.apache.camel.component.validator;${camel.osgi.split.pkg};${camel.osgi.version},
+    org.apache.camel.component.xslt;${camel.osgi.split.pkg};${camel.osgi.version}
+  </camel.osgi.export>
   </properties>
 
   <dependencies>
@@ -189,39 +189,6 @@
         </dependencies>
       </plugin>
 
-      <!-- generate the JavaDoc -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>package</id>
-            <phase>package</phase>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <links>
-            <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
-            <link>http://java.sun.com/j2ee/1.4/docs/api/</link>
-            <link>http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_0/</link>
-            <link>http://jakarta.apache.org/commons/dbcp/apidocs/</link>
-            <link>http://jakarta.apache.org/commons/fileupload/apidocs/</link>
-            <link>http://jakarta.apache.org/commons/httpclient/apidocs/</link>
-            <link>http://jakarta.apache.org/commons/logging/apidocs/</link>
-            <link>http://jakarta.apache.org/commons/pool/apidocs/</link>
-            <link>http://junit.sourceforge.net/javadoc/</link>
-            <link>http://logging.apache.org/log4j/docs/api/</link>
-            <link>http://mina.apache.org/report/trunk/apidocs/</link>
-          </links>
-          <stylesheetfile>${basedir}/../../etc/css/stylesheet.css</stylesheetfile>
-          <linksource>true</linksource>          
-          <source>1.5</source>          
-        </configuration>
-      </plugin>
-
       <!-- generate the attached tests jar -->
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
@@ -308,7 +275,46 @@
 -->
     </plugins>
   </build>
-
+  <profiles>
+    <profile>
+      <id>release</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>package</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+              </execution>
+            </executions>
+            <configuration>
+              <links>
+                <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
+                <link>http://java.sun.com/j2ee/1.4/docs/api/</link>
+                <link>http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_0/</link>
+                <link>http://jakarta.apache.org/commons/dbcp/apidocs/</link>
+                <link>http://jakarta.apache.org/commons/fileupload/apidocs/</link>
+                <link>http://jakarta.apache.org/commons/httpclient/apidocs/</link>
+                <link>http://jakarta.apache.org/commons/logging/apidocs/</link>
+                <link>http://jakarta.apache.org/commons/pool/apidocs/</link>
+                <link>http://junit.sourceforge.net/javadoc/</link>
+                <link>http://logging.apache.org/log4j/docs/api/</link>
+                <link>http://mina.apache.org/report/trunk/apidocs/</link>
+              </links>
+              <stylesheetfile>${basedir}/../../etc/css/stylesheet.css</stylesheetfile>
+              <linksource>true</linksource>
+              <source>1.5</source>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 
 <!--
   <reporting>



Mime
View raw message