format patches

This commit is contained in:
zhouganqing 2022-11-17 20:37:51 +08:00
parent 471438fdb9
commit 62a77cb361
3 changed files with 37 additions and 10 deletions

View File

@ -1,5 +1,14 @@
Description: Adds a target to generate the javadoc. From: OpenKylin Developers <packaging@lists.openkylin.top>
Date: Thu, 17 Nov 2022 20:37:50 +0800
Subject: Adds a target to generate the javadoc.
Forwarded: not-needed Forwarded: not-needed
---
build.xml | 37 ++++++++++++++++++++++++++++++++++++-
1 file changed, 36 insertions(+), 1 deletion(-)
diff --git a/build.xml b/build.xml
index f7a5923..7c703f1 100644
--- a/build.xml --- a/build.xml
+++ b/build.xml +++ b/build.xml
@@ -613,7 +613,7 @@ @@ -613,7 +613,7 @@

View File

@ -1,12 +1,21 @@
Description: This patch has been added to disable the SecurityAllowedTestCase From: Kumar Appaiah <akumar@ee.iitm.ac.in>
altogether, as it fails to complete successfully on GCJ. The issue Date: Thu, 17 Nov 2022 20:37:51 +0800
seems to be with GCJ, so till the time that GCJ is fixed, we don't run Subject: This patch has been added to disable the SecurityAllowedTestCase
this test.
Author: Kumar Appaiah <akumar@ee.iitm.ac.in>
Forwarded: not-needed Forwarded: not-needed
altogether, as it fails to complete successfully on GCJ. The issue
seems to be with GCJ, so till the time that GCJ is fixed, we don't run
this test.
---
.../org/apache/commons/logging/security/SecurityAllowedTestCase.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/test/java/org/apache/commons/logging/security/SecurityAllowedTestCase.java b/src/test/java/org/apache/commons/logging/security/SecurityAllowedTestCase.java
index b957237..04a0a53 100644
--- a/src/test/java/org/apache/commons/logging/security/SecurityAllowedTestCase.java --- a/src/test/java/org/apache/commons/logging/security/SecurityAllowedTestCase.java
+++ b/src/test/java/org/apache/commons/logging/security/SecurityAllowedTestCase.java +++ b/src/test/java/org/apache/commons/logging/security/SecurityAllowedTestCase.java
@@ -92,6 +92,7 @@ @@ -92,6 +92,7 @@ public class SecurityAllowedTestCase extends TestCase
mySecurityManager.addPermission(new AllPermission()); mySecurityManager.addPermission(new AllPermission());
System.setSecurityManager(mySecurityManager); System.setSecurityManager(mySecurityManager);
@ -14,7 +23,7 @@ Forwarded: not-needed
try { try {
// Use reflection so that we can control exactly when the static // Use reflection so that we can control exactly when the static
// initialiser for the LogFactory class is executed. // initialiser for the LogFactory class is executed.
@@ -136,5 +137,6 @@ @@ -136,5 +137,6 @@ public class SecurityAllowedTestCase extends TestCase
t.printStackTrace(pw); t.printStackTrace(pw);
fail("Unexpected exception:" + t.getMessage() + ":" + sw.toString()); fail("Unexpected exception:" + t.getMessage() + ":" + sw.toString());
} }

View File

@ -1,8 +1,17 @@
Description: Adds the classpath entry to the manifest file From: OpenKylin Developers <packaging@lists.openkylin.top>
Date: Thu, 17 Nov 2022 20:37:51 +0800
Subject: Adds the classpath entry to the manifest file
Forwarded: not-needed Forwarded: not-needed
---
src/conf/MANIFEST.MF | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/conf/MANIFEST.MF b/src/conf/MANIFEST.MF
index 5182e07..7f6dc10 100644
--- a/src/conf/MANIFEST.MF --- a/src/conf/MANIFEST.MF
+++ b/src/conf/MANIFEST.MF +++ b/src/conf/MANIFEST.MF
@@ -26,3 +26,4 @@ @@ -26,3 +26,4 @@ Import-Package: javax.servlet;resolution:=optional;version="[2.1.0,3.0
Include-Resource: META-INF/NOTICE.txt=NOTICE.txt,META-INF/LICENSE.txt= Include-Resource: META-INF/NOTICE.txt=NOTICE.txt,META-INF/LICENSE.txt=
LICENSE.txt LICENSE.txt
Specification-Version: 1.2 Specification-Version: 1.2