diff options
| author | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2010-07-24 07:59:09 +0000 |
|---|---|---|
| committer | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2010-07-24 07:59:09 +0000 |
| commit | f5bd8ab49ea4d44910dd6d2d327d00e09dafc01d (patch) | |
| tree | f5405c01e3ccc14e486b0d01ee15d90fbfa4911d /sca-java-2.x/branches/2.0-Beta1 | |
| parent | f1684c947e0b8900e630794144e2288d575b6c4c (diff) | |
Merge r967035, r967037, r967100, r967101 from trunk to beta1 brn to get samples building in brn and not deploying to mvn repo
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@978820 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/branches/2.0-Beta1')
5 files changed, 38 insertions, 9 deletions
diff --git a/sca-java-2.x/branches/2.0-Beta1/features/core/pom.xml b/sca-java-2.x/branches/2.0-Beta1/features/core/pom.xml index e0b9418a2b..4b16f28c64 100644 --- a/sca-java-2.x/branches/2.0-Beta1/features/core/pom.xml +++ b/sca-java-2.x/branches/2.0-Beta1/features/core/pom.xml @@ -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> diff --git a/sca-java-2.x/branches/2.0-Beta1/pom.xml b/sca-java-2.x/branches/2.0-Beta1/pom.xml index 969ba433cc..dc65275119 100644 --- a/sca-java-2.x/branches/2.0-Beta1/pom.xml +++ b/sca-java-2.x/branches/2.0-Beta1/pom.xml @@ -582,7 +582,6 @@ <defaultGoal>deploy</defaultGoal> <plugins> <plugin> - <inherited>true</inherited> <artifactId>maven-deploy-plugin</artifactId> <version>2.4</version> <configuration> diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/pom.xml b/sca-java-2.x/branches/2.0-Beta1/samples/pom.xml index eb67d82ce1..e893dc22a9 100644 --- a/sca-java-2.x/branches/2.0-Beta1/samples/pom.xml +++ b/sca-java-2.x/branches/2.0-Beta1/samples/pom.xml @@ -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> diff --git a/sca-java-2.x/branches/2.0-Beta1/shades/base-nodep/pom.xml b/sca-java-2.x/branches/2.0-Beta1/shades/base-nodep/pom.xml index daade617e0..72bdb77416 100644 --- a/sca-java-2.x/branches/2.0-Beta1/shades/base-nodep/pom.xml +++ b/sca-java-2.x/branches/2.0-Beta1/shades/base-nodep/pom.xml @@ -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>
diff --git a/sca-java-2.x/branches/2.0-Beta1/shades/base/pom.xml b/sca-java-2.x/branches/2.0-Beta1/shades/base/pom.xml index 455f2a9e54..e447878fd2 100644 --- a/sca-java-2.x/branches/2.0-Beta1/shades/base/pom.xml +++ b/sca-java-2.x/branches/2.0-Beta1/shades/base/pom.xml @@ -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>
|