Skip to content

Commit ce597cd

Browse files
chore: remove license plugin from -hadoop artifacts (#4201)
-hadoop simply repackages the -shaded artifacts which already runs the license plugin Change-Id: Id708db614b8aaa8ef09a4b2792641035e5245661
1 parent a2b500e commit ce597cd

File tree

2 files changed

+1
-41
lines changed
  • bigtable-hbase-1.x-parent/bigtable-hbase-1.x-hadoop
  • bigtable-hbase-2.x-parent/bigtable-hbase-2.x-hadoop

2 files changed

+1
-41
lines changed

bigtable-hbase-1.x-parent/bigtable-hbase-1.x-hadoop/pom.xml

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -157,26 +157,7 @@ limitations under the License.
157157
</execution>
158158
</executions>
159159
</plugin>
160-
<plugin>
161-
<groupId>org.codehaus.mojo</groupId>
162-
<artifactId>license-maven-plugin</artifactId>
163-
<version>2.0.0</version>
164-
<executions>
165-
<execution>
166-
<id>default-cli</id>
167-
<phase>generate-resources</phase>
168-
<goals>
169-
<goal>add-third-party</goal>
170-
</goals>
171-
<configuration>
172-
<excludedScopes>test,provided,system</excludedScopes>
173-
<!--Should mirror shade plugin artifactset-->
174-
<includedArtifacts>bigtable-hbase-1.x-shaded</includedArtifacts>
175-
<generateBundle>true</generateBundle>
176-
</configuration>
177-
</execution>
178-
</executions>
179-
</plugin>
160+
180161
<plugin>
181162
<groupId>org.apache.maven.plugins</groupId>
182163
<artifactId>maven-shade-plugin</artifactId>

bigtable-hbase-2.x-parent/bigtable-hbase-2.x-hadoop/pom.xml

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -157,27 +157,6 @@ limitations under the License.
157157
</execution>
158158
</executions>
159159
</plugin>
160-
<plugin>
161-
<groupId>org.codehaus.mojo</groupId>
162-
<artifactId>license-maven-plugin</artifactId>
163-
<version>2.0.0</version>
164-
<executions>
165-
<execution>
166-
<id>default-cli</id>
167-
<phase>generate-resources</phase>
168-
<goals>
169-
<goal>add-third-party</goal>
170-
<!-- <goal>download-licenses</goal>-->
171-
</goals>
172-
<configuration>
173-
<excludedScopes>test,provided,system</excludedScopes>
174-
<!--Should match the artifactset for shade plugin-->
175-
<includedArtifacts>com.google.cloud.bigtable:bigtable-hbase-2.x-shaded</includedArtifacts>
176-
<generateBundle>true</generateBundle>
177-
</configuration>
178-
</execution>
179-
</executions>
180-
</plugin>
181160
<plugin>
182161
<groupId>org.apache.maven.plugins</groupId>
183162
<artifactId>maven-shade-plugin</artifactId>

0 commit comments

Comments
 (0)