svn commit: r1546000 - in /cxf/fediz/trunk: plugins/core/src/test/java/org/apache/cxf/fediz/core/config/FedizConfigurationTest.java plugins/core/src/test/java/org/apache/cxf/fediz/core/config/FedizConfigurationWriterTest.java pom.xml

[coheigea]

Author: coheigea
Date: Wed Nov 27 11:46:05 2013
New Revision: 1546000

URL: http://svn.apache.org/r1546000
Log:
Upgrading some dependencies

Modified:
    
cxf/fediz/trunk/plugins/core/src/test/java/org/apache/cxf/fediz/core/config/FedizConfigurationTest.java
    
cxf/fediz/trunk/plugins/core/src/test/java/org/apache/cxf/fediz/core/config/FedizConfigurationWriterTest.java
    cxf/fediz/trunk/pom.xml

Modified: 
cxf/fediz/trunk/plugins/core/src/test/java/org/apache/cxf/fediz/core/config/FedizConfigurationTest.java
URL: 
http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/core/src/test/java/org/apache/cxf/fediz/core/config/FedizConfigurationTest.java?rev=1546000&r1=1545999&r2=1546000&view=diff
==============================================================================
--- 
cxf/fediz/trunk/plugins/core/src/test/java/org/apache/cxf/fediz/core/config/FedizConfigurationTest.java
 (original)
+++ 
cxf/fediz/trunk/plugins/core/src/test/java/org/apache/cxf/fediz/core/config/FedizConfigurationTest.java
 Wed Nov 27 11:46:05 2013
@@ -223,7 +223,7 @@ public class FedizConfigurationTest {
     }
 
     @org.junit.Test
-    public void testSaveConfig() throws JAXBException, IOException {
+    public void testSaveAndLoadConfig() throws JAXBException, IOException {
         final JAXBContext jaxbContext = JAXBContext
                 .newInstance(FedizConfig.class);
 
@@ -239,12 +239,9 @@ public class FedizConfigurationTest {
         f.createNewFile();
 
         configurator.saveConfiguration(f);
-    }
-
-    @org.junit.Test
-    public void testLoadConfig() throws JAXBException {
-        FederationConfigurator configurator = new FederationConfigurator();
-        File f = new File(CONFIG_FILE);
+        
+        configurator = new FederationConfigurator();
+        f = new File(CONFIG_FILE);
         configurator.loadConfig(f);
     }
 

Modified: 
cxf/fediz/trunk/plugins/core/src/test/java/org/apache/cxf/fediz/core/config/FedizConfigurationWriterTest.java
URL: 
http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/core/src/test/java/org/apache/cxf/fediz/core/config/FedizConfigurationWriterTest.java?rev=1546000&r1=1545999&r2=1546000&view=diff
==============================================================================
--- 
cxf/fediz/trunk/plugins/core/src/test/java/org/apache/cxf/fediz/core/config/FedizConfigurationWriterTest.java
 (original)
+++ 
cxf/fediz/trunk/plugins/core/src/test/java/org/apache/cxf/fediz/core/config/FedizConfigurationWriterTest.java
 Wed Nov 27 11:46:05 2013
@@ -203,7 +203,7 @@ public class FedizConfigurationWriterTes
     }
 
     @org.junit.Test
-    public void testSaveConfig() throws JAXBException, IOException {
+    public void testSaveAndLoadConfig() throws JAXBException, IOException {
         final JAXBContext jaxbContext = JAXBContext
                 .newInstance(FedizConfig.class);
 
@@ -218,12 +218,9 @@ public class FedizConfigurationWriterTes
         f.createNewFile();
 
         configurator.saveConfiguration(f);
-    }
-
-    @org.junit.Test
-    public void testLoadConfig() throws JAXBException {
-        FederationConfigurator configurator = new FederationConfigurator();
-        File f = new File(CONFIG_FILE);
+        
+        configurator = new FederationConfigurator();
+        f = new File(CONFIG_FILE);
         configurator.loadConfig(f);
     }
 

Modified: cxf/fediz/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/cxf/fediz/trunk/pom.xml?rev=1546000&r1=1545999&r2=1546000&view=diff
==============================================================================
--- cxf/fediz/trunk/pom.xml (original)
+++ cxf/fediz/trunk/pom.xml Wed Nov 27 11:46:05 2013
@@ -41,14 +41,14 @@
         <jericho.version>3.2</jericho.version>
         <jetty.version>8.1.12.v20130726</jetty.version>
         <!--<jetty.version>7.6.8.v20121106</jetty.version>-->
-        <junit.version>4.8.2</junit.version>
-        <log4j.version>1.2.15</log4j.version>
+        <junit.version>4.11</junit.version>
+        <log4j.version>1.2.17</log4j.version>
         <servlet.version>2.5</servlet.version>
         <slf4j.version>1.7.5</slf4j.version>
         <spring.version>3.1.4.RELEASE</spring.version>
         <spring.security.version>3.1.4.RELEASE</spring.security.version>
         <tomcat.version>7.0.42</tomcat.version>
-        <wss4j.version>1.6.12</wss4j.version>
+        <wss4j.version>1.6.13</wss4j.version>
 
         <tomcat.url>http://localhost:8080/manager/text</tomcat.url>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -476,7 +476,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-pmd-plugin</artifactId>
-                    <version>2.7.1</version>
+                    <version>3.0.1</version>
                     <dependencies>
                         <dependency>
                             <groupId>org.apache.cxf.build-utils</groupId>