drill-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject [3/9] drill git commit: Temporary fix for build issue with generated dependency-reduced-pom.xml
Date Tue, 16 Feb 2016 21:23:21 GMT
Temporary fix for build issue with generated dependency-reduced-pom.xml

This generated pom file was being discovered and maven was trying to
run the target directory in jdbc-all as a submodule.

This change reverts to the default output location (the module root)
and adds corresponding .gitignore and RAT exclude entries.

More investigation of why this became an issue when we added the
maven-enforcer plugin to the module (and only appears when running a release)
will come in DRILL-4336.

Also updated intergration test for the jdbc-all jar with small
path change, as changing the location of the dependency-reduced-pom.xml
actually changed the directory the test was being executed from.


Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/e8aa20d5
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/e8aa20d5
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/e8aa20d5

Branch: refs/heads/1.5.0
Commit: e8aa20d59f450270b5ed8f7ac4e71966a9293514
Parents: 03d0414
Author: Jason Altekruse <altekrusejason@gmail.com>
Authored: Mon Feb 1 23:17:37 2016 -0800
Committer: Jason Altekruse <altekrusejason@gmail.com>
Committed: Tue Feb 2 23:07:38 2016 -0800

----------------------------------------------------------------------
 .gitignore                                                   | 2 ++
 exec/jdbc-all/pom.xml                                        | 8 +++++++-
 .../src/test/java/org/apache/drill/jdbc/ITTestShadedJar.java | 2 +-
 pom.xml                                                      | 2 ++
 4 files changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/e8aa20d5/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 73c1be4..504a745 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,5 @@ CMakeFiles
 Makefile
 cmake_install.cmake
 install_manifest.txt
+# TODO - DRILL-4336
+exec/jdbc-all/dependency-reduced-pom.xml

http://git-wip-us.apache.org/repos/asf/drill/blob/e8aa20d5/exec/jdbc-all/pom.xml
----------------------------------------------------------------------
diff --git a/exec/jdbc-all/pom.xml b/exec/jdbc-all/pom.xml
index a9059b4..34f9811 100644
--- a/exec/jdbc-all/pom.xml
+++ b/exec/jdbc-all/pom.xml
@@ -260,7 +260,13 @@
         <configuration>
           <shadedArtifactAttached>false</shadedArtifactAttached>
           <createDependencyReducedPom>true</createDependencyReducedPom>
-          <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation>
+          <!-- TODO DRILL-4336: try to move the dependencyReducedPom out of the default
location (the module root).
+               Putting it here caused the target directory to be run as a submodule (oddly
+               only when trying to run the maven release goal) -->
+          <!--dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation-->
+          <!-- TODO DRILL-4336: an attempt to fix the issue by moving the file elsewhere,
had issues executing
+               but may be able to be modified to to fix the issue-->
+          <!--dependencyReducedPomLocation>${project.build.directory}/generated/shade/dependency-reduced-pom.xml</dependencyReducedPomLocation-->
           <minimizeJar>false</minimizeJar>
 
           <artifactSet>

http://git-wip-us.apache.org/repos/asf/drill/blob/e8aa20d5/exec/jdbc-all/src/test/java/org/apache/drill/jdbc/ITTestShadedJar.java
----------------------------------------------------------------------
diff --git a/exec/jdbc-all/src/test/java/org/apache/drill/jdbc/ITTestShadedJar.java b/exec/jdbc-all/src/test/java/org/apache/drill/jdbc/ITTestShadedJar.java
index b335c0f..19d99b9 100644
--- a/exec/jdbc-all/src/test/java/org/apache/drill/jdbc/ITTestShadedJar.java
+++ b/exec/jdbc-all/src/test/java/org/apache/drill/jdbc/ITTestShadedJar.java
@@ -63,7 +63,7 @@ public class ITTestShadedJar {
     try {
       Driver driver = (Driver) clazz.newInstance();
       try (Connection c = driver.connect("jdbc:drill:drillbit=localhost:31010", null)) {
-        String path = Paths.get("").toAbsolutePath().toString() + "/../src/test/resources/types.json";
+        String path = Paths.get("").toAbsolutePath().toString() + "/src/test/resources/types.json";
         printQuery(c, "select * from dfs.`" + path + "`");
       }
     } catch (Exception ex) {

http://git-wip-us.apache.org/repos/asf/drill/blob/e8aa20d5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5db5b03..fcaed68 100644
--- a/pom.xml
+++ b/pom.xml
@@ -207,6 +207,8 @@
             <exclude>**/*.linux</exclude>
             <exclude>**/client/build/**</exclude>
             <exclude>**/*.tbl</exclude>
+            <!-- TODO DRILL-4336: try to avoid the need to add this -->
+            <exclude>dependency-reduced-pom.xml</exclude>
           </excludes>
         </configuration>
       </plugin>


Mime
View raw message