incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1133684 - /incubator/isis/trunk/src/main/appended-resources/supplemental-models.xml
Date Thu, 09 Jun 2011 07:12:52 GMT
Author: danhaywood
Date: Thu Jun  9 07:12:51 2011
New Revision: 1133684

URL: http://svn.apache.org/viewvc?rev=1133684&view=rev
Log:
updating supplemental-models.xml prior to RC4

Modified:
    incubator/isis/trunk/src/main/appended-resources/supplemental-models.xml

Modified: incubator/isis/trunk/src/main/appended-resources/supplemental-models.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/src/main/appended-resources/supplemental-models.xml?rev=1133684&r1=1133683&r2=1133684&view=diff
==============================================================================
--- incubator/isis/trunk/src/main/appended-resources/supplemental-models.xml (original)
+++ incubator/isis/trunk/src/main/appended-resources/supplemental-models.xml Thu Jun  9 07:12:51
2011
@@ -52,21 +52,6 @@
       <version>1.7.0</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>commons-beanutils</groupId>
-      <artifactId>commons-beanutils-core</artifactId>
-      <version>1.7.0</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>          
@@ -74,7 +59,7 @@
       </licenses>
     </project>
   </supplement>
-  
+
   
   <supplement>
     <project>
@@ -113,39 +98,9 @@
   
   <supplement>
     <project>
-      <groupId>javax.annotation</groupId>
-      <artifactId>jsr250-api</artifactId>
-      <version>1.0</version>
-      <licenses>
-        <license>
-            <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1</name>
-            <url>http://www.opensource.org/licenses/cddl1</url>
-            <distribution>repo</distribution>          
-        </license>
-      </licenses>
-    </project>
-  </supplement>
-  
-  <supplement>
-    <project>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.5</version>
-      <licenses>
-        <license>
-            <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1</name>
-            <url>http://www.opensource.org/licenses/cddl1</url>
-            <distribution>repo</distribution>          
-        </license>
-      </licenses>
-    </project>
-  </supplement>
-  
-  <supplement>
-    <project>
       <groupId>org.scannotation</groupId>
       <artifactId>scannotation</artifactId>
-      <version>1.0.2</version>
+      <version>1.0.3</version>
       <licenses>
         <license>
             <name>The Apache Software License, Version 2.0</name>
@@ -175,36 +130,6 @@
     <project>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.4.2</version>
-      <licenses>
-        <license>
-            <name>MIT License</name>
-            <url>http://www.opensource.org/licenses/mit-license.php</url>
-            <distribution>repo</distribution>          
-        </license>
-      </licenses>
-    </project>
-  </supplement>
-  
-  <supplement>
-    <project>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>1.5.2</version>
-      <licenses>
-        <license>
-            <name>MIT License</name>
-            <url>http://www.opensource.org/licenses/mit-license.php</url>
-            <distribution>repo</distribution>          
-        </license>
-      </licenses>
-    </project>
-  </supplement>
-  
-  <supplement>
-    <project>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
       <version>1.5.8</version>
       <licenses>
         <license>
@@ -219,23 +144,8 @@
   <supplement>
     <project>
       <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-simple</artifactId>
-      <version>1.5.2</version>
-      <licenses>
-        <license>
-            <name>MIT License</name>
-            <url>http://www.opensource.org/licenses/mit-license.php</url>
-            <distribution>repo</distribution>          
-        </license>
-      </licenses>
-    </project>
-  </supplement>
-
-  <supplement>
-    <project>
-      <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
-      <version>1.4.2</version>
+      <version>1.5.8</version>
       <licenses>
         <license>
             <name>MIT License</name>
@@ -249,73 +159,13 @@
   
   <supplement>
     <project>
-      <groupId>tjws</groupId>
-      <artifactId>webserver</artifactId>
-      <version>1.3.3</version>
-      <licenses>
-        <license>
-            <name>BSD License</name>
-            <url>http://www.opensource.org/licenses/bsd-license.php</url>
-            <distribution>repo</distribution>          
-        </license>
-      </licenses>
-    </project>
-  </supplement>
-  
-  <supplement>
-    <project>
-      <groupId>xalan</groupId>
-      <artifactId>xalan</artifactId>
-      <version>2.7.0</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>batik</groupId>
-      <artifactId>batik-css</artifactId>
-      <version>1.6-1</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>batik</groupId>
-      <artifactId>batik-ext</artifactId>
-      <version>1.6-1</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>batik</groupId>
-      <artifactId>batik-gui-util</artifactId>
-      <version>1.6-1</version>
+      <groupId>com.sun</groupId>
+      <artifactId>tools</artifactId>
+      <version>1.5.0</version>
       <licenses>
         <license>
-            <name>The Apache Software License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1</name>
+            <url>http://www.opensource.org/licenses/cddl1</url>
             <distribution>repo</distribution>          
         </license>
       </licenses>
@@ -324,13 +174,13 @@
   
   <supplement>
     <project>
-      <groupId>batik</groupId>
-      <artifactId>batik-util</artifactId>
-      <version>1.6-1</version>
+      <groupId>dom4j</groupId>
+      <artifactId>dom4j</artifactId>
+      <version>1.4</version>
       <licenses>
         <license>
-            <name>The Apache Software License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <name>BSD License</name>
+            <url>http://dom4j.sourceforge.net/dom4j-1.6.1/license.html</url>
             <distribution>repo</distribution>          
         </license>
       </licenses>
@@ -339,28 +189,28 @@
 
   <supplement>
     <project>
-      <groupId>com.sun</groupId>
-      <artifactId>tools</artifactId>
-      <version>1.5.0</version>
+      <groupId>org.jdom</groupId>
+      <artifactId>jdom</artifactId>
+      <version>1.1</version>
       <licenses>
         <license>
-            <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1</name>
-            <url>http://www.opensource.org/licenses/cddl1</url>
+            <name>Apache-style License</name>
+            <url>http://www.jdom.org/docs/faq.html#a0030</url>
             <distribution>repo</distribution>          
         </license>
       </licenses>
     </project>
   </supplement>
-  
+
   <supplement>
     <project>
-      <groupId>dom4j</groupId>
-      <artifactId>dom4j</artifactId>
-      <version>1.4</version>
+      <groupId>net.jcip</groupId>
+      <artifactId>jcip-annotations</artifactId>
+      <version>1.0</version>
       <licenses>
         <license>
-            <name>BSD License</name>
-            <url>http://dom4j.sourceforge.net/dom4j-1.6.1/license.html</url>
+            <name>Creative Commons Attribution 2.5 License</name>
+            <url>http://creativecommons.org/licenses/by/2.5/</url>
             <distribution>repo</distribution>          
         </license>
       </licenses>
@@ -442,35 +292,5 @@
       </licenses>
     </project>
   </supplement>
-
-  <supplement>
-    <project>
-      <groupId>org.owasp</groupId>
-      <artifactId>antisamy</artifactId>
-      <version>1.3-SNAPSHOT</version>
-      <licenses>
-        <license>
-            <name>BSD License</name>
-            <url>http://www.opensource.org/licenses/bsd-license.php</url>
-            <distribution>repo</distribution>          
-        </license>
-      </licenses>
-    </project>
-  </supplement>
-
-  <supplement>
-    <project>
-      <groupId>xml-apis</groupId>
-      <artifactId>xmlParserAPIs</artifactId>
-      <version>2.0.2</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>
   
-</supplementalDataModels>
\ No newline at end of file
+</supplementalDataModels>



Mime
View raw message