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 2014/03/17 23:49:23 UTC

[04/50] [abbrv] git commit: ISIS-695: updates to restful poms

ISIS-695: updates to restful poms


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/91c28d45
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/91c28d45
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/91c28d45

Branch: refs/heads/master
Commit: 91c28d45a7b21e7ecebd1f9a050b5f4e8d68da34
Parents: 3ec3f50
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Mar 6 15:58:30 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Mar 6 15:58:30 2014 +0000

----------------------------------------------------------------------
 component/viewer/restfulobjects/pom.xml         |  2 +-
 .../appended-resources/supplemental-models.xml  | 54 ++++++++++++++------
 component/viewer/restfulobjects/tck/pom.xml     |  2 +-
 3 files changed, 41 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/91c28d45/component/viewer/restfulobjects/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/pom.xml b/component/viewer/restfulobjects/pom.xml
index 32c44f3..5b42cc7 100644
--- a/component/viewer/restfulobjects/pom.xml
+++ b/component/viewer/restfulobjects/pom.xml
@@ -24,7 +24,7 @@
 	<parent>
 		<groupId>org.apache.isis.core</groupId>
 		<artifactId>isis</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.4.0</version>
 		<relativePath>../../../core/pom.xml</relativePath>
 	</parent>
 

http://git-wip-us.apache.org/repos/asf/isis/blob/91c28d45/component/viewer/restfulobjects/src/main/appended-resources/supplemental-models.xml
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/src/main/appended-resources/supplemental-models.xml b/component/viewer/restfulobjects/src/main/appended-resources/supplemental-models.xml
index 383c784..1c4131e 100644
--- a/component/viewer/restfulobjects/src/main/appended-resources/supplemental-models.xml
+++ b/component/viewer/restfulobjects/src/main/appended-resources/supplemental-models.xml
@@ -43,21 +43,6 @@
 
   <supplement>
     <project>
-      <groupId>org.scannotation</groupId>
-      <artifactId>scannotation</artifactId>
-      <version>1.0.3</version>
-      <licenses>
-        <license>
-            <name>The Apache Software License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-            <distribution>repo</distribution>          
-        </license>
-      </licenses>
-    </project>
-  </supplement>
-    
-  <supplement>
-    <project>
       <groupId>net.jcip</groupId>
       <artifactId>jcip-annotations</artifactId>
       <version>1.0</version>
@@ -70,5 +55,44 @@
       </licenses>
     </project>
   </supplement>
+
+    <supplement>
+        <project>
+          <groupId>javax.transaction</groupId>
+          <artifactId>transaction-api</artifactId>
+          <version>1.1</version>
+          <name>Java Transaction API (JTA)</name>
+          <organization>
+            <name>Oracle Corp</name>
+            <url>http://www.oracle.com/</url>
+          </organization>
+          <licenses>
+            <license>
+              <name>Common Development and Distribution License (CDDL) v1.0</name>
+              <url>https://glassfish.java.net/public/CDDLv1.0.html</url>
+            </license>
+          </licenses>
+        </project>
+      </supplement>
+  
+    <supplement>
+        <project>
+          <groupId>org.datanucleus</groupId>
+          <artifactId>datanucleus-jdo-query</artifactId>
+          <version>3.0.2</version>
+          <name>DataNucleus JDO Query</name>
+          <organization>
+            <name>DataNucleus</name>
+            <url>http://www.datanucleus.org/</url>
+          </organization>
+          <licenses>
+            <license>
+                <name>The Apache Software License, Version 2.0</name>
+                <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            </license>
+          </licenses>
+        </project>
+      </supplement>
+
  
 </supplementalDataModels>

http://git-wip-us.apache.org/repos/asf/isis/blob/91c28d45/component/viewer/restfulobjects/tck/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/tck/pom.xml b/component/viewer/restfulobjects/tck/pom.xml
index 9c904d2..864e8ae 100644
--- a/component/viewer/restfulobjects/tck/pom.xml
+++ b/component/viewer/restfulobjects/tck/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.isis.core</groupId>
         <artifactId>isis-core-tck</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.4.0</version>
         <relativePath>../../../../core/tck/pom.xml</relativePath>
     </parent>