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 2015/03/27 15:40:53 UTC
isis git commit: ISIS-1058: removing 'provided' scope for our
dependency on geronimo-servlet_3.0_spec (in
dependencyManagement/dependencies/dependency) ...
Repository: isis
Updated Branches:
refs/heads/master 647ec490d -> dd1754e4f
ISIS-1058: removing 'provided' scope for our dependency on geronimo-servlet_3.0_spec (in dependencyManagement/dependencies/dependency) ...
... so that there is no need for webapps to specify the verion themselves.
Instead the 'provided' scope is pushed down into the actual dependency usage (in dependencies/dependency).
Also, for simpleapp:
- add intellij profile so can run the app from within IntelliJ (activate using idea.version property).
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/dd1754e4
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/dd1754e4
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/dd1754e4
Branch: refs/heads/master
Commit: dd1754e4facc65d9c0bf6a105d008662e0e79d7e
Parents: 647ec49
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Mar 27 14:40:38 2015 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Mar 27 14:40:38 2015 +0000
----------------------------------------------------------------------
core/metamodel/pom.xml | 5 +----
core/pom.xml | 1 -
core/runtime/pom.xml | 1 +
core/security-shiro/pom.xml | 1 +
core/viewer-restfulobjects-server/pom.xml | 1 +
core/viewer-wicket/impl/pom.xml | 1 +
core/viewer-wicket/ui/pom.xml | 1 +
core/webserver/pom.xml | 1 +
example/application/simpleapp/webapp/pom.xml | 25 +++++++++++++++++------
9 files changed, 26 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/dd1754e4/core/metamodel/pom.xml
----------------------------------------------------------------------
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index 50ab253..f4ae23f 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -102,13 +102,10 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-applib</artifactId>
- </dependency>
- <dependency>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-accessplatform-jdo-rdbms</artifactId>
<type>pom</type>
http://git-wip-us.apache.org/repos/asf/isis/blob/dd1754e4/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 96f2e2f..430c578 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1811,7 +1811,6 @@ ${license.additional-notes}
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_3.0_spec</artifactId>
<version>${geronimo-servlet_3.0_spec.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/dd1754e4/core/runtime/pom.xml
----------------------------------------------------------------------
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index 3d5b3fb..54db5af 100644
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@ -176,6 +176,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <scope>provided</scope>
</dependency>
<!-- Email Notification Service -->
http://git-wip-us.apache.org/repos/asf/isis/blob/dd1754e4/core/security-shiro/pom.xml
----------------------------------------------------------------------
diff --git a/core/security-shiro/pom.xml b/core/security-shiro/pom.xml
index 4d08ad3..69496bc 100644
--- a/core/security-shiro/pom.xml
+++ b/core/security-shiro/pom.xml
@@ -142,6 +142,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/isis/blob/dd1754e4/core/viewer-restfulobjects-server/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/pom.xml b/core/viewer-restfulobjects-server/pom.xml
index 72287bb..648347e 100644
--- a/core/viewer-restfulobjects-server/pom.xml
+++ b/core/viewer-restfulobjects-server/pom.xml
@@ -58,6 +58,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/dd1754e4/core/viewer-wicket/impl/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-wicket/impl/pom.xml b/core/viewer-wicket/impl/pom.xml
index 0c597d7..03ecc90 100644
--- a/core/viewer-wicket/impl/pom.xml
+++ b/core/viewer-wicket/impl/pom.xml
@@ -76,6 +76,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/dd1754e4/core/viewer-wicket/ui/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-wicket/ui/pom.xml b/core/viewer-wicket/ui/pom.xml
index fa828f1..7098e6e 100644
--- a/core/viewer-wicket/ui/pom.xml
+++ b/core/viewer-wicket/ui/pom.xml
@@ -134,6 +134,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <scope>provided</scope>
</dependency>
<!-- LOGGING DEPENDENCIES - LOG4J -->
http://git-wip-us.apache.org/repos/asf/isis/blob/dd1754e4/core/webserver/pom.xml
----------------------------------------------------------------------
diff --git a/core/webserver/pom.xml b/core/webserver/pom.xml
index fb0fb26..e96c353 100644
--- a/core/webserver/pom.xml
+++ b/core/webserver/pom.xml
@@ -75,6 +75,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/isis/blob/dd1754e4/example/application/simpleapp/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/webapp/pom.xml b/example/application/simpleapp/webapp/pom.xml
index 9894324..5125558 100644
--- a/example/application/simpleapp/webapp/pom.xml
+++ b/example/application/simpleapp/webapp/pom.xml
@@ -202,11 +202,6 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_3.0_spec</artifactId>
- <!--
- Use 'compile' so can run o.a.i.WebServer from within IntelliJ;
- can rely on servlet container to ignore this in war file
- -->
- <scope>compile</scope>
</dependency>
<!--
@@ -277,7 +272,25 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>intellij</id>
+ <activation>
+ <property>
+ <name>idea.version</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <!--
+ Use 'compile' so can run o.a.i.WebServer from within IntelliJ;
+ can rely on servlet container to ignore this in war file
+ -->
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ </profile>
<profile>
<id>jrebel</id>
<properties>