Merge branch 'gerrit/trinity' into 'master'
Change-Id: I232ad62caaf2816a50e8f6c3260d0327fa9815bb
diff --git a/asterixdb/asterix-app/pom.xml b/asterixdb/asterix-app/pom.xml
index d2b1a95..5db986d 100644
--- a/asterixdb/asterix-app/pom.xml
+++ b/asterixdb/asterix-app/pom.xml
@@ -39,6 +39,7 @@
<sonar.sources>pom.xml,src/main/java,src/main/resources</sonar.sources>
<pip.path>${project.build.directory}/bin/pip3</pip.path>
<shiv.path>${project.build.directory}/bin/shiv</shiv.path>
+ <asterix-test-datagenerator-maven-plugin.version>${project.version}</asterix-test-datagenerator-maven-plugin.version>
</properties>
<build>
<plugins>
@@ -108,7 +109,7 @@
<plugin>
<groupId>org.apache.asterix</groupId>
<artifactId>asterix-test-datagenerator-maven-plugin</artifactId>
- <version>${project.version}</version>
+ <version>${asterix-test-datagenerator-maven-plugin.version}</version>
<executions>
<execution>
<id>replace-template-data</id>
diff --git a/asterixdb/asterix-external-data/pom.xml b/asterixdb/asterix-external-data/pom.xml
index 253754e..5957eff 100644
--- a/asterixdb/asterix-external-data/pom.xml
+++ b/asterixdb/asterix-external-data/pom.xml
@@ -35,13 +35,14 @@
<properties>
<root.dir>${basedir}/..</root.dir>
<generatedSourcesDirectory>${project.build.directory}/generated-sources/lexer/</generatedSourcesDirectory>
+ <lexer-generator-maven-plugin.version>${project.version}</lexer-generator-maven-plugin.version>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.asterix</groupId>
<artifactId>lexer-generator-maven-plugin</artifactId>
- <version>${project.version}</version>
+ <version>${lexer-generator-maven-plugin.version}</version>
<configuration>
<grammarFile>src/main/resources/adm.grammar</grammarFile>
<outputDir>${project.build.directory}/generated-sources/lexer/org/apache/asterix/runtime/operators/file/adm</outputDir>
diff --git a/asterixdb/asterix-transactions/pom.xml b/asterixdb/asterix-transactions/pom.xml
index 4c92fa9..e2cdcad 100644
--- a/asterixdb/asterix-transactions/pom.xml
+++ b/asterixdb/asterix-transactions/pom.xml
@@ -34,13 +34,14 @@
</licenses>
<properties>
<root.dir>${basedir}/..</root.dir>
+ <record-manager-generator-maven-plugin.version>${project.version}</record-manager-generator-maven-plugin.version>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.asterix</groupId>
<artifactId>record-manager-generator-maven-plugin</artifactId>
- <version>${project.version}</version>
+ <version>${record-manager-generator-maven-plugin.version}</version>
<configuration>
<debug>false</debug>
<inputFiles>