drill-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject [3/3] drill git commit: DRILL-3320: Do away with "rebuffing" Drill jar
Date Wed, 24 Jun 2015 06:26:21 GMT
DRILL-3320: Do away with "rebuffing" Drill jar


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

Branch: refs/heads/master
Commit: 3aa82bc923cdcb15fdb918baa8b99a5bb85ef6cb
Parents: 8815eb7
Author: Aditya Kishore <adi@apache.org>
Authored: Fri Jun 19 13:12:46 2015 -0700
Committer: Aditya Kishore <adi@apache.org>
Committed: Tue Jun 23 23:13:01 2015 -0700

----------------------------------------------------------------------
 common/pom.xml                    |   32 -
 distribution/pom.xml              |    3 -
 distribution/src/assemble/bin.xml |    6 +-
 exec/java-exec/pom.xml            |   36 -
 protocol/output                   | 3076 --------------------------------
 protocol/pom.xml                  |   30 -
 6 files changed, 3 insertions(+), 3180 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/3aa82bc9/common/pom.xml
----------------------------------------------------------------------
diff --git a/common/pom.xml b/common/pom.xml
index 7ab8adc..c23d9cc 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -143,38 +143,6 @@
           </execution>
         </executions>
       </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>2.1</version>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <configuration>
-              <artifactSet>
-                <includes>
-                  <include>com.google.protobuf:protobuf-java</include>
-                </includes>
-              </artifactSet>
-              <shadedArtifactAttached>true</shadedArtifactAttached>
-              <shadedClassifierName>rebuffed</shadedClassifierName>
-
-              <relocations>
-                <relocation>
-                  <pattern>com.google.protobuf</pattern>
-                  <shadedPattern>250.com.google.protobuf</shadedPattern>
-                </relocation>
-              </relocations>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-
     </plugins>
 
   </build>

http://git-wip-us.apache.org/repos/asf/drill/blob/3aa82bc9/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/pom.xml b/distribution/pom.xml
index d00d2c41..2ee4c63 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -28,19 +28,16 @@
       <groupId>org.apache.drill</groupId>
       <artifactId>drill-protocol</artifactId>
       <version>${project.version}</version>
-      <classifier>rebuffed</classifier>
     </dependency>
     <dependency>
       <groupId>org.apache.drill.exec</groupId>
       <artifactId>drill-java-exec</artifactId>
       <version>${project.version}</version>
-      <classifier>rebuffed</classifier>
     </dependency>
     <dependency>
       <groupId>org.apache.drill</groupId>
       <artifactId>drill-common</artifactId>
       <version>${project.version}</version>
-      <classifier>rebuffed</classifier>
     </dependency>
     <dependency>
       <groupId>org.apache.drill.exec</groupId>

http://git-wip-us.apache.org/repos/asf/drill/blob/3aa82bc9/distribution/src/assemble/bin.xml
----------------------------------------------------------------------
diff --git a/distribution/src/assemble/bin.xml b/distribution/src/assemble/bin.xml
index 684ff19..244230f 100644
--- a/distribution/src/assemble/bin.xml
+++ b/distribution/src/assemble/bin.xml
@@ -84,9 +84,9 @@
       <!-- Now, select which projects to include in this module-set. -->
       <includes>
         <include>org.apache.drill.exec:drill-jdbc:jar</include>
-        <include>org.apache.drill:drill-protocol:jar:rebuffed</include>
-        <include>org.apache.drill:drill-common:jar:rebuffed</include>
-        <include>org.apache.drill.exec:drill-java-exec:jar:rebuffed</include>
+        <include>org.apache.drill:drill-protocol:jar</include>
+        <include>org.apache.drill:drill-common:jar</include>
+        <include>org.apache.drill.exec:drill-java-exec:jar</include>
         <include>org.apache.drill.contrib.storage-hive:drill-storage-hive-core</include>
         <include>org.apache.drill.contrib.storage-hive:drill-hive-exec-shaded</include>
         <include>org.apache.drill.contrib.data:tpch-sample-data:jar</include>

http://git-wip-us.apache.org/repos/asf/drill/blob/3aa82bc9/exec/java-exec/pom.xml
----------------------------------------------------------------------
diff --git a/exec/java-exec/pom.xml b/exec/java-exec/pom.xml
index 5cc209d..3754126 100644
--- a/exec/java-exec/pom.xml
+++ b/exec/java-exec/pom.xml
@@ -589,42 +589,6 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>2.1</version>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <configuration>
-              <artifactSet>
-                <includes>
-                  <include>com.google.protobuf:protobuf-java</include>
-                </includes>
-              </artifactSet>
-              <shadedArtifactAttached>true</shadedArtifactAttached>
-              <shadedClassifierName>rebuffed</shadedClassifierName>
-              <filters>
-                <filter>
-                  <artifact>com.google.protobuf:protobuf-java</artifact>
-                  <excludes>
-                    <exclude>**</exclude>
-                  </excludes>
-                </filter>
-              </filters>
-              <relocations>
-                <relocation>
-                  <pattern>com.google.protobuf</pattern>
-                  <shadedPattern>250.com.google.protobuf</shadedPattern>
-                </relocation>
-              </relocations>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>javacc-maven-plugin</artifactId>
         <version>2.4</version>


Mime
View raw message