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 2018/03/15 12:56:53 UTC
[isis] 03/05: adds workaround for use of flattened poms
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 84caf8c97dc97be798b2ea804b65a44e9a7f48d5
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Mar 15 12:48:14 2018 +0000
adds workaround for use of flattened poms
---
core/mavendeps/webapp/pom.xml | 5 --
example/application/simpleapp/application/pom.xml | 16 ++---
.../application/simpleapp/module-simple/pom.xml | 73 ++++++++++++++++++++++
example/application/simpleapp/pom.xml | 3 +-
example/application/simpleapp/webapp/pom.xml | 35 +++++++++++
5 files changed, 119 insertions(+), 13 deletions(-)
diff --git a/core/mavendeps/webapp/pom.xml b/core/mavendeps/webapp/pom.xml
index cd99aeb..8e1f738 100644
--- a/core/mavendeps/webapp/pom.xml
+++ b/core/mavendeps/webapp/pom.xml
@@ -64,11 +64,6 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security</artifactId>
</dependency>
-
-<!-- <dependency> -->
-<!-- <groupId>org.apache.geronimo.specs</groupId> -->
-<!-- <artifactId>geronimo-servlet_3.0_spec</artifactId> -->
-<!-- </dependency> -->
</dependencies>
</profile>
<profile>
diff --git a/example/application/simpleapp/application/pom.xml b/example/application/simpleapp/application/pom.xml
index 0bd1c24..abce8c1 100644
--- a/example/application/simpleapp/application/pom.xml
+++ b/example/application/simpleapp/application/pom.xml
@@ -104,11 +104,13 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>simpleapp-module-simple</artifactId>
+ <version>${isis.version}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-wrapper</artifactId>
+ <version>${isis.version}</version>
</dependency>
<!-- test -->
@@ -122,6 +124,7 @@
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
<artifactId>isis-mavendeps-testing</artifactId>
+ <version>${isis.version}</version>
<type>pom</type>
<scope>test</scope>
</dependency>
@@ -131,38 +134,37 @@
<profiles>
<profile>
<!--
- specifying -Drevision means that scope=pom dependencies are not resolved.
+ The flattened pom plugin seems to interfere with isis-mavendeps-testing type=pom dependency
This is a workaround for that issue
-->
- <id>revision</id>
+ <id>flattened-pom</id>
<activation>
<property>
- <name>revision</name>
+ <name>!skip.flattened-pom</name>
</property>
</activation>
<properties>
<hamcrest.version>1.3</hamcrest.version>
<assertj.version>3.6.2</assertj.version>
<objenesis.version>2.4</objenesis.version>
- <hsqldb.version>2.3.4</hsqldb.version>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
- <version>${revision}</version>
+ <version>${isis.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-integtestsupport</artifactId>
- <version>${revision}</version>
+ <version>${isis.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-specsupport</artifactId>
- <version>${revision}</version>
+ <version>${isis.version}</version>
<scope>test</scope>
</dependency>
diff --git a/example/application/simpleapp/module-simple/pom.xml b/example/application/simpleapp/module-simple/pom.xml
index 48c5bca..1bb68c2 100644
--- a/example/application/simpleapp/module-simple/pom.xml
+++ b/example/application/simpleapp/module-simple/pom.xml
@@ -144,6 +144,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib</artifactId>
+ <version>${isis.version}</version>
</dependency>
<!-- ISIS CORE PLUGINS -->
@@ -151,21 +152,25 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-plugins-discovery-reflections</artifactId>
+ <version>${isis.version}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-plugins-jdo-datanucleus-5</artifactId>
+ <version>${isis.version}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-plugins-eventbus-guava</artifactId>
+ <version>${isis.version}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-plugins-jaxrs-resteasy-3</artifactId>
+ <version>${isis.version}</version>
</dependency>
<!-- TESTS -->
@@ -173,15 +178,83 @@
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
<artifactId>isis-mavendeps-testing</artifactId>
+ <version>${isis.version}</version>
<type>pom</type>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
+ <version>${hsqldb.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <!--
+ The flattened pom plugin seems to interfere with isis-mavendeps-testing type=pom dependency
+ This is a workaround for that issue
+ -->
+ <id>flattened-pom</id>
+ <activation>
+ <property>
+ <name>!skip.flattened-pom</name>
+ </property>
+ </activation>
+ <properties>
+ <hamcrest.version>1.3</hamcrest.version>
+ <assertj.version>3.6.2</assertj.version>
+ <objenesis.version>2.4</objenesis.version>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-unittestsupport</artifactId>
+ <version>${isis.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-integtestsupport</artifactId>
+ <version>${isis.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-specsupport</artifactId>
+ <version>${isis.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.objenesis</groupId>
+ <artifactId>objenesis</artifactId>
+ <version>${objenesis.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-library</artifactId>
+ <version>${hamcrest.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <version>${assertj.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>${hsqldb.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml
index d58f4e2..0dc7dda 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -48,6 +48,8 @@
<!-- override incode-build -->
<datanucleus-core.version>5.1.6</datanucleus-core.version>
+ <hsqldb.version>2.3.4</hsqldb.version>
+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
@@ -212,7 +214,6 @@
</dependencies>
</dependencyManagement>
<properties>
- <hsqldb.version>2.3.4</hsqldb.version>
<log4jdbc-remix.version>0.2.7</log4jdbc-remix.version>
</properties>
</profile>
diff --git a/example/application/simpleapp/webapp/pom.xml b/example/application/simpleapp/webapp/pom.xml
index b7b6701..634e501 100644
--- a/example/application/simpleapp/webapp/pom.xml
+++ b/example/application/simpleapp/webapp/pom.xml
@@ -118,6 +118,7 @@
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
<artifactId>isis-mavendeps-webapp</artifactId>
+ <version>${isis.version}</version>
<type>pom</type>
</dependency>
@@ -125,6 +126,40 @@
<profiles>
<profile>
+ <!--
+ The flattened pom plugin seems to interfere with isis-mavendeps-webapp type=pom dependency
+ This is a workaround for that issue
+ -->
+ <id>flattened-pom</id>
+ <activation>
+ <property>
+ <name>!skip.flattened-pom</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-viewer-wicket-impl</artifactId>
+ <version>${isis.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-viewer-restfulobjects-server</artifactId>
+ <version>${isis.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-security-shiro</artifactId>
+ <version>${isis.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-security</artifactId>
+ <version>${isis.version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
<id>isis-swagger</id>
<activation>
<property>
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.