Skip to content
/ beam Public
forked from apache/beam

Commit

Permalink
Merge pull request apache#5455: Fix build with Maven (Again!)
Browse files Browse the repository at this point in the history
Fix build with Maven (Again!)
  • Loading branch information
iemejia authored May 23, 2018
2 parents fe73369 + 815ec27 commit 8345991
Showing 7 changed files with 57 additions and 13 deletions.
11 changes: 5 additions & 6 deletions runners/direct-java/pom.xml
Original file line number Diff line number Diff line change
@@ -196,6 +196,11 @@
</build>

<dependencies>
<dependency>
<groupId>org.apache.beam</groupId>
<artifactId>beam-model-fn-execution</artifactId>
</dependency>

<dependency>
<groupId>org.apache.beam</groupId>
<artifactId>beam-model-pipeline</artifactId>
@@ -352,11 +357,5 @@
<artifactId>jackson-dataformat-yaml</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.beam</groupId>
<artifactId>beam-model-fn-execution</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>
20 changes: 20 additions & 0 deletions runners/flink/pom.xml
Original file line number Diff line number Diff line change
@@ -231,6 +231,11 @@
</exclusions>
</dependency>

<dependency>
<groupId>org.apache.beam</groupId>
<artifactId>beam-model-job-management</artifactId>
</dependency>

<dependency>
<groupId>org.apache.beam</groupId>
<artifactId>beam-runners-core-java</artifactId>
@@ -264,6 +269,11 @@
</exclusions>
</dependency>

<dependency>
<groupId>org.apache.beam</groupId>
<artifactId>beam-sdks-java-fn-execution</artifactId>
</dependency>

<dependency>
<groupId>org.apache.beam</groupId>
<artifactId>beam-model-pipeline</artifactId>
@@ -284,6 +294,16 @@
<artifactId>jsr305</artifactId>
</dependency>

<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
</dependency>

<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
5 changes: 5 additions & 0 deletions runners/java-fn-execution/pom.xml
Original file line number Diff line number Diff line change
@@ -90,6 +90,11 @@
<artifactId>beam-model-fn-execution</artifactId>
</dependency>

<dependency>
<groupId>org.apache.beam</groupId>
<artifactId>beam-model-job-management</artifactId>
</dependency>

<dependency>
<groupId>org.apache.beam</groupId>
<artifactId>beam-sdks-java-fn-execution</artifactId>
Original file line number Diff line number Diff line change
@@ -25,7 +25,6 @@
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
import com.google.common.net.HostAndPort;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import java.io.IOException;
import java.util.Map;
import java.util.concurrent.ExecutorService;
@@ -224,7 +223,7 @@ private static class SimpleStageBundleFactory<InputT> implements StageBundleFact
private final ExecutableProcessBundleDescriptor processBundleDescriptor;

// Store the wrapped client in order to keep a live reference into the cache.
@SuppressFBWarnings private WrappedSdkHarnessClient wrappedClient;
private WrappedSdkHarnessClient wrappedClient;

static <InputT> SimpleStageBundleFactory<InputT> create(
WrappedSdkHarnessClient wrappedClient,
Original file line number Diff line number Diff line change
@@ -375,4 +375,11 @@
-->
<Package name="org.apache.beam.sdk.extensions.sql.impl.parser.impl"/>
</Match>

<Match>
<Class name="org.apache.beam.runners.fnexecution.control.DockerJobBundleFactory$SimpleStageBundleFactory"/>
<Field name="wrappedClient"/>
<Bug pattern="URF_UNREAD_FIELD"/>
<!-- Fix build. -->
</Match>
</FindBugsFilter>
19 changes: 14 additions & 5 deletions sdks/java/extensions/sql/pom.xml
Original file line number Diff line number Diff line change
@@ -364,6 +364,17 @@
<artifactId>beam-sdks-java-extensions-join-library</artifactId>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>

<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>1.2.12</version>
</dependency>

<dependency>
<groupId>com.google.auto.value</groupId>
<artifactId>auto-value</artifactId>
@@ -407,27 +418,25 @@
<artifactId>hamcrest-core</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.pholser</groupId>
<artifactId>junit-quickcheck-core</artifactId>
<version>${quickcheck.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>1.2.12</version>
</dependency>
</dependencies>
</project>
5 changes: 5 additions & 0 deletions sdks/java/nexmark/pom.xml
Original file line number Diff line number Diff line change
@@ -218,6 +218,11 @@
<artifactId>beam-sdks-java-extensions-google-cloud-platform-core</artifactId>
</dependency>

<dependency>
<groupId>com.google.api-client</groupId>
<artifactId>google-api-client</artifactId>
</dependency>

<dependency>
<groupId>com.google.apis</groupId>
<artifactId>google-api-services-bigquery</artifactId>

0 comments on commit 8345991

Please sign in to comment.