Author: ningjiang
Date: Thu Apr 22 12:10:40 2010
New Revision: 936807
URL: http://svn.apache.org/viewvc?rev=936807&view=rev
Log:
CAMEL-2668 Fixed more warning messages
Modified:
camel/trunk/apache-camel/pom.xml
camel/trunk/apache-camel/src/main/descriptors/common-bin.xml
camel/trunk/pom.xml
Modified: camel/trunk/apache-camel/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/apache-camel/pom.xml?rev=936807&r1=936806&r2=936807&view=diff
==============================================================================
--- camel/trunk/apache-camel/pom.xml (original)
+++ camel/trunk/apache-camel/pom.xml Thu Apr 22 12:10:40 2010
@@ -189,6 +189,13 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-jt400</artifactId>
+ <!-- avoid the WARINING message -->
+ <exclusions>
+ <exclusion>
+ <groupId>net.sf.jt400</groupId>
+ <artifactId>jt400-full</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -213,6 +220,13 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-msv</artifactId>
+ <!--Avoid the WARNING message -->
+ <exclusions>
+ <exclusion>
+ <groupId>org.iso_relax.verifier.jaxp.validation</groupId>
+ <artifactId>isorelax-jaxp-bridge</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -459,32 +473,6 @@
<forkMode>pertest</forkMode>
</configuration>
</plugin>
-<!--
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-bundle-jar</id>
- <phase>package</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}</outputDirectory>
- <artifactItems>
- <artifactItem>
- <groupId>${project.groupId}</groupId>
- <artifactId>camel-bundle</artifactId>
- <version>${project.version}</version>
-
<destFileName>${project.artifactId}-${project.version}.jar</destFileName>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
--->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
@@ -500,7 +488,8 @@
<descriptor>src/main/descriptors/unix-bin.xml</descriptor>
</descriptors>
<finalName>${project.artifactId}-${project.version}</finalName>
- <appendAssemblyId>false</appendAssemblyId>
+ <appendAssemblyId>false</appendAssemblyId>
+ <tarLongFileMode>gnu</tarLongFileMode>
</configuration>
</execution>
<execution>
@@ -526,7 +515,8 @@
<configuration>
<descriptors>
<descriptor>src/main/descriptors/unix-src.xml</descriptor>
- </descriptors>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
</configuration>
</execution>
<execution>
@@ -613,82 +603,9 @@
</execution>
</executions>
</plugin>
-
-
-<!--
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
-
- <executions>
- <execution>
- <id>download-website</id>
- <phase>compile</phase>
- <configuration>
- <tasks>
-
- <exec executable="rsync">
- <arg value="-ave" />
- <arg value="ssh" />
- <arg
value="people.apache.org:/www/activemq.apache.org/camel/" />
- <arg value="${basedir}/target/website/" />
- </exec>
-
- <echo message="Replaceing absolute links with relative
ones" />
- <replace dir="${basedir}/target/website">
- <replacefilter
token="http://activemq.apache.org/camel/maven/"; value="maven/" />
- <replacefilter
token="http://activemq.apache.org/camel/styles/"; value="styles/" />
- </replace>
-
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
--->
</plugins>
</build>
</profile>
- <!--<profile>-->
- <!--<id>assembly-src</id>-->
- <!--<build>-->
- <!--<plugins>-->
- <!--<plugin>-->
- <!--<groupId>org.apache.maven.plugins</groupId>-->
- <!--<artifactId>maven-assembly-plugin</artifactId>-->
- <!--<executions>-->
- <!--<execution>-->
- <!--<id>unix-src</id>-->
- <!--<phase>package</phase>-->
- <!--<goals>-->
- <!--<goal>attached</goal>-->
- <!--</goals>-->
- <!--<configuration>-->
- <!--<descriptors>-->
-
<!--<descriptor>src/main/descriptors/unix-src.xml</descriptor>-->
- <!--</descriptors>-->
- <!--</configuration>-->
- <!--</execution>-->
- <!--<execution>-->
- <!--<id>windows-src</id>-->
- <!--<phase>package</phase>-->
- <!--<goals>-->
- <!--<goal>attached</goal>-->
- <!--</goals>-->
- <!--<configuration>-->
- <!--<descriptors>-->
-
<!--<descriptor>src/main/descriptors/windows-src.xml</descriptor>-->
- <!--</descriptors>-->
- <!--</configuration>-->
- <!--</execution>-->
- <!--</executions>-->
- <!--</plugin>-->
- <!--</plugins>-->
- <!--</build>-->
- <!--</profile>-->
</profiles>
</project>
Modified: camel/trunk/apache-camel/src/main/descriptors/common-bin.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/apache-camel/src/main/descriptors/common-bin.xml?rev=936807&r1=936806&r2=936807&view=diff
==============================================================================
--- camel/trunk/apache-camel/src/main/descriptors/common-bin.xml (original)
+++ camel/trunk/apache-camel/src/main/descriptors/common-bin.xml Thu Apr 22
12:10:40 2010
@@ -134,7 +134,6 @@
<include>org.apache.geronimo.specs:geronimo-j2ee-management_1.0_spec</include>
<include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
<include>org.apache.geronimo.specs:geronimo-j2ee-jacc_1.0_spec</include>
-
<include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
</includes>
</dependencySet>
</dependencySets>
Modified: camel/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/pom.xml?rev=936807&r1=936806&r2=936807&view=diff
==============================================================================
--- camel/trunk/pom.xml (original)
+++ camel/trunk/pom.xml Thu Apr 22 12:10:40 2010
@@ -277,7 +277,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.3</version>
+ <version>2.3</version>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
