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 16:59:49 UTC
svn commit: r896499 - in /tuscany/sca-java-2.x/trunk/shades: base-nodep/
base-nodep/pom.xml base/pom.xml
Author: antelder
Date: Wed Jan 6 15:59:47 2010
New Revision: 896499
URL: http://svn.apache.org/viewvc?rev=896499&view=rev
Log:
Change the shaded base jar to not include dependencies and add a new base-nodep jar which does include the dependencies. The idea being that there will be the shaded jars for the core tuscany runtime and each extension (jms, bpel, webservices etc), and then for each of those jars also an aditional *-nodep jar that includes all the dependencies
Added:
tuscany/sca-java-2.x/trunk/shades/base-nodep/
tuscany/sca-java-2.x/trunk/shades/base-nodep/pom.xml
Modified:
tuscany/sca-java-2.x/trunk/shades/base/pom.xml
Added: 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=896499&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/shades/base-nodep/pom.xml (added)
+++ tuscany/sca-java-2.x/trunk/shades/base-nodep/pom.xml Wed Jan 6 15:59:47 2010
@@ -0,0 +1,68 @@
+<?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-base-nodep</artifactId>
+ <name>Apache Tuscany SCA Base Jar</name>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-base</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>1.3</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <transformers>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+ <manifestEntries>
+ <Main-Class>org.apache.tuscany.sca.launcher.LauncherMain</Main-Class>
+ </manifestEntries>
+ </transformer>
+ </transformers>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
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=896499&r1=896498&r2=896499&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/shades/base/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/shades/base/pom.xml Wed Jan 6 15:59:47 2010
@@ -73,25 +73,6 @@
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>tuscany-binding-jms-runtime</artifactId>
- <version>${pom.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-databinding-axiom</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-wsdlgen</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-interface-wsdl</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
<artifactId>tuscany-host-jetty</artifactId>
<version>${pom.version}</version>
<exclusions>
@@ -207,7 +188,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>
@@ -215,24 +196,12 @@
<goal>shade</goal>
</goals>
<configuration>
- <relocations>
- <!-- relocation>
- <pattern>org.objectweb.asm</pattern>
- <shadedPattern>org.apache.tuscany.asm</shadedPattern>
- </relocation>
- <relocation>
- <pattern>net.sf.cglib</pattern>
- <shadedPattern>org.apache.tuscany.cglib</shadedPattern>
- </relocation>
- <relocation>
- <pattern>org.apache.catalina.tribes</pattern>
- <shadedPattern>org.apache.tuscany.tribes</shadedPattern>
- </relocation>
- <relocation>
- <pattern>org.apache.juli</pattern>
- <shadedPattern>org.apache.tuscany.juli</shadedPattern>
- </relocation -->
- </relocations>
+ <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+ <artifactSet>
+ <includes>
+ <include>org.apache.tuscany.sca:*</include>
+ </includes>
+ </artifactSet>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">