Author: gabriele
Date: Wed Jun 23 18:57:11 2010
New Revision: 957302
URL: http://svn.apache.org/viewvc?rev=957302&view=rev
Log:
fixed minor merge issue
Modified:
incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/pom.xml
Modified:
incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/pom.xml?rev=957302&r1=957301&r2=957302&view=diff
==============================================================================
---
incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/pom.xml
(original)
+++
incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/pom.xml
Wed Jun 23 18:57:11 2010
@@ -25,6 +25,13 @@
<packaging>bundle</packaging>
<build>
+ <testResources>
+ <!-- Added to avoid logging in the base project folder and filter
log4j.properties -->
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
@@ -46,6 +53,7 @@
</instructions>
</configuration>
</plugin>
+
</plugins>
</build>
@@ -90,13 +98,4 @@
</pluginRepositories>
- <build>
- <testResources>
- <!-- Added to avoid logging in the base project folder and filter
log4j.properties -->
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </testResource>
- </testResources>
- </build>
</project>
