diff options
| author |   Dmitry Puzikov <dmitry.puzikov@tieto.com> | 2019-04-12 16:48:42 +0200 |
|---|---|---|
| committer | Dmitry Puzikov <dmitry.puzikov@tieto.com> | 2019-08-29 15:09:44 +0200 |
| commit | 62901567f5cf9c57ffdd51d77fcbd797adc39f93 (patch) | |
| tree | 31eb933862d0436846b5cfc76aff4c5549f570d0 /aai-resources/pom.xml | |
| parent | e8d95f2d2d0f82f84b8235e73a95f45e2b34c90d (diff) | |
Fixed project version parsing
Change-Id: Ie32719f771e86f7dac5aa2ce3124f7c507183bdc
Issue-ID: INT-761
Signed-off-by: Dmitry Puzikov <dmitry.puzikov@tieto.com>
Diffstat (limited to 'aai-resources/pom.xml')
| -rw-r--r-- | aai-resources/pom.xml | 49 |
1 files changed, 47 insertions, 2 deletions
diff --git a/aai-resources/pom.xml b/aai-resources/pom.xml index b09a6c7..3214cc7 100644 --- a/aai-resources/pom.xml +++ b/aai-resources/pom.xml @@ -74,6 +74,7 @@ <janino.version>2.7.8</janino.version> <google.guava.version>19.0</google.guava.version> <janusgraph.version>0.2.3</janusgraph.version> + <jnr.ffi.version>2.1.9</jnr.ffi.version> <gremlin.driver.version>3.2.2</gremlin.driver.version> <gremlin.core.version>3.2.2</gremlin.core.version> <gremlin.version>3.2.2</gremlin.version> @@ -106,13 +107,15 @@ <eclipse.jetty.version>9.4.1.v20170120</eclipse.jetty.version> - <docker.fabric.version>0.23.0</docker.fabric.version> + <docker.fabric.version>0.28.0</docker.fabric.version> <!-- Default docker registry that maven fabric plugin will try to pull from --> <docker.registry>docker.io</docker.registry> <!-- Specifying the docker push registry where the image should be pushed --> <!-- This value should be overwritten at runtime to wherever need to be pushed to --> <docker.push.registry>localhost:5000</docker.push.registry> <aai.docker.version>1.0.0</aai.docker.version> + <aai.base.image>alpine</aai.base.image> + <aai.base.image.version>1.6.0</aai.base.image.version> <!-- Location where assembly of our scripts, resources and main jar will be held @@ -164,6 +167,37 @@ <build> <plugins> <plugin> + <groupId>org.codehaus.groovy.maven</groupId> + <artifactId>gmaven-plugin</artifactId> + <version>1.0</version> + <executions> + <execution> + <phase>pre-clean</phase> + </execution> + <execution> + <id>parse-base</id> + <phase>prepare-package</phase> + <goals> + <goal>execute</goal> + </goals> + <configuration> + <source> + def userAaiBaseImage = session.userProperties['aai.base.image'] + def userAaiCommonVersion = session.userProperties['aai.base.image.version'] + if (userAaiCommonVersion != null) { + project.properties['aai.base.image.version'] = userAaiCommonVersion + } + if (userAaiBaseImage != null) { + project.properties['aai.base.image'] = userAaiBaseImage + } + log.info 'Base image flavour: ' + project.properties['aai.base.image'] + log.info 'Base image version: ' + project.properties['aai.base.image.version'] + </source> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>io.fabric8</groupId> <artifactId>docker-maven-plugin</artifactId> <version>${docker.fabric.version}</version> @@ -172,7 +206,8 @@ <apiVersion>1.23</apiVersion> <images> <image> - <name>${docker.push.registry}/${aai.docker.namespace}/${project.artifactId}:%l</name> + <name>${docker.push.registry}/${aai.docker.namespace}/${project.artifactId}:%l + </name> <build> <filter>@</filter> <tags> @@ -476,6 +511,16 @@ </exclusion> </exclusions> </dependency> + <!-- + indirect janusgraph-cassandra dependency + need to be newer than default one + in order to support multiple cpu archs + --> + <dependency> + <groupId>com.github.jnr</groupId> + <artifactId>jnr-ffi</artifactId> + <version>${jnr.ffi.version}</version> + </dependency> <dependency> <groupId>org.janusgraph</groupId> <artifactId>janusgraph-cql</artifactId> |