diff options
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 16 |
1 files changed, 10 insertions, 6 deletions
@@ -411,13 +411,13 @@ f = new File( p ); if( f.exists() ) { break; - } + } p = "../" + p; } } if( f != null ) { String basePath = f.getCanonicalPath(); - basePath = basePath.substring( 0, basePath.lastIndexOf( File.separator ) ); + basePath = basePath.substring( 0, basePath.lastIndexOf( File.separator ) ); project.properties['base-path'] = basePath.replace( '\\' , '/'); log.info(' - used base path = ' + project.properties['base-path'] ); } else { @@ -578,16 +578,16 @@ <skipBuild>${docker.skip.build}</skipBuild> <skipPush>${docker.skip.push}</skipPush> <dockerHost>${docker.newHost}</dockerHost> - <!-- 1. Update address to your local docker VM. 2. Add IP to + <!-- 1. Update address to your local docker VM. 2. Add IP to your NO_PROXY environment variable --> <certPath>${docker.host.cert.path}</certPath> - <!-- Add -Ddocker.host.cert.pat="path to your local certs directory" + <!-- Add -Ddocker.host.cert.pat="path to your local certs directory" to maven build command --> <pushRegistry>${dockerPushRepo}</pushRegistry> - <!-- Update .m2/settings.xml Add server id settings.dockerRepository, + <!-- Update .m2/settings.xml Add server id settings.dockerRepository, username, and password --> <pullRegistry>${dockerPullRepo}</pullRegistry> - <!-- If docker repo is not public. Update .m2/settings.xml Add + <!-- If docker repo is not public. Update .m2/settings.xml Add server id settings.dockerRepository, username, and password --> <images> <image> @@ -855,6 +855,10 @@ <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </exclusion> + <exclusion> + <groupId>com.vaadin.external.google</groupId> + <artifactId>android-json</artifactId> + </exclusion> </exclusions> </dependency> <dependency> |