开源软件构建与测试

Changes of Revision 7

_service:tar_scm:log4j12.spec Changed

@@ -7,7 +7,6 @@
 BuildArch:     noarch
 Source0:       https://github.com/apache/log4j/archive/v1_2_17.tar.gz
 Source1:       log4j.catalog
-Source2:       repository.tar.gz
 
 Patch0000:     0001-logfactor5-changed-userdir.patch
 Patch0001:     0009-Fix-tests.patch
@@ -17,9 +16,8 @@
 Patch0005:     CVE-2022-23302.patch
 Patch0006:     CVE-2022-23305.patch
 Patch0007:     CVE-2022-23307.patch
-Patch0008:     fix-mav.patch
 
-BuildRequires: maven-local mvn(ant-contrib:ant-contrib) mvn(javax.mail:mail) mvn(com.h2database:h2)
+BuildRequires: maven-local mvn(ant-contrib:ant-contrib) mvn(javax.mail:mail)
 BuildRequires: mvn(junit:junit) mvn(org.apache.ant:ant-junit)
 BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires: mvn(org.apache.geronimo.specs:geronimo-jms_1.1_spec)
@@ -43,8 +41,7 @@
 
 %prep
 %autosetup -n log4j-1_2_17 -p1
-mkdir -p /home/abuild/.m2/repository/
-tar -xvf %{SOURCE2} -C /home/abuild/.m2/repository/
+
 find . $ -name "*.jar" -o -name "*.class" -o -name "*.dll" $ -exec rm -f {} \;
 rm -rf docs/api

_service:tar_scm:fix-mav.patch Deleted

@@ -1,73 +0,0 @@
-diff -ur log4j-1_2_17/pom.xml log4j-1_2_17-copy/pom.xml
---- log4j-1_2_17/pom.xml	2012-05-26 18:00:25.000000000 +0800
-+++ log4j-1_2_17-copy/pom.xml	2023-06-10 15:59:18.258498078 +0800
-@@ -89,6 +89,7 @@
-       <plugin>
-         <groupId>org.apache.maven.plugins</groupId>
-         <artifactId>maven-resources-plugin</artifactId>
-+        <version>3.3.1</version>
-         <configuration>
-           <encoding>UTF-8</encoding>
-         </configuration>
-@@ -331,7 +332,7 @@
-       </plugin>
-       <plugin>
-         <artifactId>maven-assembly-plugin</artifactId>
--        <version>2.2-beta-5</version>
-+        <version>3.1.0</version>
-         <configuration>
-           <descriptors>
-             <descriptor>src/assembly/bin.xml</descriptor>
-Only in log4j-1_2_17-copy/target/classes/org/apache/log4j/chainsaw: doc-files
-Only in log4j-1_2_17-copy/target/classes/org/apache/log4j/chainsaw: package.html
-Only in log4j-1_2_17-copy/target/classes/org/apache/log4j/config: package.html
-Only in log4j-1_2_17-copy/target/classes/org/apache/log4j/helpers: package.html
-Only in log4j-1_2_17-copy/target/classes/org/apache/log4j/jdbc: package.html
-Only in log4j-1_2_17-copy/target/classes/org/apache/log4j/jmx: package.html
-Only in log4j-1_2_17-copy/target/classes/org/apache/log4j/net: package.html
-Only in log4j-1_2_17-copy/target/classes/org/apache/log4j/nt: package.html
-Only in log4j-1_2_17-copy/target/classes/org/apache/log4j/or/jms: package.html
-Only in log4j-1_2_17-copy/target/classes/org/apache/log4j/or: package.html
-Only in log4j-1_2_17-copy/target/classes/org/apache/log4j/or/sax: package.html
-Only in log4j-1_2_17-copy/target/classes/org/apache/log4j: package.html
-Only in log4j-1_2_17-copy/target/classes/org/apache/log4j/pattern: package.html
-Only in log4j-1_2_17-copy/target/classes/org/apache/log4j/spi: package.html
-Only in log4j-1_2_17-copy/target/classes/org/apache/log4j/varia: package.html
-Only in log4j-1_2_17-copy/target/classes/org/apache/log4j/xml: package.html
-Only in log4j-1_2_17-copy/target/test-classes/org/apache/log4j: CoreTestSuite.class
-Binary files log4j-1_2_17/target/test-classes/org/apache/log4j/customLogger/XLoggerTestCase.class and log4j-1_2_17-copy/target/test-classes/org/apache/log4j/customLogger/XLoggerTestCase.class differ
-Binary files log4j-1_2_17/target/test-classes/org/apache/log4j/DRFATestCase.class and log4j-1_2_17-copy/target/test-classes/org/apache/log4j/DRFATestCase.class differ
-Binary files log4j-1_2_17/target/test-classes/org/apache/log4j/EnhancedPatternLayoutTestCase.class and log4j-1_2_17-copy/target/test-classes/org/apache/log4j/EnhancedPatternLayoutTestCase.class differ
-Binary files log4j-1_2_17/target/test-classes/org/apache/log4j/FileAppenderTest.class and log4j-1_2_17-copy/target/test-classes/org/apache/log4j/FileAppenderTest.class differ
-Binary files log4j-1_2_17/target/test-classes/org/apache/log4j/helpers/PatternParserTestCase.class and log4j-1_2_17-copy/target/test-classes/org/apache/log4j/helpers/PatternParserTestCase.class differ
-Binary files log4j-1_2_17/target/test-classes/org/apache/log4j/HierarchyThresholdTestCase.class and log4j-1_2_17-copy/target/test-classes/org/apache/log4j/HierarchyThresholdTestCase.class differ
-Only in log4j-1_2_17-copy/target/test-classes/org/apache/log4j: Last.class
-Binary files log4j-1_2_17/target/test-classes/org/apache/log4j/LevelTest$CustomLevel.class and log4j-1_2_17-copy/target/test-classes/org/apache/log4j/LevelTest$CustomLevel.class differ
-Binary files log4j-1_2_17/target/test-classes/org/apache/log4j/LevelTest.class and log4j-1_2_17-copy/target/test-classes/org/apache/log4j/LevelTest.class differ
-Binary files log4j-1_2_17/target/test-classes/org/apache/log4j/MDCTestCase.class and log4j-1_2_17-copy/target/test-classes/org/apache/log4j/MDCTestCase.class differ
-Binary files log4j-1_2_17/target/test-classes/org/apache/log4j/MinimumTestCase.class and log4j-1_2_17-copy/target/test-classes/org/apache/log4j/MinimumTestCase.class differ
-Binary files log4j-1_2_17/target/test-classes/org/apache/log4j/net/SocketServerTestCase.class and log4j-1_2_17-copy/target/test-classes/org/apache/log4j/net/SocketServerTestCase.class differ
-Binary files log4j-1_2_17/target/test-classes/org/apache/log4j/PatternLayoutTestCase.class and log4j-1_2_17-copy/target/test-classes/org/apache/log4j/PatternLayoutTestCase.class differ
-Binary files log4j-1_2_17/target/test-classes/org/apache/log4j/rewrite/RewriteAppenderTest$BaseBean.class and log4j-1_2_17-copy/target/test-classes/org/apache/log4j/rewrite/RewriteAppenderTest$BaseBean.class differ
-Binary files log4j-1_2_17/target/test-classes/org/apache/log4j/rewrite/RewriteAppenderTest$MessageBean.class and log4j-1_2_17-copy/target/test-classes/org/apache/log4j/rewrite/RewriteAppenderTest$MessageBean.class differ
-Binary files log4j-1_2_17/target/test-classes/org/apache/log4j/rewrite/RewriteAppenderTest.class and log4j-1_2_17-copy/target/test-classes/org/apache/log4j/rewrite/RewriteAppenderTest.class differ
-Binary files log4j-1_2_17/target/test-classes/org/apache/log4j/spi/LoggingEventTest$BadMessage.class and log4j-1_2_17-copy/target/test-classes/org/apache/log4j/spi/LoggingEventTest$BadMessage.class differ
-Binary files log4j-1_2_17/target/test-classes/org/apache/log4j/spi/LoggingEventTest.class and log4j-1_2_17-copy/target/test-classes/org/apache/log4j/spi/LoggingEventTest.class differ
-Only in log4j-1_2_17-copy/target/test-classes/org/apache/log4j: stressCategory
-Only in log4j-1_2_17-copy/target/test-classes/org/apache/log4j: stressCategory.pl
-Only in log4j-1_2_17-copy/target/test-classes/org/apache/log4j/util: Compare.class
-Binary files log4j-1_2_17/target/test-classes/org/apache/log4j/util/ControlFilter.class and log4j-1_2_17-copy/target/test-classes/org/apache/log4j/util/ControlFilter.class differ
-Binary files log4j-1_2_17/target/test-classes/org/apache/log4j/util/Filter.class and log4j-1_2_17-copy/target/test-classes/org/apache/log4j/util/Filter.class differ
-Only in log4j-1_2_17-copy/target/test-classes/org/apache/log4j/util: SerializationTestHelper.class
-Binary files log4j-1_2_17/target/test-classes/org/apache/log4j/util/Transformer.class and log4j-1_2_17-copy/target/test-classes/org/apache/log4j/util/Transformer.class differ
-Only in log4j-1_2_17-copy/target/test-classes/org/apache/log4j/util: UnexpectedFormatException.class
-Binary files log4j-1_2_17/target/test-classes/org/apache/log4j/varia/ErrorHandlerTestCase.class and log4j-1_2_17-copy/target/test-classes/org/apache/log4j/varia/ErrorHandlerTestCase.class differ
-Binary files log4j-1_2_17/target/test-classes/org/apache/log4j/varia/LevelMatchFilterTestCase.class and log4j-1_2_17-copy/target/test-classes/org/apache/log4j/varia/LevelMatchFilterTestCase.class differ
-Binary files log4j-1_2_17/target/test-classes/org/apache/log4j/xml/CustomLevelTestCase.class and log4j-1_2_17-copy/target/test-classes/org/apache/log4j/xml/CustomLevelTestCase.class differ
-Binary files log4j-1_2_17/target/test-classes/org/apache/log4j/xml/DOMTestCase$CustomErrorHandler.class and log4j-1_2_17-copy/target/test-classes/org/apache/log4j/xml/DOMTestCase$CustomErrorHandler.class differ
-Binary files log4j-1_2_17/target/test-classes/org/apache/log4j/xml/DOMTestCase$CustomLogger.class and log4j-1_2_17-copy/target/test-classes/org/apache/log4j/xml/DOMTestCase$CustomLogger.class differ
-Binary files log4j-1_2_17/target/test-classes/org/apache/log4j/xml/DOMTestCase$CustomLoggerFactory.class and log4j-1_2_17-copy/target/test-classes/org/apache/log4j/xml/DOMTestCase$CustomLoggerFactory.class differ
-Binary files log4j-1_2_17/target/test-classes/org/apache/log4j/xml/DOMTestCase$MockThrowableRenderer.class and log4j-1_2_17-copy/target/test-classes/org/apache/log4j/xml/DOMTestCase$MockThrowableRenderer.class differ
-Binary files log4j-1_2_17/target/test-classes/org/apache/log4j/xml/DOMTestCase.class and log4j-1_2_17-copy/target/test-classes/org/apache/log4j/xml/DOMTestCase.class differ
-Binary files log4j-1_2_17/target/test-classes/org/apache/log4j/xml/XMLLayoutTestCase$X.class and log4j-1_2_17-copy/target/test-classes/org/apache/log4j/xml/XMLLayoutTestCase$X.class differ
-Binary files log4j-1_2_17/target/test-classes/org/apache/log4j/xml/XMLLayoutTestCase.class and log4j-1_2_17-copy/target/test-classes/org/apache/log4j/xml/XMLLayoutTestCase.class differ

_constraints Deleted

_service:tar_scm:repository.tar.gz Deleted