vvysotskyi commented on a change in pull request #1264: DRILL-6422: Update guava to 23.0 and shade it URL: https://github.com/apache/drill/pull/1264#discussion_r200957067
########## File path: drill-shaded/guava-shaded/pom.xml ########## @@ -0,0 +1,86 @@ +<?xml version="1.0"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.drill</groupId> + <artifactId>drill-shaded</artifactId> + <version>1.0</version> + </parent> + + <artifactId>guava-shaded</artifactId> + <version>23.0</version> + <name>drill-shaded/guava-shaded</name> + + <properties> + <!-- skip source archives --> + <assembly.attach>false</assembly.attach> + <dep.guava.version>23.0</dep.guava.version> + </properties> + + <dependencies> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>${dep.guava.version}</version> + </dependency> + <dependency> + <groupId>com.google.errorprone</groupId> + <artifactId>error_prone_annotations</artifactId> + <version>2.0.18</version> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <version>3.1.0</version> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <createSourcesJar>true</createSourcesJar> Review comment: It causes a problem which I mentioned in the comment in the previous code review round. It causes renaming packages in sources for not only classes from the included lib but for other classes whose packages matches the pattern. But when leaving only `createSourcesJar` without `shadeSourcesContent`, links to the unshaded sources are used. So I have added `shadeSourcesContent` and specified both `com.google.common` and `com.google.thirdparty` as it was in one of the previous versions of my changes. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services
