INSPECTIT-2184: Updated agent and shared.all to java 1.6, added java … (inspectIT#159)

Author: Ivan Senic

dependencies.gradle

@@ -70,9 +70,10 @@ configurations {
 	xjc
 	izpack
 	jvms
-	java15rt
+	java16rt
 	eclipseBase
 	antContrib
+	jarCheck
 }
 // all our configurations to transitive=false
 configurations.sharedAllProd.transitive = false
@@ -119,7 +120,7 @@ dependencies {
 		'javax.validation:validation-api:1.1.0.Final',
 		'javax.inject:com.springsource.javax.inject:1.0.0',
 
-		'com.google.guava:guava-jdk5:13.0',
+		'com.google.guava:guava:18.0',
 		'com.github.stephenc.high-scale-lib:high-scale-lib:1.1.2',
 		'org.codehaus.jackson:jackson-core-asl:1.9.13',
 		'org.codehaus.jackson:jackson-mapper-asl:1.9.13'
@@ -249,13 +250,16 @@ dependencies {
 		'org.openjdk:openjdk-7-jre-linux-x64:1.7.0-u80-unofficial',
 		'org.openjdk:openjdk-7-jre-macosx-x64:1.7.0-u80-unofficial'
 	)
-	java15rt (
-		'com.sun:rt:1.5.0_22'
+	java16rt (
+		'com.sun:rt:1.6.0_45'
 	)
 	eclipseBase (
 		'org.eclipse:eclipse-base:3.8.2'
 	)
 	antContrib (
 		'ant-contrib:ant-contrib:1.0b3'
 	)
+	jarCheck (
+		'jarcheck:jarcheck:1.5'
+	)
 }

inspectit.agent.java/.classpath

@@ -25,7 +25,7 @@
 			<attribute name="FROM_GRADLE_MODEL" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

inspectit.agent.java/.settings/org.eclipse.jdt.core.prefs

@@ -1,14 +1,13 @@
-#Mon Jun 20 09:15:30 CEST 2011
 eclipse.preferences.version=1
 instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
 org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore

inspectit.agent.java/inspectit.agent.java.gradle

@@ -8,8 +8,8 @@ evaluationDependsOn(':inspectit.shared.all')
 defaultTasks 'releaseAndAnalyze'
 
 /** used by the eclipse buildship plugin */
-sourceCompatibility = '1.5'
-targetCompatibility = '1.5'
+sourceCompatibility = '1.6'
+targetCompatibility = '1.6'
 
 /** defined to have it included in Eclipse as source */
 sourceSets {
@@ -23,7 +23,7 @@ sourceSets {
 /** Some agent specific properties */
 ext {
 	distJarName = 'inspectit-agent'
-	releaseNameSun15 = "inspectit-agent-sun1.5-${versionInfo}.zip"
+	releaseName = "inspectit-agent-java6-${versionInfo}.zip"
 }
 
 /** Setting compile configuration as plugin in Eclipse needs it */
@@ -43,17 +43,12 @@ dependencies {
 	testCompile project (path: ':inspectit.shared.all', configuration: 'testArchives')
 }
 
-/** Compile compatibility to 1.5 for all compile tasks */
+/** Compile compatibility to 1.6 for all compile tasks */
 tasks.withType(JavaCompile) { t ->
-	// jmh can not run with java 1.5
-	if (!(t.getName().contains('jmh') || t.getName().contains('Jmh'))) {
-		sourceCompatibility = '1.5'
-		targetCompatibility = '1.5'
+	sourceCompatibility = '1.6'
+	targetCompatibility = '1.6'
 
-		options.bootClasspath = configurations.java15rt.asPath
-		// Used to suppress the warning that source value 1.5 will be obsolete in the future.
-		options.compilerArgs << '-Xlint:-options'
-	}
+	options.bootClasspath = configurations.java16rt.asPath
 }
 
 
@@ -66,15 +61,26 @@ cobertura {
  * Creates the jar. Excludes libs from the configurations.agentJavaProd that are not Java5 compatible. Uses existing manifest.
  */
 jar {
+	// use jarCheck to make sure all classes in our dependencies are at maximum in version 1.6
+	doFirst {
+		def jarCheckOutput = new File("$buildRoot/jarCheck")
+		jarCheckOutput.mkdirs()
+		configurations.agentJavaProd.each { file ->
+			def name = file.name
+			javaexec {
+				classpath configurations.jarCheck
+				main = 'com.mindprod.jarcheck.JarCheck'
+				args = ["$file", "1.0", "1.6"]
+				standardOutput = new File(jarCheckOutput, "$name-check.log").newOutputStream()
+			}
+		}
+	}
+
 	archivesBaseName = distJarName
-	
+
 	into('libs') {
 		from project(':inspectit.shared.all').jar.outputs
 		from configurations.agentJavaProd
-
-		// exclude due to the incompatibility with Java5
-		exclude('validation-api*')
-		exclude('hibernate-jpa-2.1-api*')
 	}
 
 	manifest {
@@ -86,10 +92,10 @@ jar {
  * Creates the release package.
  */
 task release (type: Zip, dependsOn: jar) {
-	description = "Releases the ${releaseNameSun15} package."
+	description = "Releases the ${releaseName} package."
 	group = 'Release'
 	destinationDir = file(buildReleasePackages)
-	archiveName = releaseNameSun15
+	archiveName = releaseName
 	into('agent') {
 		from jar.outputs
 		from file(mainExtResources)
@@ -98,7 +104,7 @@ task release (type: Zip, dependsOn: jar) {
 }
 
 task releaseAndAnalyze {
-	description = "Runs all unit tests, all checks and releases the ${releaseNameSun15} package."
+	description = "Runs all unit tests, all checks and releases the ${releaseName} package."
 	group = 'Release'
 	dependsOn(analyze, release)
 }

inspectit.shared.all/.classpath

@@ -15,7 +15,7 @@
 			<attribute name="FROM_GRADLE_MODEL" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

inspectit.shared.all/.settings/org.eclipse.jdt.core.prefs

@@ -1,13 +1,12 @@
-#Mon Jun 20 09:21:22 CEST 2011
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
 org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore

inspectit.shared.all/inspectit.shared.all.gradle

@@ -7,8 +7,8 @@
 defaultTasks 'releaseAndAnalyze'
 
 /** used by the eclipse buildship plugin */
-sourceCompatibility = '1.5'
-targetCompatibility = '1.5'
+sourceCompatibility = '1.6'
+targetCompatibility = '1.6'
 
 /** Artifact names */
 ext {
@@ -27,14 +27,12 @@ configurations {
 	testArchives.extendsFrom (testCompile)
 }
 
-/** Compile compatibility to 1.5 for all compile tasks */
+/** Compile compatibility to 1.6 for all compile tasks */
 tasks.withType(JavaCompile) { 
-	sourceCompatibility = '1.5'
-	targetCompatibility = '1.5'
+	sourceCompatibility = '1.6'
+	targetCompatibility = '1.6'
 
-	options.bootClasspath = configurations.java15rt.asPath
-	// Used to suppress the warning that source value 1.5 will be obsolete in the future.
-	options.compilerArgs << '-Xlint:-options'
+	options.bootClasspath = configurations.java16rt.asPath
 }
 
 /** 

inspectit.shared.all/src/main/resources/META-INF/MANIFEST.MF

@@ -55,7 +55,7 @@ Require-Bundle: com.esotericsoftware.minlog;bundle-version="1.2.0",
  de.javakaffee.kryo-serializers;bundle-version="0.23.0",
  com.esotericsoftware.kryonet;bundle-version="2.21.0",
  slf4j.api;bundle-version="1.7.21",
- com.google.guava.jdk5;bundle-version="13.0.0",
+ com.google.guava;bundle-version="18.0.0",
  org.hamcrest.all;bundle-version="1.3.0",
  org.hibernate.javax.persistence.hibernate-jpa-2.1-api;bundle-version="1.0.0",
  javax.validation.api;bundle-version="1.1.0",

inspectit.shared.cs/src/main/resources/META-INF/MANIFEST.MF

@@ -15,7 +15,7 @@ Require-Bundle: rocks.inspectit.shared.all,
  slf4j.api;bundle-version="1.7.21",
  com.esotericsoftware.kryo;bundle-version="2.24.0",
  org.hamcrest.all;bundle-version="1.3.0",
- com.google.guava.jdk5;bundle-version="13.0.0",
+ com.google.guava;bundle-version="18.0.0",
  com.github.stephenc.high-scale-lib;bundle-version="1.1.2",
  org.springframework.spring-aop;bundle-version="3.2.16",
  org.springframework.spring-beans;bundle-version="3.2.16",

inspectit.ui.rcp/src/main/resources/META-INF/MANIFEST.MF

@@ -38,7 +38,7 @@ Require-Bundle: org.eclipse.ui,
  ch.qos.logback.core;bundle-version="1.1.7",
  uk.org.lidalia.sysout-over-slf4j;bundle-version="1.0.2",
  com.esotericsoftware.kryo;bundle-version="2.24.0",
- com.google.guava.jdk5;bundle-version="13.0.0",
+ com.google.guava;bundle-version="18.0.0",
  com.google.gson;bundle-version="2.3.1",
  org.springframework.spring-aop;bundle-version="3.2.16",
  org.springframework.spring-beans;bundle-version="3.2.16",

inspectit.ui.rcp/src/main/resources/inspectIT.product

@@ -111,7 +111,7 @@ END OF TERMS AND CONDITIONS
       <plugin id="com.esotericsoftware.reflectasm"/>
       <plugin id="com.github.stephenc.high-scale-lib"/>
       <plugin id="com.google.gson"/>
-      <plugin id="com.google.guava.jdk5"/>
+      <plugin id="com.google.guava"/>
       <plugin id="com.ibm.icu"/>
       <plugin id="com.springsource.javax.inject"/>
       <plugin id="com.springsource.org.aopalliance"/>