Java 6 as per JasperReports 4.6.0+

intive-FDV · Jun 19, 2013 · 864b0f0 · 864b0f0
1 parent 9a29155
commit 864b0f0
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -65,26 +65,27 @@ API.
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<!--<version>2.0</version>-->
+                <version>2.5.1</version>
 				<configuration>
-					<source>1.5</source>
-					<target>1.5</target>
+					<source>1.6</source>
+					<target>1.6</target>
 					<debug>true</debug>
 					<fork>true</fork>
-					<executable>${env.JAVA5_HOME}/bin/javac</executable>
+					<executable>${env.JAVA_HOME}/bin/javac</executable>
 				</configuration>
 			</plugin>
 		      <plugin>
 		        <groupId>org.apache.maven.plugins</groupId>
 		        <artifactId>maven-resources-plugin</artifactId>
-		        <version>2.4.1</version>
+		        <version>2.6</version>
 		        <configuration>
 		          <encoding>UTF-8</encoding>
 		        </configuration>
 		      </plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
+                <version>2.4</version>
 				<executions>
 					<execution>
 						<goals>
@@ -96,6 +97,7 @@ API.
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
+                <version>2.2.1</version>
 				<executions>
 					<execution>
 						<goals>
@@ -117,6 +119,11 @@ API.
 					<finalName>DynamicJasper version ${version}</finalName>
 				</configuration>
 			</plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.15</version>
+            </plugin>
 			<!--
 		      <plugin>
 		        <groupId>org.apache.maven.plugins</groupId>
@@ -149,6 +156,7 @@ API.
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-source-plugin</artifactId>
+                        <version>2.2.1</version>
 						<executions>
 							<execution>
 								<id>attach-source</id>
@@ -162,6 +170,7 @@ API.
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-javadoc-plugin</artifactId>
+                        <version>2.8.1</version>
 						<configuration>
 							<source>1.5</source>
 						</configuration>
@@ -184,6 +193,7 @@ API.
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-jar-plugin</artifactId>
+                        <version>2.4</version>
 						<executions>
 							<execution>
 								<goals>
@@ -330,7 +340,7 @@ API.
 		<dependency>
 		    <groupId>net.sf.jasperreports</groupId>
 		    <artifactId>jasperreports</artifactId>
-		    <version>4.1.1</version>
+		    <version>4.6.0</version>
             <exclusions>
                 <exclusion>
                     <groupId>commons-collections</groupId>

diff --git a/src/config/maven-site.vm b/src/config/maven-site.vm
@@ -365,16 +365,15 @@ $(document).ready(function(){
 	});
 
 function makeImageLinks(){
-	$("div.section img").each(function(){
+/*	$("div.section img").each(function(){
 		var original_name = this.src;
 		var thumb_name = this.src.substring(0,this.src.lastIndexOf(".")) + "_s" + this.src.substring(this.src.lastIndexOf("."));
 		this.src = thumb_name;
 		$(this).wrap("<a href='"+original_name+"' class='imageLink' title='"+ this.title +"'></a>");
 
 	});
 	$("div.section a.imageLink").fancybox({ 'hideOnContentClick': true });
-
-	//$("div.section").fadeIn('slow');
+	*/
 }
 
 function goDownload(elem) {