flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From trohrm...@apache.org
Subject [66/82] [abbrv] incubator-flink git commit: Exclude netty and protobuf dependency from hadoop-commons-2.0.0-alpha
Date Thu, 18 Dec 2014 18:46:02 GMT
Exclude netty and protobuf dependency from hadoop-commons-2.0.0-alpha


Project: http://git-wip-us.apache.org/repos/asf/incubator-flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-flink/commit/f32c4753
Tree: http://git-wip-us.apache.org/repos/asf/incubator-flink/tree/f32c4753
Diff: http://git-wip-us.apache.org/repos/asf/incubator-flink/diff/f32c4753

Branch: refs/heads/master
Commit: f32c4753740e0a8033accff0320a81777a03795a
Parents: 0516d26
Author: Till Rohrmann <trohrmann@apache.org>
Authored: Wed Dec 17 10:58:05 2014 +0100
Committer: Till Rohrmann <trohrmann@apache.org>
Committed: Thu Dec 18 18:58:32 2014 +0100

----------------------------------------------------------------------
 .../src/test/resources/log4j-test.properties    | 10 ++++++-
 pom.xml                                         | 29 ++++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/f32c4753/flink-addons/flink-avro/src/test/resources/log4j-test.properties
----------------------------------------------------------------------
diff --git a/flink-addons/flink-avro/src/test/resources/log4j-test.properties b/flink-addons/flink-avro/src/test/resources/log4j-test.properties
index 2fb9345..0b686e5 100644
--- a/flink-addons/flink-avro/src/test/resources/log4j-test.properties
+++ b/flink-addons/flink-avro/src/test/resources/log4j-test.properties
@@ -16,4 +16,12 @@
 # limitations under the License.
 ################################################################################
 
-log4j.rootLogger=OFF
\ No newline at end of file
+# Set root logger level to DEBUG and its only appender to A1.
+log4j.rootLogger=OFF, A1
+
+# A1 is set to be a ConsoleAppender.
+log4j.appender.A1=org.apache.log4j.ConsoleAppender
+
+# A1 uses PatternLayout.
+log4j.appender.A1.layout=org.apache.log4j.PatternLayout
+log4j.appender.A1.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/f32c4753/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3cbfaa7..3eaa76e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -369,6 +369,35 @@ under the License.
 		</profile>
 
 		<profile>
+			<id>hadoop-2.0.0-alpha</id>
+			<activation>
+				<property>
+					<name>hadoop.version</name>
+					<value>2.0.0-alpha</value>
+				</property>
+			</activation>
+			<dependencyManagement>
+				<dependencies>
+					<dependency>
+						<groupId>org.apache.hadoop</groupId>
+						<artifactId>hadoop-common</artifactId>
+						<version>${hadoop.version}</version>
+						<exclusions>
+							<exclusion>
+								<groupId>org.jboss.netty</groupId>
+								<artifactId>netty</artifactId>
+							</exclusion>
+							<exclusion>
+								<groupId>com.google.protobuf</groupId>
+								<artifactId>protobuf-java</artifactId>
+							</exclusion>
+						</exclusions>
+					</dependency>
+				</dependencies>
+			</dependencyManagement>
+		</profile>
+
+		<profile>
 			<id>vendor-repos</id>
 			<!-- Add vendor maven repositories -->
 			<repositories>


Mime
View raw message