flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject [1/2] flink git commit: [FLINK-2453] [pom] Move Java source and target version to 1.7
Date Thu, 06 Aug 2015 14:23:31 GMT
Repository: flink
Updated Branches:
  refs/heads/master 925ac1f76 -> 5a788ec23


[FLINK-2453] [pom] Move Java source and target version to 1.7


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

Branch: refs/heads/master
Commit: 5a788ec23d50d36201ebb2fb0ad2b521272d034f
Parents: 249fa2b
Author: Stephan Ewen <sewen@apache.org>
Authored: Thu Aug 6 14:40:53 2015 +0200
Committer: Stephan Ewen <sewen@apache.org>
Committed: Thu Aug 6 14:53:30 2015 +0200

----------------------------------------------------------------------
 .../src/main/resources/archetype-resources/pom.xml  |  4 ++--
 .../src/main/resources/archetype-resources/pom.xml  |  4 ++--
 .../src/main/resources/archetype-resources/pom.xml  |  4 ++--
 flink-staging/flink-avro/pom.xml                    | 16 ----------------
 pom.xml                                             |  4 ++--
 5 files changed, 8 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/5a788ec2/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/pom.xml
b/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/pom.xml
index de481d7..fe915df 100644
--- a/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/pom.xml
+++ b/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/pom.xml
@@ -231,8 +231,8 @@ under the License.
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.1</version>
 				<configuration>
-					<source>1.6</source> <!-- If you want to use Java 8, change this to "1.8"
-->
-					<target>1.6</target> <!-- If you want to use Java 8, change this to "1.8"
-->
+					<source>1.7</source> <!-- If you want to use Java 8, change this to "1.8"
-->
+					<target>1.7</target> <!-- If you want to use Java 8, change this to "1.8"
-->
 				</configuration>
 			</plugin>
 		</plugins>

http://git-wip-us.apache.org/repos/asf/flink/blob/5a788ec2/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/pom.xml
b/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/pom.xml
index 90358d2..cca652e 100644
--- a/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/pom.xml
+++ b/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/pom.xml
@@ -222,8 +222,8 @@ under the License.
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.1</version>
 				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
+					<source>1.7</source>
+					<target>1.7</target>
 				</configuration>
 			</plugin>
 			<plugin>

http://git-wip-us.apache.org/repos/asf/flink/blob/5a788ec2/flink-quickstart/flink-tez-quickstart/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/flink-quickstart/flink-tez-quickstart/src/main/resources/archetype-resources/pom.xml
b/flink-quickstart/flink-tez-quickstart/src/main/resources/archetype-resources/pom.xml
index 5274f47..2bad10a 100644
--- a/flink-quickstart/flink-tez-quickstart/src/main/resources/archetype-resources/pom.xml
+++ b/flink-quickstart/flink-tez-quickstart/src/main/resources/archetype-resources/pom.xml
@@ -114,8 +114,8 @@ under the License.
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.1</version>
                 <configuration>
-                    <source>1.6</source> <!-- If you want to use Java 8, change
this to "1.8" -->
-                    <target>1.6</target> <!-- If you want to use Java 8, change
this to "1.8" -->
+                    <source>1.7</source> <!-- If you want to use Java 8, change
this to "1.8" -->
+                    <target>1.7</target> <!-- If you want to use Java 8, change
this to "1.8" -->
                 </configuration>
             </plugin>
         </plugins>

http://git-wip-us.apache.org/repos/asf/flink/blob/5a788ec2/flink-staging/flink-avro/pom.xml
----------------------------------------------------------------------
diff --git a/flink-staging/flink-avro/pom.xml b/flink-staging/flink-avro/pom.xml
index e2d1c29..71a99d7 100644
--- a/flink-staging/flink-avro/pom.xml
+++ b/flink-staging/flink-avro/pom.xml
@@ -189,20 +189,4 @@ under the License.
 		</pluginManagement>
 	</build>
 
-	<profiles>
-		<profile>
-			<!-- A bug with java6 is causing the javadoc generation
-			to fail because the test case contains junit?
-			See https://github.com/stratosphere/stratosphere/pull/405#issuecomment-32591978
-			for further links -->
-			<id>disable-javadocs-in-java6</id>
-			<activation>
-				 <jdk>(,1.6]</jdk> <!-- disable javadocs for java6 or lower. -->
-			</activation>
-			<properties>
-				<maven.javadoc.skip>true</maven.javadoc.skip>
-			</properties>
-		</profile>
-	</profiles>
-
 </project>

http://git-wip-us.apache.org/repos/asf/flink/blob/5a788ec2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 455153a..f215fe4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -813,8 +813,8 @@ under the License.
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.1</version><!--$NO-MVN-MAN-VER$-->
 				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
+					<source>1.7</source>
+					<target>1.7</target>
 					<!-- The output of Xlint is not show by default, but we activate it for the QA bot
 					to be able to get more warnings -->
 					<compilerArgument>-Xlint:all</compilerArgument>


Mime
View raw message