Replace commons-io:commons-io #2632

pks-1981 · 2024-03-09T10:36:39Z

Replace commons-io:commons-io

pks-1981 · 2024-03-09T18:11:09Z

Note:
Still used for tests in EntityUtils
->testImplementation"commons-io:commons-io:2.15.1"

dieppa · 2024-03-28T08:44:30Z

Hello @pks-1981 , please can you fix the conflicts when you have the chance? 😄

# Conflicts: # src/testFixtures/java/com/github/tomakehurst/wiremock/testsupport/TestFiles.java

pks-1981 · 2024-03-28T09:42:13Z

Hello @pks-1981 , please can you fix the conflicts when you have the chance? 😄

Hello. All done

Mahoney · 2024-03-29T07:56:01Z

Apologies, I merged a dependabot PR which upgraded commons-io which has created another conflict... I'm afraid I can't resolve it because it's on your fork.

pks-1981 · 2024-03-29T08:17:55Z

Apologies, I merged a dependabot PR which upgraded commons-io which has created another conflict... I'm afraid I can't resolve it because it's on your fork.

Thats ok) I will update later)

# Conflicts: # build.gradle

pks-1981 · 2024-03-29T09:30:09Z

@dieppa @Mahoney
Hello) All done)

Mahoney · 2024-03-29T09:37:41Z

...om/github/tomakehurst/wiremock/extension/responsetemplating/HandlebarsOptimizedTemplate.java

@@ -72,7 +70,7 @@ public String apply(Object contextData) {
  private String applyTemplate(Context context) {
    return Exceptions.uncheck(
        () -> {
-          Writer stringWriter = new StringBuilderWriter(template.text().length() * 2);
+          Writer stringWriter = new StringWriter(template.text().length() * 2);


Have you tested the performance impact of this change?

From the docs of org.apache.commons.io.output.StringBuilderWriter:

This implementation, as an alternative to java.io.StringWriter, provides an un-synchronized (i.e. for use in a single thread) implementation for better performance.

I did a simple test

`package org.example;

import org.apache.commons.io.output.StringBuilderWriter;
import org.openjdk.jmh.annotations.*;
import org.openjdk.jmh.infra.Blackhole;
import org.openjdk.jmh.runner.Runner;
import org.openjdk.jmh.runner.options.Options;
import org.openjdk.jmh.runner.options.OptionsBuilder;

import java.io.IOException;
import java.io.StringWriter;
import java.io.Writer;
import java.util.concurrent.TimeUnit;

@OutputTimeUnit(TimeUnit.MILLISECONDS)
@fork(value = 1, warmups = 1)
@State(Scope.Benchmark)
public class Benchmark {

/* Generated by https://www.blindtextgenerator.com/lorem-ipsum 2000 words 10 paragraphs */ @Param({"Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi. Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet. Etiam ultricies nisi vel augue. Curabitur ullamcorper ultricies nisi. Nam eget dui. Etiam rhoncus. Maecenas tempus, tellus eget condimentum rhoncus, sem quam semper libero, sit amet adipiscing sem neque sed ipsum. Nam quam nunc, blandit vel, luctus pulvinar, hendrerit id, lorem. Maecenas nec odio et ante tincidunt tempus. Donec vitae sapien ut libero venenatis faucibus. Nullam quis ante. Etiam sit amet orci eget eros faucibus tincidunt. Duis leo. Sed fringilla mauris sit amet nibh.\n" + "\n" + "Donec sodales sagittis magna. Sed consequat, leo eget bibendum sodales, augue velit cursus nunc, quis gravida magna mi a libero. Fusce vulputate eleifend sapien. Vestibulum purus quam, scelerisque ut, mollis sed, nonummy id, metus. Nullam accumsan lorem in dui. Cras ultricies mi eu turpis hendrerit fringilla. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; In ac dui quis mi consectetuer lacinia. Nam pretium turpis et arcu. Duis arcu tortor, suscipit eget, imperdiet nec, imperdiet iaculis, ipsum. Sed aliquam ultrices mauris. Integer ante arcu, accumsan a, consectetuer eget, posuere ut, mauris. Praesent adipiscing. Phasellus ullamcorper ipsum rutrum nunc. Nunc nonummy metus. Vestibulum volutpat pretium libero. Cras id dui. Aenean ut eros et nisl sagittis vestibulum. Nullam nulla eros, ultricies sit amet, nonummy id, imperdiet feugiat, pede. Sed lectus. Donec mollis hendrerit risus. Phasellus nec sem in justo pellentesque facilisis. Etiam imperdiet imperdiet orci. Nunc nec neque. Phasellus leo dolor, tempus non, auctor et, hendrerit quis, nisi. Curabitur ligula sapien, tincidunt non, euismod vitae, posuere imperdiet, leo. Maecenas malesuada. Praesent congue erat at massa. Sed cursus turpis vitae tortor.\n" + "\n" + "Donec posuere vulputate arcu. Phasellus accumsan cursus velit. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Sed aliquam, nisi quis porttitor congue, elit erat euismod orci, ac placerat dolor lectus quis orci. Phasellus consectetuer vestibulum elit. Aenean tellus metus, bibendum sed, posuere ac, mattis non, nunc. Vestibulum fringilla pede sit amet augue. In turpis. Pellentesque posuere. Praesent turpis. Aenean posuere, tortor sed cursus feugiat, nunc augue blandit nunc, eu sollicitudin urna dolor sagittis lacus. Donec elit libero, sodales nec, volutpat a, suscipit non, turpis. Nullam sagittis. Suspendisse pulvinar, augue ac venenatis condimentum, sem libero volutpat nibh, nec pellentesque velit pede quis nunc. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Fusce id purus. Ut varius tincidunt libero. Phasellus dolor. Maecenas vestibulum mollis diam. Pellentesque ut neque. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. In dui magna, posuere eget, vestibulum et, tempor auctor, justo. In ac felis quis tortor malesuada pretium. Pellentesque auctor neque nec urna. Proin sapien ipsum, porta a, auctor quis, euismod ut, mi.\n" + "\n" + "Aenean viverra rhoncus pede. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut non enim eleifend felis pretium feugiat. Vivamus quis mi. Phasellus a est. Phasellus magna. In hac habitasse platea dictumst. Curabitur at lacus ac velit ornare lobortis. Curabitur a felis in nunc fringilla tristique. Morbi mattis ullamcorper velit. Phasellus gravida semper nisi. Nullam vel sem. Pellentesque libero tortor, tincidunt et, tincidunt eget, semper nec, quam. Sed hendrerit. Morbi ac felis. Nunc egestas, augue at pellentesque laoreet, felis eros vehicula leo, at malesuada velit leo quis pede. Donec interdum, metus et hendrerit aliquet, dolor diam sagittis ligula, eget egestas libero turpis vel mi. Nunc nulla. Fusce risus nisl, viverra et, tempor et, pretium in, sapien. Donec venenatis vulputate lorem. Morbi nec metus. Phasellus blandit leo ut odio. Maecenas ullamcorper, dui et placerat feugiat, eros pede varius nisi, condimentum viverra felis nunc et lorem. Sed magna purus, fermentum eu, tincidunt eu, varius ut, felis. In auctor lobortis lacus. Quisque libero metus, condimentum nec, tempor a, commodo mollis, magna. Vestibulum ullamcorper mauris at ligula. Fusce fermentum. Nullam cursus lacinia erat. Praesent blandit laoreet nibh.\n" + "\n" + "Fusce convallis metus id felis luctus adipiscing. Pellentesque egestas, neque sit amet convallis pulvinar, justo nulla eleifend augue, ac auctor orci leo non est. Quisque id mi. Ut tincidunt tincidunt erat. Etiam feugiat lorem non metus. Vestibulum dapibus nunc ac augue. Curabitur vestibulum aliquam leo. Praesent egestas neque eu enim. In hac habitasse platea dictumst. Fusce a quam. Etiam ut purus mattis mauris sodales aliquam. Curabitur nisi. Quisque malesuada placerat nisl. Nam ipsum risus, rutrum vitae, vestibulum eu, molestie vel, lacus. Sed augue ipsum, egestas nec, vestibulum et, malesuada adipiscing, dui. Vestibulum facilisis, purus nec pulvinar iaculis, ligula mi congue nunc, vitae euismod ligula urna in dolor. Mauris sollicitudin fermentum libero. Praesent nonummy mi in odio. Nunc interdum lacus sit amet orci. Vestibulum rutrum, mi nec elementum vehicula, eros quam gravida nisl, id fringilla neque ante vel mi. Morbi mollis tellus ac sapien. Phasellus volutpat, metus eget egestas mollis, lacus lacus blandit dui, id egestas quam mauris ut lacus. Fusce vel dui. Sed in libero ut nibh placerat accumsan. Proin faucibus arcu quis ante. In consectetuer turpis ut velit. Nulla sit amet est. Praesent metus tellus, elementum eu, semper a, adipiscing nec, purus.\n" + "\n" + "Cras risus ipsum, faucibus ut, ullamcorper id, varius ac, leo. Suspendisse feugiat. Suspendisse enim turpis, dictum sed, iaculis a, condimentum nec, nisi. Praesent nec nisl a purus blandit viverra. Praesent ac massa at ligula laoreet iaculis. Nulla neque dolor, sagittis eget, iaculis quis, molestie non, velit. Mauris turpis nunc, blandit et, volutpat molestie, porta ut, ligula. Fusce pharetra convallis urna. Quisque ut nisi. Donec mi odio, faucibus at, scelerisque quis, convallis in, nisi. Suspendisse non nisl sit amet velit hendrerit rutrum. Ut leo. Ut a nisl id ante tempus hendrerit. Proin pretium, leo ac pellentesque mollis, felis nunc ultrices eros, sed gravida augue augue mollis justo. Suspendisse eu ligula. Nulla facilisi. Donec id justo. Praesent porttitor, nulla vitae posuere iaculis, arcu nisl dignissim dolor, a pretium mi sem ut ipsum. Curabitur suscipit suscipit tellus. Praesent vestibulum dapibus nibh. Etiam iaculis nunc ac metus. Ut id nisl quis enim dignissim sagittis. Etiam sollicitudin, ipsum eu pulvinar rutrum, tellus ipsum laoreet sapien, quis venenatis ante odio sit amet eros. Proin magna. Duis vel nibh at velit scelerisque suscipit. Curabitur turpis. Vestibulum suscipit nulla quis orci. Fusce ac felis sit amet ligula pharetra condimentum.\n" + "\n" + "Maecenas egestas arcu quis ligula mattis placerat. Duis lobortis massa imperdiet quam. Suspendisse potenti. Pellentesque commodo eros a enim. Vestibulum turpis sem, aliquet eget, lobortis pellentesque, rutrum eu, nisl. Sed libero. Aliquam erat volutpat. Etiam vitae tortor. Morbi vestibulum volutpat enim. Aliquam eu nunc. Nunc sed turpis. Sed mollis, eros et ultrices tempus, mauris ipsum aliquam libero, non adipiscing dolor urna a orci. Nulla porta dolor. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Pellentesque dapibus hendrerit tortor. Praesent egestas tristique nibh. Sed a libero. Cras varius. Donec vitae orci sed dolor rutrum auctor. Fusce egestas elit eget lorem. Suspendisse nisl elit, rhoncus eget, elementum ac, condimentum eget, diam. Nam at tortor in tellus interdum sagittis. Aliquam lobortis. Donec orci lectus, aliquam ut, faucibus non, euismod id, nulla. Curabitur blandit mollis lacus. Nam adipiscing. Vestibulum eu odio. Vivamus laoreet. Nullam tincidunt adipiscing enim. Phasellus tempus. Proin viverra, ligula sit amet ultrices semper, ligula arcu tristique sapien, a accumsan nisi mauris ac eros. Fusce neque. Suspendisse faucibus, nunc et pellentesque egestas, lacus ante convallis tellus, vitae iaculis lacus elit id tortor.\n" + "\n" + "Vivamus aliquet elit ac nisl. Fusce fermentum odio nec arcu. Vivamus euismod mauris. In ut quam vitae odio lacinia tincidunt. Praesent ut ligula non mi varius sagittis. Cras sagittis. Praesent ac sem eget est egestas volutpat. Vivamus consectetuer hendrerit lacus. Cras non dolor. Vivamus in erat ut urna cursus vestibulum. Fusce commodo aliquam arcu. Nam commodo suscipit quam. Quisque id odio. Praesent venenatis metus at tortor pulvinar varius. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi. Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet. Etiam ultricies nisi vel augue.\n" + "\n" + "Curabitur ullamcorper ultricies nisi. Nam eget dui. Etiam rhoncus. Maecenas tempus, tellus eget condimentum rhoncus, sem quam semper libero, sit amet adipiscing sem neque sed ipsum. Nam quam nunc, blandit vel, luctus pulvinar, hendrerit id, lorem. Maecenas nec odio et ante tincidunt tempus. Donec vitae sapien ut libero venenatis faucibus. Nullam quis ante. Etiam sit amet orci eget eros faucibus tincidunt. Duis leo. Sed fringilla mauris sit amet nibh. Donec sodales sagittis magna. Sed consequat, leo eget bibendum sodales, augue velit cursus nunc, quis gravida magna mi a libero. Fusce vulputate eleifend sapien. Vestibulum purus quam, scelerisque ut, mollis sed, nonummy id, metus. Nullam accumsan lorem in dui. Cras ultricies mi eu turpis hendrerit fringilla. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; In ac dui quis mi consectetuer lacinia. Nam pretium turpis et arcu. Duis arcu tortor, suscipit eget, imperdiet nec, imperdiet iaculis, ipsum. Sed aliquam ultrices mauris. Integer ante arcu, accumsan a, consectetuer eget, posuere ut, mauris. Praesent adipiscing. Phasellus ullamcorper ipsum rutrum nunc. Nunc nonummy metus. Vestibulum volutpat pretium libero. Cras id dui. Aenean ut eros et nisl sagittis vestibulum.\n" + "\n" + "Nullam nulla eros, ultricies sit amet, nonummy id, imperdiet feugiat, pede. Sed lectus. Donec mollis hendrerit risus. Phasellus nec sem in justo pellentesque facilisis. Etiam imperdiet imperdiet orci. Nunc nec neque. Phasellus leo dolor, tempus non, auctor et, hendrerit quis, nisi. Curabitur ligula sapien, tincidunt non, euismod vitae, posuere imperdiet, leo. Maecenas malesuada. Praesent congue erat at massa. Sed cursus turpis vitae tortor. Donec posuere vulputate arcu. Phasellus accumsan cursus velit. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Sed aliquam, nisi quis porttitor congue, elit erat euismod orci, ac placerat dolor lectus quis orci. Phasellus consectetuer vestibulum elit. Aenean tellus metus, bibendum sed, posuere ac, mattis non, nunc. Vestibulum fringilla pede sit amet augue. In turpis. Pellentesque posuere. Praesent turpis. Aenean posuere, tortor sed cursus feugiat, nunc augue blandit nunc, eu sollicitudin urna dolor sagittis lacus. Donec elit libero, sodales nec, volutpat a, suscipit non, turpis. Nullam sagittis. Suspendisse pulvinar, augue ac venenatis condimentum, sem libero volutpat nibh, nec pellentesque velit pede quis nunc. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Fusce id purus. Ut varius tincidunt libero. Phasellus dolor. Maecenas vestibulum mollis diam. Pellentesque ut neque. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. In dui magna, posuere eget, vestibulum et, tempor auctor, justo. In ac felis quis tortor malesuada pretium. Pellentesque auctor neque nec urna. Proin sapien ipsum, porta a, auctor quis, euismod ut, mi. Aenean viverra rhoncus pede. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut non enim eleifend felis pretium feugiat. Vivamus quis mi. Phasellus a est. Phasellus magna. In hac habitasse platea dictumst. Curabitur at lacus ac velit ornare lobortis. Curabitur a felis in nunc fringilla tristique. Morbi mattis ullamcorper velit. Phasellus gravida semper nisi. Nullam vel sem. Pellentesque libero tortor, tincidunt et, tincidunt eget, semper nec, quam. Sed hendrerit. Morbi ac felis.\n" + "\n"}) private String INPUT; public static void main(String[] args) throws Exception { Options opt = new OptionsBuilder() .include(Benchmark.class.getSimpleName()) .forks(1) .build(); new Runner(opt).run(); } @org.openjdk.jmh.annotations.Benchmark public void jdkStringWriter(Blackhole blackhole) { try (Writer stringWriter = new StringWriter(INPUT.length() * 2)) { blackhole.consume(stringWriter.append(INPUT)); } catch (IOException e) { throw new RuntimeException(e); } } @org.openjdk.jmh.annotations.Benchmark public void commonsIOStringBuilderWriter(Blackhole blackhole) { try (Writer stringWriter = new StringBuilderWriter(INPUT.length() * 2)) { blackhole.consume(stringWriter.append(INPUT)); } catch (IOException e) { throw new RuntimeException(e); } }

}`

I got very close results

(INPUT) Mode Cnt Score Error Units
jdkStringWriter
thrpt 5 316,929 ± 2,652 ops/ms
commonsIOStringBuilderWriter
thrpt 5 319,308 ± 0,779 ops/ms

Agreed, I've just tested it in context and there's no noticeable difference:

Pre change:

Result "benchmarks.HandlebarsOptimizedTemplateBenchmark.transform": 128.817 ±(99.9%) 2.789 ops/s [Average] (min, avg, max) = (121.318, 128.817, 132.848), stdev = 3.212 CI (99.9%): [126.028, 131.606] (assumes normal distribution) Benchmark Mode Cnt Score Error Units HandlebarsOptimizedTemplateBenchmark.transform thrpt 20 128.817 ± 2.789 ops/s

Post change:

Result "benchmarks.HandlebarsOptimizedTemplateBenchmark.transform": 128.634 ±(99.9%) 1.560 ops/s [Average] (min, avg, max) = (124.034, 128.634, 130.370), stdev = 1.796 CI (99.9%): [127.074, 130.194] (assumes normal distribution) Benchmark Mode Cnt Score Error Units HandlebarsOptimizedTemplateBenchmark.transform thrpt 20 128.634 ± 1.560 ops/s

Mahoney · 2024-03-29T09:49:07Z

src/main/java/com/github/tomakehurst/wiremock/common/StreamSources.java

+  public static String getStringFromInputStream(InputStream inputStream) {
+    try {
+      StringBuilder sb = new StringBuilder();
+      for (int ch; (ch = inputStream.read()) != -1; ) {
+        sb.append((char) ch);
+      }
+      return sb.toString();
+    } catch (Exception ignored) {
+      return null;
+    }
+  }


This is only used in tests - I wonder if we could move it out of the production codebase?

Concerns otherwise:

Looks like it is unbuffered, which would have performance implications if used in the production code.

Swallows any exception - IOUtils.toString(InputStream, Charset) propagates it, so it could just throw it

Mahoney · 2024-03-29T09:54:45Z

src/main/java/com/github/tomakehurst/wiremock/http/multipart/FileUpload.java

+      try (InputStream input =
+          sizeMax >= 0
+              ? new LimitedInputStream(ctx.getInputStream(), sizeMax) {
+                @Override
+                protected void raiseError(long pSizeMax, long pCount) throws IOException {
+                  FileUploadException ex =
+                      new SizeLimitExceededException(
+                          format(
+                              "the request was rejected because its size (%s) exceeds the configured maximum (%s)",
+                              pCount, pSizeMax),
+                          pCount,
+                          pSizeMax);
+                  throw new FileUploadIOException(ex);
+                }
+              }
+              : ctx.getInputStream()) {


Nice, try with resources is better than closing the stream and then throwing.

Mahoney · 2024-03-29T09:55:18Z

src/test/java/com/github/tomakehurst/wiremock/DeadlockTest.java

-    try (InputStream is = connection.getInputStream()) {
-      return IOUtils.toString(is, StandardCharsets.UTF_8);
-    }
+    return getStringFromInputStream(connection.getInputStream());


It's only test code, but any reason for removing the try with resources here?

Mahoney · 2024-03-29T09:58:12Z

src/test/java/com/github/tomakehurst/wiremock/SavingMappingsAcceptanceTest.java

@@ -41,8 +44,10 @@ public class SavingMappingsAcceptanceTest extends AcceptanceTestBase {

  private static void resetFileSourceRoot() {
    try {
-      if (FILE_SOURCE_ROOT.exists()) {
-        FileUtils.deleteDirectory(FILE_SOURCE_ROOT);
+      if (new File(String.valueOf(FILE_SOURCE_ROOT.toPath().toAbsolutePath())).exists()) {


I understand the replacement of FileUtils.deleteDirectory, but what was wrong with if (FILE_SOURCE_ROOT.exists())? It looks like you're taking the File instance, turning it into a Path and then back into a File?

Mahoney · 2024-03-29T09:59:06Z

src/test/java/com/github/tomakehurst/wiremock/StandaloneAcceptanceTest.java

@@ -77,10 +78,11 @@ public class StandaloneAcceptanceTest {

  @BeforeEach
  public void init() throws Exception {
-    if (FILE_SOURCE_ROOT.exists()) {
-      FileUtils.deleteDirectory(FILE_SOURCE_ROOT);
+    if (new File(String.valueOf(FILE_SOURCE_ROOT.toPath().toAbsolutePath())).exists()) {


Same question as above

Mahoney · 2024-04-03T10:03:09Z

Needs another rebase, but then we'll merge it

pks-1981 · 2024-04-03T10:21:08Z

Needs another rebase, but then we'll merge it

Updated with the latest master

Mahoney · 2024-04-03T10:30:30Z

Thanks very much!

Replace commons-io:commons-io

9868da8

pks-1981 requested a review from a team as a code owner March 9, 2024 10:36

Replace commons-io:commons-io

dbede0d

pks-1981 marked this pull request as draft March 9, 2024 10:54

Replace commons-io:commons-io

a92217e

pks-1981 marked this pull request as ready for review March 9, 2024 18:08

Kirill Peshin added 6 commits March 9, 2024 22:26

Replace commons-io:commons-io

6e944b7

Replace commons-io:commons-io

6bee13d

Replace commons-io:commons-io

294888f

Merge branch 'master' into commons_io

d4ab4c8

Merge branch 'master' into commons_io

44f3c99

Merge branch 'master' into commons_io

e99f9fc

dieppa self-assigned this Mar 27, 2024

Kirill Peshin added 2 commits March 28, 2024 12:25

Merge branch 'master' into commons_io

ff68ff3

# Conflicts: # src/testFixtures/java/com/github/tomakehurst/wiremock/testsupport/TestFiles.java

Update

b9b3403

Merge branch 'master' into commons_io

7d2e4d6

Merge branch 'master' into commons_io

3345139

# Conflicts: # build.gradle

Mahoney reviewed Mar 29, 2024

View reviewed changes

dieppa removed their assignment Mar 29, 2024

Mahoney reviewed Mar 29, 2024

View reviewed changes

Kirill Peshin added 2 commits March 30, 2024 07:43

Update

a914add

Merge branch 'master' into commons_io

8fc4014

Mahoney approved these changes Apr 3, 2024

View reviewed changes

Merge branch 'master' into commons_io

96b0a43

Mahoney approved these changes Apr 3, 2024

View reviewed changes

leeturner merged commit a7f76a7 into wiremock:master Apr 3, 2024
10 checks passed

pks-1981 deleted the commons_io branch April 6, 2024 15:56

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Replace commons-io:commons-io #2632

Replace commons-io:commons-io #2632

pks-1981 commented Mar 9, 2024

pks-1981 commented Mar 9, 2024 •

edited

dieppa commented Mar 28, 2024

pks-1981 commented Mar 28, 2024

Mahoney commented Mar 29, 2024

pks-1981 commented Mar 29, 2024

pks-1981 commented Mar 29, 2024

Mahoney Mar 29, 2024

pks-1981 Mar 30, 2024 •

edited

Mahoney Apr 3, 2024

Mahoney Mar 29, 2024

pks-1981 Mar 30, 2024

Mahoney Mar 29, 2024

Mahoney Mar 29, 2024

pks-1981 Mar 30, 2024

Mahoney Mar 29, 2024

pks-1981 Mar 30, 2024

Mahoney Mar 29, 2024

pks-1981 Mar 30, 2024

Mahoney commented Apr 3, 2024

pks-1981 commented Apr 3, 2024

Mahoney commented Apr 3, 2024

Replace commons-io:commons-io #2632

Replace commons-io:commons-io #2632

Conversation

pks-1981 commented Mar 9, 2024

pks-1981 commented Mar 9, 2024 • edited

dieppa commented Mar 28, 2024

pks-1981 commented Mar 28, 2024

Mahoney commented Mar 29, 2024

pks-1981 commented Mar 29, 2024

pks-1981 commented Mar 29, 2024

Choose a reason for hiding this comment

pks-1981 Mar 30, 2024 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Mahoney commented Apr 3, 2024

pks-1981 commented Apr 3, 2024

Mahoney commented Apr 3, 2024

pks-1981 commented Mar 9, 2024 •

edited

pks-1981 Mar 30, 2024 •

edited