jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gma...@apache.org
Subject svn commit: r1511693 - in /jspwiki/trunk: ChangeLog jspwiki-site/src/site/trunk/templates/release.mdtext jspwiki-war/src/main/java/org/apache/wiki/Release.java jspwiki-war/src/test/java/org/apache/wiki/web/TestContainer.java pom.xml
Date Thu, 08 Aug 2013 11:07:40 GMT
Author: gmazza
Date: Thu Aug  8 11:07:40 2013
New Revision: 1511693

URL: http://svn.apache.org/r1511693
Log:
Move back to JDK6-supporting Jetty 8.

Modified:
    jspwiki/trunk/ChangeLog
    jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext
    jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
    jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/web/TestContainer.java
    jspwiki/trunk/pom.xml

Modified: jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?rev=1511693&r1=1511692&r2=1511693&view=diff
==============================================================================
--- jspwiki/trunk/ChangeLog (original)
+++ jspwiki/trunk/ChangeLog Thu Aug  8 11:07:40 2013
@@ -1,5 +1,11 @@
 2013-08-07  Glen Mazza (gmazza AT apache DOT org)
 
+       * 2.10.0-svn-35
+
+       * Partial revert of Jetty to v. 8.1.12 so it can still run with the JDK 6 used by
Jenkins.
+        
+2013-08-07  Glen Mazza (gmazza AT apache DOT org)
+
        * 2.10.0-svn-34
 
        * Upgrade from Jetty used in unit test cases from v. 7.6.7 to v. 9.0.4

Modified: jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext?rev=1511693&r1=1511692&r2=1511693&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext (original)
+++ jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext Thu Aug  8 11:07:40
2013
@@ -1 +1 @@
-JSPWiki v2.10.0-svn-33
\ No newline at end of file
+JSPWiki v2.10.0-svn-34
\ No newline at end of file

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=1511693&r1=1511692&r2=1511693&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 Thu Aug  8 11:07:40
2013
@@ -75,7 +75,7 @@ public final class Release
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "34";
+    public static final String     BUILD         = "35";
     
     /**
      *  This is the generic version string you should use

Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/web/TestContainer.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/web/TestContainer.java?rev=1511693&r1=1511692&r2=1511693&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/web/TestContainer.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/web/TestContainer.java Thu Aug
 8 11:07:40 2013
@@ -44,7 +44,7 @@ import org.eclipse.jetty.server.Connecto
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.ServerConnector;
+import org.eclipse.jetty.server.bio.SocketConnector;
 import org.eclipse.jetty.server.handler.*;
 import org.eclipse.jetty.util.security.Password;
 import org.eclipse.jetty.webapp.WebAppContext;
@@ -239,10 +239,10 @@ public class TestContainer
         server.setStopAtShutdown( true );
         
         // Create HTTP listener
-        ServerConnector connector = new ServerConnector(server);
+        SocketConnector connector = new SocketConnector();
         connector.setHost( "localhost" );
         connector.setPort( HTTP_PORT );
-        connector.setIdleTimeout( 60000 );
+        connector.setMaxIdleTime( 60000 );
 
         server.setConnectors( new Connector[] {connector} );
         log.info( "added HTTP listener for port " + HTTP_PORT );

Modified: jspwiki/trunk/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/pom.xml?rev=1511693&r1=1511692&r2=1511693&view=diff
==============================================================================
--- jspwiki/trunk/pom.xml (original)
+++ jspwiki/trunk/pom.xml Thu Aug  8 11:07:40 2013
@@ -218,10 +218,16 @@
         <version>1.5.7</version>
       </dependency>
 
+      <!--
+           Note: As Jetty activates during the build, can upgrade
+           only to the latest Jetty version that can run on the
+           minimum JDK JSPWiki supports:
+           http://www.eclipse.org/jetty/documentation/current/what-jetty-version.html
+      -->
       <dependency>
         <groupId>org.eclipse.jetty.aggregate</groupId>
         <artifactId>jetty-all</artifactId>
-        <version>9.0.4.v20130625</version>
+        <version>8.1.12.v20130726</version>
       </dependency>
 
       <dependency>



Mime
View raw message