Author: danhaywood
Date: Thu Nov 29 16:36:51 2012
New Revision: 1415262
URL: http://svn.apache.org/viewvc?rev=1415262&view=rev
Log:
ISIS-188: fixing up supplemental-models for missing license info
Modified:
isis/trunk/framework/pom.xml
isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/dom/pom.xml
isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-applib/pom.xml
isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/pom.xml
isis/trunk/framework/runtimes/dflt/objectstores/jdo/pom.xml
isis/trunk/framework/src/main/appended-resources/supplemental-models.xml
isis/trunk/framework/tck/tck-dom/pom.xml
isis/trunk/framework/viewer/bdd/concordion/pom.xml
isis/trunk/framework/viewer/wicket/pom.xml
Modified: isis/trunk/framework/pom.xml
URL:
http://svn.apache.org/viewvc/isis/trunk/framework/pom.xml?rev=1415262&r1=1415261&r2=1415262&view=diff
==============================================================================
--- isis/trunk/framework/pom.xml (original)
+++ isis/trunk/framework/pom.xml Thu Nov 29 16:36:51 2012
@@ -1315,6 +1315,11 @@ archetype includes this explicit depende
<artifactId>geronimo-jsp_2.1_spec</artifactId>
<version>1.0.1</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <version>1.1.1</version>
+ </dependency>
<dependency>
<groupId>org.htmlparser</groupId>
Modified:
isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/dom/pom.xml
URL:
http://svn.apache.org/viewvc/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/dom/pom.xml?rev=1415262&r1=1415261&r2=1415262&view=diff
==============================================================================
---
isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/dom/pom.xml
(original)
+++
isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/dom/pom.xml
Thu Nov 29 16:36:51 2012
@@ -117,6 +117,13 @@
<dependency>
<groupId>javax.jdo</groupId>
<artifactId>jdo-api</artifactId>
+ <exclusions>
+ <exclusion>
+ <!-- use geronimo-jta_1.1_spec instead -->
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.datanucleus</groupId>
@@ -127,10 +134,10 @@
<artifactId>datanucleus-enhancer</artifactId>
<!--
<exclusions>
- <exclusion>
- <groupId>org.ow2.asm</groupId>
- <artifactId>asm</artifactId>
- </exclusion>
+ <exclusion>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
</exclusions>
-->
</dependency>
@@ -138,6 +145,11 @@
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-api-jdo</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ </dependency>
+
</dependencies>
Modified: isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-applib/pom.xml
URL:
http://svn.apache.org/viewvc/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-applib/pom.xml?rev=1415262&r1=1415261&r2=1415262&view=diff
==============================================================================
--- isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-applib/pom.xml
(original)
+++ isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-applib/pom.xml Thu
Nov 29 16:36:51 2012
@@ -123,11 +123,18 @@
<dependency>
<groupId>javax.jdo</groupId>
<artifactId>jdo-api</artifactId>
+ <exclusions>
+ <exclusion>
+ <!-- use geronimo-jta_1.1_spec instead -->
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-core</artifactId>
- <scope>runtime</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.datanucleus</groupId>
@@ -141,6 +148,10 @@
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-api-jdo</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ </dependency>
</dependencies>
Modified:
isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/pom.xml
URL:
http://svn.apache.org/viewvc/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/pom.xml?rev=1415262&r1=1415261&r2=1415262&view=diff
==============================================================================
--- isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/pom.xml
(original)
+++ isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/pom.xml
Thu Nov 29 16:36:51 2012
@@ -61,6 +61,13 @@
<dependency>
<groupId>javax.jdo</groupId>
<artifactId>jdo-api</artifactId>
+ <exclusions>
+ <exclusion>
+ <!-- use geronimo-jta_1.1_spec instead -->
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.datanucleus</groupId>
@@ -78,17 +85,15 @@
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-rdbms</artifactId>
</dependency>
- <!--
<dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-jdo-query</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
</dependency>
- -->
- <dependency>
- <groupId>org.apache.isis.runtimes.dflt.bytecode</groupId>
- <artifactId>identity</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.apache.isis.runtimes.dflt.bytecode</groupId>
+ <artifactId>identity</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
Modified: isis/trunk/framework/runtimes/dflt/objectstores/jdo/pom.xml
URL:
http://svn.apache.org/viewvc/isis/trunk/framework/runtimes/dflt/objectstores/jdo/pom.xml?rev=1415262&r1=1415261&r2=1415262&view=diff
==============================================================================
--- isis/trunk/framework/runtimes/dflt/objectstores/jdo/pom.xml (original)
+++ isis/trunk/framework/runtimes/dflt/objectstores/jdo/pom.xml Thu Nov 29
16:36:51 2012
@@ -150,6 +150,13 @@
<groupId>javax.jdo</groupId>
<artifactId>jdo-api</artifactId>
<version>3.0.1</version>
+ <exclusions>
+ <!-- use geronimo-jta_1.1_spec instead -->
+ <exclusion>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.datanucleus</groupId>
@@ -159,7 +166,7 @@
<dependency>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-jodatime</artifactId>
- <version>3.1.0-release</version>
+ <version>3.1.1</version>
</dependency>
<dependency>
<groupId>org.datanucleus</groupId>
@@ -176,6 +183,11 @@
<artifactId>datanucleus-rdbms</artifactId>
<version>3.1.2</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <version>1.1.1</version>
+ </dependency>
<dependency>
<groupId>org.hsqldb</groupId>
Modified:
isis/trunk/framework/src/main/appended-resources/supplemental-models.xml
URL:
http://svn.apache.org/viewvc/isis/trunk/framework/src/main/appended-resources/supplemental-models.xml?rev=1415262&r1=1415261&r2=1415262&view=diff
==============================================================================
--- isis/trunk/framework/src/main/appended-resources/supplemental-models.xml
(original)
+++ isis/trunk/framework/src/main/appended-resources/supplemental-models.xml
Thu Nov 29 16:36:51 2012
@@ -12,20 +12,6 @@
<supplementalDataModels
xmlns="http://maven.apache.org/supplemental-model/1.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/supplemental-model/1.0.0
http://maven.apache.org/xsd/supplemental-model-1.0.0.xsd";>
- <supplement>
- <project>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- <version>2.1_3</version>
- <licenses>
- <license>
- <name>Apache 1.1</name>
- <url>http://www.apache.org/licenses/LICENSE-1.1</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- </project>
- </supplement>
<supplement>
<project>
@@ -40,42 +26,21 @@
</project>
</supplement>
-
<supplement>
+ <!-- not quite sure why licenses:download-license flags this, since
license info seems to be in its POM -->
<project>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- <version>3.1</version>
- <licenses>
- <license>
- <name>ASM OW2 License, Copyright (c) 2000-2005 INRIA, France
Telecom</name>
- <url>http://asm.ow2.org/license.html</url>
- </license>
- </licenses>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-jodatime</artifactId>
+ <version>3.1.1</version>
+ <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>
-
- <supplement>
- <project>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>3.8.0.GA</version>
- <licenses>
- <license>
- <name>GNU Lesser General Public License, version 2.1</name>
- <url>http://www.gnu.org/licenses/lgpl-2.1.html</url>
- <distribution>repo</distribution>
- </license>
- <license>
- <name>Mozilla Public License 1.1</name>
- <url>http://www.mozilla.org/MPL/MPL-1.1.html</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- </project>
- </supplement>
-
<supplement>
<project>
<groupId>org.scannotation</groupId>
@@ -90,58 +55,12 @@
</licenses>
</project>
</supplement>
-
- <supplement>
- <project>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- <version>1.7.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>
-
- <supplement>
- <project>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.5.8</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.5.8</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>dom4j</groupId>
<artifactId>dom4j</artifactId>
- <version>1.4</version>
+ <version>1.6.1</version>
<licenses>
<license>
<name>BSD License</name>
@@ -154,21 +73,6 @@
<supplement>
<project>
- <groupId>org.jdom</groupId>
- <artifactId>jdom</artifactId>
- <version>1.1</version>
- <licenses>
- <license>
- <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>net.jcip</groupId>
<artifactId>jcip-annotations</artifactId>
<version>1.0</version>
@@ -182,98 +86,6 @@
</project>
</supplement>
- <supplement>
- <project>
- <groupId>isorelax</groupId>
- <artifactId>isorelax</artifactId>
- <version>20020414</version>
- <licenses>
- <license>
- <name>MIT License</name>
- <url>http://www.opensource.org/licenses/mit-license.html</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- </project>
- </supplement>
-
- <supplement>
- <project>
- <groupId>msv</groupId>
- <artifactId>msv</artifactId>
- <version>20020414</version>
- <name>Sun Multi-Schema XML Validator (MSV)</name>
- <licenses>
- <license>
- <name>BSD Modified License</name>
- <url>http://olex.openlogic.com/licenses/msv-bsd-license</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- </project>
- </supplement>
-
- <supplement>
- <project>
- <groupId>relaxngDatatype</groupId>
- <artifactId>relaxngDatatype</artifactId>
- <version>20020414</version>
- <licenses>
- <license>
- <name>Java Web Services Developer Pack License, v1.5</name>
-
<url>http://download.oracle.com/docs/cd/E17802_01/webservices/webservices/docs/1.5/LICENSE</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- </project>
- </supplement>
-
- <supplement>
- <project>
- <groupId>saxpath</groupId>
- <artifactId>saxpath</artifactId>
- <version>1.0-FCS</version>
- <licenses>
- <license>
- <name>Werken Apache-style License</name>
- <url>http://www.saxpath.org/</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- </project>
- </supplement>
-
- <supplement>
- <project>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- <version>1.0-FCS</version>
- <licenses>
- <license>
- <name>Werken Apache-style License</name>
- <url>http://jaxen.codehaus.org/faq.html</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- </project>
- </supplement>
-
-
-
- <supplement>
- <project>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.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>
<supplement>
<project>
Modified: isis/trunk/framework/tck/tck-dom/pom.xml
URL:
http://svn.apache.org/viewvc/isis/trunk/framework/tck/tck-dom/pom.xml?rev=1415262&r1=1415261&r2=1415262&view=diff
==============================================================================
--- isis/trunk/framework/tck/tck-dom/pom.xml (original)
+++ isis/trunk/framework/tck/tck-dom/pom.xml Thu Nov 29 16:36:51 2012
@@ -117,6 +117,13 @@
<dependency>
<groupId>javax.jdo</groupId>
<artifactId>jdo-api</artifactId>
+ <exclusions>
+ <exclusion>
+ <!-- use geronimo-jta_1.1_spec instead -->
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.datanucleus</groupId>
@@ -131,6 +138,10 @@
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-api-jdo</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: isis/trunk/framework/viewer/bdd/concordion/pom.xml
URL:
http://svn.apache.org/viewvc/isis/trunk/framework/viewer/bdd/concordion/pom.xml?rev=1415262&r1=1415261&r2=1415262&view=diff
==============================================================================
--- isis/trunk/framework/viewer/bdd/concordion/pom.xml (original)
+++ isis/trunk/framework/viewer/bdd/concordion/pom.xml Thu Nov 29 16:36:51 2012
@@ -59,19 +59,19 @@
<dependency>
<groupId>org.concordion</groupId>
- <artifactId>concordion</artifactId>
- <exclusions>
- <exclusion>
- <!-- excluded because of LGPL; end-developer must
include in POM file directly -->
- <groupId>xom</groupId>
- <artifactId>xom</artifactId>
- </exclusion>
- <exclusion>
- <!-- for dependency convergence -->
- <groupId>junit</groupId>
- <artifactId>junit-dep</artifactId>
- </exclusion>
- </exclusions>
+ <artifactId>concordion</artifactId>
+ <exclusions>
+ <exclusion>
+ <!-- excluded because of LGPL; end-developer must include
in POM file directly -->
+ <groupId>xom</groupId>
+ <artifactId>xom</artifactId>
+ </exclusion>
+ <exclusion>
+ <!-- for dependency convergence -->
+ <groupId>junit</groupId>
+ <artifactId>junit-dep</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
Modified: isis/trunk/framework/viewer/wicket/pom.xml
URL:
http://svn.apache.org/viewvc/isis/trunk/framework/viewer/wicket/pom.xml?rev=1415262&r1=1415261&r2=1415262&view=diff
==============================================================================
--- isis/trunk/framework/viewer/wicket/pom.xml (original)
+++ isis/trunk/framework/viewer/wicket/pom.xml Thu Nov 29 16:36:51 2012
@@ -155,7 +155,7 @@
<version>${wicket.version}</version>
<exclusions>
<exclusion>
- <!-- for dependency convergence
-->
+ <!-- for dependency convergence -->
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
