(commons-daemon) branch master updated: Add chnagelog entry
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-daemon.git The following commit(s) were added to refs/heads/master by this push: new f73823f Add chnagelog entry f73823f is described below commit f73823fc3284061a7daaba88c42b6eeac9392c23 Author: Mark Thomas AuthorDate: Tue May 14 16:58:22 2024 +0100 Add chnagelog entry --- src/changes/changes.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index d4be951..a4f7334 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -56,6 +56,9 @@ Procrun. Add support for hybrid CRT builds. + +jsvc. Add support for LoongArch64 support #92. + Bump commons-parent from 57 to 69 #155.
(commons-daemon) branch master updated: Add LoongArch64 support
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-daemon.git The following commit(s) were added to refs/heads/master by this push: new d8c956d Add LoongArch64 support d8c956d is described below commit d8c956d7fd7b82b67f5e2e3c136c00765091f8c5 Author: Jingyun Hua AuthorDate: Wed May 17 14:05:01 2023 +0800 Add LoongArch64 support Signed-off-by: Jingyun Hua --- src/native/unix/support/apsupport.m4 | 4 1 file changed, 4 insertions(+) diff --git a/src/native/unix/support/apsupport.m4 b/src/native/unix/support/apsupport.m4 index c58e2a7..dbca23f 100644 --- a/src/native/unix/support/apsupport.m4 +++ b/src/native/unix/support/apsupport.m4 @@ -185,6 +185,10 @@ AC_DEFUN(AP_SUPPORTED_HOST,[ CFLAGS="$CFLAGS -DCPU=\\\"riscv64\\\"" HOST_CPU=riscv64 ;; + loongarch64) +CFLAGS="$CFLAGS -DCPU=\\\"loongarch64\\\"" +HOST_CPU=loongarch64 +;; *) AC_MSG_RESULT([failed]) AC_MSG_ERROR([Unsupported CPU architecture "$host_cpu"]);;
(commons-lang) branch master updated: Comments
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-lang.git
The following commit(s) were added to refs/heads/master by this push:
new f9828e240 Comments
f9828e240 is described below
commit f9828e240182743c150b8f7fbc523d9ac956eb6a
Author: Gary Gregory
AuthorDate: Tue May 14 11:22:39 2024 -0400
Comments
---
src/main/java/org/apache/commons/lang3/StringUtils.java | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/main/java/org/apache/commons/lang3/StringUtils.java
b/src/main/java/org/apache/commons/lang3/StringUtils.java
index d22342a9e..6e786b004 100644
--- a/src/main/java/org/apache/commons/lang3/StringUtils.java
+++ b/src/main/java/org/apache/commons/lang3/StringUtils.java
@@ -1414,10 +1414,13 @@ public class StringUtils {
case '\u0142':
decomposed.setCharAt(i, 'l');
break;
+// D with stroke
case '\u0110':
+// LATIN CAPITAL LETTER D WITH STROKE
decomposed.setCharAt(i, 'D');
break;
case '\u0111':
+// LATIN SMALL LETTER D WITH STROKE
decomposed.setCharAt(i, 'd');
break;
// I with bar
(commons-lang) branch master updated: StringUtils.stripAccents(String) doesn't handle T with stroke
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-lang.git
The following commit(s) were added to refs/heads/master by this push:
new 7c51e696d StringUtils.stripAccents(String) doesn't handle T with stroke
7c51e696d is described below
commit 7c51e696d59fafe3c6f6e422fd7062ae9654bf50
Author: Gary Gregory
AuthorDate: Tue May 14 11:18:54 2024 -0400
StringUtils.stripAccents(String) doesn't handle T with stroke
---
src/changes/changes.xml | 1 +
src/main/java/org/apache/commons/lang3/StringUtils.java | 9 +
.../java/org/apache/commons/lang3/StringUtilsTrimStripTest.java | 5 +
3 files changed, 15 insertions(+)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 7fa1a899b..34841687a 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -133,6 +133,7 @@ The type attribute can be add,update,fix,remove.
StringUtils.stripAccents(String) doesn't handle "\u0111" and
"\u0110" (Vietnamese) #1216.
StringUtils.stripAccents(String) doesn't handle I with bar.
StringUtils.stripAccents(String) doesn't handle U with bar.
+StringUtils.stripAccents(String) doesn't handle T with
stroke.
Bump commons-parent from 64 to 69 #1194.
Bump org.codehaus.mojo:exec-maven-plugin from 3.1.1 to
3.2.0 #1175.
diff --git a/src/main/java/org/apache/commons/lang3/StringUtils.java
b/src/main/java/org/apache/commons/lang3/StringUtils.java
index 6fd3dc839..d22342a9e 100644
--- a/src/main/java/org/apache/commons/lang3/StringUtils.java
+++ b/src/main/java/org/apache/commons/lang3/StringUtils.java
@@ -1453,6 +1453,15 @@ public class StringUtils {
// MODIFIER LETTER SMALL U BAR
decomposed.setCharAt(i, 'u');
break;
+// T with stroke
+case '\u0166':
+// LATIN CAPITAL LETTER T WITH STROKE
+decomposed.setCharAt(i, 'T');
+break;
+case '\u0167':
+// LATIN SMALL LETTER T WITH STROKE
+decomposed.setCharAt(i, 't');
+break;
default:
break;
}
diff --git
a/src/test/java/org/apache/commons/lang3/StringUtilsTrimStripTest.java
b/src/test/java/org/apache/commons/lang3/StringUtilsTrimStripTest.java
index f38f08f3d..aa827ddf5 100644
--- a/src/test/java/org/apache/commons/lang3/StringUtilsTrimStripTest.java
+++ b/src/test/java/org/apache/commons/lang3/StringUtilsTrimStripTest.java
@@ -115,6 +115,11 @@ public class StringUtilsTrimStripTest extends
AbstractLangTest {
assertEquals("U u U u", StringUtils.stripAccents("\u0244 \u0289 \u1D7E
\u1DB6"));
}
+@Test
+public void testStripAccentsTWithStroke() {
+assertEquals("T t", StringUtils.stripAccents("\u0166 \u0167"));
+}
+
@Test
public void testStripAll() {
// test stripAll method, merely an array version of the above strip
(commons-lang) branch master updated: StringUtils.stripAccents(String) doesn't handle U with bar
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-lang.git
The following commit(s) were added to refs/heads/master by this push:
new 17ceb435e StringUtils.stripAccents(String) doesn't handle U with bar
17ceb435e is described below
commit 17ceb435edca4cc0ebb9acbaa27408222db09243
Author: Gary Gregory
AuthorDate: Tue May 14 11:15:07 2024 -0400
StringUtils.stripAccents(String) doesn't handle U with bar
---
src/changes/changes.xml| 1 +
.../java/org/apache/commons/lang3/StringUtils.java | 18 ++
.../apache/commons/lang3/StringUtilsTrimStripTest.java | 5 +
3 files changed, 24 insertions(+)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index c12576c2c..7fa1a899b 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -132,6 +132,7 @@ The type attribute can be add,update,fix,remove.
Make SystemProperties.getLineSeparator(Supplier).
StringUtils.stripAccents(String) doesn't handle "\u0111" and
"\u0110" (Vietnamese) #1216.
StringUtils.stripAccents(String) doesn't handle I with bar.
+StringUtils.stripAccents(String) doesn't handle U with bar.
Bump commons-parent from 64 to 69 #1194.
Bump org.codehaus.mojo:exec-maven-plugin from 3.1.1 to
3.2.0 #1175.
diff --git a/src/main/java/org/apache/commons/lang3/StringUtils.java
b/src/main/java/org/apache/commons/lang3/StringUtils.java
index 03215e981..6fd3dc839 100644
--- a/src/main/java/org/apache/commons/lang3/StringUtils.java
+++ b/src/main/java/org/apache/commons/lang3/StringUtils.java
@@ -1420,6 +1420,7 @@ public class StringUtils {
case '\u0111':
decomposed.setCharAt(i, 'd');
break;
+// I with bar
case '\u0197':
decomposed.setCharAt(i, 'I');
break;
@@ -1435,6 +1436,23 @@ public class StringUtils {
case '\u1DA7':
decomposed.setCharAt(i, 'I');
break;
+// U with bar
+case '\u0244':
+// LATIN CAPITAL LETTER U BAR
+decomposed.setCharAt(i, 'U');
+break;
+case '\u0289':
+// LATIN SMALL LETTER U BAR
+decomposed.setCharAt(i, 'u');
+break;
+case '\u1D7E':
+// LATIN SMALL CAPITAL LETTER U WITH STROKE
+decomposed.setCharAt(i, 'U');
+break;
+case '\u1DB6':
+// MODIFIER LETTER SMALL U BAR
+decomposed.setCharAt(i, 'u');
+break;
default:
break;
}
diff --git
a/src/test/java/org/apache/commons/lang3/StringUtilsTrimStripTest.java
b/src/test/java/org/apache/commons/lang3/StringUtilsTrimStripTest.java
index eedb5f71b..f38f08f3d 100644
--- a/src/test/java/org/apache/commons/lang3/StringUtilsTrimStripTest.java
+++ b/src/test/java/org/apache/commons/lang3/StringUtilsTrimStripTest.java
@@ -110,6 +110,11 @@ public class StringUtilsTrimStripTest extends
AbstractLangTest {
assertEquals("I i I i I", StringUtils.stripAccents("\u0197 \u0268
\u1D7B \u1DA4 \u1DA7"));
}
+@Test
+public void testStripAccentsUWithBar() {
+assertEquals("U u U u", StringUtils.stripAccents("\u0244 \u0289 \u1D7E
\u1DB6"));
+}
+
@Test
public void testStripAll() {
// test stripAll method, merely an array version of the above strip
(commons-lang) branch master updated: StringUtils.stripAccents(String) doesn't handle I with bar
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-lang.git
The following commit(s) were added to refs/heads/master by this push:
new 006d1d1df StringUtils.stripAccents(String) doesn't handle I with bar
006d1d1df is described below
commit 006d1d1df98ffe95e32d5965f75ca5bac3961bc4
Author: Gary Gregory
AuthorDate: Tue May 14 11:04:45 2024 -0400
StringUtils.stripAccents(String) doesn't handle I with bar
---
src/changes/changes.xml | 1 +
src/main/java/org/apache/commons/lang3/StringUtils.java | 15 +++
.../apache/commons/lang3/StringUtilsTrimStripTest.java| 5 +
3 files changed, 21 insertions(+)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 5758ef443..c12576c2c 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -131,6 +131,7 @@ The type attribute can be add,update,fix,remove.
Make ObjectUtils.getFirstNonNull(Supplier...) null-safe.
Make SystemProperties.getLineSeparator(Supplier).
StringUtils.stripAccents(String) doesn't handle "\u0111" and
"\u0110" (Vietnamese) #1216.
+StringUtils.stripAccents(String) doesn't handle I with bar.
Bump commons-parent from 64 to 69 #1194.
Bump org.codehaus.mojo:exec-maven-plugin from 3.1.1 to
3.2.0 #1175.
diff --git a/src/main/java/org/apache/commons/lang3/StringUtils.java
b/src/main/java/org/apache/commons/lang3/StringUtils.java
index db9e26153..03215e981 100644
--- a/src/main/java/org/apache/commons/lang3/StringUtils.java
+++ b/src/main/java/org/apache/commons/lang3/StringUtils.java
@@ -1420,6 +1420,21 @@ public class StringUtils {
case '\u0111':
decomposed.setCharAt(i, 'd');
break;
+case '\u0197':
+decomposed.setCharAt(i, 'I');
+break;
+case '\u0268':
+decomposed.setCharAt(i, 'i');
+break;
+case '\u1D7B':
+decomposed.setCharAt(i, 'I');
+break;
+case '\u1DA4':
+decomposed.setCharAt(i, 'i');
+break;
+case '\u1DA7':
+decomposed.setCharAt(i, 'I');
+break;
default:
break;
}
diff --git
a/src/test/java/org/apache/commons/lang3/StringUtilsTrimStripTest.java
b/src/test/java/org/apache/commons/lang3/StringUtilsTrimStripTest.java
index a052fe9b4..eedb5f71b 100644
--- a/src/test/java/org/apache/commons/lang3/StringUtilsTrimStripTest.java
+++ b/src/test/java/org/apache/commons/lang3/StringUtilsTrimStripTest.java
@@ -105,6 +105,11 @@ public class StringUtilsTrimStripTest extends
AbstractLangTest {
assertEquals(input, StringUtils.stripAccents(input), "Failed to handle
Korean text");
}
+@Test
+public void testStripAccentsIWithBar() {
+assertEquals("I i I i I", StringUtils.stripAccents("\u0197 \u0268
\u1D7B \u1DA4 \u1DA7"));
+}
+
@Test
public void testStripAll() {
// test stripAll method, merely an array version of the above strip
(commons-lang) branch master updated: Use a switch
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-lang.git
The following commit(s) were added to refs/heads/master by this push:
new 0b00e8de2 Use a switch
0b00e8de2 is described below
commit 0b00e8de26e4760d0c15a7ead8e9f1020379c82b
Author: Gary Gregory
AuthorDate: Tue May 14 11:01:47 2024 -0400
Use a switch
---
src/main/java/org/apache/commons/lang3/StringUtils.java | 16
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/apache/commons/lang3/StringUtils.java
b/src/main/java/org/apache/commons/lang3/StringUtils.java
index 25fcf0641..db9e26153 100644
--- a/src/main/java/org/apache/commons/lang3/StringUtils.java
+++ b/src/main/java/org/apache/commons/lang3/StringUtils.java
@@ -1406,14 +1406,22 @@ public class StringUtils {
private static void convertRemainingAccentCharacters(final StringBuilder
decomposed) {
for (int i = 0; i < decomposed.length(); i++) {
-if (decomposed.charAt(i) == '\u0141') {
+final char charAt = decomposed.charAt(i);
+switch (charAt) {
+case '\u0141':
decomposed.setCharAt(i, 'L');
-} else if (decomposed.charAt(i) == '\u0142') {
+break;
+case '\u0142':
decomposed.setCharAt(i, 'l');
-} else if (decomposed.charAt(i) == '\u0110') {
+break;
+case '\u0110':
decomposed.setCharAt(i, 'D');
-} else if (decomposed.charAt(i) == '\u0111') {
+break;
+case '\u0111':
decomposed.setCharAt(i, 'd');
+break;
+default:
+break;
}
}
}
(commons-lang) branch master updated: Clean up String building
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-lang.git
The following commit(s) were added to refs/heads/master by this push:
new 89a85532c Clean up String building
89a85532c is described below
commit 89a85532cb71d2ec9b0875f7c0ee696cbdd6f6ec
Author: Gary Gregory
AuthorDate: Tue May 14 10:57:31 2024 -0400
Clean up String building
Whitespace
---
src/test/java/org/apache/commons/lang3/StringUtilsTrimStripTest.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git
a/src/test/java/org/apache/commons/lang3/StringUtilsTrimStripTest.java
b/src/test/java/org/apache/commons/lang3/StringUtilsTrimStripTest.java
index 217b37114..a052fe9b4 100644
--- a/src/test/java/org/apache/commons/lang3/StringUtilsTrimStripTest.java
+++ b/src/test/java/org/apache/commons/lang3/StringUtilsTrimStripTest.java
@@ -101,9 +101,8 @@ public class StringUtilsTrimStripTest extends
AbstractLangTest {
@Disabled
public void testStripAccents_Korean() {
// LANG-1655
-final String input = "\uC78A\uC9C0\uB9C8 \uB10C \uD750\uB9B0
\uC5B4\uB460\uC0AC\uC774 " + "\uC67C\uC190\uC73C\uB85C \uADF8\uB9B0 \uBCC4
\uD558\uB098";
+final String input = "\uC78A\uC9C0\uB9C8 \uB10C \uD750\uB9B0
\uC5B4\uB460\uC0AC\uC774 \uC67C\uC190\uC73C\uB85C \uADF8\uB9B0 \uBCC4
\uD558\uB098";
assertEquals(input, StringUtils.stripAccents(input), "Failed to handle
Korean text");
-
}
@Test
(commons-lang) branch master updated: StringUtils.stripAccents(String) doesn't handle "\u0111" and "\u0110" (Vietnamese) #1216
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-lang.git The following commit(s) were added to refs/heads/master by this push: new 69b73420f StringUtils.stripAccents(String) doesn't handle "\u0111" and "\u0110" (Vietnamese) #1216 69b73420f is described below commit 69b73420f032a52cc4b929e2d089f20de5b61a27 Author: Gary Gregory AuthorDate: Tue May 14 10:56:50 2024 -0400 StringUtils.stripAccents(String) doesn't handle "\u0111" and "\u0110" (Vietnamese) #1216 --- src/changes/changes.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index a38991da0..5758ef443 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -130,6 +130,7 @@ The type attribute can be add,update,fix,remove. Make LockVisitor.applyWriteLocked(FailableConsumer) null-safe. Make ObjectUtils.getFirstNonNull(Supplier...) null-safe. Make SystemProperties.getLineSeparator(Supplier). +StringUtils.stripAccents(String) doesn't handle "\u0111" and "\u0110" (Vietnamese) #1216. Bump commons-parent from 64 to 69 #1194. Bump org.codehaus.mojo:exec-maven-plugin from 3.1.1 to 3.2.0 #1175.
(commons-lang) branch master updated: strip accents "\u0111" and "\u0110" (#1216)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-lang.git
The following commit(s) were added to refs/heads/master by this push:
new 851de661c strip accents "\u0111" and "\u0110" (#1216)
851de661c is described below
commit 851de661c657300b54165238f990d339fbf8c754
Author: hunghhdev
AuthorDate: Tue May 14 21:55:12 2024 +0700
strip accents "\u0111" and "\u0110" (#1216)
---
src/main/java/org/apache/commons/lang3/StringUtils.java | 4
src/test/java/org/apache/commons/lang3/StringUtilsTrimStripTest.java | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/commons/lang3/StringUtils.java
b/src/main/java/org/apache/commons/lang3/StringUtils.java
index 16dd46e96..25fcf0641 100644
--- a/src/main/java/org/apache/commons/lang3/StringUtils.java
+++ b/src/main/java/org/apache/commons/lang3/StringUtils.java
@@ -1410,6 +1410,10 @@ public class StringUtils {
decomposed.setCharAt(i, 'L');
} else if (decomposed.charAt(i) == '\u0142') {
decomposed.setCharAt(i, 'l');
+} else if (decomposed.charAt(i) == '\u0110') {
+decomposed.setCharAt(i, 'D');
+} else if (decomposed.charAt(i) == '\u0111') {
+decomposed.setCharAt(i, 'd');
}
}
}
diff --git
a/src/test/java/org/apache/commons/lang3/StringUtilsTrimStripTest.java
b/src/test/java/org/apache/commons/lang3/StringUtilsTrimStripTest.java
index 0b7339e00..217b37114 100644
--- a/src/test/java/org/apache/commons/lang3/StringUtilsTrimStripTest.java
+++ b/src/test/java/org/apache/commons/lang3/StringUtilsTrimStripTest.java
@@ -84,8 +84,8 @@ public class StringUtilsTrimStripTest extends
AbstractLangTest {
assertEquals("", StringUtils.stripAccents(""), "Failed empty String");
assertEquals("control", StringUtils.stripAccents("control"), "Failed
to handle non-accented text");
assertEquals("eclair", StringUtils.stripAccents("\u00E9clair"),
"Failed to handle easy example");
-assertEquals("ALOSZZCN aloszzcn",
-
StringUtils.stripAccents("\u0104\u0141\u00D3\u015A\u017B\u0179\u0106\u0143
\u0105\u0142\u00F3\u015B\u017C\u017A\u0107\u0144"));
+assertEquals("ALOSZZCND aloszzcnd",
+
StringUtils.stripAccents("\u0104\u0141\u00D3\u015A\u017B\u0179\u0106\u0143\u0110
\u0105\u0142\u00F3\u015B\u017C\u017A\u0107\u0144\u0111"));
assertEquals("The cafe\u2019s pinata gave me deja vu.",
StringUtils.stripAccents("The caf\u00e9\u2019s pi\u00f1ata gave me
d\u00e9j\u00e0 vu."),
"Failed to handle accented text");
assertEquals("fluid quest", StringUtils.stripAccents("\ufb02uid
que\ufb06"), "Failed to handle ligatures");
(commons-daemon) branch master updated: Make box bigger as text is now longer
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-daemon.git The following commit(s) were added to refs/heads/master by this push: new 086ee66 Make box bigger as text is now longer 086ee66 is described below commit 086ee661080b5a6df15e9dd84f9aa03f6a26bda3 Author: Mark Thomas AuthorDate: Tue May 14 15:31:05 2024 +0100 Make box bigger as text is now longer --- src/native/windows/apps/prunmgr/prunmgr.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/native/windows/apps/prunmgr/prunmgr.rc b/src/native/windows/apps/prunmgr/prunmgr.rc index b0909a6..6cfb0f9 100644 --- a/src/native/windows/apps/prunmgr/prunmgr.rc +++ b/src/native/windows/apps/prunmgr/prunmgr.rc @@ -89,7 +89,7 @@ BEGIN EDITTEXTIDC_PPSGDISP,70,22,180,12,ES_AUTOHSCROLL LTEXT ": ",IDC_STATIC,10,41,43,8 EDITTEXTIDC_PPSGDESC,70,40,180,12,ES_AUTOHSCROLL -LTEXT "Command used to start service:",IDC_STATIC,10,63,66,8 +LTEXT "Command used to start service:",IDC_STATIC,10,63,110,8 EDITTEXTIDC_PPSGDEXE,10,75,240,12,ES_AUTOHSCROLL | WS_DISABLED LTEXT "Startup typ:",IDC_STATIC,10,94,46,8 COMBOBOXIDC_PPSGCMBST,70,93,180,80,CBS_DROPDOWNLIST | WS_VSCROLL |
(commons-lang) branch master updated: Trailing whitespace
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-lang.git
The following commit(s) were added to refs/heads/master by this push:
new f50a4df11 Trailing whitespace
f50a4df11 is described below
commit f50a4df11cd56984f251b51765fe55ce30d71266
Author: Gary Gregory
AuthorDate: Tue May 14 10:30:13 2024 -0400
Trailing whitespace
---
src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java
b/src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java
index 38c7add81..d80a390b0 100644
--- a/src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java
@@ -77,14 +77,14 @@ final class AAAClass extends AAClass {
/**
* Test fixture.
- *
+ *
* @param Test fixture type, unused type parameter for test.
*/
class AAClass {
/**
* Test fixture.
- *
+ *
* @param Test fixture type, unused type parameter for test.
*/
public class BBClass {
(commons-daemon) branch master updated: Fix DAEMON-461 - better label for command used to start service
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-daemon.git The following commit(s) were added to refs/heads/master by this push: new bee3e02 Fix DAEMON-461 - better label for command used to start service bee3e02 is described below commit bee3e024067a82c4c3a0bdeab2425041908b98ed Author: Mark Thomas AuthorDate: Tue May 14 15:24:47 2024 +0100 Fix DAEMON-461 - better label for command used to start service --- src/changes/changes.xml| 4 src/native/windows/apps/prunmgr/prunmgr.rc | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index d697071..d4be951 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -48,6 +48,10 @@ Procrun. Enable Control Flow Guard for Windows binaries. + +Procrun. Better label for command used to start service shown in +Prunmgr.exe. + Procrun. Add support for hybrid CRT builds. diff --git a/src/native/windows/apps/prunmgr/prunmgr.rc b/src/native/windows/apps/prunmgr/prunmgr.rc index b9e5be7..b0909a6 100644 --- a/src/native/windows/apps/prunmgr/prunmgr.rc +++ b/src/native/windows/apps/prunmgr/prunmgr.rc @@ -89,7 +89,7 @@ BEGIN EDITTEXTIDC_PPSGDISP,70,22,180,12,ES_AUTOHSCROLL LTEXT ": ",IDC_STATIC,10,41,43,8 EDITTEXTIDC_PPSGDESC,70,40,180,12,ES_AUTOHSCROLL -LTEXT "Pat to executable:",IDC_STATIC,10,63,66,8 +LTEXT "Command used to start service:",IDC_STATIC,10,63,66,8 EDITTEXTIDC_PPSGDEXE,10,75,240,12,ES_AUTOHSCROLL | WS_DISABLED LTEXT "Startup typ:",IDC_STATIC,10,94,46,8 COMBOBOXIDC_PPSGCMBST,70,93,180,80,CBS_DROPDOWNLIST | WS_VSCROLL |
(commons-daemon) branch master updated: Fix DAEMON-429 Enable control flow guard
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-daemon.git The following commit(s) were added to refs/heads/master by this push: new fed3689 Fix DAEMON-429 Enable control flow guard fed3689 is described below commit fed36896cbac1c7b524a047f4e973228d2d41ab7 Author: Mark Thomas AuthorDate: Tue May 14 14:48:12 2024 +0100 Fix DAEMON-429 Enable control flow guard --- src/changes/changes.xml | 9 ++--- src/native/windows/include/Makefile.inc | 6 +++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 8445ffa..d697071 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -45,9 +45,12 @@ [StepSecurity] ci: Harden GitHub Actions #95. + +Procrun. Enable Control Flow Guard for Windows binaries. + -Add support for hybrid CRT builds. +Procrun. Add support for hybrid CRT builds. @@ -58,8 +61,8 @@ 8. -The minimum Windows versions supported are now Windows 10 and Windows -Server 2016. +Procrun. The minimum Windows versions supported are now Windows 10 and +Windows Server 2016. diff --git a/src/native/windows/include/Makefile.inc b/src/native/windows/include/Makefile.inc index b68766e..f26913e 100644 --- a/src/native/windows/include/Makefile.inc +++ b/src/native/windows/include/Makefile.inc @@ -177,9 +177,9 @@ MACHINE_LC=amd64 !IF "$(BUILD)" == "RELEASE" !IF "$(CPU)" == "X86" -OPT_CFLAGS = -O2 -Ob2 -Oy- -Zi -DNDEBUG +OPT_CFLAGS = -O2 -Ob2 -Oy- -Zi -DNDEBUG -guard:cf !ELSE -OPT_CFLAGS = -O2 -Ob2 -Zi -DNDEBUG +OPT_CFLAGS = -O2 -Ob2 -Zi -DNDEBUG -guard:cf !ENDIF !ELSE OPT_CFLAGS = -Od -Zi -DDEBUG -D_DEBUG @@ -227,7 +227,7 @@ COMMON_LFLAGS = /NOLOGO # Always add debugging to the linker OPT_LFLAGS = /INCREMENTAL:NO /DEBUG !IF "$(BUILD)" == "RELEASE" -OPT_LFLAGS = $(OPT_LFLAGS) /OPT:REF +OPT_LFLAGS = $(OPT_LFLAGS) /OPT:REF /guard:cf !IF DEFINED(STATIC_CRT) && "$(STATIC_CRT)" == "Hybrid" OPT_LFLAGS = $(OPT_LFLAGS) /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib !ENDIF
(commons-lang) branch master updated: Javadoc
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-lang.git
The following commit(s) were added to refs/heads/master by this push:
new edc8dcfe8 Javadoc
edc8dcfe8 is described below
commit edc8dcfe85a83ea49d76e82190672e2896fb4f65
Author: Gary Gregory
AuthorDate: Tue May 14 09:17:59 2024 -0400
Javadoc
---
.../org/apache/commons/lang3/reflect/TypeUtilsTest.java | 13 +++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java
b/src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java
index 9ec6c9a7c..38c7add81 100644
--- a/src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java
@@ -59,7 +59,7 @@ import org.junit.jupiter.api.Test;
/**
* Test fixture for https://issues.apache.org/jira/browse/LANG-1524
*
- * @param Test fixture type.
+ * @param Test fixture type, unused type parameter for test.
*/
class Class {
public static class Class {
@@ -75,9 +75,18 @@ final class AAAClass extends AAClass {
}
}
-@SuppressWarnings("unused") // Unused type parameter for test
+/**
+ * Test fixture.
+ *
+ * @param Test fixture type, unused type parameter for test.
+ */
class AAClass {
+/**
+ * Test fixture.
+ *
+ * @param Test fixture type, unused type parameter for test.
+ */
public class BBClass {
// empty
}
(commons-lang) branch master updated: Javadoc
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-lang.git
The following commit(s) were added to refs/heads/master by this push:
new 279d8f8d5 Javadoc
279d8f8d5 is described below
commit 279d8f8d574a6c54c3ffb0a108fbdfc09030714e
Author: Gary Gregory
AuthorDate: Tue May 14 09:16:22 2024 -0400
Javadoc
---
src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java
b/src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java
index 50e629697..9ec6c9a7c 100644
--- a/src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java
@@ -58,10 +58,13 @@ import org.junit.jupiter.api.Test;
/**
* Test fixture for https://issues.apache.org/jira/browse/LANG-1524
+ *
+ * @param Test fixture type.
*/
class Class {
public static class Class {
public static class lass {
+// empty
}
}
}
(commons-lang) 01/02: Remove one superfluous @SuppressWarnings
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-lang.git
commit 1b5f9d1af8a16b1285384190af55c5734fb7cb49
Author: Gary Gregory
AuthorDate: Tue May 14 09:15:15 2024 -0400
Remove one superfluous @SuppressWarnings
---
src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java
b/src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java
index 541cc02c7..1e90add47 100644
--- a/src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java
@@ -158,7 +158,7 @@ abstract class Test1 {
/**
* Test TypeUtils
*/
-@SuppressWarnings({ "unchecked", "unused", "rawtypes" })
+@SuppressWarnings({ "unused", "rawtypes" })
//raw types, where used, are used purposely
public class TypeUtilsTest extends AbstractLangTest {
(commons-lang) 02/02: Javadoc
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-lang.git
commit 180f801d73287acefd323f829c061259dad65229
Author: Gary Gregory
AuthorDate: Tue May 14 09:15:22 2024 -0400
Javadoc
---
src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java
b/src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java
index 1e90add47..50e629697 100644
--- a/src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java
@@ -156,7 +156,9 @@ abstract class Test1 {
}
/**
- * Test TypeUtils
+ * Tests {@link TypeUtils}.
+ *
+ * @param Type for test fixtures.
*/
@SuppressWarnings({ "unused", "rawtypes" })
//raw types, where used, are used purposely
(commons-lang) branch master updated (88ab71b19 -> 180f801d7)
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/commons-lang.git from 88ab71b19 Comment empty blocks new 1b5f9d1af Remove one superfluous @SuppressWarnings new 180f801d7 Javadoc The 2 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: src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-)
(commons-lang) branch master updated (5e36226a0 -> 88ab71b19)
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/commons-lang.git from 5e36226a0 Add test new 74a9bea58 Better implementation of org.apache.commons.lang3.builder.MultilineRecursiveToStringStyle.spacer(int) new 416a35430 Indentation new 88ab71b19 Comment empty blocks The 3 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: .../commons/lang3/builder/MultilineRecursiveToStringStyle.java | 9 +++-- .../java/org/apache/commons/lang3/time/DurationFormatUtils.java | 6 +++--- .../java/org/apache/commons/lang3/reflect/TypeUtilsTest.java | 8 3 files changed, 14 insertions(+), 9 deletions(-)
(commons-lang) 01/03: Better implementation of org.apache.commons.lang3.builder.MultilineRecursiveToStringStyle.spacer(int)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-lang.git
commit 74a9bea58feb0a15b906623dff06721b07fec6a7
Author: Gary Gregory
AuthorDate: Sun May 12 18:13:45 2024 -0400
Better implementation of
org.apache.commons.lang3.builder.MultilineRecursiveToStringStyle.spacer(int)
---
.../commons/lang3/builder/MultilineRecursiveToStringStyle.java | 9 +++--
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git
a/src/main/java/org/apache/commons/lang3/builder/MultilineRecursiveToStringStyle.java
b/src/main/java/org/apache/commons/lang3/builder/MultilineRecursiveToStringStyle.java
index 861a55fe2..54cb160c7 100644
---
a/src/main/java/org/apache/commons/lang3/builder/MultilineRecursiveToStringStyle.java
+++
b/src/main/java/org/apache/commons/lang3/builder/MultilineRecursiveToStringStyle.java
@@ -18,6 +18,7 @@
package org.apache.commons.lang3.builder;
import org.apache.commons.lang3.ClassUtils;
+import org.apache.commons.lang3.StringUtils;
/**
* Works with {@link ToStringBuilder} to create a "deep" {@code toString}.
@@ -206,12 +207,8 @@ public class MultilineRecursiveToStringStyle extends
RecursiveToStringStyle {
* @param spaces how far to indent
* @return a StringBuilder with {spaces} leading space characters.
*/
-private StringBuilder spacer(final int spaces) {
-final StringBuilder sb = new StringBuilder();
-for (int i = 0; i < spaces; i++) {
-sb.append(" ");
-}
-return sb;
+private String spacer(final int spaces) {
+return StringUtils.repeat(' ', spaces);
}
}
(commons-lang) 03/03: Comment empty blocks
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-lang.git
commit 88ab71b19491efe351dd7caa554ee99911c6d9cf
Author: Gary Gregory
AuthorDate: Tue May 14 09:13:06 2024 -0400
Comment empty blocks
---
src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java | 8
1 file changed, 8 insertions(+)
diff --git a/src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java
b/src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java
index dca2096b5..541cc02c7 100644
--- a/src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java
@@ -163,6 +163,7 @@ abstract class Test1 {
public class TypeUtilsTest extends AbstractLangTest {
public interface And extends This {
+// empty
}
public static class ClassWithSuperClassWithGenericType extends
ArrayList {
@@ -175,24 +176,31 @@ public class TypeUtilsTest extends AbstractLangTest {
/** This non-static inner class is parameterized. */
private class MyInnerClass {
+// empty
}
public class Other implements This {
+// empty
}
public class Tester implements This {
+// empty
}
public class That implements This {
+// empty
}
public class The extends That implements And {
+// empty
}
public class Thing extends Other {
+// empty
}
public interface This {
+// empty
}
public static Comparable stringComparable;
(commons-lang) 02/03: Indentation
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-lang.git
commit 416a354308bbea30466639d141c81b0580d6cd01
Author: Gary Gregory
AuthorDate: Sun May 12 18:42:55 2024 -0400
Indentation
---
.../java/org/apache/commons/lang3/time/DurationFormatUtils.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/src/main/java/org/apache/commons/lang3/time/DurationFormatUtils.java
b/src/main/java/org/apache/commons/lang3/time/DurationFormatUtils.java
index 5e0fbccc8..417d2a592 100644
--- a/src/main/java/org/apache/commons/lang3/time/DurationFormatUtils.java
+++ b/src/main/java/org/apache/commons/lang3/time/DurationFormatUtils.java
@@ -257,9 +257,9 @@ public class DurationFormatUtils {
}
}
if (isLiteral) {
- if (!inOptional || !lastOutputZero) {
- buffer.append(value.toString());
- }
+if (!inOptional || !lastOutputZero) {
+buffer.append(value.toString());
+}
} else if (value.equals(y)) {
lastOutputSeconds = false;
lastOutputZero = years == 0;
(commons-daemon) branch DAEMON-464 created (now c5939cf)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch DAEMON-464 in repository https://gitbox.apache.org/repos/asf/commons-daemon.git at c5939cf [DAEMON-464] struct sigaction function pointer causes build failures on LLVM 15+ This branch includes the following new commits: new c5939cf [DAEMON-464] struct sigaction function pointer causes build failures on LLVM 15+ The 1 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.
(commons-daemon) 01/01: [DAEMON-464] struct sigaction function pointer causes build failures on LLVM 15+
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch DAEMON-464
in repository https://gitbox.apache.org/repos/asf/commons-daemon.git
commit c5939cfe63d9fcfb0e5950a296d6aad857ea0ad1
Author: Michael Osipov
AuthorDate: Tue May 14 09:19:51 2024 +0200
[DAEMON-464] struct sigaction function pointer causes build failures on
LLVM 15+
Co-authored-by: Matthew Ryan
This closes #166 and #170
---
src/native/unix/native/jsvc-unix.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/native/unix/native/jsvc-unix.c
b/src/native/unix/native/jsvc-unix.c
index e331a0f..88e071f 100644
--- a/src/native/unix/native/jsvc-unix.c
+++ b/src/native/unix/native/jsvc-unix.c
@@ -86,7 +86,7 @@ static int lockf(int fildes, int function, off_t size)
#endif
-static void handler(int sig)
+static void handler(int sig, siginfo_t * sip, void *ucp)
{
switch (sig) {
case SIGTERM:
@@ -901,7 +901,7 @@ static int child(arg_data *args, home_data *data, uid_t
uid, gid_t gid)
/* Install signal handlers */
memset(, '\0', sizeof(act));
-act.sa_handler = handler;
+act.sa_sigaction = handler;
sigemptyset(_mask);
act.sa_flags = SA_RESTART | SA_NOCLDSTOP;
@@ -1308,7 +1308,7 @@ static int run_controller(arg_data *args, home_data
*data, uid_t uid, gid_t gid)
* These will be replaced in the child process.
*/
memset(, '\0', sizeof(act));
-act.sa_handler = controller;
+act.sa_sigaction = controller;
sigemptyset(_mask);
act.sa_flags = SA_RESTART | SA_NOCLDSTOP | SA_SIGINFO;
