jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From juanpa...@apache.org
Subject svn commit: r1608535 - in /jspwiki/trunk: ./ jspwiki-war/src/main/java/org/apache/wiki/ jspwiki-war/src/test/java/org/apache/wiki/attachment/ jspwiki-war/src/test/java/org/apache/wiki/plugin/ jspwiki-war/src/test/java/org/apache/wiki/stress/
Date Mon, 07 Jul 2014 17:59:15 GMT
Author: juanpablo
Date: Mon Jul  7 17:59:15 2014
New Revision: 1608535

URL: http://svn.apache.org/r1608535
Log:
2.10.2-svn-4

* Dependencies' upgrade: EhCache to 2.6.9, SLF4J to 1.7.7, Selenium to 2.42.0, Stripes to
1.5.7-classloaderfix and Jetty to 8.1.15

* maven-dependency-plugin added to m2e exclusions

* updated + added missing jars to LICENSE

Modified:
    jspwiki/trunk/ChangeLog
    jspwiki/trunk/LICENSE
    jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
    jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/attachment/AttachmentManagerTest.java
    jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/ReferringUndefinedPagesPluginTest.java
    jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/stress/MassiveRepositoryTest.java
    jspwiki/trunk/mvn_cheat-sheet.md
    jspwiki/trunk/pom.xml

Modified: jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?rev=1608535&r1=1608534&r2=1608535&view=diff
==============================================================================
--- jspwiki/trunk/ChangeLog (original)
+++ jspwiki/trunk/ChangeLog Mon Jul  7 17:59:15 2014
@@ -1,3 +1,10 @@
+2014-07-07  Juan Pablo Santos (juanpablo AT apache DOT org)
+
+       * 2.10.2-svn-4
+
+       * Dependencies' upgrade: EhCache to 2.6.9, SLF4J to 1.7.7, Selenium to 2.42.0, Stripes
to 1.5.7-classloaderfix 
+         and Jetty to 8.1.15
+       
 2014-06-23  Juan Pablo Santos (juanpablo AT apache DOT org)
 
        * 2.10.2-svn-3

Modified: jspwiki/trunk/LICENSE
URL: http://svn.apache.org/viewvc/jspwiki/trunk/LICENSE?rev=1608535&r1=1608534&r2=1608535&view=diff
==============================================================================
--- jspwiki/trunk/LICENSE (original)
+++ jspwiki/trunk/LICENSE Mon Jul  7 17:59:15 2014
@@ -230,9 +230,11 @@ lucene-memory-4.7.0.jar                 
 mail-1.4.7.jar                              doc/LICENSE.cddl
 nekohtml-0.9.5.jar                          LICENSE
 oro-2.0.8.jar                               LICENSE
-ehcache-core-2.6.6.jar                      LICENSE
+ehcache-core-2.6.9.jar                      LICENSE
 sandler-0.5.jar                             doc/LICENSE.sandler
 servlet-api-2.5.jar                         doc/LICENSE.cddl
+slf4-api-1.7.7.jar                          doc/LICENSE.mit
+slf4j-log4j-1.7.7.jar                       doc/LICENSE.mit
 xmlrpc-2.0.1.jar                            LICENSE
 
 TEST LIBRARY                                LICENSE FILE
@@ -241,12 +243,12 @@ commons-el-1.0.jar                      
 custom_rhino-0.4.3.jar                      doc/LICENSE.mpl
 hsqldb-2.3.0.jar                            doc/LICENSE.hsqldb
 sqltool-2.3.0.jar                           doc/LICENSE.hsqldb
-jetty-all-8.1.12.v20130726.jar              LICENSE
+jetty-all-8.1.15.v20140411.jar              LICENSE
 junit-4.11.jar                              doc/LICENSE.cpl
-selenium-chrome-driver-2.41.0.jar           LICENSE
-selenium-firefox-driver-2.41.0.jar          LICENSE
-selenium-ie-driver-2.41.0.jar               LICENSE
-stripes-1.5.7.jar                           LICENSE
+selenium-chrome-driver-2.42.0.jar           LICENSE
+selenium-firefox-driver-2.42.0.jar          LICENSE
+selenium-ie-driver-2.42.0.jar               LICENSE
+stripes-1.5.7-classloaderfix.jar            LICENSE
 xercesImpl-2.6.2.jar                        LICENSE
 xml-apis-1.0.b2.jar                         LICENSE
 yuicompressor-2.4.7.jar                     doc/LICENSE.yui

Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java?rev=1608535&r1=1608534&r2=1608535&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java Mon Jul  7 17:59:15
2014
@@ -72,7 +72,7 @@ public final class Release {
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "3";
+    public static final String     BUILD         = "4";
     
     /**
      *  This is the generic version string you should use when printing out the version.
 It is of 

Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/attachment/AttachmentManagerTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/attachment/AttachmentManagerTest.java?rev=1608535&r1=1608534&r2=1608535&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/attachment/AttachmentManagerTest.java
(original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/attachment/AttachmentManagerTest.java
Mon Jul  7 17:59:15 2014
@@ -13,7 +13,12 @@
  */
 package org.apache.wiki.attachment;
 
-import java.io.*;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.StringReader;
+import java.io.StringWriter;
 import java.util.Collection;
 import java.util.Properties;
 

Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/ReferringUndefinedPagesPluginTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/ReferringUndefinedPagesPluginTest.java?rev=1608535&r1=1608534&r2=1608535&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/ReferringUndefinedPagesPluginTest.java
(original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/ReferringUndefinedPagesPluginTest.java
Mon Jul  7 17:59:15 2014
@@ -19,17 +19,18 @@ under the License.    
 
 package org.apache.wiki.plugin;
 
+import java.util.Properties;
+
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 import net.sf.ehcache.CacheManager;
+
 import org.apache.wiki.TestEngine;
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.WikiPage;
 import org.apache.wiki.api.engine.PluginManager;
 
-import java.util.Properties;
-
 public class ReferringUndefinedPagesPluginTest extends TestCase {
     Properties props = TestEngine.getTestProperties();
 
@@ -40,7 +41,7 @@ public class ReferringUndefinedPagesPlug
 	PluginManager manager;
 
 	public void setUp() throws Exception {
-        CacheManager.getInstance().clearAll();
+        CacheManager.getInstance().removalAll();
 		testEngine = new TestEngine(props);
 
         testEngine.saveText("TestPage01", "Some Text for testing 01 which refers [NonExistingPageA]
");

Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/stress/MassiveRepositoryTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/stress/MassiveRepositoryTest.java?rev=1608535&r1=1608534&r2=1608535&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/stress/MassiveRepositoryTest.java
(original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/stress/MassiveRepositoryTest.java
Mon Jul  7 17:59:15 2014
@@ -47,7 +47,7 @@ public class MassiveRepositoryTest exten
 
         TestEngine.deleteAll(f);
 
-        CacheManager.getInstance().clearAll();
+        CacheManager.getInstance().removalAll();
 
         engine = new TestEngine(props);
     }

Modified: jspwiki/trunk/mvn_cheat-sheet.md
URL: http://svn.apache.org/viewvc/jspwiki/trunk/mvn_cheat-sheet.md?rev=1608535&r1=1608534&r2=1608535&view=diff
==============================================================================
--- jspwiki/trunk/mvn_cheat-sheet.md (original)
+++ jspwiki/trunk/mvn_cheat-sheet.md Mon Jul  7 17:59:15 2014
@@ -1,3 +1,5 @@
+
+
 # 1. IDE Specific
 
 | Maven Command                                                     | Description       
                                                                                         
             |
@@ -5,6 +7,7 @@
 | mvn eclipse:eclipse                                               | generates Eclipse project
files (alternatively, you could use m2e)                                                 
      |
 | mvn idea:idea                                                     | generates IDEA IntelliJ
project files                                                                            
        |
 
+
 # 2. Build Specific
 
 | Maven Command                                                     | Description       
                                                                                         
             |
@@ -23,11 +26,13 @@
 | mvn wro4j:run -Dminimize=false                                    | only merge the js &
css files  (no compression)                                                              
            |
 | mvn clean install -Dmaven.test.skip -Dminimize=false              | performs a build, skipping
the tests and skip compression                                                           
     |
 
+
 # 3. Reports Specific
+
 | Maven Command                                                     | Description       
                                                                                         
             |
 | ----------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------
|
 | mvn apache-rat:check                                              | creates an Apache RAT
report. See: http://creadur.apache.org/rat/apache-rat-plugin/plugin-info.html            
          |
 | mvn cobertura:cobertura                                           | generates a cobertura
maven report. See: http://mojo.codehaus.org/cobertura-maven-plugin/usage.html            
          |
 | mvn javadoc:javadoc                                               | creates javadocs; if
graphviz binaries (www.graphviz.org) are found on $PATH, the javadocs will display some UML
class/package level diagrams |
 | mvn sonar:sonar                                                   | generates a Sonar report.
Expects a Sonar server running at http://localhost:9000/                                 
      | 
-| cd jspwiki-site; mvn test -Dtest=SiteGeneratorTest                | checks all language
resource files for missing or unused translations                                        
             |
+| cd jspwiki-site; mvn test -Dtest=SiteGeneratorTest                | checks all language
resource files for missing or unused translations                                        
            |

Modified: jspwiki/trunk/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/pom.xml?rev=1608535&r1=1608534&r2=1608535&view=diff
==============================================================================
--- jspwiki/trunk/pom.xml (original)
+++ jspwiki/trunk/pom.xml Mon Jul  7 17:59:15 2014
@@ -40,6 +40,8 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <jdk.version>1.6</jdk.version>
     <lucene.version>4.7.0</lucene.version>
+    <selenium.version>2.42.0</selenium.version>
+    <slf4j.version>1.7.7</slf4j.version>
     <minimize>true</minimize> <!-- wro4j compression -->
   </properties>
 
@@ -123,12 +125,18 @@
       </dependency>
 
       <dependency>
-         <groupId>org.slf4j</groupId>
-         <artifactId>slf4j-log4j12</artifactId>
-         <version>1.7.2</version>
-       </dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+        <version>${slf4j.version}</version>
+      </dependency>
 
-        <dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-log4j12</artifactId>
+        <version>${slf4j.version}</version>
+      </dependency>
+
+      <dependency>
         <groupId>net.sourceforge</groupId>
         <artifactId>akismet-java</artifactId>
         <version>1.02</version>
@@ -143,7 +151,7 @@
       <dependency>
         <groupId>net.sf.ehcache</groupId>
         <artifactId>ehcache-core</artifactId>
-        <version>2.6.6</version>
+        <version>2.6.9</version>
       </dependency>
 
       <dependency>
@@ -180,19 +188,19 @@
       <dependency>
         <groupId>org.seleniumhq.selenium</groupId>
         <artifactId>selenium-chrome-driver</artifactId>
-        <version>2.41.0</version>
+        <version>${selenium.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.seleniumhq.selenium</groupId>
         <artifactId>selenium-firefox-driver</artifactId>
-        <version>2.41.0</version>
+        <version>${selenium.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.seleniumhq.selenium</groupId>
         <artifactId>selenium-ie-driver</artifactId>
-        <version>2.41.0</version>
+        <version>${selenium.version}</version>
       </dependency>
 
       <dependency>
@@ -217,7 +225,7 @@
       <dependency>
         <groupId>net.sourceforge.stripes</groupId>
         <artifactId>stripes</artifactId>
-        <version>1.5.7</version>
+        <version>1.5.7-classloaderfix</version>
       </dependency>
 
       <!--
@@ -229,7 +237,7 @@
       <dependency>
         <groupId>org.eclipse.jetty.aggregate</groupId>
         <artifactId>jetty-all</artifactId>
-        <version>8.1.12.v20130726</version>
+        <version>8.1.15.v20140411</version>
       </dependency>
 
       <dependency>
@@ -509,7 +517,7 @@
           <configuration>
             <excludes>
               <exclude>mvn_cheat-sheet.md</exclude> <!-- handy list of maven
commands; will be moved to site once we've switched to Maven -->
-			  <exclude>.svnignore</exclude>          <!-- svn exclusions -->
+              <exclude>.svnignore</exclude>          <!-- svn exclusions -->
               <exclude>**/src/main/config/doc/LICENSE.*</exclude>    <!--
3rd party License files -->
               <exclude>**/src/main/config/wikipages/**</exclude>     <!--
Default wikipages -->
               <exclude>**/src/main/config/dev/OldChangeLog</exclude> <!--
ChangeLog excluded by default, this is, well, an old ChangeLog -->
@@ -616,6 +624,15 @@
                   </pluginExecutionFilter>
                   <action><ignore /></action>
                 </pluginExecution>
+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <versionRange>[2.1,)</versionRange>
+                    <goals><goal>unpack</goal></goals>
+                  </pluginExecutionFilter>
+                  <action><ignore></ignore></action>
+                </pluginExecution>
               </pluginExecutions>
             </lifecycleMappingMetadata>
           </configuration>



Mime
View raw message