You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2011/06/08 18:36:53 UTC
svn commit: r1133458 - in
/incubator/isis/branches/0.1.2-RC3a-incubating/trunk: pom.xml
quickstart-archetype/src/main/resources/archetype-resources/pom.xml
src/site/site.xml
Author: danhaywood
Date: Wed Jun 8 16:36:53 2011
New Revision: 1133458
URL: http://svn.apache.org/viewvc?rev=1133458&view=rev
Log:
updating files in branch
Modified:
incubator/isis/branches/0.1.2-RC3a-incubating/trunk/pom.xml
incubator/isis/branches/0.1.2-RC3a-incubating/trunk/quickstart-archetype/src/main/resources/archetype-resources/pom.xml
incubator/isis/branches/0.1.2-RC3a-incubating/trunk/src/site/site.xml
Modified: incubator/isis/branches/0.1.2-RC3a-incubating/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/branches/0.1.2-RC3a-incubating/trunk/pom.xml?rev=1133458&r1=1133457&r2=1133458&view=diff
==============================================================================
--- incubator/isis/branches/0.1.2-RC3a-incubating/trunk/pom.xml (original)
+++ incubator/isis/branches/0.1.2-RC3a-incubating/trunk/pom.xml Wed Jun 8 16:36:53 2011
@@ -97,9 +97,10 @@
</properties>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/isis/trunk/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/isis/trunk/</developerConnection>
- <url>http://svn.apache.org/repos/asf/incubator/isis/trunk/</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/isis/branches/0.1.2-RC3a-incubating/trunk/</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/isis/branches/0.1.2-RC3a-incubating/trunk/</developerConnection>
+ <url>http://svn.apache.org/repos/asf/incubator/isis/branches/0.1.2-RC3a-incubating/trunk/</url>
+
</scm>
<!-- used in Site generation for relative references. -->
@@ -1073,13 +1074,39 @@ BDD-Viewer module.
<version>1.1</version>
</dependency>
-
+ <!-- Scimpi dependencies -->
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20090211</version>
</dependency>
+
+ <!-- RestEasy -->
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-jaxrs</artifactId>
+ <version>1.0.2.GA</version>
+ <exclusions>
+ <!-- instead use org.apache.geronimo.specs:geronimo-servlet_2.5_spec -->
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <!-- instead use org.apache.geronimo.specs:geronimo-annotation_1.0_spec -->
+ <exclusion>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </exclusion>
+ <!-- org.apache.geronimo.specs:geronimo-activation_1.1_spec -->
+ <exclusion>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+
<!-- predicate libraries -->
<dependency>
<groupId>org.hamcrest</groupId>
@@ -1163,6 +1190,22 @@ BDD-Viewer module.
<version>1.2</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ <version>1.7.1</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
Modified: incubator/isis/branches/0.1.2-RC3a-incubating/trunk/quickstart-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/branches/0.1.2-RC3a-incubating/trunk/quickstart-archetype/src/main/resources/archetype-resources/pom.xml?rev=1133458&r1=1133457&r2=1133458&view=diff
==============================================================================
--- incubator/isis/branches/0.1.2-RC3a-incubating/trunk/quickstart-archetype/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/isis/branches/0.1.2-RC3a-incubating/trunk/quickstart-archetype/src/main/resources/archetype-resources/pom.xml Wed Jun 8 16:36:53 2011
@@ -28,7 +28,7 @@
<packaging>pom</packaging>
<properties>
- <isis.version>0.1.2-incubating-SNAPSHOT</isis.version>
+ <isis.version>0.1.2-RC3a-incubating</isis.version>
</properties>
<repositories>
Modified: incubator/isis/branches/0.1.2-RC3a-incubating/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/branches/0.1.2-RC3a-incubating/trunk/src/site/site.xml?rev=1133458&r1=1133457&r2=1133458&view=diff
==============================================================================
--- incubator/isis/branches/0.1.2-RC3a-incubating/trunk/src/site/site.xml (original)
+++ incubator/isis/branches/0.1.2-RC3a-incubating/trunk/src/site/site.xml Wed Jun 8 16:36:53 2011
@@ -22,7 +22,7 @@
<skin>
<groupId>org.apache.isis.skins</groupId>
<artifactId>classic-skin</artifactId>
- <version>0.1.2-incubating-SNAPSHOT</version>
+ <version>0.1.2-RC3a-incubating</version>
</skin>
<version position="right" />