You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tr...@apache.org on 2019/09/26 12:35:41 UTC
[flink] branch FLINK-14195 created (now 00064c3)
This is an automated email from the ASF dual-hosted git repository.
trohrmann pushed a change to branch FLINK-14195
in repository https://gitbox.apache.org/repos/asf/flink.git.
at 00064c3 Add Streaming File Sink s3 end-to-end test back for java 11.
This branch includes the following new commits:
new f2631c0 Add jaxb dependency and do relocation for java 11 in s3.
new 00064c3 Add Streaming File Sink s3 end-to-end test back for java 11.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[flink] 01/02: Add jaxb dependency and do relocation for java 11 in
s3.
Posted by tr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
trohrmann pushed a commit to branch FLINK-14195
in repository https://gitbox.apache.org/repos/asf/flink.git
commit f2631c048ca41ee15bfa8d26e4938b373dd50c0c
Author: kevin.cyj <ke...@alibaba-inc.com>
AuthorDate: Wed Sep 25 17:06:16 2019 +0800
Add jaxb dependency and do relocation for java 11 in s3.
---
flink-filesystems/flink-s3-fs-hadoop/pom.xml | 43 ++++++++++++++++++++++++++++
flink-filesystems/flink-s3-fs-presto/pom.xml | 43 ++++++++++++++++++++++++++++
2 files changed, 86 insertions(+)
diff --git a/flink-filesystems/flink-s3-fs-hadoop/pom.xml b/flink-filesystems/flink-s3-fs-hadoop/pom.xml
index e03c885..d04def1 100644
--- a/flink-filesystems/flink-s3-fs-hadoop/pom.xml
+++ b/flink-filesystems/flink-s3-fs-hadoop/pom.xml
@@ -126,4 +126,47 @@ under the License.
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>java11</id>
+ <activation>
+ <jdk>11</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <!-- Hadoop requires jaxb-api for javax.xml.bind.JAXBException -->
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.3.0</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>shade-flink</id>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <relocations combine.children="append">
+ <relocation>
+ <pattern>javax.xml.bind</pattern>
+ <shadedPattern>org.apache.flink.fs.s3hadoop.shaded.javax.xml.bind</shadedPattern>
+ </relocation>
+ </relocations>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
diff --git a/flink-filesystems/flink-s3-fs-presto/pom.xml b/flink-filesystems/flink-s3-fs-presto/pom.xml
index f589e04..b56c77e 100644
--- a/flink-filesystems/flink-s3-fs-presto/pom.xml
+++ b/flink-filesystems/flink-s3-fs-presto/pom.xml
@@ -323,4 +323,47 @@ under the License.
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>java11</id>
+ <activation>
+ <jdk>11</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <!-- Hadoop requires jaxb-api for javax.xml.bind.JAXBException -->
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.3.0</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>shade-flink</id>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <relocations combine.children="append">
+ <relocation>
+ <pattern>javax.xml.bind</pattern>
+ <shadedPattern>org.apache.flink.fs.s3presto.shaded.javax.xml.bind</shadedPattern>
+ </relocation>
+ </relocations>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
[flink] 02/02: Add Streaming File Sink s3 end-to-end test back for
java 11.
Posted by tr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
trohrmann pushed a commit to branch FLINK-14195
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 00064c32ebd856265ad9c94fa12d4556f9f7c1c6
Author: kevin.cyj <ke...@alibaba-inc.com>
AuthorDate: Wed Sep 25 17:11:34 2019 +0800
Add Streaming File Sink s3 end-to-end test back for java 11.
---
tools/travis/splits/split_misc.sh | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/tools/travis/splits/split_misc.sh b/tools/travis/splits/split_misc.sh
index 856b351..97f811d 100755
--- a/tools/travis/splits/split_misc.sh
+++ b/tools/travis/splits/split_misc.sh
@@ -54,9 +54,7 @@ run_test "Streaming SQL end-to-end test (Old planner)" "$END_TO_END_DIR/test-scr
run_test "Streaming SQL end-to-end test (Blink planner)" "$END_TO_END_DIR/test-scripts/test_streaming_sql.sh blink" "skip_check_exceptions"
run_test "Streaming bucketing end-to-end test" "$END_TO_END_DIR/test-scripts/test_streaming_bucketing.sh" "skip_check_exceptions"
run_test "Streaming File Sink end-to-end test" "$END_TO_END_DIR/test-scripts/test_streaming_file_sink.sh" "skip_check_exceptions"
-if [[ ${PROFILE} != *"jdk11"* ]]; then
- run_test "Streaming File Sink s3 end-to-end test" "$END_TO_END_DIR/test-scripts/test_streaming_file_sink.sh s3" "skip_check_exceptions"
-fi
+run_test "Streaming File Sink s3 end-to-end test" "$END_TO_END_DIR/test-scripts/test_streaming_file_sink.sh s3" "skip_check_exceptions"
run_test "Stateful stream job upgrade end-to-end test" "$END_TO_END_DIR/test-scripts/test_stateful_stream_job_upgrade.sh 2 4"
run_test "Elasticsearch (v2.3.5) sink end-to-end test" "$END_TO_END_DIR/test-scripts/test_streaming_elasticsearch.sh 2 https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/2.3.5/elasticsearch-2.3.5.tar.gz"