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/01/06 17:38:01 UTC
svn commit: r896517 - in /tuscany/sca-java-2.x/trunk/shades:
webservices-nodep/ webservices-nodep/pom.xml webservices/pom.xml
Author: antelder
Date: Wed Jan 6 16:38:00 2010
New Revision: 896517
URL: http://svn.apache.org/viewvc?rev=896517&view=rev
Log:
Split the webservices shaded jar into webservices and webservices-nodep
Added:
tuscany/sca-java-2.x/trunk/shades/webservices-nodep/ (with props)
tuscany/sca-java-2.x/trunk/shades/webservices-nodep/pom.xml
Modified:
tuscany/sca-java-2.x/trunk/shades/webservices/pom.xml
Propchange: tuscany/sca-java-2.x/trunk/shades/webservices-nodep/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Jan 6 16:38:00 2010
@@ -0,0 +1,20 @@
+target
+work
+dojo
+*.iws
+*.ipr
+*.iml
+derby.log
+maven.log
+maven-eclipse.xml
+build.xml
+build-dependency.xml
+velocity.log*
+junit*.properties
+surefire*.properties
+.project
+.classpath
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
Added: 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=896517&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/shades/webservices-nodep/pom.xml (added)
+++ tuscany/sca-java-2.x/trunk/shades/webservices-nodep/pom.xml Wed Jan 6 16:38:00 2010
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-shades</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>tuscany-webservices-nodep</artifactId>
+ <name>Apache Tuscany SCA Web Services Jar</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-webservices</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>1.2.1</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <transformers>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+ </transformers>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
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=896517&r1=896516&r2=896517&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/shades/webservices/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/shades/webservices/pom.xml Wed Jan 6 16:38:00 2010
@@ -150,6 +150,14 @@
</exclusion>
</exclusions>
</dependency>
+
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-base</artifactId>
+ <version>${pom.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
</dependencies>
<build>
@@ -157,7 +165,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>1.2.1</version>
+ <version>1.3</version>
<executions>
<execution>
<phase>package</phase>
@@ -165,6 +173,12 @@
<goal>shade</goal>
</goals>
<configuration>
+ <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+ <artifactSet>
+ <includes>
+ <include>org.apache.tuscany.sca:*</include>
+ </includes>
+ </artifactSet>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
</transformers>