Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
f5efda73cb
!21 [sync] PR-19: Rebuild for fix log4j1.x cves
From: @openeuler-sync-bot 
Reviewed-by: @wangchong1995924 
Signed-off-by: @wangchong1995924
2022-02-28 09:12:20 +00:00
wk333
f6b2bec29a Rebuild for fix log4j1.x cves
(cherry picked from commit e616ed46d5f6902d400ad48fdf64324ffe1499bc)
2022-02-26 17:46:36 +08:00
openeuler-ci-bot
41ae24c40b !16 [sync] PR-14: This package depends on log4j.After the log4j vulnerability CVE-2021-44832 is fixed,the version needs to be rebuild.
Merge pull request !16 from openeuler-sync-bot/sync-pr14-openEuler-20.03-LTS-SP1-to-openEuler-20.03-LTS-SP3
2021-12-31 07:03:19 +00:00
houyingchao
12ab33eeef This package depends on log4j.After the log4j vulnerability CVE-2021-44832 is fixed,the version needs to be rebuild.
(cherry picked from commit c5f6248ad41c4de431afb809e28130885d8ddd89)
2021-12-31 10:59:48 +08:00
openeuler-ci-bot
53cd94b42f !10 [sync] PR-8: This package depends on log4j.After the log4j vulnerability CVE-2021-45105 is fixed,the version needs to be rebuild.
Merge pull request !10 from openeuler-sync-bot/sync-pr8-openEuler-20.03-LTS-SP1-to-openEuler-20.03-LTS-SP3
2021-12-27 09:50:52 +00:00
starlet-dx
47de54ef6d This package depends on log4j.After the log4j vulnerability CVE-2021-45105 is fixed,the version needs to be rebuild.
(cherry picked from commit 595846b09a55351f399011fee27b85d257903096)
2021-12-24 21:12:11 +08:00
openeuler-ci-bot
e76f5c4208 !5 [sync] PR-2: This package depends on log4j.After the log4j vulnerability CVE-2021-44228 is fixed,the version needs to be rebuild.
Merge pull request !5 from openeuler-sync-bot/sync-pr2-openEuler-20.03-LTS-SP1-to-openEuler-20.03-LTS-SP3
2021-12-20 11:41:37 +00:00
wk333
e5beb55f75 This package depends on log4j.After the log4j vulnerability CVE-2021-44228 is fixed,the version needs to be rebuild.
(cherry picked from commit fb30b5e74cea6c208c6ae4eaaf64402619bfb0ee)
2021-12-17 10:32:52 +08:00
openeuler-ci-bot
863e25ecfe !1 add avalon-framework source
Merge pull request !1 from sigui/sgs-refreash
2019-12-14 17:26:26 +08:00
sigui
db8343ad7e add avalon-framework source 2019-12-14 16:43:40 +08:00
4 changed files with 274 additions and 0 deletions

View File

@ -0,0 +1,178 @@
From fe5bf9cd9a3395574ad5d96596dcbcd235b53040 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Tue, 14 Jun 2016 14:21:15 +0200
Subject: [PATCH] Port build script to Maven 3
---
avalon-framework-api-4.3/project.xml | 19 +++++++--
avalon-framework-impl-4.3/project.xml | 73 +++++++++++------------------------
pom.xml | 11 ++++++
3 files changed, 50 insertions(+), 53 deletions(-)
create mode 100644 pom.xml
diff --git a/avalon-framework-api-4.3/project.xml b/avalon-framework-api-4.3/project.xml
index e64d251..e36b6ac 100644
--- a/avalon-framework-api-4.3/project.xml
+++ b/avalon-framework-api-4.3/project.xml
@@ -16,12 +16,13 @@
limitations under the License.
-->
<project>
- <extend>${basedir}/../project-common.xml</extend>
+ <modelVersion>4.0.0</modelVersion>
<name>Avalon Framework API</name>
+ <groupId>avalon-framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <shortDescription>Avalon Framework API</shortDescription>
- <package>org.apache.avalon.framework</package>
+ <description>Avalon Framework API</description>
+ <version>4.3</version>
<dependencies>
<dependency>
@@ -29,5 +30,17 @@
<artifactId>avalon-logkit</artifactId>
<version>2.1</version>
</dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
+
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <testSourceDirectory>src/test</testSourceDirectory>
+ </build>
</project>
diff --git a/avalon-framework-impl-4.3/project.xml b/avalon-framework-impl-4.3/project.xml
index d72efba..4022b4f 100644
--- a/avalon-framework-impl-4.3/project.xml
+++ b/avalon-framework-impl-4.3/project.xml
@@ -17,11 +17,13 @@
-->
<project>
- <extend>${basedir}/../project-common.xml</extend>
+ <modelVersion>4.0.0</modelVersion>
<name>Avalon Framework Implementation</name>
+ <groupId>avalon-framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
- <shortDescription>Avalon Framework Implementation</shortDescription>
+ <version>4.3</version>
+ <description>Avalon Framework Implementation</description>
<dependencies>
<dependency>
@@ -31,48 +33,16 @@
</dependency>
<dependency>
- <id>xml-apis</id>
- <version>2.0.2</version>
- <properties note="Only required if not provided by JVM.">
- <optional>true</optional>
- </properties>
- </dependency>
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- <version>2.0.2</version>
- <properties note="Only required if not provided by JVM.">
- <optional>true</optional>
- </properties>
- </dependency>
- <dependency>
- <id>xerces</id>
- <version>2.4.0</version>
- <properties note="Only required if not provided by JVM.">
- <optional>true</optional>
- </properties>
- </dependency>
- <dependency>
- <id>xalan</id>
- <version>2.6.0</version>
- <properties note="Only required if not provided by JVM.">
- <optional>true</optional>
- </properties>
- </dependency>
-
- <dependency>
- <id>log4j</id>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
<version>1.2.11</version>
- <properties note="Only required if log4j features are used.">
- <optional>true</optional>
- </properties>
+ <optional>true</optional>
</dependency>
- <dependency>
- <id>commons-logging</id>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
<version>1.0.4</version>
- <properties note="Only required if commons-logging features are used.">
- <optional>true</optional>
- </properties>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>avalon-logkit</groupId>
@@ -80,18 +50,21 @@
<version>2.1</version>
</dependency>
<dependency>
- <id>junit</id>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
<version>3.8.1</version>
- <properties note="Only required by tests.">
- <build>true</build>
- </properties>
+ <scope>test</scope>
</dependency>
<dependency>
- <id>jmock</id>
- <version>1.0.1</version>
- <properties note="Only required by tests.">
- <build>true</build>
- </properties>
+ <groupId>jmock</groupId>
+ <artifactId>jmock</artifactId>
+ <version>1.0.1</version>
+ <scope>test</scope>
</dependency>
</dependencies>
+
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <testSourceDirectory>src/test</testSourceDirectory>
+ </build>
</project>
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..a36ec55
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,11 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>placeholder</groupId>
+ <artifactId>aggregator</artifactId>
+ <version>1</version>
+ <packaging>pom</packaging>
+ <modules>
+ <module>avalon-framework-api-4.3/project.xml</module>
+ <module>avalon-framework-impl-4.3/project.xml</module>
+ </modules>
+</project>
--
2.5.5

Binary file not shown.

Binary file not shown.

96
avalon-framework.spec Normal file
View File

@ -0,0 +1,96 @@
Name: avalon-framework
Epoch: 0
Version: 4.3
Release: 26
Summary: Java components interfaces
License: ASL 2.0
URL: http://avalon.apache.org/
Source0: http://archive.apache.org/dist/excalibur/avalon-framework/source/%{name}-api-%{version}-src.tar.gz
Source1: http://archive.apache.org/dist/excalibur/avalon-framework/source/%{name}-impl-%{version}-src.tar.gz
BuildRequires: maven-local mvn(avalon-logkit:avalon-logkit) mvn(log4j:log4j)
BuildRequires: mvn(commons-logging:commons-logging) mvn(org.apache.felix:maven-bundle-plugin)
BuildArch: noarch
Patch0001: 0001-Port-build-script-to-Maven-3.patch
%description
Apache Avalon provided Java software for component and container
programming and pioneered the use of design patterns such as Inversion of
Control (IoC) and Separation of Concerns (SoC).
%package help
Summary: API documentation %{name}
Provides: avalon-framework-javadoc = %{epoch}:%{version}-%{release}
Obsoletes: avalon-framework-javadoc < %{epoch}:%{version}-%{release}
%description help
This package provides help documentation for avalon-framework
%prep
%autosetup -c -a 0 -a 1 -p1
%mvn_package :aggregator __noinstall
%mvn_file ":*api*" %{name}-api
%mvn_file ":*impl*" %{name}-impl %{name}
%pom_xpath_inject pom:project "<packaging>bundle</packaging>" *api*/project.xml
%pom_xpath_inject pom:build "
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>avalon-framework-api-4.3</Bundle-SymbolicName>
<_nouses>true</_nouses>
</instructions>
</configuration>
</plugin>
</plugins>" *api*/project.xml
%pom_xpath_inject pom:project "<packaging>bundle</packaging>" *impl*/project.xml
%pom_xpath_inject pom:build "
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>avalon-framework-impl-4.3</Bundle-SymbolicName>
<_nouses>true</_nouses>
</instructions>
</configuration>
</plugin>
</plugins>" *impl*/project.xml
%mvn_alias 'avalon-framework:{*}' 'org.apache.avalon.framework:@1'
%build
%mvn_build -f
%install
%mvn_install
mv .mfiles-javadoc .mfiles-help
%files -f .mfiles
%license avalon-framework-api-4.3/LICENSE.txt
%license avalon-framework-api-4.3/NOTICE.txt
%files help -f .mfiles-help
%changelog
* Fri Feb 25 2022 wangkai <wangkai385@huawei.com> - 0:4.3-26
- Rebuild for fix log4j1.x cves
* Wed Dec 29 2021 houyingchao <houyingchao@huawei.com> - 0:4.3-25
- This package depends on log4j.After the log4j vulnerability CVE-2021-44832 is fixed,the version needs to be rebuild.
* Fri Dec 24 2021 yaoxin <yaoxin30@huawei.com> - 0:4.3-24
- This package depends on log4j.After the log4j vulnerability CVE-2021-45105 is fixed,the version needs to be rebuild.
* Thu Dec 16 2021 wangkai <wangkai385@huawei.com> - 0:4.3-23
- This package depends on log4j.After the log4j vulnerability CVE-2021-44228 is fixed,the version needs to be rebuild.
* Fri Nov 22 2019 sunguoshuai <sunguoshuai@huawei.com> - 0:4.3-22
- Package init.