Author: lindner
Date: Tue Dec 16 03:49:39 2008
New Revision: 727032
URL: http://svn.apache.org/viewvc?rev=727032&view=rev
Log:
SHINDIG-794 | maven build fixes
Modified:
incubator/shindig/trunk/features/pom.xml
incubator/shindig/trunk/java/common/pom.xml
incubator/shindig/trunk/java/gadgets/pom.xml
incubator/shindig/trunk/java/server/pom.xml
incubator/shindig/trunk/java/social-api/pom.xml
Modified: incubator/shindig/trunk/features/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/features/pom.xml?rev=727032&r1=727031&r2=727032&view=diff
==============================================================================
--- incubator/shindig/trunk/features/pom.xml (original)
+++ incubator/shindig/trunk/features/pom.xml Tue Dec 16 03:49:39 2008
@@ -44,6 +44,13 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
</plugin>
<plugin>
@@ -150,8 +157,9 @@
</plugins>
<resources>
<resource>
- <targetPath>/features</targetPath>
+ <targetPath>features</targetPath>
<directory>${basedir}</directory>
+ <filtering>false</filtering>
<excludes>
<exclude>pom.xml</exclude>
<exclude>target/**</exclude>
@@ -161,4 +169,4 @@
</build>
<dependencies />
-</project>
\ No newline at end of file
+</project>
Modified: incubator/shindig/trunk/java/common/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/pom.xml?rev=727032&r1=727031&r2=727032&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/pom.xml (original)
+++ incubator/shindig/trunk/java/common/pom.xml Tue Dec 16 03:49:39 2008
@@ -39,6 +39,15 @@
</scm>
<build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ </plugins>
<resources>
<resource>
<targetPath>containers/default</targetPath>
Modified: incubator/shindig/trunk/java/gadgets/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/pom.xml?rev=727032&r1=727031&r2=727032&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/pom.xml (original)
+++ incubator/shindig/trunk/java/gadgets/pom.xml Tue Dec 16 03:49:39 2008
@@ -43,6 +43,13 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<webResources>
Modified: incubator/shindig/trunk/java/server/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/pom.xml?rev=727032&r1=727031&r2=727032&view=diff
==============================================================================
--- incubator/shindig/trunk/java/server/pom.xml (original)
+++ incubator/shindig/trunk/java/server/pom.xml Tue Dec 16 03:49:39 2008
@@ -46,6 +46,13 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<webResources>
@@ -59,7 +66,7 @@
</resource>
<resource>
<targetPath>META-INF</targetPath>
-
<directory>${build.directory}/maven-shared-archive-resources/META-INF</directory>
+
<directory>target/maven-shared-archive-resources/META-INF</directory>
<includes>
<include>**/*</include>
</includes>
Modified: incubator/shindig/trunk/java/social-api/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/pom.xml?rev=727032&r1=727031&r2=727032&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/pom.xml (original)
+++ incubator/shindig/trunk/java/social-api/pom.xml Tue Dec 16 03:49:39 2008
@@ -39,6 +39,15 @@
</scm>
<build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ </plugins>
<resources>
<resource>
<directory>conf</directory>
