You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2010/04/23 09:51:39 UTC
svn commit: r937176 - in /tuscany/sca-java-2.x/trunk/shades: base-nodep/
base/ bpel-nodep/ bpel/ jms-nodep/ jms/ json-nodep/ json/ spring-nodep/
spring/ webservices-nodep/ webservices/
Author: antelder
Date: Fri Apr 23 07:51:38 2010
New Revision: 937176
URL: http://svn.apache.org/viewvc?rev=937176&view=rev
Log:
Update to latest shade plugin which fixes the merge issue when services files don't end with a new line
Modified:
tuscany/sca-java-2.x/trunk/shades/base-nodep/pom.xml
tuscany/sca-java-2.x/trunk/shades/base/pom.xml
tuscany/sca-java-2.x/trunk/shades/bpel-nodep/pom.xml
tuscany/sca-java-2.x/trunk/shades/bpel/pom.xml
tuscany/sca-java-2.x/trunk/shades/jms-nodep/pom.xml
tuscany/sca-java-2.x/trunk/shades/jms/pom.xml
tuscany/sca-java-2.x/trunk/shades/json-nodep/pom.xml
tuscany/sca-java-2.x/trunk/shades/json/pom.xml
tuscany/sca-java-2.x/trunk/shades/spring-nodep/pom.xml
tuscany/sca-java-2.x/trunk/shades/spring/pom.xml
tuscany/sca-java-2.x/trunk/shades/webservices-nodep/pom.xml
tuscany/sca-java-2.x/trunk/shades/webservices/pom.xml
Modified: tuscany/sca-java-2.x/trunk/shades/base-nodep/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/shades/base-nodep/pom.xml?rev=937176&r1=937175&r2=937176&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/shades/base-nodep/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/shades/base-nodep/pom.xml Fri Apr 23 07:51:38 2010
@@ -48,7 +48,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>1.3</version>
+ <version>1.3.2</version>
<executions>
<execution>
<phase>package</phase>
Modified: tuscany/sca-java-2.x/trunk/shades/base/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/shades/base/pom.xml?rev=937176&r1=937175&r2=937176&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/shades/base/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/shades/base/pom.xml Fri Apr 23 07:51:38 2010
@@ -206,7 +206,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>1.3</version>
+ <version>1.3.2</version>
<executions>
<execution>
<phase>package</phase>
Modified: tuscany/sca-java-2.x/trunk/shades/bpel-nodep/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/shades/bpel-nodep/pom.xml?rev=937176&r1=937175&r2=937176&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/shades/bpel-nodep/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/shades/bpel-nodep/pom.xml Fri Apr 23 07:51:38 2010
@@ -55,7 +55,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>1.2.1</version>
+ <version>1.3.2</version>
<executions>
<execution>
<phase>package</phase>
Modified: tuscany/sca-java-2.x/trunk/shades/bpel/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/shades/bpel/pom.xml?rev=937176&r1=937175&r2=937176&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/shades/bpel/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/shades/bpel/pom.xml Fri Apr 23 07:51:38 2010
@@ -106,7 +106,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>1.3</version>
+ <version>1.3.2</version>
<executions>
<execution>
<phase>package</phase>
Modified: tuscany/sca-java-2.x/trunk/shades/jms-nodep/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/shades/jms-nodep/pom.xml?rev=937176&r1=937175&r2=937176&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/shades/jms-nodep/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/shades/jms-nodep/pom.xml Fri Apr 23 07:51:38 2010
@@ -87,7 +87,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>1.3</version>
+ <version>1.3.2</version>
<executions>
<execution>
<phase>package</phase>
Modified: tuscany/sca-java-2.x/trunk/shades/jms/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/shades/jms/pom.xml?rev=937176&r1=937175&r2=937176&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/shades/jms/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/shades/jms/pom.xml Fri Apr 23 07:51:38 2010
@@ -98,7 +98,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>1.3</version>
+ <version>1.3.2</version>
<executions>
<execution>
<phase>package</phase>
Modified: tuscany/sca-java-2.x/trunk/shades/json-nodep/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/shades/json-nodep/pom.xml?rev=937176&r1=937175&r2=937176&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/shades/json-nodep/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/shades/json-nodep/pom.xml Fri Apr 23 07:51:38 2010
@@ -53,7 +53,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>1.3</version>
+ <version>1.3.2</version>
<executions>
<execution>
<phase>package</phase>
Modified: tuscany/sca-java-2.x/trunk/shades/json/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/shades/json/pom.xml?rev=937176&r1=937175&r2=937176&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/shades/json/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/shades/json/pom.xml Fri Apr 23 07:51:38 2010
@@ -141,7 +141,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>1.3</version>
+ <version>1.3.2</version>
<executions>
<execution>
<phase>package</phase>
Modified: tuscany/sca-java-2.x/trunk/shades/spring-nodep/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/shades/spring-nodep/pom.xml?rev=937176&r1=937175&r2=937176&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/shades/spring-nodep/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/shades/spring-nodep/pom.xml Fri Apr 23 07:51:38 2010
@@ -52,7 +52,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>1.3</version>
+ <version>1.3.2</version>
<executions>
<execution>
<phase>package</phase>
Modified: tuscany/sca-java-2.x/trunk/shades/spring/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/shades/spring/pom.xml?rev=937176&r1=937175&r2=937176&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/shades/spring/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/shades/spring/pom.xml Fri Apr 23 07:51:38 2010
@@ -85,7 +85,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>1.3</version>
+ <version>1.3.2</version>
<executions>
<execution>
<phase>package</phase>
Modified: tuscany/sca-java-2.x/trunk/shades/webservices-nodep/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/shades/webservices-nodep/pom.xml?rev=937176&r1=937175&r2=937176&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/shades/webservices-nodep/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/shades/webservices-nodep/pom.xml Fri Apr 23 07:51:38 2010
@@ -49,7 +49,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>1.2.1</version>
+ <version>1.3.2</version>
<executions>
<execution>
<phase>package</phase>
Modified: tuscany/sca-java-2.x/trunk/shades/webservices/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/shades/webservices/pom.xml?rev=937176&r1=937175&r2=937176&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/shades/webservices/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/shades/webservices/pom.xml Fri Apr 23 07:51:38 2010
@@ -182,7 +182,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>1.3</version>
+ <version>1.3.2</version>
<executions>
<execution>
<phase>package</phase>