Skip to content

[BEAM-3060] Fixing mvn dependency issue when runnning filebasedIOIT t… #4870

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lukecwik merged 6 commits into from
Mar 23, 2018
Merged

[BEAM-3060] Fixing mvn dependency issue when runnning filebasedIOIT t… #4870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8213a7c
[BEAM-3060] Fixing mvn dependency issue when runnning filebasedIOIT t…
szewi Mar 15, 2018
a52fa25
Jax-api added to dependencyManagement.
szewi Mar 15, 2018
981d53f
Jaxb-api added to beam root pom.xml
szewi Mar 15, 2018
4ce9cdc
Removed empty line
szewi Mar 16, 2018
dacf8a3
Updated gradle build to use jaxb-api. Jaxb-api version set to 2.2.12
szewi Mar 20, 2018
613a506
Scope removed from root pom.xml and jaxb-api dependency set to shadow…
szewi Mar 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ def pubsub_grpc_version = "0.1.18"
def apex_core_version = "3.6.0"
def apex_malhar_version = "3.4.0"
def postgres_version = "9.4.1212.jre7"
def jaxb_api_version = "2.2.12"

// A map of maps containing common libraries used per language. To use:
// dependencies {
Expand Down Expand Up @@ -125,6 +126,7 @@ ext.library = [
jackson_dataformat_cbor: "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:$jackson_version",
jackson_dataformat_yaml: "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:$jackson_version",
jackson_module_scala: "com.fasterxml.jackson.module:jackson-module-scala_2.11:$jackson_version",
jaxb_api: "javax.xml.bind:jaxb-api:$jaxb_api_version",
joda_time: "joda-time:joda-time:2.4",
junit: "junit:junit:4.12",
kafka_clients: "org.apache.kafka:kafka-clients:1.0.0",
Expand Down
8 changes: 8 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@
<compiler.default.pkginfo.flag>-Xpkginfo:always</compiler.default.pkginfo.flag>
<compiler.default.exclude>nothing</compiler.default.exclude>
<gax-grpc.version>0.20.0</gax-grpc.version>
<jaxb-api.version>2.2.12</jaxb-api.version>

<!-- standard binary for kubectl -->
<kubectl>kubectl</kubectl>
Expand Down Expand Up @@ -1498,6 +1499,13 @@
<classifier>tests</classifier>
<scope>test</scope>
</dependency>

<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>${jaxb-api.version}</version>
</dependency>

</dependencies>
</dependencyManagement>

Expand Down
1 change: 1 addition & 0 deletions sdks/java/io/file-based-io-tests/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,5 @@ dependencies {
shadowTest library.java.guava
shadowTest library.java.junit
shadowTest library.java.hamcrest_core
shadowTest library.java.jaxb_api
}
5 changes: 5 additions & 0 deletions sdks/java/io/file-based-io-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,11 @@
<version>${apache.hadoop.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
Copy link
Contributor

@chamikaramj chamikaramj Mar 15, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add this to root level dependencyManagement so that we use the same version of jaxb-api across components.

Copy link
Contributor

@chamikaramj chamikaramj Mar 15, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, by root level I meant beam/pom.xml

Copy link
Contributor Author

@szewi szewi Mar 15, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added to dependencyManagement from java/io. Version removed from filebased pom.xml as because it's defined in dependencyManagement and this one will be used. To be consistent with scopes in dependencyManagement scope was also changed to test and it was sufficient to run tests.

Copy link
Contributor Author

@szewi szewi Mar 15, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No problem, I will move it to beam/pom.xml, but I need to run local tests, before another pull.

Copy link
Contributor

@chamikaramj chamikaramj Mar 15, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. Can you also define JAXB dependencies in https://github.com/apache/beam/blob/master/sdks/java/io/xml/pom.xml in root level and update that component to use the version defined in the root level. Also, can't we use 2.2.3 instead of 2.2.2 which seems to be pretty old ? I think we could run into issues if we have to use both 2.2.0 and 2.2.3 for different components.

<scope>test</scope>
</dependency>
</dependencies>
</profile>
</profiles>
Expand Down
1 change: 1 addition & 0 deletions sdks/java/io/xml/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ dependencies {
shadow library.java.stax2_api
shadow library.java.findbugs_jsr305
shadow library.java.woodstox_core_asl
shadowTest library.java.jaxb_api
testCompile project(path: ":sdks:java:core", configuration: "shadowTest")
testCompile project(path: ":runners:direct-java", configuration: "shadow")
testCompile library.java.junit
Expand Down
6 changes: 6 additions & 0 deletions sdks/java/io/xml/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,12 @@
<artifactId>hamcrest-library</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<profiles>
Expand Down