Merge pull request #1319 from microsoft/heya/drop-java-7

Drop java 7

Author: heyams

.github/CONTRIBUTING.md

@@ -4,7 +4,7 @@ If you're interested in contributing, take a look at the general [contributer's
 
 ## Prerequisites
 
-1.  Java SDK 1.7 or higher
+1.  Java SDK 1.8 or higher
 2.  Sign-in to [Microsoft Azure](https://azure.com)
 
 ### Windows Naitive DLLs
@@ -23,8 +23,4 @@ If you're interested in contributing, take a look at the general [contributer's
 2.  Add GRADLE_HOME/bin to your PATH environment variable
 3.  In build.gradle add line `apply plugin: 'eclipse'`
 4.  In Eclipse used _File -> Import Existing Project_ in a workspace.
-5.  Use `gradle build` to build the project from the command line.
-
-### Notes
-
-* If you are using Java 8+, set JAVA_JRE_7 environment variable to point a Java 7 JRE installation. This will configure the bootstrap classpath to use the Java 7 library jars.
+5.  Use `gradle build` to build the project from the command line.

gradle/common-java.gradle

@@ -31,8 +31,8 @@ apply plugin: 'checkstyle'
 apply plugin: 'org.owasp.dependencycheck'
 apply plugin: 'com.github.spotbugs'
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 configurations {
     compileClasspath.resolutionStrategy.activateDependencyLocking()
@@ -129,38 +129,6 @@ if (hasProperty("JDKToUse")) {
 }
 updateTestDirectories()
 
-// setting this variable is highly recommended
-def java7JreDir = System.env.'JAVA_JRE_7'
-def isJava7 = JavaVersion.current().isJava7()
-def isJava7Compatible = JavaVersion.current().isJava7Compatible()
-
-if (!isJava7Compatible) {
-    logger.error "The current JDK version isn't compatible with Java 7: "+JavaVersion.current()+". Please upgrade JDK 1.7+"
-    if (isBuildServer || isRelease) {
-        throw new GradleException("incompatible JDK version: ${JavaVersion.current()}; needs 1.7+")
-    }
-}
-if (java7JreDir) {
-    def jre7libDir = fileTree(dir: "$java7JreDir/lib", include: '*.jar')
-    if (!jre7libDir.any()) {
-        throw new GradleException("Invalid JAVA_JRE_7 directory. ${jre7libDir.dir} was empty")
-    }
-
-    tasks.withType(JavaCompile) {
-        options.bootstrapClasspath = jre7libDir
-    }
-} else {
-    def msg = "IMPORTANT: Environment variable 'JAVA_JRE_7' is not defined - Install JRE 7 and set 'JAVA_JRE_7' to prevent runtime compatibility issues!"
-    if (!isJava7) {
-        if (isBuildServer || isRelease) {
-            logger.error msg
-            throw new GradleException("JAVA_JRE_7 must be set")
-        } else {
-            logger.warn msg
-        }
-    }
-}
-
 sourceSets {
     integrationTest {
         java.srcDir file('src/integTest/java')

settings.gradle

@@ -36,10 +36,8 @@ include ':agent:agent'
 // Projects for smokeTests
 include ':test:smoke'
 include ':test:smoke:appServers'
-include ':test:smoke:appServers:Tomcat.7'
 include ':test:smoke:appServers:Tomcat.8.5'
 include ':test:smoke:appServers:JBossEAP.7'
-include ':test:smoke:appServers:JBossEAP.6'
 include ':test:smoke:appServers:Jetty.9'
 include ':test:smoke:appServers:JavaSE'
 include ':test:smoke:testApps'

test/fakeIngestion/servlet/build.gradle

@@ -14,4 +14,4 @@ dependencies {
 
 }
 
-sourceCompatibility = 1.7
+sourceCompatibility = 1.8

test/fakeIngestion/standalone/build.gradle

@@ -16,4 +16,4 @@ dependencies {
 
 mainClassName = 'com.microsoft.applicationinsights.test.fakeingestion.MockedAppInsightsIngestionServer'
 
-sourceCompatibility = 1.7
+sourceCompatibility = 1.8