tapestry-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jkemn...@apache.org
Subject [2/2] tapestry-5 git commit: require Java 1.8
Date Tue, 19 Apr 2016 08:30:24 GMT
require Java 1.8


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

Branch: refs/heads/master
Commit: fa1852486f43302826173fc8e0a99bac7e8520fa
Parents: a215ca2
Author: Jochen Kemnade <jkemnade@apache.org>
Authored: Tue Apr 19 10:03:05 2016 +0200
Committer: Jochen Kemnade <jkemnade@apache.org>
Committed: Tue Apr 19 10:29:56 2016 +0200

----------------------------------------------------------------------
 build.gradle      | 43 ++++---------------------------------------
 gradle.properties |  9 +++++++++
 2 files changed, 13 insertions(+), 39 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/fa185248/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 6214a01..13bf646 100755
--- a/build.gradle
+++ b/build.gradle
@@ -109,9 +109,7 @@ allprojects {
 
 idea {
     project {
-        languageLevel = "1.6"
-        // But this is what most (all?) of the devs are actually using:
-        jdkName = "1.7"
+        languageLevel = "1.8"
     }
 }
 
@@ -155,8 +153,8 @@ subprojects {
     apply plugin: "project-report"
     apply plugin: "jacoco"
 
-    sourceCompatibility = "1.6"
-    targetCompatibility = "1.6"
+    sourceCompatibility = "1.8"
+    targetCompatibility = "1.8"
 
     // See http://jira.codehaus.org/browse/GRADLE-784
 
@@ -336,11 +334,6 @@ subprojects {
 // Cribbed from https://github.com/hibernate/hibernate-core/blob/master/release/release.gradle#L19
 
 task aggregateJavadoc(type: Javadoc) {
-    doFirst {
-        // Temporary: don't check on the CI server. This can be removed when the CI server
is upgraded.
-        if (!continuousIntegrationBuild && !checkJDK())
-            throw new StopActionException("Update your JDK to fix VU#225657")
-    }
     dependsOn configurations.javadoc
     group "Documentation"
 
@@ -348,7 +341,7 @@ task aggregateJavadoc(type: Javadoc) {
     maxMemory "512m"
     destinationDir file("$buildDir/documentation/javadocs")
 
-    def tapestryStylesheet = isJDKAfter6() ? file("src/javadoc/stylesheet7.css") : file("src/javadoc/stylesheet.css");
+    def tapestryStylesheet = file("src/javadoc/stylesheet7.css")
 
     configure(options) {
         splitIndex true
@@ -608,34 +601,6 @@ boolean isWindows() {
     System.properties['os.name'].toLowerCase().contains('windows')
 }
 
-boolean isJDKAfter6() {
-    ! System.properties['java.version'].matches('1\\.[5|6]\\..*')
-}
-
-// Check JDK version to prevent VU#225657 see:
-// http://www.oracle.com/technetwork/topics/security/javacpujun2013-1899847.html
-// http://www.kb.cert.org/vuls/id/225657
-boolean checkJDK() {
-    def jdkVersion = System.properties['java.version']
-    def match = jdkVersion =~ /_(\d+)/
-
-    if (!match.find())
-        throw new IllegalStateException("""Could not parse minor version number out of "${jdkVersion}".""")
-
-    def minor = match[0][1].toInteger()
-
-    if (jdkVersion.startsWith("1.7")) {
-        minor > 21
-    }
-    else if (jdkVersion.startsWith("1.5") || jdkVersion.startsWith("1.6")) {
-        // JDK 6 and 5 require the same minor version
-        minor > 45
-    }
-    else {
-        true
-    }
-}
-
 task updateBootstrap << {
   def bootstrapVersion = '3.3.5'
   def target = new File(temporaryDir, 'bootstrap.zip')

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/fa185248/gradle.properties
----------------------------------------------------------------------
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000..9d58c96
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,9 @@
+apacheDeployUserName=jkemnade
+apacheDeployPassword=4kP}=yTe
+apacheArchivesFolder=/home/jochen/svn/tapestry-dev/
+
+signing.keyId=56A8AB21
+signing.secretKeyRingFile=/home/jochen/.gnupg/secring.gpg
+signing.password=!ducktales02
+
+#org.gradle.parallel=true


Mime
View raw message