[isis] branch master updated: ISIS-1904: attempts to fix docker push issues

[da...@apache.org]

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 a97d6b9  ISIS-1904: attempts to fix docker push issues
a97d6b9 is described below

commit a97d6b9a8ab362a7bf41d15d800f1795bae15ce4
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Mar 15 16:43:14 2018 +0000

    ISIS-1904: attempts to fix docker push issues
    
    failing to resolve from localRepository, complaining about cannot resolve from sonatype-snapshots.  Don't know why.  Attempting to skip.
    
    Also, running mvn help:effective-pom trips up without hsqldb.version in webapp, so hard-coding...
---
 .gitlab-ci.yml                               | 4 +++-
 example/application/simpleapp/webapp/pom.xml | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e05de83..7d3bc95 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -58,7 +58,9 @@ build-package:
           -Dmavenmixin-docker \
           -Ddocker-plugin.imageName=$DOCKER_REGISTRY_USERNAME/$DOCKER_REGISTRY_REPOSITORY \
           -Ddocker-plugin.serverId=$DOCKER_REGISTRY_ID \
-          -Ddocker.registryUrl=$DOCKER_REGISTRY_URL
+          -Ddocker.registryUrl=$DOCKER_REGISTRY_URL \
+          -Dskip.sonatype-snapshots \
+          -Dskip.apache-snapshots
     - cd ../../..
 
 
diff --git a/example/application/simpleapp/webapp/pom.xml b/example/application/simpleapp/webapp/pom.xml
index 634e501..744056d 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>2.3.1</version>
+                                <version>${hsqldb.version}</version>
                             </dependency>
                             <!-- workaround to avoid conflict with plexus-default -->
                         </dependencies>
@@ -217,6 +217,7 @@
                 <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.