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 2013/10/20 12:06:55 UTC
[2/2] git commit: ISIS-437: updating dependencies, licenses, headers
ISIS-437: updating dependencies, licenses, headers
... for core, jdo, shiro, ro, wicket
also
- force version of javax.jdo:jdo-api, as used by the DN enhancer,
to be fixed to that used by the JDO ObjectStore itself.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/1c7417ad
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/1c7417ad
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/1c7417ad
Branch: refs/heads/master
Commit: 1c7417adef19e81f3c65a75f9b08378c62eea817
Parents: 628d3d2
Author: Dan Haywood <da...@apache.org>
Authored: Sun Oct 20 11:06:17 2013 +0100
Committer: Dan Haywood <da...@apache.org>
Committed: Sun Oct 20 11:06:17 2013 +0100
----------------------------------------------------------------------
component/objectstore/jdo/pom.xml | 15 +---------
component/security/shiro/pom.xml | 4 +++
.../appended-resources/supplemental-models.xml | 15 ++++++++++
.../appended-resources/supplemental-models.xml | 15 ++++++++++
.../appended-resources/supplemental-models.xml | 31 ++++++++++----------
component/viewer/wicket/tck/pom.xml | 2 +-
core/pom.xml | 10 +++----
.../quickstart_wicket_restful_jdo/dom/pom.xml | 8 ++---
.../quickstart_wicket_restful_jdo/pom.xml | 5 ++--
.../simple_wicket_restful_jdo/dom/pom.xml | 8 ++---
.../simple_wicket_restful_jdo/pom.xml | 5 ++--
.../quickstart_wicket_restful_jdo/pom.xml | 4 +--
12 files changed, 71 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/1c7417ad/component/objectstore/jdo/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/pom.xml b/component/objectstore/jdo/pom.xml
index 618e28b..ebb8df6 100644
--- a/component/objectstore/jdo/pom.xml
+++ b/component/objectstore/jdo/pom.xml
@@ -77,6 +77,7 @@
-->
<exclude>**/target/**</exclude>
<exclude>**/target-ide/**</exclude>
+ <exclude>**/.log</exclude>
<exclude>**/*.project</exclude>
<exclude>**/.classpath</exclude>
@@ -152,7 +153,6 @@
</exclusions>
</dependency>
-
<dependency>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-core</artifactId>
@@ -173,19 +173,6 @@
<artifactId>datanucleus-jodatime</artifactId>
<version>${datanucleus-jodatime.version}</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>
- <artifactId>hsqldb</artifactId>
- <version>2.2.9</version>
- </dependency>
-
</dependencies>
</dependencyManagement>
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/1c7417ad/component/security/shiro/pom.xml
----------------------------------------------------------------------
diff --git a/component/security/shiro/pom.xml b/component/security/shiro/pom.xml
index eb20458..b2ab9f9 100644
--- a/component/security/shiro/pom.xml
+++ b/component/security/shiro/pom.xml
@@ -37,6 +37,10 @@
<siteBaseDir>.</siteBaseDir>
<relativeUrl />
<shiro.version>1.2.1</shiro.version>
+ <!--
+ staying with 1.2.1 for now; see ISIS-574
+ <shiro.version>1.2.2</shiro.version>
+ -->
</properties>
<!-- used in Site generation for relative references. -->
http://git-wip-us.apache.org/repos/asf/isis/blob/1c7417ad/component/security/shiro/src/main/appended-resources/supplemental-models.xml
----------------------------------------------------------------------
diff --git a/component/security/shiro/src/main/appended-resources/supplemental-models.xml b/component/security/shiro/src/main/appended-resources/supplemental-models.xml
index 9ecb462..5210ece 100644
--- a/component/security/shiro/src/main/appended-resources/supplemental-models.xml
+++ b/component/security/shiro/src/main/appended-resources/supplemental-models.xml
@@ -26,4 +26,19 @@
</project>
</supplement>
+ <supplement>
+ <project>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.6.1</version>
+ <licenses>
+ <license>
+ <name>BSD License</name>
+ <url>http://dom4j.sourceforge.net/dom4j-1.6.1/license.html</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+
</supplementalDataModels>
http://git-wip-us.apache.org/repos/asf/isis/blob/1c7417ad/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 f0d213c..383c784 100644
--- a/component/viewer/restfulobjects/src/main/appended-resources/supplemental-models.xml
+++ b/component/viewer/restfulobjects/src/main/appended-resources/supplemental-models.xml
@@ -26,6 +26,21 @@
</project>
</supplement>
+ <supplement>
+ <project>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.6.1</version>
+ <licenses>
+ <license>
+ <name>BSD License</name>
+ <url>http://dom4j.sourceforge.net/dom4j-1.6.1/license.html</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+
<supplement>
<project>
<groupId>org.scannotation</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/1c7417ad/component/viewer/wicket/src/main/appended-resources/supplemental-models.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/src/main/appended-resources/supplemental-models.xml b/component/viewer/wicket/src/main/appended-resources/supplemental-models.xml
index 0b3cdbc..bb2b36a 100644
--- a/component/viewer/wicket/src/main/appended-resources/supplemental-models.xml
+++ b/component/viewer/wicket/src/main/appended-resources/supplemental-models.xml
@@ -26,6 +26,22 @@
</project>
</supplement>
+ <supplement>
+ <project>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.6.1</version>
+ <licenses>
+ <license>
+ <name>BSD License</name>
+ <url>http://dom4j.sourceforge.net/dom4j-1.6.1/license.html</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+
+
<!--
<supplement>
<project>
@@ -58,21 +74,6 @@
<supplement>
<project>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- <version>1.6.1</version>
- <licenses>
- <license>
- <name>BSD License</name>
- <url>http://dom4j.sourceforge.net/dom4j-1.6.1/license.html</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- </project>
- </supplement>
-
- <supplement>
- <project>
<groupId>net.jcip</groupId>
<artifactId>jcip-annotations</artifactId>
<version>1.0</version>
http://git-wip-us.apache.org/repos/asf/isis/blob/1c7417ad/component/viewer/wicket/tck/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/tck/pom.xml b/component/viewer/wicket/tck/pom.xml
index 6482071..8e4054c 100644
--- a/component/viewer/wicket/tck/pom.xml
+++ b/component/viewer/wicket/tck/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck</artifactId>
- <version>1.2.0</version>
+ <version>1.3.0-SNAPSHOT</version>
<relativePath>../../../../core/tck/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/isis/blob/1c7417ad/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 1bdca9f..a497e4e 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -20,9 +20,9 @@
</parent>
<groupId>org.apache.isis.core</groupId>
+ <artifactId>isis</artifactId>
<version>1.3.0-SNAPSHOT</version>
- <artifactId>isis</artifactId>
<packaging>pom</packaging>
<name>Apache Isis Core</name>
@@ -74,12 +74,12 @@
<license.additional-notes>In addition, Isis uses some Javascript libraries:
* JQuery core and JQuery UI, licensed under the MIT license [1].
* Twitter Bootstrap, licensed under ASL v2 [2]
-* JGrowl (JQuery plugin), licensed under an ASL-style license [3]
+* JGrowl (JQuery plugin), licensed under MIT license [3]
* LiveQuery (JQuery plugin), licensed under MIT license [4]
[1] http://jquery.org/license/
[2] http://getbootstrap.com/2.3.2/
-[3] https://github.com/stanlemon/jGrowl/blob/master/LICENSE
+[3] https://github.com/stanlemon/jGrowl/blob/master/jquery.jgrowl.js
[4] https://github.com/brandonaaron/livequery#license</license.additional-notes>
</properties>
@@ -338,7 +338,7 @@
<licenseFamilyName>MIT </licenseFamilyName>
<notes />
<patterns>
- <pattern>Dual licensed under the MIT or GPL Version 2 licenses.</pattern>
+ <pattern>Dual licensed under the MIT</pattern>
</patterns>
</license>
<license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
@@ -1477,7 +1477,7 @@ ${license.additional-notes}
<artifactId>geronimo-javamail_1.4_spec</artifactId>
<version>1.7.1</version>
</dependency>
-
+
<dependency>
<groupId>org.picocontainer</groupId>
<artifactId>picocontainer</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/1c7417ad/example/application/quickstart_wicket_restful_jdo/dom/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/dom/pom.xml b/example/application/quickstart_wicket_restful_jdo/dom/pom.xml
index 33592ed..12bd977 100644
--- a/example/application/quickstart_wicket_restful_jdo/dom/pom.xml
+++ b/example/application/quickstart_wicket_restful_jdo/dom/pom.xml
@@ -53,18 +53,16 @@
<version>3.2.0-release</version>
<dependencies>
<dependency>
- <!-- Force the enhancer to use the same version
- of core that's already on the classpath -->
+ <!-- Force the enhancer to use the same version of core as the JDO objectstore -->
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-core</artifactId>
<version>${datanucleus-core.version}</version>
</dependency>
<dependency>
- <!-- Force the enhancer to use the "jdo-api" released "3.0.1" version instead
- of the "3.0.1-SNAPSHOT" version -->
+ <!-- Force the enhancer to use the same version of jdo-api as the JDO objectstore -->
<groupId>javax.jdo</groupId>
<artifactId>jdo-api</artifactId>
- <version>3.0.1</version>
+ <version>${jdo-api.version}</version>
</dependency>
</dependencies>
<configuration>
http://git-wip-us.apache.org/repos/asf/isis/blob/1c7417ad/example/application/quickstart_wicket_restful_jdo/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/pom.xml b/example/application/quickstart_wicket_restful_jdo/pom.xml
index 1c76d38..99d6f74 100644
--- a/example/application/quickstart_wicket_restful_jdo/pom.xml
+++ b/example/application/quickstart_wicket_restful_jdo/pom.xml
@@ -34,10 +34,11 @@
<isis-objectstore-jdo.version>1.2.0-SNAPSHOT</isis-objectstore-jdo.version>
<isis-viewer-wicket.version>1.3.0-SNAPSHOT</isis-viewer-wicket.version>
<isis-viewer-restfulobjects.version>2.1.0-SNAPSHOT</isis-viewer-restfulobjects.version>
- <isis-security-shiro.version>1.1.1</isis-security-shiro.version>
+ <isis-security-shiro.version>1.1.2-SNAPSHOT</isis-security-shiro.version>
- <!-- must be consistent with the version defined by the JDO Objecstore -->
+ <!-- must be consistent with the versions defined by the JDO Objectstore -->
<datanucleus-core.version>3.2.7</datanucleus-core.version>
+ <jdo-api.version>3.0.1</jdo-api.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
http://git-wip-us.apache.org/repos/asf/isis/blob/1c7417ad/example/application/simple_wicket_restful_jdo/dom/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simple_wicket_restful_jdo/dom/pom.xml b/example/application/simple_wicket_restful_jdo/dom/pom.xml
index e2d2757..121bbf5 100644
--- a/example/application/simple_wicket_restful_jdo/dom/pom.xml
+++ b/example/application/simple_wicket_restful_jdo/dom/pom.xml
@@ -53,18 +53,16 @@
<version>3.2.0-release</version>
<dependencies>
<dependency>
- <!-- Force the enhancer to use the same version
- of core that's already on the classpath -->
+ <!-- Force the enhancer to use the same version of core as the JDO objectstore -->
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-core</artifactId>
<version>${datanucleus-core.version}</version>
</dependency>
<dependency>
- <!-- Force the enhancer to use the "jdo-api" released "3.0.1" version instead
- of the "3.0.1-SNAPSHOT" version -->
+ <!-- Force the enhancer to use the same version of jdo-api as the JDO objectstore -->
<groupId>javax.jdo</groupId>
<artifactId>jdo-api</artifactId>
- <version>3.0.1</version>
+ <version>${jdo-api.version}</version>
</dependency>
</dependencies>
<configuration>
http://git-wip-us.apache.org/repos/asf/isis/blob/1c7417ad/example/application/simple_wicket_restful_jdo/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simple_wicket_restful_jdo/pom.xml b/example/application/simple_wicket_restful_jdo/pom.xml
index fd2cf9a..50f6337 100644
--- a/example/application/simple_wicket_restful_jdo/pom.xml
+++ b/example/application/simple_wicket_restful_jdo/pom.xml
@@ -34,10 +34,11 @@
<isis-objectstore-jdo.version>1.2.0-SNAPSHOT</isis-objectstore-jdo.version>
<isis-viewer-wicket.version>1.3.0-SNAPSHOT</isis-viewer-wicket.version>
<isis-viewer-restfulobjects.version>2.1.0-SNAPSHOT</isis-viewer-restfulobjects.version>
- <isis-security-shiro.version>1.1.1</isis-security-shiro.version>
+ <isis-security-shiro.version>1.1.2-SNAPSHOT</isis-security-shiro.version>
- <!-- must be consistent with the version defined by the JDO Objecstore -->
+ <!-- must be consistent with the versions defined by the JDO Objectstore -->
<datanucleus-core.version>3.2.7</datanucleus-core.version>
+ <jdo-api.version>3.0.1</jdo-api.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
http://git-wip-us.apache.org/repos/asf/isis/blob/1c7417ad/example/archetype/quickstart_wicket_restful_jdo/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/quickstart_wicket_restful_jdo/pom.xml b/example/archetype/quickstart_wicket_restful_jdo/pom.xml
index a3fe205..e33740e 100644
--- a/example/archetype/quickstart_wicket_restful_jdo/pom.xml
+++ b/example/archetype/quickstart_wicket_restful_jdo/pom.xml
@@ -44,7 +44,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.2.0</version>
- <relativePath>../../../core/pom.xm</relativePath>
+ <version>1.3.0-SNAPSHOT</version>
+ <relativePath>../../../core/pom.xml</relativePath>
</parent>
</project>