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 17:36:15 UTC
[isis] 01/03: Revert "ISIS-1904: attempts to fix docker push issues"
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 3fed44fedf28b7b171952da5df9bbff3b97df266
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Mar 15 17:35:31 2018 +0000
Revert "ISIS-1904: attempts to fix docker push issues"
This reverts commit a97d6b9a8ab362a7bf41d15d800f1795bae15ce4.
---
.gitlab-ci.yml | 4 +---
example/application/simpleapp/webapp/pom.xml | 3 +--
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 170920e..4b2d569 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -58,9 +58,7 @@ build-package:
-Dmavenmixin-docker \
-Ddocker-plugin.imageName=$DOCKER_REGISTRY_USERNAME/$DOCKER_REGISTRY_REPOSITORY \
-Ddocker-plugin.serverId=$DOCKER_REGISTRY_ID \
- -Ddocker.registryUrl=$DOCKER_REGISTRY_URL \
- -Dskip.sonatype-snapshots \
- -Dskip.apache-snapshots
+ -Ddocker.registryUrl=$DOCKER_REGISTRY_URL
- cd ../../..
diff --git a/example/application/simpleapp/webapp/pom.xml b/example/application/simpleapp/webapp/pom.xml
index 744056d..634e501 100644
--- a/example/application/simpleapp/webapp/pom.xml
+++ b/example/application/simpleapp/webapp/pom.xml
@@ -198,7 +198,7 @@
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>${hsqldb.version}</version>
+ <version>2.3.1</version>
</dependency>
<!-- workaround to avoid conflict with plexus-default -->
</dependencies>
@@ -217,7 +217,6 @@
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>${hsqldb.version}</version>
</dependency>
</dependencies>
</profile>
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.