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/10 13:41:59 UTC
[isis] branch master updated: ISIS-1904: flattens dependencies in
simpleapp so can build using -Drevision=
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
The following commit(s) were added to refs/heads/master by this push:
new 5b6a0aa ISIS-1904: flattens dependencies in simpleapp so can build using -Drevision=
5b6a0aa is described below
commit 5b6a0aa09720f52747f74a12ab0bbe99bc4e216f
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Mar 10 13:41:49 2018 +0000
ISIS-1904: flattens dependencies in simpleapp so can build using -Drevision=
---
.gitlab-ci.yml | 2 +-
core/pom.xml | 2 -
example/application/simpleapp/application/pom.xml | 66 +++++++++++++++++++
.../application/simpleapp/module-simple/pom.xml | 74 ++++++++++++++++++++--
example/application/simpleapp/pom.xml | 24 ++++---
5 files changed, 148 insertions(+), 20 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1c6143e..93c5ad9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,5 +7,5 @@ maven-build:
script:
- mvn -Drevision=2.0.0-M1.$(date +%Y%m%d)-$(git rev-parse --short HEAD) -Dskip.arch -Dskip.app -B clean install
- cd example/application/simpleapp
- - mvn -Drevision=2.0.0-M1.$(date +%Y%m%d)-$(git rev-parse --short HEAD) -Dmavenmixin-docker -B install
+ - mvn -Drevision=2.0.0-M1.$(date +%Y%m%d)-$(git rev-parse --short HEAD) -Dmavenmixin-docker -Ddocker-plugin.imageName=isis/simpleapp -B install
diff --git a/core/pom.xml b/core/pom.xml
index 4b92b1d..e93e7ba 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -149,8 +149,6 @@
<swagger-core.version>1.5.9</swagger-core.version>
<webjars-servlet-2.x.version>1.5</webjars-servlet-2.x.version>
- <!-- using 2.3.2 throws strange error about not finding org.hsqldb.jdbcDriver -->
- <!-- using 2.3.3 throws SQL exception in simpleapp integtests -->
<hsqldb.version>2.3.4</hsqldb.version>
<log4jdbc-remix.version>0.2.7</log4jdbc-remix.version>
diff --git a/example/application/simpleapp/application/pom.xml b/example/application/simpleapp/application/pom.xml
index fe10399..0bd1c24 100644
--- a/example/application/simpleapp/application/pom.xml
+++ b/example/application/simpleapp/application/pom.xml
@@ -128,4 +128,70 @@
</dependencies>
+ <profiles>
+ <profile>
+ <!--
+ specifying -Drevision means that scope=pom dependencies are not resolved.
+ This is a workaround for that issue
+ -->
+ <id>revision</id>
+ <activation>
+ <property>
+ <name>revision</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>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-integtestsupport</artifactId>
+ <version>${revision}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-specsupport</artifactId>
+ <version>${revision}</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/module-simple/pom.xml b/example/application/simpleapp/module-simple/pom.xml
index 67124ad..81d22c2 100644
--- a/example/application/simpleapp/module-simple/pom.xml
+++ b/example/application/simpleapp/module-simple/pom.xml
@@ -173,7 +173,7 @@
</dependency>
<!-- TESTS -->
-
+
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
<artifactId>isis-mavendeps-testing</artifactId>
@@ -181,12 +181,72 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <scope>test</scope>
- </dependency>
-
</dependencies>
+ <profiles>
+ <profile>
+ <!--
+ specifying -Drevision means that scope=pom dependencies are not resolved.
+ This is a workaround for that issue
+ -->
+ <id>revision</id>
+ <activation>
+ <property>
+ <name>revision</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>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-integtestsupport</artifactId>
+ <version>${revision}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-specsupport</artifactId>
+ <version>${revision}</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 e2178b2..07fa027 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -131,6 +131,14 @@
<dependencyManagement>
<dependencies>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis</artifactId>
+ <version>${revision}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
<!-- this project's own modules -->
<dependency>
<groupId>org.apache.isis.example.application</groupId>
@@ -175,10 +183,14 @@
<profiles>
<profile>
- <id>isis</id>
+ <!--
+ specifying -Drevision means that scope=pom dependencies are not resolved.
+ This is a workaround for that issue
+ -->
+ <id>revision</id>
<activation>
<property>
- <name>!skip.isis</name>
+ <name>revision</name>
</property>
</activation>
<dependencyManagement>
@@ -186,14 +198,6 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis</artifactId>
- <version>${revision}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib</artifactId>
<version>${revision}</version>
</dependency>
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.