Michael Blow has uploaded a new change for review.

  https://asterix-gerrit.ics.uci.edu/1952

Change subject: [NO ISSUE][HYR][*DB] Dependency/versions cleanup
......................................................................

[NO ISSUE][HYR][*DB] Dependency/versions cleanup

- Remove removed hyracks modules from dependency management
- Use all-inclusive version ranges for eclipse lifecycle plugin
- Move license plugin version to plugin management

Change-Id: Ib22c5a42977442ef5015f1b04cbd15334e84274c
---
M asterixdb/asterix-algebra/pom.xml
M asterixdb/asterix-app/pom.xml
M asterixdb/asterix-client-helper/pom.xml
M asterixdb/asterix-external-data/pom.xml
M asterixdb/asterix-installer/pom.xml
M asterixdb/asterix-lang-sqlpp/pom.xml
M asterixdb/asterix-license/pom.xml
M asterixdb/asterix-runtime/pom.xml
M asterixdb/asterix-server/pom.xml
M asterixdb/asterix-yarn/pom.xml
M asterixdb/pom.xml
M hyracks-fullstack/algebricks/algebricks-tests/pom.xml
M hyracks-fullstack/hyracks-fullstack-license/pom.xml
M 
hyracks-fullstack/hyracks/hyracks-maven-plugins/hyracks-virtualcluster-maven-plugin/pom.xml
M hyracks-fullstack/hyracks/pom.xml
M hyracks-fullstack/pom.xml
16 files changed, 37 insertions(+), 46 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb 
refs/changes/52/1952/1

diff --git a/asterixdb/asterix-algebra/pom.xml 
b/asterixdb/asterix-algebra/pom.xml
index 2cc9075..dbaae50 100644
--- a/asterixdb/asterix-algebra/pom.xml
+++ b/asterixdb/asterix-algebra/pom.xml
@@ -111,7 +111,7 @@
                   <pluginExecutionFilter>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>javacc-maven-plugin</artifactId>
-                    <versionRange>[2.6,)</versionRange>
+                    <versionRange>[0.0,)</versionRange>
                     <goals>
                       <goal>javacc</goal>
                     </goals>
diff --git a/asterixdb/asterix-app/pom.xml b/asterixdb/asterix-app/pom.xml
index beac085..f4396f7 100644
--- a/asterixdb/asterix-app/pom.xml
+++ b/asterixdb/asterix-app/pom.xml
@@ -245,7 +245,7 @@
                   <pluginExecutionFilter>
                     <groupId>org.apache.asterix</groupId>
                     
<artifactId>asterix-test-datagenerator-maven-plugin</artifactId>
-                    <versionRange>[0.8.9-SNAPSHOT,)</versionRange>
+                    <versionRange>[0.0,)</versionRange>
                     <goals>
                       <goal>generate-testdata</goal>
                     </goals>
diff --git a/asterixdb/asterix-client-helper/pom.xml 
b/asterixdb/asterix-client-helper/pom.xml
index 4918c7d..cc0d38f 100644
--- a/asterixdb/asterix-client-helper/pom.xml
+++ b/asterixdb/asterix-client-helper/pom.xml
@@ -58,7 +58,6 @@
       <plugin>
         <groupId>org.apache.hyracks</groupId>
         <artifactId>license-automation-plugin</artifactId>
-        <version>${hyracks.version}</version>
         <executions>
           <execution>
             <phase>generate-resources</phase>
@@ -146,7 +145,7 @@
                   <pluginExecutionFilter>
                     <groupId>org.apache.hyracks</groupId>
                     <artifactId>license-automation-plugin</artifactId>
-                    <versionRange>${hyracks.version}</versionRange>
+                    <versionRange>[0.0,)</versionRange>
                     <goals>
                       <goal>generate</goal>
                     </goals>
diff --git a/asterixdb/asterix-external-data/pom.xml 
b/asterixdb/asterix-external-data/pom.xml
index 551928f..e202c44 100644
--- a/asterixdb/asterix-external-data/pom.xml
+++ b/asterixdb/asterix-external-data/pom.xml
@@ -189,7 +189,7 @@
                   <pluginExecutionFilter>
                     <groupId> org.apache.asterix</groupId>
                     <artifactId> lexer-generator-maven-plugin</artifactId>
-                    <versionRange>[0.1,)</versionRange>
+                    <versionRange>[0.0,)</versionRange>
                     <goals>
                       <goal>generate-lexer</goal>
                     </goals>
@@ -204,7 +204,7 @@
                   <pluginExecutionFilter>
                     <groupId> org.codehaus.mojo</groupId>
                     <artifactId>build-helper-maven-plugin</artifactId>
-                    <versionRange>[1.7,)</versionRange>
+                    <versionRange>[0.0,)</versionRange>
                     <goals>
                       <goal>add-source</goal>
                     </goals>
diff --git a/asterixdb/asterix-installer/pom.xml 
b/asterixdb/asterix-installer/pom.xml
index 344180e..beda57d 100644
--- a/asterixdb/asterix-installer/pom.xml
+++ b/asterixdb/asterix-installer/pom.xml
@@ -47,7 +47,6 @@
       <plugin>
         <groupId>org.apache.hyracks</groupId>
         <artifactId>license-automation-plugin</artifactId>
-        <version>${hyracks.version}</version>
         <executions>
           <execution>
             <phase>generate-resources</phase>
@@ -336,7 +335,7 @@
                   <pluginExecutionFilter>
                     <groupId>org.apache.hyracks</groupId>
                     <artifactId>license-automation-plugin</artifactId>
-                    <versionRange>${hyracks.version}</versionRange>
+                    <versionRange>[0.0,)</versionRange>
                     <goals>
                       <goal>generate</goal>
                     </goals>
diff --git a/asterixdb/asterix-lang-sqlpp/pom.xml 
b/asterixdb/asterix-lang-sqlpp/pom.xml
index c866331..499cb05 100644
--- a/asterixdb/asterix-lang-sqlpp/pom.xml
+++ b/asterixdb/asterix-lang-sqlpp/pom.xml
@@ -93,7 +93,7 @@
                   <pluginExecutionFilter>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>javacc-maven-plugin</artifactId>
-                    <versionRange>[2.6,)</versionRange>
+                    <versionRange>[0.0,)</versionRange>
                     <goals>
                       <goal>jjdoc</goal>
                       <goal>javacc</goal>
diff --git a/asterixdb/asterix-license/pom.xml 
b/asterixdb/asterix-license/pom.xml
index 6ba2073..3252921 100644
--- a/asterixdb/asterix-license/pom.xml
+++ b/asterixdb/asterix-license/pom.xml
@@ -40,7 +40,6 @@
       <plugin>
         <groupId>org.apache.hyracks</groupId>
         <artifactId>license-automation-plugin</artifactId>
-        <version>${hyracks.version}</version>
         <executions>
           <execution>
             <phase>generate-resources</phase>
@@ -104,7 +103,7 @@
                   <pluginExecutionFilter>
                     <groupId>org.apache.asterix</groupId>
                     <artifactId>license-automation-plugin</artifactId>
-                    <versionRange>${project.version}</versionRange>
+                    <versionRange>[0.0,)</versionRange>
                     <goals>
                       <goal>generate</goal>
                     </goals>
diff --git a/asterixdb/asterix-runtime/pom.xml 
b/asterixdb/asterix-runtime/pom.xml
index 6092cc5..97973e0 100644
--- a/asterixdb/asterix-runtime/pom.xml
+++ b/asterixdb/asterix-runtime/pom.xml
@@ -68,7 +68,7 @@
                   <pluginExecutionFilter>
                     <groupId>org.apache.asterix</groupId>
                     
<artifactId>asterix-evaluator-generator-maven-plugin</artifactId>
-                    <versionRange>(0.8.8-incubating,)</versionRange>
+                    <versionRange>[0.0,)</versionRange>
                     <goals>
                       <goal>generate-evaluator</goal>
                     </goals>
diff --git a/asterixdb/asterix-server/pom.xml b/asterixdb/asterix-server/pom.xml
index 0064f35..d9cb2d1 100644
--- a/asterixdb/asterix-server/pom.xml
+++ b/asterixdb/asterix-server/pom.xml
@@ -55,7 +55,6 @@
       <plugin>
         <groupId>org.apache.hyracks</groupId>
         <artifactId>license-automation-plugin</artifactId>
-        <version>${hyracks.version}</version>
         <executions>
           <execution>
             <phase>generate-resources</phase>
@@ -389,7 +388,7 @@
                   <pluginExecutionFilter>
                     <groupId>org.apache.hyracks</groupId>
                     <artifactId>license-automation-plugin</artifactId>
-                    <versionRange>${hyracks.version}</versionRange>
+                    <versionRange>[0.0,)</versionRange>
                     <goals>
                       <goal>generate</goal>
                     </goals>
diff --git a/asterixdb/asterix-yarn/pom.xml b/asterixdb/asterix-yarn/pom.xml
index b06c4b5..bcb0a8f 100644
--- a/asterixdb/asterix-yarn/pom.xml
+++ b/asterixdb/asterix-yarn/pom.xml
@@ -78,7 +78,6 @@
       <plugin>
         <groupId>org.apache.hyracks</groupId>
         <artifactId>license-automation-plugin</artifactId>
-        <version>${hyracks.version}</version>
         <executions>
           <execution>
             <phase>generate-resources</phase>
@@ -232,7 +231,7 @@
                   <pluginExecutionFilter>
                     <groupId>org.apache.hyracks</groupId>
                     <artifactId>license-automation-plugin</artifactId>
-                    <versionRange>${hyracks.version}</versionRange>
+                    <versionRange>[0.0,)</versionRange>
                     <goals>
                       <goal>generate</goal>
                     </goals>
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index 4ed33b6..8ae68bc 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -270,7 +270,7 @@
                   <pluginExecutionFilter>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-plugin-plugin</artifactId>
-                    <versionRange>[3.3,)</versionRange>
+                    <versionRange>[0.0,)</versionRange>
                     <goals>
                       <goal>descriptor</goal>
                     </goals>
@@ -283,7 +283,7 @@
                   <pluginExecutionFilter>
                     <groupId>org.apache.asterix</groupId>
                     
<artifactId>record-manager-generator-maven-plugin</artifactId>
-                    <versionRange>[0.8.7-SNAPSHOT,)</versionRange>
+                    <versionRange>[0.0,)</versionRange>
                     <goals>
                       <goal>generate-record-manager</goal>
                     </goals>
@@ -296,7 +296,7 @@
                   <pluginExecutionFilter>
                     <groupId>org.apache.asterix</groupId>
                     
<artifactId>asterix-evaluator-generator-maven-plugin</artifactId>
-                    <versionRange>[0.8.7-SNAPSHOT,)</versionRange>
+                    <versionRange>[0.0,)</versionRange>
                     <goals>
                       <goal>generate-evaluator</goal>
                     </goals>
@@ -309,7 +309,7 @@
                   <pluginExecutionFilter>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <versionRange>[2.4,)</versionRange>
+                    <versionRange>[0.0,)</versionRange>
                     <goals>
                       <goal>test-jar</goal>
                     </goals>
@@ -322,7 +322,7 @@
                   <pluginExecutionFilter>
                     <groupId>org.apache.rat</groupId>
                     <artifactId>apache-rat-plugin</artifactId>
-                    <versionRange>[0.11,)</versionRange>
+                    <versionRange>[0.0,)</versionRange>
                     <goals>
                       <goal>check</goal>
                     </goals>
@@ -335,7 +335,7 @@
                   <pluginExecutionFilter>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-checkstyle-plugin</artifactId>
-                    <versionRange>[2.17,)</versionRange>
+                    <versionRange>[0.0,)</versionRange>
                     <goals>
                       <goal>check</goal>
                     </goals>
@@ -348,7 +348,7 @@
                   <pluginExecutionFilter>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>javacc-maven-plugin</artifactId>
-                    <versionRange>[2.6,)</versionRange>
+                    <versionRange>[0.0,)</versionRange>
                     <goals>
                       <goal>jjdoc</goal>
                     </goals>
@@ -361,7 +361,7 @@
                   <pluginExecutionFilter>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-dependency-plugin</artifactId>
-                    <versionRange>[2.10,)</versionRange>
+                    <versionRange>[0.0,)</versionRange>
                     <goals>
                       <goal>analyze-only</goal>
                     </goals>
@@ -403,6 +403,11 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-failsafe-plugin</artifactId>
           <version>2.20</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.hyracks</groupId>
+          <artifactId>license-automation-plugin</artifactId>
+          <version>${hyracks.version}</version>
         </plugin>
       </plugins>
     </pluginManagement>
@@ -879,17 +884,7 @@
       </dependency>
       <dependency>
         <groupId>org.apache.hyracks</groupId>
-        <artifactId>hyracks-cli</artifactId>
-        <version>${hyracks.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.hyracks</groupId>
         <artifactId>hyracks-dataflow-common</artifactId>
-        <version>${hyracks.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.hyracks</groupId>
-        <artifactId>hyracks-dataflow-hadoop</artifactId>
         <version>${hyracks.version}</version>
       </dependency>
       <dependency>
@@ -910,11 +905,6 @@
       <dependency>
         <groupId>org.apache.hyracks</groupId>
         <artifactId>hyracks-storage-am-rtree</artifactId>
-        <version>${hyracks.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.hyracks</groupId>
-        <artifactId>hyracks-storage-am-invertedindex</artifactId>
         <version>${hyracks.version}</version>
       </dependency>
       <dependency>
@@ -1100,4 +1090,5 @@
       </dependency>
     </dependencies>
   </dependencyManagement>
+
 </project>
diff --git a/hyracks-fullstack/algebricks/algebricks-tests/pom.xml 
b/hyracks-fullstack/algebricks/algebricks-tests/pom.xml
index 06fc128..97642f2 100644
--- a/hyracks-fullstack/algebricks/algebricks-tests/pom.xml
+++ b/hyracks-fullstack/algebricks/algebricks-tests/pom.xml
@@ -96,7 +96,7 @@
                     <artifactId>
                       maven-antrun-plugin
                     </artifactId>
-                    <versionRange>[1.3,)</versionRange>
+                    <versionRange>[0.0,)</versionRange>
                     <goals>
                       <goal>run</goal>
                     </goals>
diff --git a/hyracks-fullstack/hyracks-fullstack-license/pom.xml 
b/hyracks-fullstack/hyracks-fullstack-license/pom.xml
index 6eca6e3..1be3506 100644
--- a/hyracks-fullstack/hyracks-fullstack-license/pom.xml
+++ b/hyracks-fullstack/hyracks-fullstack-license/pom.xml
@@ -100,7 +100,7 @@
                   <pluginExecutionFilter>
                     <groupId>org.apache.asterix</groupId>
                     <artifactId>license-automation-plugin</artifactId>
-                    <versionRange>${project.version}</versionRange>
+                    <versionRange>[0.0,)</versionRange>
                     <goals>
                       <goal>generate</goal>
                     </goals>
diff --git 
a/hyracks-fullstack/hyracks/hyracks-maven-plugins/hyracks-virtualcluster-maven-plugin/pom.xml
 
b/hyracks-fullstack/hyracks/hyracks-maven-plugins/hyracks-virtualcluster-maven-plugin/pom.xml
index 17eefea..f9eae96 100644
--- 
a/hyracks-fullstack/hyracks/hyracks-maven-plugins/hyracks-virtualcluster-maven-plugin/pom.xml
+++ 
b/hyracks-fullstack/hyracks/hyracks-maven-plugins/hyracks-virtualcluster-maven-plugin/pom.xml
@@ -48,7 +48,7 @@
                                   <pluginExecutionFilter>
                                       
<groupId>org.apache.maven.plugins</groupId>
                                       
<artifactId>maven-plugin-plugin</artifactId>
-                                      <versionRange>[3.3,)</versionRange>
+                                      <versionRange>[0.0,)</versionRange>
                                       <goals>
                                           <goal>descriptor</goal>
                                       </goals>
diff --git a/hyracks-fullstack/hyracks/pom.xml 
b/hyracks-fullstack/hyracks/pom.xml
index 8f09d0f..f62b86f 100644
--- a/hyracks-fullstack/hyracks/pom.xml
+++ b/hyracks-fullstack/hyracks/pom.xml
@@ -51,7 +51,7 @@
                   <pluginExecutionFilter>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-plugin-plugin</artifactId>
-                    <versionRange>[3.4,)</versionRange>
+                    <versionRange>[0.0,)</versionRange>
                     <goals>
                       <goal>descriptor</goal>
                     </goals>
diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index 08aae02..3edc7d0 100644
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@ -388,7 +388,7 @@
                   <pluginExecutionFilter>
                     <groupId>org.apache.rat</groupId>
                     <artifactId>apache-rat-plugin</artifactId>
-                    <versionRange>[0.11,)</versionRange>
+                    <versionRange>[0.0,)</versionRange>
                     <goals>
                       <goal>check</goal>
                     </goals>
@@ -401,7 +401,7 @@
                   <pluginExecutionFilter>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-checkstyle-plugin</artifactId>
-                    <versionRange>[2.17,)</versionRange>
+                    <versionRange>[0.0,)</versionRange>
                     <goals>
                       <goal>check</goal>
                     </goals>
@@ -414,7 +414,7 @@
                   <pluginExecutionFilter>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-dependency-plugin</artifactId>
-                    <versionRange>[2.10,)</versionRange>
+                    <versionRange>[0.0,)</versionRange>
                     <goals>
                       <goal>analyze-only</goal>
                     </goals>
@@ -452,6 +452,11 @@
           <artifactId>maven-failsafe-plugin</artifactId>
           <version>2.20</version>
         </plugin>
+        <plugin>
+          <groupId>org.apache.hyracks</groupId>
+          <artifactId>license-automation-plugin</artifactId>
+          <version>${project.version}</version>
+        </plugin>
       </plugins>
     </pluginManagement>
   </build>

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1952
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib22c5a42977442ef5015f1b04cbd15334e84274c
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>

Reply via email to