You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2020/01/21 14:17:59 UTC
[cxf] branch 3.2.x-fixes updated (156ed87 -> 18745d8)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from 156ed87 CXF-8197: Update to Spring Framework 4.3.26
new 5a352a8 [CXF-8193]upgrade to jetty 9.4.25.v20191220
new ad5f1ee [CXF-8193]add missing file for test
new e59ae7d [CXF-8193] upgrade to jetty 9.4.25.v20191220
new 60c903d Attempt to fix JAXRS security tests: there is an SSL configuration change (coming from JAXRSJmsTest) which causes HTTPS-based tests to fail later on.
new 5f4dcb8 Recording .gitmergeinfo Changes
new 18745d8 Updating Jackson databind
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitmergeinfo | 18 +++++++++++++++
distribution/src/main/release/samples/pom.xml | 2 +-
parent/pom.xml | 4 ++--
.../apache/cxf/systest/jaxrs/jms/JAXRSJmsTest.java | 2 +-
.../apache/cxf/systest/jaxrs/jms/JMSServer.java | 2 ++
.../resources/jaxrs_dispatch/WEB-INF/beans.xml | 2 +-
.../test/resources/jaxrs_dispatch/WEB-INF/web.xml | 26 ++++++++++++++++++++++
.../{book.html => book_include.html} | 0
8 files changed, 51 insertions(+), 5 deletions(-)
copy systests/jaxrs/src/test/resources/jaxrs_dispatch/{book.html => book_include.html} (100%)
[cxf] 01/06: [CXF-8193]upgrade to jetty 9.4.25.v20191220
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 5a352a8b942a0db9559db4b9ba07c36b3a51c3b2
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Wed Jan 15 09:40:22 2020 -0500
[CXF-8193]upgrade to jetty 9.4.25.v20191220
(cherry picked from commit 528b35178ec31860cf5ad2095d6f3cc3c951d914)
(cherry picked from commit 22678a4c84225e46825e256acdbfbbdc7bed5637)
# Conflicts:
# parent/pom.xml
---
parent/pom.xml | 2 +-
.../resources/jaxrs_dispatch/WEB-INF/beans.xml | 2 +-
.../test/resources/jaxrs_dispatch/WEB-INF/web.xml | 26 ++++++++++++++++++++++
3 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 66af4f9..7e18929 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -126,7 +126,7 @@
<cxf.joda.time.version>2.9.4</cxf.joda.time.version>
<cxf.jdom.version>1.0</cxf.jdom.version>
<cxf.jettison.version>1.4.0</cxf.jettison.version>
- <cxf.jetty9.version>9.4.24.v20191120</cxf.jetty9.version>
+ <cxf.jetty9.version>9.4.25.v20191220</cxf.jetty9.version>
<cxf.jetty.version>${cxf.jetty9.version}</cxf.jetty.version>
<cxf.jetty.osgi.version>[9.2,10)</cxf.jetty.osgi.version>
<cxf.undertow.version>1.4.27.Final</cxf.undertow.version>
diff --git a/systests/jaxrs/src/test/resources/jaxrs_dispatch/WEB-INF/beans.xml b/systests/jaxrs/src/test/resources/jaxrs_dispatch/WEB-INF/beans.xml
index 3eba438..78b93a4 100644
--- a/systests/jaxrs/src/test/resources/jaxrs_dispatch/WEB-INF/beans.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs_dispatch/WEB-INF/beans.xml
@@ -43,7 +43,7 @@
<property name="dispatcherName" value="default"/>
</bean>
<bean id="dispatchProvider5" class="org.apache.cxf.jaxrs.provider.RequestDispatcherProvider">
- <property name="resourcePath" value="/book.html"/>
+ <property name="resourcePath" value="/book_include.html"/>
<property name="includeResource" value="true"/>
</bean>
<jaxrs:server id="bookservice1" address="/bookstore1">
diff --git a/systests/jaxrs/src/test/resources/jaxrs_dispatch/WEB-INF/web.xml b/systests/jaxrs/src/test/resources/jaxrs_dispatch/WEB-INF/web.xml
index a221233..589fad5 100644
--- a/systests/jaxrs/src/test/resources/jaxrs_dispatch/WEB-INF/web.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs_dispatch/WEB-INF/web.xml
@@ -58,6 +58,32 @@
<url-pattern>/the/*</url-pattern>
</servlet-mapping>
<servlet>
+ <servlet-name>RedirectIncludeCXFServlet</servlet-name>
+ <display-name>Redirect CXF Servlet</display-name>
+ <servlet-class>
+ org.apache.cxf.transport.servlet.CXFServlet
+ </servlet-class>
+ <init-param>
+ <param-name>redirects-list</param-name>
+ <param-value>
+ /(\w)+.html
+ </param-value>
+ </init-param>
+ <init-param>
+ <param-name>redirect-with-include</param-name>
+ <param-value>true</param-value>
+ </init-param>
+ <init-param>
+ <param-name>redirect-servlet-path</param-name>
+ <param-value>/static</param-value>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>RedirectIncludeCXFServlet</servlet-name>
+ <url-pattern>/book_include.html</url-pattern>
+ </servlet-mapping>
+ <servlet>
<servlet-name>RedirectCXFServlet</servlet-name>
<display-name>Redirect CXF Servlet</display-name>
<servlet-class>
[cxf] 04/06: Attempt to fix JAXRS security tests: there is an SSL
configuration change (coming from JAXRSJmsTest) which causes HTTPS-based
tests to fail later on.
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 60c903da5af61b14e891f9e4906fcf80dc0cb4cb
Author: reta <dr...@gmail.com>
AuthorDate: Sun Jan 19 20:51:59 2020 -0500
Attempt to fix JAXRS security tests: there is an SSL configuration change (coming from JAXRSJmsTest) which causes HTTPS-based tests to fail later on.
(cherry picked from commit fa1f6120a3a98717d22a4e7ee1c4e0d6cbc9f03e)
(cherry picked from commit 385d29a696b8000ce82ca20bbb8a6ab0be687661)
---
.../src/test/java/org/apache/cxf/systest/jaxrs/jms/JAXRSJmsTest.java | 2 +-
.../jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jms/JMSServer.java | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jms/JAXRSJmsTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jms/JAXRSJmsTest.java
index b957f36..ca4a36b 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jms/JAXRSJmsTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jms/JAXRSJmsTest.java
@@ -73,7 +73,7 @@ public class JAXRSJmsTest extends AbstractBusClientServerTestBase {
System.getProperty("java.util.logging.config.file"));
assertTrue("server did not launch correctly",
- launchServer(EmbeddedJMSBrokerLauncher.class, props, null));
+ launchServer(EmbeddedJMSBrokerLauncher.class, props, null, false));
assertTrue("server did not launch correctly",
launchServer(JMSServer.class, true));
serversStarted = true;
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jms/JMSServer.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jms/JMSServer.java
index d267da8..903bf31 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jms/JMSServer.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jms/JMSServer.java
@@ -19,6 +19,7 @@
package org.apache.cxf.systest.jaxrs.jms;
import org.apache.activemq.broker.BrokerService;
+import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -32,6 +33,7 @@ public class JMSServer extends AbstractBusTestServerBase {
}
public void tearDown() {
+ context.getBean(JAXRSServerFactoryBean.class).getServer().destroy();
context.close();
}
[cxf] 03/06: [CXF-8193] upgrade to jetty 9.4.25.v20191220
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit e59ae7df829fecbeef9d318cd688094dc64b9c49
Author: Dennis Kieselhorst <de...@apache.org>
AuthorDate: Sun Jan 19 11:18:01 2020 +0100
[CXF-8193] upgrade to jetty 9.4.25.v20191220
(cherry picked from commit b9732e5a2d4cead834af8246a35b863aa7b8c811)
# Conflicts:
# distribution/src/main/release/samples/pom.xml
(cherry picked from commit 354fbdd3cd58e7e7380873638c82aac9bd4e793f)
# Conflicts:
# distribution/src/main/release/samples/pom.xml
---
distribution/src/main/release/samples/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index df63ddc..51f15e8 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -32,7 +32,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.boot.version>1.5.17.RELEASE</spring.boot.version>
<spring.cloud.eureka.version>1.3.4.RELEASE</spring.cloud.eureka.version>
- <cxf.jetty9.version>9.4.24.v20191120</cxf.jetty9.version>
+ <cxf.jetty9.version>9.4.25.v20191220</cxf.jetty9.version>
</properties>
<dependencies>
<dependency>
[cxf] 02/06: [CXF-8193]add missing file for test
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit ad5f1eeee8633a6431118b4d27277ce37eea2303
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Thu Jan 16 09:33:27 2020 -0500
[CXF-8193]add missing file for test
(cherry picked from commit e32d89a5c959b6e44df34b4849094029ba2015e3)
---
.../resources/jaxrs_dispatch/book_include.html | 28 ++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/systests/jaxrs/src/test/resources/jaxrs_dispatch/book_include.html b/systests/jaxrs/src/test/resources/jaxrs_dispatch/book_include.html
new file mode 100644
index 0000000..58fc58b
--- /dev/null
+++ b/systests/jaxrs/src/test/resources/jaxrs_dispatch/book_include.html
@@ -0,0 +1,28 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:books="http://www.w3.org/books">
+<head> <title>Testing XML Example</title> </head>
+<body>
+ <h1>Book</h1>
+ <ul>
+ <books:bookTag>CXF Rocks</books:bookTag>
+ </ul>
+</body>
+</html>
[cxf] 06/06: Updating Jackson databind
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 18745d8f7520fdbb62c102bd1c8caa3b59a78d5a
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Jan 21 13:27:53 2020 +0000
Updating Jackson databind
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 7e18929..1780332 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -98,7 +98,7 @@
<cxf.httpcomponents.core.version.range>[4.3,4.5.0)</cxf.httpcomponents.core.version.range>
<cxf.hsqldb.version>2.4.1</cxf.hsqldb.version>
<cxf.jackson.version>2.9.10</cxf.jackson.version>
- <cxf.jackson.databind.version>2.9.10</cxf.jackson.databind.version>
+ <cxf.jackson.databind.version>2.9.10.2</cxf.jackson.databind.version>
<cxf.james.mim4j.version>0.7.2</cxf.james.mim4j.version>
<cxf.kerby.version>1.1.1</cxf.kerby.version>
<cxf.logback.classic.version>1.2.3</cxf.logback.classic.version>
[cxf] 05/06: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 5f4dcb8abbaef04cc319766f4f79673b578ec246
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Jan 21 13:27:38 2020 +0000
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 9a9f384..67571ee 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -83,6 +83,7 @@ B 1bece4e52d9fde576b34883fbabe5ef07fc7db2e
B 1cbe0268c1c428717ad8215363ec06c08ee462b7
B 1cfdb42724549fdef21a9d50d62cd9dbdc5d8dd3
B 1d1694a70c22d5dff10aebdae588d3dd1aff25e1
+B 1dd77ac8a4f82bb191826d2dbe0655f026227e53
B 1e35c3ac012c3acda3b82f225bada42c883e4098
B 1e3f132d74bf032be991995a587b7d107424ff05
B 1eef49d84401ef1e30d0d8ae6fdb77a833745157
@@ -105,6 +106,7 @@ B 23d5c4a78bb55fcaa8b89ecf7e034f2581830b43
B 2424d912e92109c3ce08a95347056e825b52c035
B 246a43a7b7ccc813ec4137078fdd939f1d6f2b17
B 2484a8d80c63b0ae577be71b017e887f143e0071
+B 24b107260890e1893b7e48a9fdcc2f72959ee16c
B 2566c8ff08e0b237d18c97bc919d32628eaa39ea
B 2569f6312af44fe43c53a059652579e2565c5a00
B 258584a4ef8a744d088f978ed9c68e3efcf98f40
@@ -152,6 +154,7 @@ B 3117e62c01ca9fa10fec395304bde3723c67e16b
B 319093538ca614e51da87ca52df85d83093b962b
B 320a7f161a4c4eb7c6f2379a9a4238dbb7e2e66f
B 32458f15e4d2c82b8f3cd800318793c01db05b74
+B 3267d1344940066a1b2a91c5565985ba1c4a6a2c
B 3306b06a07f5cd10491f55045f22cb79f83421b4
B 331836e7161bbf69d27877822c001f43b1233d6a
B 3354fb233a592a05ed584d913128972636fb3864
@@ -448,6 +451,7 @@ B 8fa0216240e42d62cca60723c23402c6df022dfd
B 8fbfa82ff79fdeafc95733baccc0bdaf8d0922db
B 90057038bf23efc12df254795ad80c4766c0d2dd
B 90832dcab359e04b4c9c8adde630252509d87b9e
+B 90f626ca32946511583975d5ea44ba8e852a71ff
B 9101e20ab3716f99f196eddda1d0d619aacfd642
B 91244e84e02c7d01410b347bb14efca27d2ec2b1
B 9185a35ad95d74be43b23905e3ed45f0444eba94
@@ -477,6 +481,7 @@ B 9beabe7ba8bcc50a2e732ce456da700a33c74bb4
B 9bf7601d47f4ff7830f349dd5e59ef28c25e6f15
B 9c5e79b74fa332c5b725a32122fd9de8adba8bca
B 9c9d5c4b61021263c1ad11177d3b6044bb146ded
+B 9c9fe8e09e1bf7dc0529e6ba5cae7d5ee703602e
B 9d0ca57b2ca12267b8e80e3afa48ee82ed2d37ea
B 9d363d1a2b7090bb67b9b362b1b9effdec351347
B 9d532c0c6be68fb08460c2bc51c076395e658210
@@ -517,6 +522,7 @@ B aa4469b8bc8513c6c5d319793575616697a76ebd
B aa8c7a1666b4d5896f81f5a0d748e0b9befe0ab5
B aae5389c450d91aab7fa062ac8c0edd393018a1b
B ab2013cec7d0548023a2ec23dc874f18b36c2c73
+B ab2349a4ad1f2eabf562b897b145c77b62b7b2ae
B ab2a445759124dd874787bcf99efbfa462ebb126
B abb7a250188c1a2aa52277d369bb8968bd1d0188
B aca3a18b2fb5cae542d8a34f3c804fb0dc02ce73
@@ -570,6 +576,7 @@ B bc1a22503447649e7991f4b8f3368a90deb42a7d
B bc1a8f581a0cf3930db9086c6b6d8a795b44684b
B bc7d9c0b017be38c7aa066eaad179cb6df7ef4ab
B bca53bff89b0d18dea275847fcfa84b2a495acce
+B bcd5339dc3dd41e9a8d07c4b9e5d6913833883b3
B bcd823d25ef0aeb1014e9b7f7cbf03dde08ab13e
B bd528bf5f94cfcd9aea7f71117f535a2a343dc76
B bdae8a1b0237f2fb8bdee8c2f7548036b79930ec
@@ -590,6 +597,7 @@ B c19b382995dce13ded39d9cd5ea70a24a48db380
B c2c912024f22d498e343bbd52e57a65f3fd4a1b8
B c2d9000c1872973d4ad6e30075d320da167d3c2d
B c2ebc2870ebd11a021277c450876bb79d0e78b6f
+B c35124bdfb4950c217f40663650e995abe6aeafe
B c489d553a5398c457b05b79f4fc24304cf39a113
B c55faf9728791395ff7749beb50781b1a710c477
B c58d9cc7dc625750b3ccd45ad981c664d678eb3b
@@ -602,10 +610,12 @@ B c6b6c498e0b80ab57b140533dda4f2cc42706dbf
B c6c5b7c601988b3d66f14684eba042e1d33c8ace
B c715942d412a0e487dc51ec59e87f7cb17b85b72
B c717e6ca3bdf99f862133de74d6e668fbaf8ea40
+B c75bec461842e17df930a3d58f561eef5f834e3f
B c77a0434191e2c7d23dbb055af3db8b5d4b86dc6
B c7806cbcbba6005bd6f6af75cf71696d82c5ba4d
B c7c41411460b50a74eb1d2bcd5a4f98519e77fc3
B c7da5a42985e497274f13d5ba6f8eeca12f097eb
+B c7fcd92b2213401c54f228ea6b7ef3cf4b7932aa
B c80ef8069f2e1240af743936502a791005c75834
B c8683bec8cbd7b6b1dc8dd4ba92f5eafde609e80
B c8d0fb7e32f0642eab24fd29ee95963adcd3b4a7
@@ -653,6 +663,7 @@ B d38128abb6b579eee3cedaf252cc6ad470ea349b
B d3b60a4df7a5081bb62e80edef35aa456dd3fd19
B d3de21c45a8f6c74996b5edecfe2e03f8b6a2bd3
B d43e6cab2c0c2fe2a0a98631c87117110f6b40fc
+B d484b43096c6da5f6c9bf4c8f0312e57ced6895b
B d52e54049991cad01ac269e4e144dff6ea72e9a1
B d70589ed28942692f86753590fa23712850b3854
B d7218658172f27943489ee19807f27223317e3f4
@@ -673,11 +684,13 @@ B dd49d1caaca52beb95fc85d6eab1c4e8980aa770
B dd944beff269f3d12fee69bda6e5429e157490d3
B ddb9815e23a3896a162cf2e11d125d54c541f12d
B de3d4bfecc0664cb5f68f1ebb1ad7ca656229706
+B dea9d48056e950955dc3583556a99d3c5cbd7a79
B df43be53908f920b29c0d146bda1cdaef1df6cf2
B df52c92962cd582cefc74d215471fb892453dd89
B df89b6d479a9a0d68a104a89b3b5fe8c1cd33217
B e000e8c0b8ed82533cbeb4e3a39dd9fbf128383c
B e0692b412843695b2c3d8a1f2c4633a2cd3aed78
+B e0a3a23c8d8942ec085f73f6ce6aef85dec4b995
B e12b54296cf3db79df9283a904f2f60c193715da
B e14fddd4ed6df0150597d5726803b0cab6f7e7fb
B e23579d37e839b479ab723f8c1bb9d7b6146ed10
@@ -742,8 +755,10 @@ B f2c6f57bb73ef435b6c4965766551fd452110677
B f2ff0f6c70c33966219649181e8cef57d2e4c327
B f366b942b64c427ebfaacc79b0229ddb7a481237
B f518006392fbe8f740fce10c03a01995b3cb5f54
+B f5299b7d9fc72b64e154edd57c299df5cea7616e
B f58f1641b8f524999b6b6dd5546149f3b29d70d4
B f627e44aafed24f075f48052f782925f2c0bfc06
+B f62b344a5e9189bc19eabbaa88412538fe94c16b
B f64fa00245bf0749ddb807df3a0292ab46900976
B f652464526edb0cb7eac277ff64c9f2d02e2b920
B f659e3f568d8c6e1246437022531ccf834c1cf7a
@@ -755,6 +770,7 @@ B f86b91d4c4240ee0fe11eec6db6b692debdb97c8
B f8791ca3a34711444c7e1d6b1613c5bd311abbec
B f89a26cbd773ac615870dfbf3766e00f41646ea0
B f8c59c182755eaa3570831916718d69f5eed1efb
+B fa37b20da739c2a5cd0660df54eafa253f591b24
B fa3c4d45a9891bc17882cf43a5ef8653f1659da0
B fa5387c54e7a2600cc437e6cf9834256a2af1286
B fb74d32c7e5571de7a7e1de5c71ca4fe51276fb0
@@ -790,6 +806,7 @@ M 1a4505c09fa403262a54e0fa745edf78a8c3ba0c
M 1cc03b9b70bc509d8f8c631563c3964e56e30621
M 1cdf673a8ce2fc5c57318d1a102ca0923cb1d945
M 1f0468398ddb21ecaf6b6eda370e3464e402ef8a
+M 22678a4c84225e46825e256acdbfbbdc7bed5637
M 23f9204b9d0e01738e8100f0152baf53320d98f8
M 26f3e944a56b79ac2e30286c61b3fab6d4bab638
M 28924caee27ef6601398725ebcb198fe363157d5
@@ -799,6 +816,7 @@ M 2dd0450422b5952b15ddab15b7f40dee499bc1a5
M 2de7e14eb95626fffef6f61365186de9a1c9de3d
M 34473b533d14ca0c4e5ba24e3d92b0d5f402973a
M 34f719e75775fff5353f73a661a5d5c1b461b446
+M 354fbdd3cd58e7e7380873638c82aac9bd4e793f
M 37537350f8c56635902b6566dc94bec19a4e19c3
M 37f997f79c3f583b4966ae1bd60d0603101ec750
M 38158988f675b4ad7056cee2bdb8cec081aefbb8