diff --git a/0001-Port-to-current-qdox.patch b/0001-Port-to-current-qdox.patch new file mode 100644 index 0000000..1d283b9 --- /dev/null +++ b/0001-Port-to-current-qdox.patch @@ -0,0 +1,39 @@ +From 81ed06024dd78113d2e6c5090e59cacc43453a54 Mon Sep 17 00:00:00 2001 +From: Michael Simacek +Date: Fri, 20 Jan 2017 17:27:51 +0100 +Subject: [PATCH] Port to current qdox + +--- + .../java/org/codehaus/plexus/metadata/gleaner/QDoxComponentGleaner.java | 2 +- + pom.xml | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/gleaner/QDoxComponentGleaner.java b/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/gleaner/QDoxComponentGleaner.java +index 0a798fe..41efa44 100644 +--- a/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/gleaner/QDoxComponentGleaner.java ++++ b/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/gleaner/QDoxComponentGleaner.java +@@ -244,7 +244,7 @@ public class QDoxComponentGleaner + // Remove any Plexus specific interfaces from the calculation + // ---------------------------------------------------------------------- + +- List interfaces = new ArrayList( javaClass.getImplementedInterfaces() ); ++ List interfaces = new ArrayList( javaClass.getInterfaces() ); + + for ( Iterator it = interfaces.iterator(); it.hasNext(); ) + { +diff --git a/pom.xml b/pom.xml +index eaba94d..f80f0d2 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -85,7 +85,7 @@ + + com.thoughtworks.qdox + qdox +- 2.0-M2 ++ 2.0-M5 + + + org.jdom +-- +2.9.3 + diff --git a/README.en.md b/README.en.md deleted file mode 100644 index 5055045..0000000 --- a/README.en.md +++ /dev/null @@ -1,36 +0,0 @@ -# plexus-containers - -#### Description -{**When you're done, you can delete the content in this README and update the file with details for others getting started with your repository**} - -#### Software Architecture -Software architecture description - -#### Installation - -1. xxxx -2. xxxx -3. xxxx - -#### Instructions - -1. xxxx -2. xxxx -3. xxxx - -#### Contribution - -1. Fork the repository -2. Create Feat_xxx branch -3. Commit your code -4. Create Pull Request - - -#### Gitee Feature - -1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md -2. Gitee blog [blog.gitee.com](https://blog.gitee.com) -3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore) -4. The most valuable open source project [GVP](https://gitee.com/gvp) -5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help) -6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/README.md b/README.md deleted file mode 100644 index 106643d..0000000 --- a/README.md +++ /dev/null @@ -1,39 +0,0 @@ -# plexus-containers - -#### 介绍 -{**以下是码云平台说明，您可以替换此简介** -码云是 OSCHINA 推出的基于 Git 的代码托管平台（同时支持 SVN）。专为开发者提供稳定、高效、安全的云端软件开发协作平台 -无论是个人、团队、或是企业，都能够用码云实现代码托管、项目管理、协作开发。企业项目请看 [https://gitee.com/enterprises](https://gitee.com/enterprises)} - -#### 软件架构 -软件架构说明 - - -#### 安装教程 - -1. xxxx -2. xxxx -3. xxxx - -#### 使用说明 - -1. xxxx -2. xxxx -3. xxxx - -#### 参与贡献 - -1. Fork 本仓库 -2. 新建 Feat_xxx 分支 -3. 提交代码 -4. 新建 Pull Request - - -#### 码云特技 - -1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md -2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com) -3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目 -4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目 -5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) -6. 码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/plexus-containers-1.7.1.tar.gz b/plexus-containers-1.7.1.tar.gz new file mode 100644 index 0000000..163a043 Binary files /dev/null and b/plexus-containers-1.7.1.tar.gz differ diff --git a/plexus-containers.spec b/plexus-containers.spec new file mode 100644 index 0000000..13c5385 --- /dev/null +++ b/plexus-containers.spec @@ -0,0 +1,106 @@ +Name: plexus-containers +Version: 1.7.1 +Release: 7 +Summary: Plexus' inversion-of-control (IoC) container +License: ASL 2.0 and MIT +URL: https://github.com/codehaus-plexus/plexus-containers +Source0: https://github.com/codehaus-plexus/plexus-containers/archive/plexus-containers-%{version}.tar.gz +BuildArch: noarch +BuildRequires: maven-local mvn(com.google.guava:guava:20.0) mvn(commons-cli:commons-cli) mvn(com.sun:tools) +BuildRequires: mvn(com.thoughtworks.qdox:qdox) mvn(junit:junit) mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: mvn(org.apache.maven:maven-core) mvn(org.apache.maven:maven-model) mvn(org.apache.maven:maven-plugin-api) +BuildRequires: mvn(org.apache.maven:maven-project) mvn(org.apache.maven.plugins:maven-plugin-plugin) +BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) mvn(org.apache.xbean:xbean-reflect) +BuildRequires: mvn(org.codehaus.plexus:plexus-classworlds) mvn(org.codehaus.plexus:plexus-cli) +BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations) mvn(org.codehaus.plexus:plexus:pom:) +BuildRequires: mvn(org.codehaus.plexus:plexus-utils) mvn(org.jdom:jdom2) mvn(org.ow2.asm:asm) +BuildRequires: mvn(org.ow2.asm:asm-all) mvn(org.ow2.asm:asm-commons) +Patch0000: 0001-Port-to-current-qdox.patch + +%description +Plexus IoC Container core with companion tools. + +%package component-metadata +Summary: Component metadata from plexus-containers + +%description component-metadata +plexus-component-metadata(-maven-plugin) is a Maven plugin to generate plexus component.xml from +source javadoc tags and Java 5 class annotations. + +%package component-javadoc +Summary: Javadoc component from plexus-containers + +%description component-javadoc +Javadoc component from plexus-containers. + +%package component-annotations +Summary: Component API from plexus-containers + +%description component-annotations +plexus-component-annotations provides the Java 5 annotations for plexus components. + +%package container-default +Summary: Default Container from plexus-containers. + +%description container-default +plexus-container-default is the IoC container itself. + +%package help +Provides: plexus-containers-javadoc = %{version}-%{release} +Obsoletes: plexus-containers-javadoc < %{version}-%{release} +Summary: Documentation for all plexus-containers packages + +%description help +Documentation for all plexus-containers packages. + +%prep +%autosetup -n plexus-containers-plexus-containers-%{version} -p1 +%pom_remove_plugin -r :maven-site-plugin +%pom_add_dep org.apache.maven:maven-core plexus-component-metadata +%pom_change_dep -r :google-collections com.google.guava:guava:20.0 +%pom_add_dep org.ow2.asm:asm:5.0.3:runtime plexus-container-default +%pom_add_dep org.ow2.asm:asm-commons:5.0.3:runtime plexus-container-default +%pom_remove_dep com.sun:tools plexus-component-javadoc +%pom_add_dep com.sun:tools plexus-component-javadoc +%pom_xpath_inject "pom:project" " + bundle + + + + org.apache.felix + maven-bundle-plugin + true + + + <_nouses>true + org.codehaus.plexus.component.annotations.* + + + + + " plexus-component-annotations +install -d plexus-component-annotations/src/test/java +sed -i "s|2.3| %{javadoc_plugin_version}|" plexus-component-javadoc/src/it/basic/pom.xml +%mvn_alias ":plexus-container-default" "org.codehaus.plexus:containers-component-api" +%mvn_file ":plexus-component-annotations" plexus-containers/plexus-component-annotations plexus/containers-component-annotations + +%build +%mvn_build -f -s +%install +%mvn_install + +%files -f .mfiles-plexus-containers + +%files component-metadata -f .mfiles-plexus-component-metadata + +%files component-javadoc -f .mfiles-plexus-component-javadoc + +%files component-annotations -f .mfiles-plexus-component-annotations + +%files container-default -f .mfiles-plexus-container-default + +%files help -f .mfiles-javadoc + +%changelog +* Fri Dec 13 2019 Ling Yang - 1.7.1-7 +- Package init