diff options
| author | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2010-04-23 07:51:38 +0000 |
|---|---|---|
| committer | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2010-04-23 07:51:38 +0000 |
| commit | ab13d83b7ecb6a6de540f0a525980bad9b8f6181 (patch) | |
| tree | d0edc366bd4774627063b071193cffe220955c4f /sca-java-2.x | |
| parent | 355f3e0e2eae141e702ce9051223b6691a1dd1b3 (diff) | |
Update to latest shade plugin which fixes the merge issue when services files don't end with a new line
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@937176 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x')
| -rw-r--r-- | sca-java-2.x/trunk/shades/base-nodep/pom.xml | 2 | ||||
| -rw-r--r-- | sca-java-2.x/trunk/shades/base/pom.xml | 2 | ||||
| -rw-r--r-- | sca-java-2.x/trunk/shades/bpel-nodep/pom.xml | 2 | ||||
| -rw-r--r-- | sca-java-2.x/trunk/shades/bpel/pom.xml | 2 | ||||
| -rw-r--r-- | sca-java-2.x/trunk/shades/jms-nodep/pom.xml | 2 | ||||
| -rw-r--r-- | sca-java-2.x/trunk/shades/jms/pom.xml | 2 | ||||
| -rw-r--r-- | sca-java-2.x/trunk/shades/json-nodep/pom.xml | 2 | ||||
| -rw-r--r-- | sca-java-2.x/trunk/shades/json/pom.xml | 2 | ||||
| -rw-r--r-- | sca-java-2.x/trunk/shades/spring-nodep/pom.xml | 2 | ||||
| -rw-r--r-- | sca-java-2.x/trunk/shades/spring/pom.xml | 2 | ||||
| -rw-r--r-- | sca-java-2.x/trunk/shades/webservices-nodep/pom.xml | 2 | ||||
| -rw-r--r-- | sca-java-2.x/trunk/shades/webservices/pom.xml | 2 |
12 files changed, 12 insertions, 12 deletions
diff --git a/sca-java-2.x/trunk/shades/base-nodep/pom.xml b/sca-java-2.x/trunk/shades/base-nodep/pom.xml index 1e0fb1888a..5db56c89eb 100644 --- a/sca-java-2.x/trunk/shades/base-nodep/pom.xml +++ b/sca-java-2.x/trunk/shades/base-nodep/pom.xml @@ -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>
diff --git a/sca-java-2.x/trunk/shades/base/pom.xml b/sca-java-2.x/trunk/shades/base/pom.xml index f7c89f6a08..3c541591ec 100644 --- a/sca-java-2.x/trunk/shades/base/pom.xml +++ b/sca-java-2.x/trunk/shades/base/pom.xml @@ -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>
diff --git a/sca-java-2.x/trunk/shades/bpel-nodep/pom.xml b/sca-java-2.x/trunk/shades/bpel-nodep/pom.xml index 166dfd5a28..307adcf483 100644 --- a/sca-java-2.x/trunk/shades/bpel-nodep/pom.xml +++ b/sca-java-2.x/trunk/shades/bpel-nodep/pom.xml @@ -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>
diff --git a/sca-java-2.x/trunk/shades/bpel/pom.xml b/sca-java-2.x/trunk/shades/bpel/pom.xml index ef35425e2e..baa096015d 100644 --- a/sca-java-2.x/trunk/shades/bpel/pom.xml +++ b/sca-java-2.x/trunk/shades/bpel/pom.xml @@ -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>
diff --git a/sca-java-2.x/trunk/shades/jms-nodep/pom.xml b/sca-java-2.x/trunk/shades/jms-nodep/pom.xml index 05d235018c..f55209fe26 100644 --- a/sca-java-2.x/trunk/shades/jms-nodep/pom.xml +++ b/sca-java-2.x/trunk/shades/jms-nodep/pom.xml @@ -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>
diff --git a/sca-java-2.x/trunk/shades/jms/pom.xml b/sca-java-2.x/trunk/shades/jms/pom.xml index da5e5b9789..786be02392 100644 --- a/sca-java-2.x/trunk/shades/jms/pom.xml +++ b/sca-java-2.x/trunk/shades/jms/pom.xml @@ -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>
diff --git a/sca-java-2.x/trunk/shades/json-nodep/pom.xml b/sca-java-2.x/trunk/shades/json-nodep/pom.xml index f90e6204a9..bcc4fe95e3 100644 --- a/sca-java-2.x/trunk/shades/json-nodep/pom.xml +++ b/sca-java-2.x/trunk/shades/json-nodep/pom.xml @@ -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>
diff --git a/sca-java-2.x/trunk/shades/json/pom.xml b/sca-java-2.x/trunk/shades/json/pom.xml index b61e1b5a93..6457dbc082 100644 --- a/sca-java-2.x/trunk/shades/json/pom.xml +++ b/sca-java-2.x/trunk/shades/json/pom.xml @@ -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>
diff --git a/sca-java-2.x/trunk/shades/spring-nodep/pom.xml b/sca-java-2.x/trunk/shades/spring-nodep/pom.xml index 16c576d159..02e3dd43c9 100644 --- a/sca-java-2.x/trunk/shades/spring-nodep/pom.xml +++ b/sca-java-2.x/trunk/shades/spring-nodep/pom.xml @@ -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>
diff --git a/sca-java-2.x/trunk/shades/spring/pom.xml b/sca-java-2.x/trunk/shades/spring/pom.xml index 6fe1a6d999..8ff946b2b9 100644 --- a/sca-java-2.x/trunk/shades/spring/pom.xml +++ b/sca-java-2.x/trunk/shades/spring/pom.xml @@ -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>
diff --git a/sca-java-2.x/trunk/shades/webservices-nodep/pom.xml b/sca-java-2.x/trunk/shades/webservices-nodep/pom.xml index 69deed08bc..21e2e23aa3 100644 --- a/sca-java-2.x/trunk/shades/webservices-nodep/pom.xml +++ b/sca-java-2.x/trunk/shades/webservices-nodep/pom.xml @@ -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>
diff --git a/sca-java-2.x/trunk/shades/webservices/pom.xml b/sca-java-2.x/trunk/shades/webservices/pom.xml index a5d1eadedf..b93086d222 100644 --- a/sca-java-2.x/trunk/shades/webservices/pom.xml +++ b/sca-java-2.x/trunk/shades/webservices/pom.xml @@ -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>
|