You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2025/02/28 02:00:11 UTC
(cxf) branch 4.0.x-fixes updated (d86c13439f -> b60e6e6f7d)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 4.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
from d86c13439f Recording .gitmergeinfo Changes
new f943ef5947 Bump com.puppycrawl.tools:checkstyle from 10.21.2 to 10.21.3 (#2291)
new da1d6ccb19 Bump org.apache.maven.plugins:maven-clean-plugin from 3.4.0 to 3.4.1 (#2293)
new de98ab70f9 Bump cxf.slf4j.version from 2.0.16 to 2.0.17 (#2292)
new dc74a164e9 Bump org.apache.maven.plugins:maven-compiler-plugin (#2294)
new 2ec08fac11 CXF-9110: Fix extensive memory usage with enabled LoggingFeature (#2278)
new 1c5e6c426f Update Netty to 4.1.119.Final
new b60e6e6f7d Recording .gitmergeinfo Changes
The 7 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 | 3 ++
.../java/org/apache/cxf/io/CachedOutputStream.java | 2 +
.../apache/cxf/io/CachedOutputStreamCleaner.java | 8 +++
.../cxf/io/DelayedCachedOutputStreamCleaner.java | 29 +++++++---
distribution/src/main/release/samples/pom.xml | 4 +-
parent/pom.xml | 6 +--
pom.xml | 6 +--
.../cxf/jaxrs/client/logging/RESTLoggingTest.java | 62 ++++++++++++++++++++++
.../cxf/jaxrs/client/logging/TestServiceRest.java | 6 +++
9 files changed, 111 insertions(+), 15 deletions(-)
(cxf) 01/07: Bump com.puppycrawl.tools:checkstyle from 10.21.2 to 10.21.3 (#2291)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 4.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit f943ef59471df47be4fa181fed8be190a3e48c28
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Tue Feb 25 20:44:37 2025 -0500
Bump com.puppycrawl.tools:checkstyle from 10.21.2 to 10.21.3 (#2291)
Bumps [com.puppycrawl.tools:checkstyle](https://github.com/checkstyle/checkstyle) from 10.21.2 to 10.21.3.
- [Release notes](https://github.com/checkstyle/checkstyle/releases)
- [Commits](https://github.com/checkstyle/checkstyle/compare/checkstyle-10.21.2...checkstyle-10.21.3)
---
updated-dependencies:
- dependency-name: com.puppycrawl.tools:checkstyle
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <su...@github.com>
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
(cherry picked from commit 61da0f95f7936a8ad9f87911c18f8d47d4bbebf0)
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 9313283517..ebf6506e64 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -393,7 +393,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
- <version>10.21.2</version>
+ <version>10.21.3</version>
</dependency>
</dependencies>
<configuration>
(cxf) 02/07: Bump org.apache.maven.plugins:maven-clean-plugin from 3.4.0 to 3.4.1 (#2293)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 4.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit da1d6ccb194e60e879bd2952dc9f487b9309f4fd
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Wed Feb 26 17:27:37 2025 -0500
Bump org.apache.maven.plugins:maven-clean-plugin from 3.4.0 to 3.4.1 (#2293)
Bumps [org.apache.maven.plugins:maven-clean-plugin](https://github.com/apache/maven-clean-plugin) from 3.4.0 to 3.4.1.
- [Release notes](https://github.com/apache/maven-clean-plugin/releases)
- [Commits](https://github.com/apache/maven-clean-plugin/compare/maven-clean-plugin-3.4.0...maven-clean-plugin-3.4.1)
---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-clean-plugin
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <su...@github.com>
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
(cherry picked from commit 8dec6c3a189bec84c90c406299d8f53686d0f9a2)
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 1a92477b11..78e4db705a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -444,7 +444,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
- <version>3.4.0</version>
+ <version>3.4.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
(cxf) 06/07: Update Netty to 4.1.119.Final
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 4.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 1c5e6c426f3403917b29990aa2b2f0649c887171
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Thu Feb 27 20:32:12 2025 -0500
Update Netty to 4.1.119.Final
(cherry picked from commit 00fd12ad70c247b8788e35aeb900f1bc1f8b95e7)
# Conflicts:
# distribution/src/main/release/samples/pom.xml
---
distribution/src/main/release/samples/pom.xml | 2 +-
parent/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index 89e974249c..bf32734780 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -34,7 +34,7 @@
<cxf.spring.boot.version>3.0.13</cxf.spring.boot.version>
<cxf.spring.cloud.eureka.version>4.0.4</cxf.spring.cloud.eureka.version>
<cxf.jetty11.version>11.0.24</cxf.jetty11.version>
- <cxf.netty.version>4.1.118.Final</cxf.netty.version>
+ <cxf.netty.version>4.1.119.Final</cxf.netty.version>
<cxf.httpcomponents.client.version>4.5.14</cxf.httpcomponents.client.version>
<cxf.swagger.ui.version>5.18.3</cxf.swagger.ui.version>
<cxf.tika.version>2.9.1</cxf.tika.version>
diff --git a/parent/pom.xml b/parent/pom.xml
index 6af91b923f..9b8406c70f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -186,7 +186,7 @@
<cxf.msv.version>2022.7</cxf.msv.version>
<cxf.neethi.version>3.2.1</cxf.neethi.version>
<cxf.netty.version.range>[4,5)</cxf.netty.version.range>
- <cxf.netty.version>4.1.118.Final</cxf.netty.version>
+ <cxf.netty.version>4.1.119.Final</cxf.netty.version>
<cxf.netty.tcnative.version>2.0.69.Final</cxf.netty.tcnative.version>
<cxf.olingo.version>2.0.12</cxf.olingo.version>
<cxf.openjpa.version>3.2.2</cxf.openjpa.version>
(cxf) 04/07: Bump org.apache.maven.plugins:maven-compiler-plugin (#2294)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 4.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit dc74a164e907a71256efd2f8fd09222dda8d1b3b
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Thu Feb 27 15:26:01 2025 -0500
Bump org.apache.maven.plugins:maven-compiler-plugin (#2294)
Bumps [org.apache.maven.plugins:maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.13.0 to 3.14.0.
- [Release notes](https://github.com/apache/maven-compiler-plugin/releases)
- [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.13.0...maven-compiler-plugin-3.14.0)
---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-compiler-plugin
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <su...@github.com>
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
(cherry picked from commit 16f7d2d46bc0a26e3d936ec879d32a0cdaf7de7d)
---
distribution/src/main/release/samples/pom.xml | 2 +-
pom.xml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index f2a1728c7e..89e974249c 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -190,7 +190,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.13.0</version>
+ <version>3.14.0</version>
<configuration>
<source>${cxf.jdk.version}</source>
<target>${cxf.jdk.version}</target>
diff --git a/pom.xml b/pom.xml
index 78e4db705a..01a8bcbec0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -216,7 +216,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.13.0</version>
+ <version>3.14.0</version>
<configuration>
<release>${cxf.jdk.version}</release>
<maxmem>256M</maxmem>
@@ -494,7 +494,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.13.0</version>
+ <version>3.14.0</version>
<configuration>
<release>${cxf.jdk.version}</release>
<maxmem>256M</maxmem>
(cxf) 03/07: Bump cxf.slf4j.version from 2.0.16 to 2.0.17 (#2292)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 4.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit de98ab70f9b40414d799703f344614014cfb8504
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Thu Feb 27 15:25:45 2025 -0500
Bump cxf.slf4j.version from 2.0.16 to 2.0.17 (#2292)
Bumps `cxf.slf4j.version` from 2.0.16 to 2.0.17.
Updates `org.slf4j:slf4j-jdk14` from 2.0.16 to 2.0.17
Updates `org.slf4j:jcl-over-slf4j` from 2.0.16 to 2.0.17
Updates `org.slf4j:slf4j-api` from 2.0.16 to 2.0.17
Updates `org.slf4j:slf4j-log4j12` from 2.0.16 to 2.0.17
Updates `org.slf4j:slf4j-nop` from 2.0.16 to 2.0.17
Updates `org.slf4j:jul-to-slf4j` from 2.0.16 to 2.0.17
---
updated-dependencies:
- dependency-name: org.slf4j:slf4j-jdk14
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: org.slf4j:jcl-over-slf4j
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: org.slf4j:slf4j-api
dependency-type: direct:development
update-type: version-update:semver-patch
- dependency-name: org.slf4j:slf4j-log4j12
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: org.slf4j:slf4j-nop
dependency-type: direct:development
update-type: version-update:semver-patch
- dependency-name: org.slf4j:jul-to-slf4j
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <su...@github.com>
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
(cherry picked from commit 94da28f77b803108de3eca058c25f9de03632abf)
# Conflicts:
# parent/pom.xml
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index ebf6506e64..6af91b923f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -207,7 +207,7 @@
<cxf.servlet-api.artifact>jakarta.servlet-api</cxf.servlet-api.artifact>
<cxf.servlet-api.group>jakarta.servlet</cxf.servlet-api.group>
<cxf.servlet-api.version>5.0.0</cxf.servlet-api.version>
- <cxf.slf4j.version>2.0.16</cxf.slf4j.version>
+ <cxf.slf4j.version>2.0.17</cxf.slf4j.version>
<cxf.snakeyaml.version>2.4</cxf.snakeyaml.version>
<cxf.specs.jaxws.api.version>2.3_2</cxf.specs.jaxws.api.version>
<cxf.spring.boot.version>3.0.13</cxf.spring.boot.version>
(cxf) 05/07: CXF-9110: Fix extensive memory usage with enabled LoggingFeature (#2278)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 4.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 2ec08fac115e6b287510da55eb72a7f8c1b72bdb
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Thu Feb 27 20:18:55 2025 -0500
CXF-9110: Fix extensive memory usage with enabled LoggingFeature (#2278)
* CXF-9110: Fix extensive memory usage with enabled LoggingFeature
* CXF-9110: Memory leak in DelayedCleanerImpl.queue when LoggingFeature is enabled
---------
Co-authored-by: Yury Molchan <ym...@eisgroup.com>
(cherry picked from commit a9351cd96339c9886058581d44ba92cb02a59713)
---
.../java/org/apache/cxf/io/CachedOutputStream.java | 2 +
.../apache/cxf/io/CachedOutputStreamCleaner.java | 8 +++
.../cxf/io/DelayedCachedOutputStreamCleaner.java | 29 +++++++---
.../cxf/jaxrs/client/logging/RESTLoggingTest.java | 62 ++++++++++++++++++++++
.../cxf/jaxrs/client/logging/TestServiceRest.java | 6 +++
5 files changed, 100 insertions(+), 7 deletions(-)
diff --git a/core/src/main/java/org/apache/cxf/io/CachedOutputStream.java b/core/src/main/java/org/apache/cxf/io/CachedOutputStream.java
index 3ba937d04b..f5526fa57f 100644
--- a/core/src/main/java/org/apache/cxf/io/CachedOutputStream.java
+++ b/core/src/main/java/org/apache/cxf/io/CachedOutputStream.java
@@ -283,8 +283,10 @@ public class CachedOutputStream extends OutputStream {
}
} finally {
streamList.remove(currentStream);
+ // we are not backed by file anymore, unregister from the cleaner
if (cachedOutputStreamCleaner != null) {
cachedOutputStreamCleaner.unregister(currentStream);
+ cachedOutputStreamCleaner.unregister(this);
}
deleteTempFile();
inmem = true;
diff --git a/core/src/main/java/org/apache/cxf/io/CachedOutputStreamCleaner.java b/core/src/main/java/org/apache/cxf/io/CachedOutputStreamCleaner.java
index 3d6361a4c9..dbef316afb 100644
--- a/core/src/main/java/org/apache/cxf/io/CachedOutputStreamCleaner.java
+++ b/core/src/main/java/org/apache/cxf/io/CachedOutputStreamCleaner.java
@@ -40,4 +40,12 @@ public interface CachedOutputStreamCleaner {
* Unregister the stream instance from the clean up (closed properly)
*/
void register(Closeable closeable);
+
+ /**
+ * The exact or approximate (depending on the implementation) size of the cleaner queue
+ * @return exact or approximate (depending on the implementation) size of the cleaner queue
+ */
+ default int size() {
+ return 0;
+ }
}
diff --git a/core/src/main/java/org/apache/cxf/io/DelayedCachedOutputStreamCleaner.java b/core/src/main/java/org/apache/cxf/io/DelayedCachedOutputStreamCleaner.java
index 5c8a176814..4d76b65425 100644
--- a/core/src/main/java/org/apache/cxf/io/DelayedCachedOutputStreamCleaner.java
+++ b/core/src/main/java/org/apache/cxf/io/DelayedCachedOutputStreamCleaner.java
@@ -52,19 +52,24 @@ public final class DelayedCachedOutputStreamCleaner implements CachedOutputStrea
@Override
default void register(Closeable closeable) {
}
-
+
@Override
default void unregister(Closeable closeable) {
}
-
+
@Override
default void close() {
}
-
+
@Override
default void clean() {
}
-
+
+ @Override
+ default int size() {
+ return 0;
+ }
+
default void forceClean() {
}
}
@@ -101,18 +106,23 @@ public final class DelayedCachedOutputStreamCleaner implements CachedOutputStrea
queue.drainTo(closeables);
clean(closeables);
}
-
+
@Override
public void forceClean() {
clean(queue);
}
-
+
@Override
public void close() {
timer.cancel();
queue.clear();
}
-
+
+ @Override
+ public int size() {
+ return queue.size();
+ }
+
private void clean(Collection<DelayedCloseable> closeables) {
final Iterator<DelayedCloseable> iterator = closeables.iterator();
while (iterator.hasNext()) {
@@ -224,6 +234,11 @@ public final class DelayedCachedOutputStreamCleaner implements CachedOutputStrea
cleaner.unregister(closeable);
}
+ @Override
+ public int size() {
+ return cleaner.size();
+ }
+
@Override
public void clean() {
cleaner.clean();
diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/logging/RESTLoggingTest.java b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/logging/RESTLoggingTest.java
index 6c81b20d1d..01c188c96f 100644
--- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/logging/RESTLoggingTest.java
+++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/logging/RESTLoggingTest.java
@@ -19,17 +19,21 @@
package org.apache.cxf.jaxrs.client.logging;
+import java.io.Closeable;
import java.io.IOException;
import java.io.InputStream;
import java.net.MalformedURLException;
import java.util.Collections;
import java.util.List;
+import java.util.concurrent.atomic.LongAdder;
+import org.apache.cxf.Bus;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.ext.logging.AbstractLoggingInterceptor;
import org.apache.cxf.ext.logging.LoggingFeature;
import org.apache.cxf.ext.logging.event.EventType;
import org.apache.cxf.ext.logging.event.LogEvent;
+import org.apache.cxf.io.CachedOutputStreamCleaner;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.JAXRSClientFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
@@ -39,7 +43,10 @@ import org.junit.Assert;
import org.junit.Test;
import static org.awaitility.Awaitility.await;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertEquals;
public class RESTLoggingTest {
@@ -57,6 +64,61 @@ public class RESTLoggingTest {
Assert.assertEquals("test1", result);
}
+ @Test
+ public void testCacheCleanUp() throws Exception {
+ LoggingFeature loggingFeature = new LoggingFeature();
+ loggingFeature.setInMemThreshold(1); // To activate usage of the CachedOutputStream
+
+ Server server = createService(SERVICE_URI, new TestServiceRest(), loggingFeature);
+ server.start();
+
+ try {
+ final JAXRSClientFactoryBean bean = new JAXRSClientFactoryBean();
+ bean.setAddress(SERVICE_URI);
+ bean.setTransportId(LocalTransportFactory.TRANSPORT_ID);
+
+ final LongAdder registers = new LongAdder();
+ final WebClient client = bean.createWebClient();
+ final Bus bus = bean.getBus();
+
+ // See please https://issues.apache.org/jira/browse/CXF-9110
+ final CachedOutputStreamCleaner cleaner = bus.getExtension(CachedOutputStreamCleaner.class);
+ bus.setExtension(new CachedOutputStreamCleaner() {
+ @Override
+ public void clean() {
+ cleaner.clean();
+ }
+
+ @Override
+ public void unregister(Closeable closeable) {
+ cleaner.unregister(closeable);
+ }
+
+ @Override
+ public void register(Closeable closeable) {
+ cleaner.register(closeable);
+ registers.increment();
+ }
+
+ @Override
+ public int size() {
+ return cleaner.size();
+ }
+ }, CachedOutputStreamCleaner.class);
+
+ String response = null;
+ for (int i = 0; i < 1_000; i++) { // ~2...5 seconds of the execution
+ response = client.post("DATA", String.class);
+ }
+ assertEquals("DATA", response);
+
+ assertThat(registers.longValue(), equalTo(3000L));
+ assertThat(cleaner.size(), equalTo(0));
+ } finally {
+ server.destroy();
+ }
+ }
+
@Test
public void testBinary() throws IOException, InterruptedException {
LoggingFeature loggingFeature = new LoggingFeature();
diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/logging/TestServiceRest.java b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/logging/TestServiceRest.java
index ab237bc710..1ef575e970 100644
--- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/logging/TestServiceRest.java
+++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/logging/TestServiceRest.java
@@ -19,6 +19,7 @@
package org.apache.cxf.jaxrs.client.logging;
import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.PathParam;
@@ -29,4 +30,9 @@ public class TestServiceRest {
return msg;
}
+ @POST
+ public String post(String msg) {
+ return msg;
+ }
}
+
(cxf) 07/07: Recording .gitmergeinfo Changes
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 4.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit b60e6e6f7d59a3d9069fe9e2e8d21ba2f8f9a23b
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Thu Feb 27 20:35:25 2025 -0500
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 8de98f8d58..128d3bb31a 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -2,6 +2,7 @@ origin/main
B 7fb95ad266e4a5ced561a0dc56c038db43967ca4
B 85f681bd0e70636289aacf36a32c841f03db7ee8
M 00cf7b3974b4be5fcf3e34b080ab7e4d8518ef82
+M 00fd12ad70c247b8788e35aeb900f1bc1f8b95e7
M 0136e233c8b183444d6d7ad3f20cf5dfd7db147d
M 02b3cf9cd924f95ccc9429b074e58bb31fa7a85c
M 039aeefd977be64c2ddda8dbff4cf605d302684a
@@ -138,6 +139,7 @@ M 54c3ce63ef139f99c12f2290b2107c2f428fba51
M 5612e135d1ec7f1a6b36b75f598d6212c3f9ba37
M 5744ce42c98422a96ca4f2c92213e9ff56f97804
M 5820a625f1485793b148e1479a37989ebd4bc15b
+M 5890526011f501e1b6f0ac1b8ef04cc90a6190cf
M 58ad38cd0ce8dabca103072c529d31093ef9f2a3
M 593c6d9cbd5ae883750c16d784b832b1d019aa15
M 59a167fdd6dabbd872dae8fbc7620b3a70137038
@@ -231,6 +233,7 @@ M 91e7e29f257808b643b7fa3944dec226e7fe200d
M 9240d8d1dc248f796b10f128b65281aa4645f2b4
M 94a851c1942e0348fd28a6f1923bdcc5992cd975
M 94d649af6f76058334250334dd2b85fa555824fb
+M 94da28f77b803108de3eca058c25f9de03632abf
M 950636cf6284b83f3736ecc2ca8ac24fd20583d5
M 964c4cf65fff7901d0d51f8637e1e64cfabfd971
M 96717fda5668ba3b3730fb8fbd09ab1bf6781bf6