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 2023/11/03 14:28:28 UTC
(cxf) branch 3.6.x-fixes updated (7f1bef0315 -> d572688cc5)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
from 7f1bef0315 Recording .gitmergeinfo Changes
new d2c3b517a4 Bump org.jruby:jruby from 9.4.4.0 to 9.4.5.0 (#1505)
new 8f9828618b Bump org.wildfly.common:wildfly-common from 1.6.0.Final to 1.7.0.Final (#1506)
new b107345ac7 Fix the flaky test: testGetFiles (#1504)
new d572688cc5 Recording .gitmergeinfo Changes
The 4 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 +++
core/src/test/java/org/apache/cxf/helpers/FileUtilsTest.java | 3 +--
distribution/src/main/release/samples/ruby_spring_support/pom.xml | 2 +-
parent/pom.xml | 2 +-
4 files changed, 6 insertions(+), 4 deletions(-)
(cxf) 03/04: Fix the flaky test: testGetFiles (#1504)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit b107345ac7c2df2dd1650dfe62bc311a039515b4
Author: prathyushreddylpr <11...@users.noreply.github.com>
AuthorDate: Fri Nov 3 09:11:46 2023 -0500
Fix the flaky test: testGetFiles (#1504)
* Fixed flaky test
* updated the code based on the feedback recieved
---------
Co-authored-by: Prathyush Reddy Lakkidi <pr...@Prathyushs-MacBook-Air.local>
(cherry picked from commit 49eefd2f81c5bae7f720093765ee58f239af28b6)
---
core/src/test/java/org/apache/cxf/helpers/FileUtilsTest.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/core/src/test/java/org/apache/cxf/helpers/FileUtilsTest.java b/core/src/test/java/org/apache/cxf/helpers/FileUtilsTest.java
index fab931fc80..f816dd9c2c 100644
--- a/core/src/test/java/org/apache/cxf/helpers/FileUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/helpers/FileUtilsTest.java
@@ -29,7 +29,6 @@ import java.util.Optional;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -77,6 +76,6 @@ public class FileUtilsTest {
List<File> foundFiles2 = FileUtils.getFiles(directory, ".*\\.class$");
- assertEquals(foundFiles, foundFiles2);
+ assertTrue(foundFiles.containsAll(foundFiles2) && foundFiles2.containsAll(foundFiles));
}
}
(cxf) 02/04: Bump org.wildfly.common:wildfly-common from 1.6.0.Final to 1.7.0.Final (#1506)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 8f9828618b5e79573a23cd1ad2f7fa4e0e62d2b4
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Fri Nov 3 09:03:18 2023 -0400
Bump org.wildfly.common:wildfly-common from 1.6.0.Final to 1.7.0.Final (#1506)
Bumps [org.wildfly.common:wildfly-common](https://github.com/wildfly/wildfly-common) from 1.6.0.Final to 1.7.0.Final.
- [Commits](https://github.com/wildfly/wildfly-common/compare/1.6.0.Final...1.7.0.Final)
---
updated-dependencies:
- dependency-name: org.wildfly.common:wildfly-common
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 7593b48a62ea5b998353c59de6c31cec9bc0f510)
# 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 0ef507589e..05d107825a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -227,7 +227,7 @@
<cxf.validation.api.package.version>[1.0.0,3)</cxf.validation.api.package.version>
<cxf.validation.api.version>2.0.2</cxf.validation.api.version>
<cxf.velocity.version>2.3</cxf.velocity.version>
- <cxf.wildfly.common.version>1.6.0.Final</cxf.wildfly.common.version>
+ <cxf.wildfly.common.version>1.7.0.Final</cxf.wildfly.common.version>
<cxf.wiremock.version>2.35.1</cxf.wiremock.version>
<cxf.woodstox.core.version>6.5.1</cxf.woodstox.core.version>
<cxf.woodstox.stax2-api.version>4.2.1</cxf.woodstox.stax2-api.version>
(cxf) 01/04: Bump org.jruby:jruby from 9.4.4.0 to 9.4.5.0 (#1505)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit d2c3b517a47be4187e86c7da107a28525067a95b
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Fri Nov 3 09:02:59 2023 -0400
Bump org.jruby:jruby from 9.4.4.0 to 9.4.5.0 (#1505)
Bumps org.jruby:jruby from 9.4.4.0 to 9.4.5.0.
---
updated-dependencies:
- dependency-name: org.jruby:jruby
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 469232de87044fee0a17ae3066a6e7397c154ef6)
---
distribution/src/main/release/samples/ruby_spring_support/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/distribution/src/main/release/samples/ruby_spring_support/pom.xml b/distribution/src/main/release/samples/ruby_spring_support/pom.xml
index 640c6680dd..2ec488d620 100644
--- a/distribution/src/main/release/samples/ruby_spring_support/pom.xml
+++ b/distribution/src/main/release/samples/ruby_spring_support/pom.xml
@@ -110,7 +110,7 @@
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby</artifactId>
- <version>9.4.4.0</version>
+ <version>9.4.5.0</version>
</dependency>
<dependency>
<groupId>cglib</groupId>
(cxf) 04/04: 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 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit d572688cc5f0467fd1ec68fc5163706c50ce70ba
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Fri Nov 3 10:21:38 2023 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index a91ecacd99..bd562bb0ca 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -177,6 +177,7 @@ M 03209e3e8c66684f8ebb4dfe8de0883872cf7c8b
M 0380c4d1e3e27314686c7b8f1e6d809958a6a530
M 045d613bb06c21db4b374aeee64926ae7c7bf179
M 048e9ecdf8d0053d19ea2db83bf8dedf91393645
+M 050f73eedcb3ef15d9b346126c930f8a942d59f0
M 05e92f4d2fdf9908fdca56ca1e230704d1ea34a6
M 065778af4c03fba406f4529ffaabcad88b2b7a01
M 06ac082e441aa55f0bb3878649e015fd5d0f9d17
@@ -470,6 +471,7 @@ M 74c75056545e2d33d2534f17ee810c27793ff275
M 74de14461efe4729eb0af303d2fc18a1d52611b0
M 7501891ee05153ba43eab3cdadccf789dd15de1e
M 755b552a357a3f0073396f2aca9a26d067cbd66e
+M 7593b48a62ea5b998353c59de6c31cec9bc0f510
M 7636d19f235706912276294ba404f6c64df048ca
M 76e0fdb027da9f1756902f574de59b087a88da4d
M 797df326d9b73cdaa02851a9cdc7d07bc05aad2c
@@ -509,6 +511,7 @@ M 8a69b9760fa169b72250de842a2390206322726e
M 8abb11abab186d2a76fafb41ab610f3c292d5fa8
M 8abbac83f774a61290b0569b9189e5dc04495b27
M 8ad17e3bf813589f1041abab7c439dfa10e5ca35
+M 8b205c8086aeb1f5514472f0802c1fb7d510a50e
M 8b3cdd139482f23c22ef5884ca71dcad9d7add0a
M 8b79533c5aa76c8e00da61d3a25877e0ad4fa640
M 8b8cd9af25b6abd00d7f467b97597e16ff7b6140