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/07/24 09:59:09 UTC
svn commit: r978820 - in /tuscany/sca-java-2.x/branches/2.0-Beta1: ./
features/core/pom.xml pom.xml samples/pom.xml shades/base-nodep/pom.xml
shades/base/pom.xml
Author: antelder
Date: Sat Jul 24 07:59:09 2010
New Revision: 978820
URL: http://svn.apache.org/viewvc?rev=978820&view=rev
Log:
Merge r967035, r967037, r967100, r967101 from trunk to beta1 brn to get samples building in brn and not deploying to mvn repo
Modified:
tuscany/sca-java-2.x/branches/2.0-Beta1/ (props changed)
tuscany/sca-java-2.x/branches/2.0-Beta1/features/core/pom.xml
tuscany/sca-java-2.x/branches/2.0-Beta1/pom.xml
tuscany/sca-java-2.x/branches/2.0-Beta1/samples/pom.xml
tuscany/sca-java-2.x/branches/2.0-Beta1/shades/base-nodep/pom.xml
tuscany/sca-java-2.x/branches/2.0-Beta1/shades/base/pom.xml
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jul 24 07:59:09 2010
@@ -1 +1 @@
-/tuscany/sca-java-2.x/trunk:966568,966629,966650-966658,966703,966706,966708,966714,966983
+/tuscany/sca-java-2.x/trunk:966568,966629,966650-966658,966703,966706,966708,966714,966983,967035,967037,967100-967101
Modified: tuscany/sca-java-2.x/branches/2.0-Beta1/features/core/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta1/features/core/pom.xml?rev=978820&r1=978819&r2=978820&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta1/features/core/pom.xml (original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta1/features/core/pom.xml Sat Jul 24 07:59:09 2010
@@ -230,6 +230,13 @@
<artifactId>tuscany-xsd</artifactId>
<version>2.0-Beta1-SNAPSHOT</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-shell</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+
</dependencies>
</project>
Modified: tuscany/sca-java-2.x/branches/2.0-Beta1/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta1/pom.xml?rev=978820&r1=978819&r2=978820&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta1/pom.xml (original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta1/pom.xml Sat Jul 24 07:59:09 2010
@@ -582,7 +582,6 @@
<defaultGoal>deploy</defaultGoal>
<plugins>
<plugin>
- <inherited>true</inherited>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.4</version>
<configuration>
Modified: tuscany/sca-java-2.x/branches/2.0-Beta1/samples/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta1/samples/pom.xml?rev=978820&r1=978819&r2=978820&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta1/samples/pom.xml (original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta1/samples/pom.xml Sat Jul 24 07:59:09 2010
@@ -29,12 +29,6 @@
<packaging>pom</packaging>
<name>Apache Tuscany SCA Samples</name>
- <profiles>
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
<modules>
<module>calculator-osgi</module>
<module>dosgi-calculator</module>
@@ -93,7 +87,18 @@
<!-- TODO -->
</modules>
- </profile>
- </profiles>
+
+ <build>
+ <plugins>
+ <plugin>
+ <inherited>true</inherited>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: tuscany/sca-java-2.x/branches/2.0-Beta1/shades/base-nodep/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta1/shades/base-nodep/pom.xml?rev=978820&r1=978819&r2=978820&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta1/shades/base-nodep/pom.xml (original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta1/shades/base-nodep/pom.xml Sat Jul 24 07:59:09 2010
@@ -36,6 +36,17 @@
<artifactId>tuscany-base</artifactId>
<version>${pom.version}</version>
</dependency>
+ <dependency>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ <version>0.9.94</version>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<!-- Tuscany uses java.util.logging but extensions and dependencies may use
log4j, commons-logging, slf4j, or java.util.logging. So inlcude slf4j
@@ -97,6 +108,7 @@
<goal>shade</goal>
</goals>
<configuration>
+ <createSourcesJar>true</createSourcesJar>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
</transformers>
Modified: tuscany/sca-java-2.x/branches/2.0-Beta1/shades/base/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta1/shades/base/pom.xml?rev=978820&r1=978819&r2=978820&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0-Beta1/shades/base/pom.xml (original)
+++ tuscany/sca-java-2.x/branches/2.0-Beta1/shades/base/pom.xml Sat Jul 24 07:59:09 2010
@@ -99,6 +99,12 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-shell</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-stripes</artifactId>
<version>${pom.version}</version>
<exclusions>