camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [3/4] camel git commit: Fixed some Maven Warnings
Date Fri, 20 Feb 2015 07:57:11 GMT
Fixed some Maven Warnings


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/89ba9cf0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/89ba9cf0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/89ba9cf0

Branch: refs/heads/master
Commit: 89ba9cf070220ff73d7c9880426fd668a37ee6a3
Parents: b2572bf
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Fri Feb 20 08:55:00 2015 +0100
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Fri Feb 20 08:55:00 2015 +0100

----------------------------------------------------------------------
 components/camel-blueprint/pom.xml | 90 ++++++++++++++-------------------
 1 file changed, 39 insertions(+), 51 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/89ba9cf0/components/camel-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-blueprint/pom.xml b/components/camel-blueprint/pom.xml
index 679425c..d7d75f2 100644
--- a/components/camel-blueprint/pom.xml
+++ b/components/camel-blueprint/pom.xml
@@ -121,29 +121,6 @@
 
         <plugins>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>package</id>
-                        <phase>package</phase>
-                        <configuration>
-                            <target>
-                                <echo>Including source code from camel-core-xml in
the camel-blueprint-sources.jar</echo>
-                                <jar destfile="${project.build.directory}/${project.artifactId}-${project.version}-sources.jar"
update="true">
-                                  <fileset dir="${basedir}/../camel-core-osgi/src/main/java"
includes="**/*" />
-                                  <fileset dir="${basedir}/../camel-core-xml/src/main/java"
includes="**/*" />
-                                </jar>
-                            </target>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
             <!-- add the sources from camel-core-osgi and camel-core-xml as source code
in the camel-blueprint-sources.jar -->
             <plugin>
               <groupId>org.codehaus.mojo</groupId>
@@ -167,37 +144,11 @@
               </executions>
             </plugin>
 
-            <!-- after the eip-documentation-enricher we need to copy some shchema files
-->
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-antrun-plugin</artifactId>
-              <executions>
-                <execution>
-                  <id>package</id>
-                  <phase>prepare-package</phase>
-                  <configuration>
-                    <target>
-                      <echo>Copying XSD schema to be included in JAR</echo>
-                      <replace file="${project.build.directory}/schema/camel-blueprint.xsd"
token="http://camel.apache.org/schema/spring" value="http://camel.apache.org/schema/blueprint"
/>
-                      <copy todir="${project.build.directory}/classes">
-                        <fileset dir="${project.build.directory}/schema" />
-                      </copy>
-                      <!-- copy modified schemas back again in classes so they are included
in the JAR -->
-                      <copy todir="${project.build.directory}/classes">
-                        <fileset dir="${project.build.directory}/schema"/>
-                      </copy>
-                    </target>
-                  </configuration>
-                  <goals>
-                    <goal>run</goal>
-                  </goals>
-                </execution>
-              </executions>
-            </plugin>
-
+            <!-- enrich the schemas with documentation -->
             <plugin>
               <groupId>org.apache.camel</groupId>
               <artifactId>camel-eip-documentation-enricher-maven-plugin</artifactId>
+              <version>${project.version}</version>
               <executions>
                 <execution>
                   <id>eip-documentation-enricher</id>
@@ -373,6 +324,43 @@
                               <goal>run</goal>
                           </goals>
                       </execution>
+                      <execution>
+                        <id>include-sources</id>
+                        <phase>package</phase>
+                        <configuration>
+                          <target>
+                            <echo>Including source code from camel-core-xml in the
camel-blueprint-sources.jar</echo>
+                            <jar destfile="${project.build.directory}/${project.artifactId}-${project.version}-sources.jar"
update="true">
+                              <fileset dir="${basedir}/../camel-core-osgi/src/main/java"
includes="**/*" />
+                              <fileset dir="${basedir}/../camel-core-xml/src/main/java"
includes="**/*" />
+                            </jar>
+                          </target>
+                        </configuration>
+                        <goals>
+                          <goal>run</goal>
+                        </goals>
+                      </execution>
+                      <!-- after the eip-documentation-enricher we need to copy some shchema
files -->
+                      <execution>
+                        <id>include-schemas</id>
+                        <phase>prepare-package</phase>
+                        <configuration>
+                          <target>
+                            <echo>Copying XSD schema to be included in JAR</echo>
+                            <replace file="${project.build.directory}/schema/camel-blueprint.xsd"
token="http://camel.apache.org/schema/spring" value="http://camel.apache.org/schema/blueprint"
/>
+                            <copy todir="${project.build.directory}/classes">
+                              <fileset dir="${project.build.directory}/schema" />
+                            </copy>
+                            <!-- copy modified schemas back again in classes so they are
included in the JAR -->
+                            <copy todir="${project.build.directory}/classes">
+                              <fileset dir="${project.build.directory}/schema"/>
+                            </copy>
+                          </target>
+                        </configuration>
+                        <goals>
+                          <goal>run</goal>
+                        </goals>
+                      </execution>
                   </executions>
               </plugin>
             </plugins>


Mime
View raw message