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/07/17 00:45:28 UTC
git commit: ISIS-839: tidying up poms
Repository: isis
Updated Branches:
refs/heads/master dc6b8ade6 -> 6b39f52d8
ISIS-839: tidying up poms
* introducing properties for all 3rd party versions (in dependencyManagement section)
* moving core modules together (in dependencyManagement section)
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/6b39f52d
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/6b39f52d
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/6b39f52d
Branch: refs/heads/master
Commit: 6b39f52d8637d5a2420253466242a1ac9d94858f
Parents: dc6b8ad
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jul 16 23:44:45 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jul 16 23:44:45 2014 +0100
----------------------------------------------------------------------
component/viewer/wicket/impl/pom.xml | 2 +-
component/viewer/wicket/tck/pom.xml | 1 -
core/pom.xml | 679 ++++++++++++++++--------------
core/security-shiro/pom.xml | 9 +-
core/tck/pom.xml | 2 +-
5 files changed, 376 insertions(+), 317 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/6b39f52d/component/viewer/wicket/impl/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/impl/pom.xml b/component/viewer/wicket/impl/pom.xml
index 2c3bfc9..1d4c073 100644
--- a/component/viewer/wicket/impl/pom.xml
+++ b/component/viewer/wicket/impl/pom.xml
@@ -97,7 +97,7 @@
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice-parent</artifactId>
- <version>3.0</version>
+ <version>${guice.version}</version>
<type>pom</type>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/6b39f52d/component/viewer/wicket/tck/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/tck/pom.xml b/component/viewer/wicket/tck/pom.xml
index 279a238..6614337 100644
--- a/component/viewer/wicket/tck/pom.xml
+++ b/component/viewer/wicket/tck/pom.xml
@@ -36,7 +36,6 @@
<properties>
<isis-viewer-wicket.version>1.6.0-SNAPSHOT</isis-viewer-wicket.version>
- <jetty.version>6.1.4</jetty.version>
<siteBaseDir>..</siteBaseDir>
<relativeUrl>wicket-tck/</relativeUrl>
<!-- until someone comes up with a better solution -->
http://git-wip-us.apache.org/repos/asf/isis/blob/6b39f52d/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 3ee1ab0..5a50d5b 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -94,6 +94,59 @@
<!-- ensure compatible with version aggregated in datanucleus-accessplatform-jdo-rdbms -->
<jdo-api.version>3.1-rc1</jdo-api.version>
+ <shiro.version>1.2.1</shiro.version>
+
+ <slf4j.version>1.7.6</slf4j.version>
+ <log4j.version>1.2.17</log4j.version>
+
+ <joda-time.version>2.3</joda-time.version>
+ <guava.version>16.0.1</guava.version>
+
+ <hamcrest.version>1.3</hamcrest.version>
+
+ <objenesis.version>1.4</objenesis.version>
+ <javassist.version>3.18.1-GA</javassist.version>
+ <reflections.version>0.9.8</reflections.version>
+
+ <commons-logging.version>1.1.2</commons-logging.version>
+ <commons-cli.version>1.2</commons-cli.version>
+ <commons-httpclient.version>3.1</commons-httpclient.version>
+ <commons-codec.version>1.9</commons-codec.version>
+
+ <jackson.version>1.9.11</jackson.version>
+ <gson.version>2.2.4</gson.version>
+
+ <!-- using 2.3.2 throws strange error about not finding org.hsqldb.jdbcDriver -->
+ <hsqldb.version>2.3.1</hsqldb.version>
+ <log4jdbc-remix.version>0.2.7</log4jdbc-remix.version>
+ <resteasy-jaxrs.version>2.3.7.Final</resteasy-jaxrs.version>
+
+ <jetty.version>6.1.26</jetty.version>
+
+ <guice.version>3.0</guice.version>
+ <picocontainer.version>2.14.3</picocontainer.version>
+
+ <dom4j.version>1.6.1</dom4j.version>
+ <jdom.version>2.0.2</jdom.version>
+ <xstream.version>1.4.7</xstream.version>
+ <htmlparser.version>2.1</htmlparser.version>
+
+ <junit.version>4.11</junit.version>
+ <jmock.version>2.6.0</jmock.version>
+ <easymock.version>2.5.2</easymock.version>
+ <cucumber.version>1.1.5</cucumber.version>
+
+ <geronimo-jsp_2.1_spec.version>1.0.1</geronimo-jsp_2.1_spec.version>
+ <geronimo-jta_1.1_spec.version>1.1.1</geronimo-jta_1.1_spec.version>
+ <geronimo-jta_1.0.1B_spec.version>1.1.1</geronimo-jta_1.0.1B_spec.version>
+ <geronimo-servlet_2.5_spec.version>1.2</geronimo-servlet_2.5_spec.version>
+ <geronimo-annotation_1.0_spec.version>1.1.1</geronimo-annotation_1.0_spec.version>
+ <geronimo-activation_1.1_spec.version>1.1</geronimo-activation_1.1_spec.version>
+ <geronimo-javamail_1.4_spec.version>1.7.1</geronimo-javamail_1.4_spec.version>
+ <geronimo-atinject_1.0_spec.version>1.0</geronimo-atinject_1.0_spec.version>
+ <geronimo-jcdi_1.0_spec.version>1.0</geronimo-jcdi_1.0_spec.version>
+ <validation-api.version>1.1.0.Final</validation-api.version>
+
</properties>
<scm>
@@ -820,7 +873,7 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.26</version>
+ <version>${jetty.version}</version>
<configuration>
<webAppConfig>
<contextPath>webapp</contextPath>
@@ -1076,8 +1129,7 @@ ${license.additional-notes}
<!-- not scope=test, because referenced by some sql-tests-common under compile scope -->
</dependency>
-
- <!-- default implementations of components -->
+ <!-- object store(s) -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-objectstore</artifactId>
@@ -1092,11 +1144,72 @@ ${license.additional-notes}
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-profilestore</artifactId>
+ <artifactId>isis-core-objectstore-jdo-metamodel</artifactId>
<version>1.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-objectstore-jdo-metamodel</artifactId>
+ <version>1.6.0-SNAPSHOT</version>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-objectstore-jdo-datanucleus</artifactId>
+ <version>1.6.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-objectstore-jdo-datanucleus</artifactId>
+ <version>1.6.0-SNAPSHOT</version>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+
+
+ <!-- Restful Objects viewer -->
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
+ <version>1.6.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
+ <version>1.6.0-SNAPSHOT</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
+ <version>1.6.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
+ <version>1.6.0-SNAPSHOT</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-viewer-restfulobjects-server</artifactId>
+ <version>1.6.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-viewer-restfulobjects-server</artifactId>
+ <version>1.6.0-SNAPSHOT</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+
+ <!-- security implementation(s) -->
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security</artifactId>
<version>1.6.0-SNAPSHOT</version>
</dependency>
@@ -1107,6 +1220,14 @@ ${license.additional-notes}
</dependency>
+ <!-- profile store -->
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-profilestore</artifactId>
+ <version>1.6.0-SNAPSHOT</version>
+ </dependency>
+
+
<!-- TCK -->
<dependency>
<groupId>org.apache.isis.core</groupId>
@@ -1130,100 +1251,260 @@ ${license.additional-notes}
</dependency>
+ <!-- modules -->
+ <!-- (in future, these might be released separately from core -->
+ <dependency>
+ <groupId>org.apache.isis.module</groupId>
+ <artifactId>isis-module-audit-jdo</artifactId>
+ <version>1.6.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.module</groupId>
+ <artifactId>isis-module-audit-jdo</artifactId>
+ <version>1.6.0-SNAPSHOT</version>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.module</groupId>
+ <artifactId>isis-module-background</artifactId>
+ <version>1.6.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.module</groupId>
+ <artifactId>isis-module-background</artifactId>
+ <version>1.6.0-SNAPSHOT</version>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.module</groupId>
+ <artifactId>isis-module-command-jdo</artifactId>
+ <version>1.6.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.module</groupId>
+ <artifactId>isis-module-command-jdo</artifactId>
+ <version>1.6.0-SNAPSHOT</version>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.module</groupId>
+ <artifactId>isis-module-devutils</artifactId>
+ <version>1.6.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.module</groupId>
+ <artifactId>isis-module-devutils</artifactId>
+ <version>1.6.0-SNAPSHOT</version>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+
+ <!--
+ declared as a convenience; alternative is for the domain application to
+ scope=import the o.a.i.module:isis-module-devutils in root pom.xml's dependencyManagement/dependencies
+ -->
+ <dependency>
+ <groupId>org.apache.isis.module</groupId>
+ <artifactId>isis-module-devutils-applib</artifactId>
+ <version>1.6.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.module</groupId>
+ <artifactId>isis-module-devutils-applib</artifactId>
+ <version>1.6.0-SNAPSHOT</version>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.module</groupId>
+ <artifactId>isis-module-devutils-impl</artifactId>
+ <version>1.6.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.module</groupId>
+ <artifactId>isis-module-devutils-impl</artifactId>
+ <version>1.6.0-SNAPSHOT</version>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.module</groupId>
+ <artifactId>isis-module-publishing-jdo</artifactId>
+ <version>1.6.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.module</groupId>
+ <artifactId>isis-module-publishing-jdo</artifactId>
+ <version>1.6.0-SNAPSHOT</version>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.module</groupId>
+ <artifactId>isis-module-publishingeventserializer-ro</artifactId>
+ <version>1.6.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.module</groupId>
+ <artifactId>isis-module-publishingeventserializer-ro</artifactId>
+ <version>1.6.0-SNAPSHOT</version>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.module</groupId>
+ <artifactId>isis-module-settings</artifactId>
+ <version>1.6.0-SNAPSHOT</version>
+ </dependency>
+ <!--
+ declared as a convenience; alternative is for the domain application to
+ scope=import the o.a.i.module:isis-module-devutils in root pom.xml's dependencyManagement/dependencies
+ -->
+ <dependency>
+ <groupId>org.apache.isis.module</groupId>
+ <artifactId>isis-module-settings-applib</artifactId>
+ <version>1.6.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.module</groupId>
+ <artifactId>isis-module-settings-applib</artifactId>
+ <version>1.6.0-SNAPSHOT</version>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.module</groupId>
+ <artifactId>isis-module-settings-impl-jdo</artifactId>
+ <version>1.6.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.module</groupId>
+ <artifactId>isis-module-settings-impl-jdo</artifactId>
+ <version>1.6.0-SNAPSHOT</version>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.module</groupId>
+ <artifactId>isis-module-wrapper</artifactId>
+ <version>1.6.0-SNAPSHOT</version>
+ </dependency>
+
<!-- JodaTime -->
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
- <version>2.3</version>
+ <version>${joda-time.version}</version>
+ </dependency>
+
+ <!-- Google Guava (collections and commons) -->
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava.version}</version>
</dependency>
<!-- Logging -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.6</version>
+ <version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.7.6</version>
+ <version>${slf4j.version}</version>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.17</version>
+ <version>${log4j.version}</version>
</dependency>
- <!-- Apache Commons -->
+ <dependency>
+ <!--
+ required because resteasy-jaxrs declares as a test dependency
+ whereas httpclient4 needs it as a compile dependency -->
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons-logging.version}</version>
+ </dependency>
+
+ <!-- Apache Commons -->
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <version>1.2</version>
+ <version>${commons-cli.version}</version>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
+ <version>${commons-httpclient.version}</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.9</version>
+ <version>${commons-codec.version}</version>
</dependency>
-
- <!-- Other Common Utils -->
+ <!-- Dependency injection -->
<dependency>
- <groupId>org.reflections</groupId>
- <artifactId>reflections</artifactId>
- <version>0.9.8</version>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ <version>${guice.version}</version>
</dependency>
-
-
- <!-- Google Guava (collections and commons) -->
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>16.0.1</version>
+ <groupId>org.picocontainer</groupId>
+ <artifactId>picocontainer</artifactId>
+ <version>${picocontainer.version}</version>
</dependency>
- <!-- Google Guice (dependency injection) -->
+ <!-- Reflection/metadata -->
<dependency>
- <groupId>com.google.inject</groupId>
- <artifactId>guice</artifactId>
- <version>3.0</version>
+ <groupId>org.reflections</groupId>
+ <artifactId>reflections</artifactId>
+ <version>${reflections.version}</version>
</dependency>
<!-- Bytecode libraries -->
<dependency>
<groupId>org.objenesis</groupId>
<artifactId>objenesis</artifactId>
- <version>1.4</version>
+ <version>${objenesis.version}</version>
</dependency>
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
- <version>3.18.1-GA</version>
+ <version>${javassist.version}</version>
</dependency>
+
<!-- XML libraries -->
<dependency>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
- <version>1.6.1</version>
+ <version>${dom4j.version}</version>
</dependency>
<dependency>
<groupId>org.jdom</groupId>
<artifactId>jdom</artifactId>
- <version>2.0.2</version>
+ <version>${jdom.version}</version>
</dependency>
-
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
- <version>1.4.7</version>
+ <version>${xstream.version}</version>
</dependency>
@@ -1231,48 +1512,66 @@ ${license.additional-notes}
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
- <version>1.9.11</version>
+ <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
- <version>1.9.11</version>
+ <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
- <version>2.2.4</version>
+ <version>${gson.version}</version>
</dependency>
- <!--
- seemingly unused.
+
+
+ <!-- HTML -->
<dependency>
- <groupId>org.codehaus.jettison</groupId>
- <artifactId>jettison</artifactId>
- <version>1.3.3</version>
+ <groupId>org.htmlparser</groupId>
+ <artifactId>htmlparser</artifactId>
+ <version>${htmlparser.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun</groupId>
+ <artifactId>tools</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
- -->
-
+
<!-- Databases -->
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <!-- using 2.3.2 throws strange error about not finding org.hsqldb.jdbcDriver -->
- <version>2.3.1</version>
+ <version>${hsqldb.version}</version>
</dependency>
<dependency>
<groupId>org.lazyluke</groupId>
<artifactId>log4jdbc-remix</artifactId>
- <version>0.2.7</version>
+ <version>${log4jdbc-remix.version}</version>
+ </dependency>
+
+
+ <!-- Shiro -->
+ <dependency>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-core</artifactId>
+ <version>${shiro.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-web</artifactId>
+ <version>${shiro.version}</version>
</dependency>
-
+
<!-- RestEasy -->
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs</artifactId>
- <version>2.3.7.Final</version>
+ <version>${resteasy-jaxrs.version}</version>
<exclusions>
<!-- instead use org.apache.geronimo.specs:geronimo-servlet_2.5_spec -->
<exclusion>
@@ -1296,19 +1595,19 @@ ${license.additional-notes}
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
- <version>1.3</version>
+ <version>${hamcrest.version}</version>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
- <version>1.3</version>
+ <version>${hamcrest.version}</version>
</dependency>
<!-- Web development -->
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
- <version>6.1.26</version>
+ <version>${jetty.version}</version>
<exclusions>
<exclusion>
<groupId>org.mortbay.jetty</groupId>
@@ -1317,35 +1616,23 @@ ${license.additional-notes}
</exclusions>
</dependency>
- <dependency>
- <groupId>org.htmlparser</groupId>
- <artifactId>htmlparser</artifactId>
- <version>2.1</version>
- <exclusions>
- <exclusion>
- <groupId>com.sun</groupId>
- <artifactId>tools</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
<!-- Testing libraries (not scope=test because used by isis-core-integtest) -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.11</version>
+ <version>${junit.version}</version>
</dependency>
<dependency>
<groupId>org.jmock</groupId>
<artifactId>jmock</artifactId>
- <version>2.6.0</version>
+ <version>${jmock.version}</version>
</dependency>
<dependency>
<groupId>org.jmock</groupId>
<artifactId>jmock-junit4</artifactId>
- <version>2.6.0</version>
+ <version>${jmock.version}</version>
<exclusions>
<exclusion>
<!-- for dependency convergence -->
@@ -1359,19 +1646,19 @@ ${license.additional-notes}
<dependency>
<groupId>info.cukes</groupId>
<artifactId>cucumber-java</artifactId>
- <version>1.1.5</version>
+ <version>${cucumber.version}</version>
</dependency>
<dependency>
<groupId>info.cukes</groupId>
<artifactId>cucumber-junit</artifactId>
- <version>1.1.5</version>
+ <version>${cucumber.version}</version>
</dependency>
<!-- Testing libraries (scope=test) -->
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>2.5.2</version>
+ <version>${easymock.version}</version>
<scope>test</scope>
</dependency>
@@ -1379,92 +1666,58 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jsp_2.1_spec</artifactId>
- <version>1.0.1</version>
+ <version>${geronimo-jsp_2.1_spec.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
- <version>1.1.1</version>
+ <version>${geronimo-jta_1.1_spec.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.0.1B_spec</artifactId>
- <version>1.1.1</version>
+ <version>${geronimo-jta_1.0.1B_spec.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
- <version>1.2</version>
+ <version>${geronimo-servlet_2.5_spec.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.0_spec</artifactId>
- <version>1.1.1</version>
+ <version>${geronimo-annotation_1.0_spec.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-activation_1.1_spec</artifactId>
- <version>1.1</version>
+ <version>${geronimo-activation_1.1_spec.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javamail_1.4_spec</artifactId>
- <version>1.7.1</version>
+ <version>${geronimo-javamail_1.4_spec.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-atinject_1.0_spec</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- <version>1.1.0.Final</version>
+ <version>${geronimo-atinject_1.0_spec.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jcdi_1.0_spec</artifactId>
- <version>1.0</version>
+ <version>${geronimo-jcdi_1.0_spec.version}</version>
</dependency>
- <dependency>
- <groupId>org.picocontainer</groupId>
- <artifactId>picocontainer</artifactId>
- <version>2.14.3</version>
- </dependency>
-
-
-
- <!-- for benefit of application developers, using scope=import -->
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-objectstore-jdo-metamodel</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- </dependency>
+ <!-- javax APIs -->
<dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-objectstore-jdo-metamodel</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-objectstore-jdo-datanucleus</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-objectstore-jdo-datanucleus</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- <scope>test</scope>
- <type>test-jar</type>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ <version>${validation-api.version}</version>
</dependency>
-
<!-- DataNucleus -->
<dependency>
<groupId>org.datanucleus</groupId>
@@ -1478,198 +1731,7 @@ ${license.additional-notes}
<version>${datanucleus-jodatime.version}</version>
</dependency>
-
-
- <!-- for benefit of application developers, using scope=import -->
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-viewer-restfulobjects-server</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-viewer-restfulobjects-server</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <!--
- required because resteasy-jaxrs declares as a test dependency
- whereas httpclient4 needs it as a compile dependency -->
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.2</version>
- </dependency>
-
-
- <!-- modules -->
- <!-- (in future, these might be released separately from core -->
- <dependency>
- <groupId>org.apache.isis.module</groupId>
- <artifactId>isis-module-audit-jdo</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.module</groupId>
- <artifactId>isis-module-audit-jdo</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.module</groupId>
- <artifactId>isis-module-background</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.module</groupId>
- <artifactId>isis-module-background</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.module</groupId>
- <artifactId>isis-module-command-jdo</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.module</groupId>
- <artifactId>isis-module-command-jdo</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.module</groupId>
- <artifactId>isis-module-devutils</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.module</groupId>
- <artifactId>isis-module-devutils</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- <!--
- declared as a convenience; alternative is for the domain application to
- scope=import the o.a.i.module:isis-module-devutils in root pom.xml's dependencyManagement/dependencies
- -->
- <dependency>
- <groupId>org.apache.isis.module</groupId>
- <artifactId>isis-module-devutils-applib</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.module</groupId>
- <artifactId>isis-module-devutils-applib</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.module</groupId>
- <artifactId>isis-module-devutils-impl</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.module</groupId>
- <artifactId>isis-module-devutils-impl</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.module</groupId>
- <artifactId>isis-module-publishing-jdo</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.module</groupId>
- <artifactId>isis-module-publishing-jdo</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.module</groupId>
- <artifactId>isis-module-publishingeventserializer-ro</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.module</groupId>
- <artifactId>isis-module-publishingeventserializer-ro</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.module</groupId>
- <artifactId>isis-module-settings</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- </dependency>
- <!--
- declared as a convenience; alternative is for the domain application to
- scope=import the o.a.i.module:isis-module-devutils in root pom.xml's dependencyManagement/dependencies
- -->
- <dependency>
- <groupId>org.apache.isis.module</groupId>
- <artifactId>isis-module-settings-applib</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.module</groupId>
- <artifactId>isis-module-settings-applib</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.module</groupId>
- <artifactId>isis-module-settings-impl-jdo</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.module</groupId>
- <artifactId>isis-module-settings-impl-jdo</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.module</groupId>
- <artifactId>isis-module-wrapper</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- </dependency>
-
- </dependencies>
+ </dependencies>
</dependencyManagement>
<dependencies>
@@ -1687,6 +1749,7 @@ ${license.additional-notes}
<artifactId>slf4j-api</artifactId>
</dependency>
+
<!-- test dependencies -->
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/6b39f52d/core/security-shiro/pom.xml
----------------------------------------------------------------------
diff --git a/core/security-shiro/pom.xml b/core/security-shiro/pom.xml
index b5b9c49..b9d9fe6 100644
--- a/core/security-shiro/pom.xml
+++ b/core/security-shiro/pom.xml
@@ -35,8 +35,8 @@
<properties>
<siteBaseDir>..</siteBaseDir>
<relativeUrl>security-shiro</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>
-->
@@ -127,19 +127,16 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
- <version>1.7.5</version>
- <scope>test</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-core</artifactId>
- <version>${shiro.version}</version>
</dependency>
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-web</artifactId>
- <version>${shiro.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/6b39f52d/core/tck/pom.xml
----------------------------------------------------------------------
diff --git a/core/tck/pom.xml b/core/tck/pom.xml
index 5c3d8fe..6b6c233 100644
--- a/core/tck/pom.xml
+++ b/core/tck/pom.xml
@@ -110,7 +110,7 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.26</version>
+ <version>${jetty.version}</version>
</plugin>
<plugin>