perfsonar development work

Author: rediris.montes
Date: 2010-06-07 18:18:38 +0100 (Mon, 07 Jun 2010)
New Revision: 5691

Modified:
   trunk/perfsonar-java-as/pom.xml
Log:
Changed version of default JVM

Modified: trunk/perfsonar-java-as/pom.xml
===================================================================
--- trunk/perfsonar-java-as/pom.xml     2010-06-07 17:17:43 UTC (rev 5690)
+++ trunk/perfsonar-java-as/pom.xml     2010-06-07 17:18:38 UTC (rev 5691)
@@ -54,8 +54,8 @@
                        <plugin>
                                <artifactId>maven-compiler-plugin</artifactId>
                                <configuration>
-                                       <source>1.5</source>
-                                       <target>1.5</target>
+                                       <source>1.6</source>
+                                       <target>1.6</target>
                                </configuration>
                        </plugin>
 
@@ -72,7 +72,7 @@
                                                                <copy 
file="${basedir}/conf/${configurationFile}" todir="${basedir}/conf/tmp" />
                                                                <move 
file="${basedir}/conf/tmp/${configurationFile}"
                                                                        
tofile="${basedir}/conf/tmp/configuration.xml" />
-                                                               <copy 
file="${basedir}/conf/configuration-rules.xml" todir="${basedir}/conf/tmp" />
+                                                               <!--<copy 
file="${basedir}/conf/configuration-rules.xml" todir="${basedir}/conf/tmp" 
/>-->
                                                                <copy 
file="${basedir}/conf/perfSONARtruststore.jks" todir="${basedir}/conf/tmp" />
                                                                <copy 
file="${basedir}/conf/ASValidComponentsFile" todir="${basedir}/conf/tmp" />
                                                                <copy 
file="${basedir}/conf/basic_policy.xml" todir="${basedir}/conf/tmp" />
@@ -151,7 +151,6 @@
                                                        
<directory>${basedir}/conf</directory>
                                                        <includes>
                                                                
<include>**/log4j.xml</include>
-                                                               
<include>**/log4j.properties</include>
                                                        </includes>
                                                        
<targetPath>WEB-INF/classes</targetPath>
                                                </resource>
@@ -252,8 +251,8 @@
                </dependency>
                <dependency>
                        <groupId>bouncycastle</groupId>
-                       <artifactId>bcprov-jdk15</artifactId>
-                       <version>124</version>
+                       <artifactId>bcprov-jdk16</artifactId>
+                       <version>136</version>
                </dependency>
                <dependency>
                        <groupId>xml-security</groupId>
@@ -377,7 +376,7 @@
                                        <linkXref>true</linkXref>
                                        <sourceEncoding>utf-8</sourceEncoding>
                                        <minimumTokens>100</minimumTokens>
-                                       <targetJdk>1.5</targetJdk>
+                                       <targetJdk>1.6</targetJdk>
                                </configuration>
                        </plugin>
                </plugins>