Jenkinsfile

@@ -7,6 +7,7 @@ pipeline {
 
 	options {
 		disableConcurrentBuilds()
+		buildDiscarder(logRotator(numToKeepStr: '14'))
 	}
 
 	stages {

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.ws</groupId>
 	<artifactId>spring-ws</artifactId>
-	<version>2.4.6.RELEASE</version>
+	<version>2.4.7.RELEASE</version>
 	<packaging>pom</packaging>
 
 	<name>Spring Web Services</name>
@@ -119,6 +119,7 @@
 		<xmlunit.version>1.5</xmlunit.version>
 		<xws-security.version>3.0</xws-security.version>
 		<xom.version>1.2.5</xom.version>
+		<docs.resources.version>0.1.3.RELEASE</docs.resources.version>
 	</properties>
 
 	<dependencyManagement>
@@ -184,7 +185,13 @@
 			<version>${woodstox.version}</version>
 			<scope>test</scope>
 		</dependency>
-
+		<dependency>
+			<groupId>io.spring.docresources</groupId>
+			<artifactId>spring-doc-resources</artifactId>
+			<version>${docs.resources.version}</version>
+			<type>zip</type>
+			<optional>true</optional>
+		</dependency>
 	</dependencies>
 
 	<build>
@@ -466,7 +473,52 @@
 			<id>docs</id>
 
 			<build>
+
 				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-dependency-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>unpack-doc-resources</id>
+								<goals>
+									<goal>unpack-dependencies</goal>
+								</goals>
+								<phase>generate-resources</phase>
+								<inherited>false</inherited>
+								<configuration>
+									<includeGroupIds>io.spring.docresources</includeGroupIds>
+									<includeArtifactIds>spring-doc-resources</includeArtifactIds>
+									<includeTypes>zip</includeTypes>
+									<excludeTransitive>true</excludeTransitive>
+									<outputDirectory>${project.build.directory}/refdocs/</outputDirectory>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-resources-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>copy-asciidoc-resources</id>
+								<phase>generate-resources</phase>
+								<inherited>false</inherited>
+								<goals>
+									<goal>copy-resources</goal>
+								</goals>
+								<configuration>
+									<outputDirectory>${project.build.directory}/refdocs/</outputDirectory>
+									<resources>
+										<resource>
+											<directory>src/main/asciidoctor</directory>
+											<filtering>false</filtering>
+										</resource>
+									</resources>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
 					<plugin>
 						<groupId>org.asciidoctor</groupId>
 						<artifactId>asciidoctor-maven-plugin</artifactId>
@@ -482,15 +534,23 @@
 							<execution>
 								<id>html</id>
 								<phase>generate-resources</phase>
+								<inherited>false</inherited>
 								<goals>
 									<goal>process-asciidoc</goal>
 								</goals>
 								<configuration>
 									<backend>html5</backend>
 									<outputDirectory>${project.build.directory}/site/reference/html</outputDirectory>
-									<sourceHighlighter>prettify</sourceHighlighter>
+									<sourceHighlighter>highlight.js</sourceHighlighter>
 									<attributes>
+										// these attributes are required to use the doc resources
+										<docinfo>shared</docinfo>
+										<stylesdir>css/</stylesdir>
+										<stylesheet>spring.css</stylesheet>
+										<linkcss>true</linkcss>
 										<icons>font</icons>
+										<highlightjsdir>js/highlight</highlightjsdir>
+										<highlightjs-theme>github</highlightjs-theme>
 										<sectanchors>true</sectanchors>
 									</attributes>
 								</configuration>
@@ -499,6 +559,7 @@
 							<execution>
 								<id>pdf</id>
 								<phase>generate-resources</phase>
+								<inherited>false</inherited>
 								<goals>
 									<goal>process-asciidoc</goal>
 								</goals>
@@ -510,15 +571,15 @@
 						</executions>
 
 						<configuration>
-							<sourceDirectory>src/main/asciidoctor</sourceDirectory>
+							<sourceDirectory>${project.build.directory}/refdocs/</sourceDirectory>
 							<sourceDocumentName>index.adoc</sourceDocumentName>
 							<doctype>book</doctype>
 							<attributes>
 								<version>${project.version}</version>
 								<projectName>${project.name}</projectName>
 								<projectVersion>${project.version}</projectVersion>
 								<allow-uri-read>true</allow-uri-read>
-								<toclevels>3</toclevels>
+								<toclevels>4</toclevels>
 								<numbered>true</numbered>
 								<baseDir>${project.basedir}</baseDir>
 							</attributes>
@@ -731,6 +792,14 @@
 				<enabled>false</enabled>
 			</snapshots>
 		</repository>
+		<repository>
+			<id>spring-release</id>
+			<name>Spring Releases</name>
+			<url>https://repo.spring.io/release</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
 	</repositories>
 
 	<pluginRepositories>

spring-ws-core/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.ws</groupId>
 		<artifactId>spring-ws</artifactId>
-		<version>2.4.6.RELEASE</version>
+		<version>2.4.7.RELEASE</version>
 	</parent>
 
 	<groupId>org.springframework.ws</groupId>

spring-ws-security/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.ws</groupId>
 		<artifactId>spring-ws</artifactId>
-		<version>2.4.6.RELEASE</version>
+		<version>2.4.7.RELEASE</version>
 	</parent>
 
 	<groupId>org.springframework.ws</groupId>

spring-ws-support/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.ws</groupId>
 		<artifactId>spring-ws</artifactId>
-		<version>2.4.6.RELEASE</version>
+		<version>2.4.7.RELEASE</version>
 	</parent>
 
 	<groupId>org.springframework.ws</groupId>

spring-ws-test/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.ws</groupId>
 		<artifactId>spring-ws</artifactId>
-		<version>2.4.6.RELEASE</version>
+		<version>2.4.7.RELEASE</version>
 	</parent>
 
 	<groupId>org.springframework.ws</groupId>

spring-ws-test/src/main/java/org/springframework/ws/test/client/MockWebServiceMessageSender.java

@@ -31,9 +31,10 @@
  *
  * @author Arjen Poutsma
  * @author Lukas Krecan
+ * @author Greg Turnquist
  * @since 2.0
  */
-class MockWebServiceMessageSender implements WebServiceMessageSender {
+public class MockWebServiceMessageSender implements WebServiceMessageSender {
 
 	private final List<MockSenderConnection> expectedConnections = new LinkedList<MockSenderConnection>();
 
@@ -78,4 +79,9 @@ void verifyConnections() {
 		}
 	}
 
+	void reset() {
+	    expectedConnections.clear();
+	    connectionIterator = null;
+    }
+
 }

spring-ws-test/src/main/java/org/springframework/ws/test/client/MockWebServiceServer.java

@@ -30,7 +30,7 @@
  * <ol>
  * <li>Create a {@code MockWebServiceServer} instance by calling {@link #createServer(WebServiceTemplate)},
  * {@link #createServer(WebServiceGatewaySupport)}, or {@link #createServer(ApplicationContext)}.
- * <li>Set up request expectations by calling {@link #expect(RequestMatcher)}, possibly by using the default 
+ * <li>Set up request expectations by calling {@link #expect(RequestMatcher)}, possibly by using the default
  * {@link RequestMatcher} implementations provided in {@link RequestMatchers} (which can be statically imported).
  * Multiple expectations can be set up by chaining {@link ResponseActions#andExpect(RequestMatcher)} calls.</li>
  * <li>Create an appropriate response message by calling
@@ -66,7 +66,7 @@
  *	 public void createServer() throws Exception {
  *	   <strong>mockServer = MockWebServiceServer.createServer(client)</strong>;
  *	 }
- * 
+ *
  *	 &#064;Test
  *	 public void getCustomerCount() throws Exception {
  *	   Source expectedRequestPayload =
@@ -88,13 +88,14 @@
  *
  * @author Arjen Poutsma
  * @author Lukas Krecan
+ * @author Greg Turnquist
  * @since 2.0
  */
 public class MockWebServiceServer {
 
 	private final MockWebServiceMessageSender mockMessageSender;
 
-	private MockWebServiceServer(MockWebServiceMessageSender mockMessageSender) {
+	public MockWebServiceServer(MockWebServiceMessageSender mockMessageSender) {
 		Assert.notNull(mockMessageSender, "'mockMessageSender' must not be null");
 		this.mockMessageSender = mockMessageSender;
 	}
@@ -165,15 +166,20 @@ public ResponseActions expect(RequestMatcher requestMatcher) {
 	}
 
 	/**
-	 * Verifies that all expectations were met.
+	 * Verifies that all of the {@link MockWebServiceMessageSender}'s expectations were met.
 	 *
 	 * @throws AssertionError in case of unmet expectations
 	 */
 	public void verify() {
 		mockMessageSender.verifyConnections();
 	}
-
 
+    /**
+     * Reset the {@link MockWebServiceMessageSender}'s expectations.
+     */
+    public void reset() {
+	    mockMessageSender.reset();
+    }
 
 
 }

spring-xml/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.ws</groupId>
 		<artifactId>spring-ws</artifactId>
-		<version>2.4.6.RELEASE</version>
+		<version>2.4.7.RELEASE</version>
 	</parent>
 
 	<groupId>org.springframework.ws</groupId>

src/main/asciidoctor/index.adoc

@@ -1,18 +1,17 @@
 = Spring Web Services Reference Documentation
 Arjen Poutsma, Rick Evans, Tareq Abed Rabbo, Greg Turnquist
+:doctype: book
 :revnumber: {version}
 :revdate: {localdate}
-:toc:
+:toc: left
 :toclevels: 4
-:toc-placement!:
+:source-highlighter: prettify
 :sectnumlevels: 3
 
 (C) 2005-2017 The original authors.
 
 NOTE: Copies of this document may be made for your own use and for distribution to others, provided that you do not charge any fee for such copies and further provided that each copy contains this Copyright Notice, whether distributed in print or electronically.
 
-toc::[]
-
 :sectnums!:
 
 [[spring-framework-reference]]