You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@shindig.apache.org by li...@apache.org on 2009/01/07 20:56:01 UTC
svn commit: r732449 - in /incubator/shindig/branches/1.0.x-incubating: ./
features/pom.xml java/common/pom.xml java/gadgets/pom.xml
java/server/pom.xml java/social-api/pom.xml
Author: lindner
Date: Wed Jan 7 11:56:00 2009
New Revision: 732449
URL: http://svn.apache.org/viewvc?rev=732449&view=rev
Log:
Merge: SHINDIG-794 | maven build fixes
Modified:
incubator/shindig/branches/1.0.x-incubating/ (props changed)
incubator/shindig/branches/1.0.x-incubating/features/pom.xml
incubator/shindig/branches/1.0.x-incubating/java/common/pom.xml
incubator/shindig/branches/1.0.x-incubating/java/gadgets/pom.xml
incubator/shindig/branches/1.0.x-incubating/java/server/pom.xml
incubator/shindig/branches/1.0.x-incubating/java/social-api/pom.xml
Propchange: incubator/shindig/branches/1.0.x-incubating/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 7 11:56:00 2009
@@ -1 +1 @@
-/incubator/shindig/trunk:724511-724522,724874,724915,726597
+/incubator/shindig/trunk:724511-724522,724874,724915,726597,727032
Modified: incubator/shindig/branches/1.0.x-incubating/features/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/features/pom.xml?rev=732449&r1=732448&r2=732449&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/features/pom.xml (original)
+++ incubator/shindig/branches/1.0.x-incubating/features/pom.xml Wed Jan 7 11:56:00 2009
@@ -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>
Modified: incubator/shindig/branches/1.0.x-incubating/java/common/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/common/pom.xml?rev=732449&r1=732448&r2=732449&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/common/pom.xml (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/common/pom.xml Wed Jan 7 11:56:00 2009
@@ -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/branches/1.0.x-incubating/java/gadgets/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/gadgets/pom.xml?rev=732449&r1=732448&r2=732449&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/gadgets/pom.xml (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/gadgets/pom.xml Wed Jan 7 11:56:00 2009
@@ -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/branches/1.0.x-incubating/java/server/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/server/pom.xml?rev=732449&r1=732448&r2=732449&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/server/pom.xml (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/server/pom.xml Wed Jan 7 11:56:00 2009
@@ -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/branches/1.0.x-incubating/java/social-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/social-api/pom.xml?rev=732449&r1=732448&r2=732449&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/social-api/pom.xml (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/social-api/pom.xml Wed Jan 7 11:56:00 2009
@@ -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>