Skip to content

Commit ea0e7bb

Browse files
lukecwikdavorbonaci
authored andcommitted
Create internal-only classifier for Dataflow SDK
This creates a valid module which the worker package can depend on so it can share Guava objects between itself and the SDK module until the worker package is fully separated. Users should not depend on this classifier as it will be removed. This is towards ASF Beam. ----Release Notes---- [] ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=113593122
1 parent 4638244 commit ea0e7bb

File tree

2 files changed

+20
-2
lines changed

2 files changed

+20
-2
lines changed

sdk/pom.xml

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,24 @@
289289
<artifactId>maven-shade-plugin</artifactId>
290290
<version>2.3</version>
291291
<executions>
292-
<!-- In the first phase, we pick dependencies and relocate them. -->
292+
<!-- In the first phase, we create a special classifier for a
293+
jar with no relocations. This classifier should not
294+
be depended on as it is considered deprecated and will
295+
be removed. TODO: Remove once worker module does not
296+
share Guava dependency. -->
297+
<execution>
298+
<id>internal-only</id>
299+
<phase>package</phase>
300+
<goals>
301+
<goal>shade</goal>
302+
</goals>
303+
<configuration>
304+
<shadedArtifactAttached>true</shadedArtifactAttached>
305+
<shadedClassifierName>internal-only</shadedClassifierName>
306+
</configuration>
307+
</execution>
308+
309+
<!-- In the second phase, we pick dependencies and relocate them. -->
293310
<execution>
294311
<id>bundle-and-repackage</id>
295312
<phase>package</phase>
@@ -329,7 +346,7 @@
329346
</configuration>
330347
</execution>
331348

332-
<!-- In the second phase, we pick remaining dependencies and bundle
349+
<!-- In the third phase, we pick remaining dependencies and bundle
333350
them without repackaging. -->
334351
<execution>
335352
<id>bundle-rest-without-repackaging</id>

worker/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,7 @@
209209
<groupId>com.google.cloud.dataflow</groupId>
210210
<artifactId>google-cloud-dataflow-java-sdk-all</artifactId>
211211
<version>${project.version}</version>
212+
<classifier>internal-only</classifier>
212213
</dependency>
213214

214215
<!-- test dependencies -->

0 commit comments

Comments
 (0)