diff --git a/0001-Port-build-script-to-Maven-3.patch b/0001-Port-build-script-to-Maven-3.patch new file mode 100644 index 0000000..ee1db1a --- /dev/null +++ b/0001-Port-build-script-to-Maven-3.patch @@ -0,0 +1,178 @@ +From fe5bf9cd9a3395574ad5d96596dcbcd235b53040 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +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. + --> + +- ${basedir}/../project-common.xml ++ 4.0.0 + + Avalon Framework API ++ avalon-framework + avalon-framework-api +- Avalon Framework API +- org.apache.avalon.framework ++ Avalon Framework API ++ 4.3 + + + +@@ -29,5 +30,17 @@ + avalon-logkit + 2.1 + ++ ++ ++ junit ++ junit ++ 3.8.1 ++ test ++ + ++ ++ ++ src/java ++ src/test ++ + +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 @@ + --> + + +- ${basedir}/../project-common.xml ++ 4.0.0 + + Avalon Framework Implementation ++ avalon-framework + avalon-framework-impl +- Avalon Framework Implementation ++ 4.3 ++ Avalon Framework Implementation + + + +@@ -31,48 +33,16 @@ + + + +- xml-apis +- 2.0.2 +- +- true +- +- +- +- xml-apis +- xmlParserAPIs +- 2.0.2 +- +- true +- +- +- +- xerces +- 2.4.0 +- +- true +- +- +- +- xalan +- 2.6.0 +- +- true +- +- +- +- +- log4j ++ log4j ++ log4j + 1.2.11 +- +- true +- ++ true + +- +- commons-logging ++ ++ commons-logging ++ commons-logging + 1.0.4 +- +- true +- ++ true + + + avalon-logkit +@@ -80,18 +50,21 @@ + 2.1 + + +- junit ++ junit ++ junit + 3.8.1 +- +- true +- ++ test + + +- jmock +- 1.0.1 +- +- true +- ++ jmock ++ jmock ++ 1.0.1 ++ test + + ++ ++ ++ src/java ++ src/test ++ + +diff --git a/pom.xml b/pom.xml +new file mode 100644 +index 0000000..a36ec55 +--- /dev/null ++++ b/pom.xml +@@ -0,0 +1,11 @@ ++ ++ 4.0.0 ++ placeholder ++ aggregator ++ 1 ++ pom ++ ++ avalon-framework-api-4.3/project.xml ++ avalon-framework-impl-4.3/project.xml ++ ++ +-- +2.5.5 + diff --git a/avalon-framework-api-4.3-src.tar.gz b/avalon-framework-api-4.3-src.tar.gz new file mode 100644 index 0000000..9174be6 Binary files /dev/null and b/avalon-framework-api-4.3-src.tar.gz differ diff --git a/avalon-framework-impl-4.3-src.tar.gz b/avalon-framework-impl-4.3-src.tar.gz new file mode 100644 index 0000000..2f8099b Binary files /dev/null and b/avalon-framework-impl-4.3-src.tar.gz differ diff --git a/avalon-framework.spec b/avalon-framework.spec new file mode 100644 index 0000000..e1cdc4f --- /dev/null +++ b/avalon-framework.spec @@ -0,0 +1,84 @@ +Name: avalon-framework +Epoch: 0 +Version: 4.3 +Release: 22 +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 "bundle" *api*/project.xml +%pom_xpath_inject pom:build " + + + org.apache.felix + maven-bundle-plugin + true + + + avalon-framework-api-4.3 + <_nouses>true + + + + " *api*/project.xml +%pom_xpath_inject pom:project "bundle" *impl*/project.xml +%pom_xpath_inject pom:build " + + + org.apache.felix + maven-bundle-plugin + true + + + avalon-framework-impl-4.3 + <_nouses>true + + + + " *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 Nov 22 2019 sunguoshuai - 0:4.3-22 +- Package init.