diff options
Diffstat (limited to 'pom.xml')
| -rwxr-xr-x | pom.xml | 51 |
1 files changed, 48 insertions, 3 deletions
@@ -58,7 +58,7 @@ <!-- End of Sonar Related Properties --> <!-- Start of Docker Related Properties --> - <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 --> @@ -68,6 +68,10 @@ <aai.build.directory>${project.build.directory}/${project.artifactId}-${project.version}-build/ </aai.build.directory> <aai.docker.namespace>onap</aai.docker.namespace> + <!-- base image for aai-common --> + <aai.base.image>alpine</aai.base.image> + <!-- aai-common image version --> + <aai.base.image.version>1.6.0</aai.base.image.version> <!-- End of Docker Related Properties --> <license.goal.type>check</license.goal.type> @@ -85,6 +89,7 @@ <!-- Start of Database Related Properties --> <janusgraph.version>0.2.3</janusgraph.version> + <jnr.ffi.version>2.1.9</jnr.ffi.version> <gremlin.driver.version>3.0.1-incubating</gremlin.driver.version> <gremlin.version>3.2.2</gremlin.version> <!-- End of Database Related Properties --> @@ -288,6 +293,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> @@ -423,6 +459,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> @@ -1031,7 +1077,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> - <!-- + <!-- Issue with the spring 1.5.15.RELEASE plugin is causing build errors due to the fact that the plugin 1.5.15.RELEASE was built using maven 3.5 while the current build version being used by our jenkins is 3.3.9 @@ -1236,4 +1282,3 @@ </repositories> <!-- End of ONAP Specific Repositories --> </project> - |