diff --git a/README.en.md b/README.en.md deleted file mode 100644 index b8ab22c..0000000 --- a/README.en.md +++ /dev/null @@ -1,36 +0,0 @@ -# osgi-annotation - -#### 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 501fc23..0000000 --- a/README.md +++ /dev/null @@ -1,39 +0,0 @@ -# osgi-annotation - -#### 介绍 -{**以下是码云平台说明,您可以替换此简介** -码云是 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/osgi-annotation.spec b/osgi-annotation.spec index 9509774..02ec495 100644 --- a/osgi-annotation.spec +++ b/osgi-annotation.spec @@ -1,30 +1,29 @@ -Name: osgi-annotation -Version: 6.0.0 -Release: 9 -Summary: Annotations for use in compiling bundles -License: ASL 2.0 -URL: http://www.osgi.org/ - -Source0: http://repo1.maven.org/maven2/org/osgi/osgi.annotation/%{version}/osgi.annotation-%{version}-sources.jar -Source1: http://repo1.maven.org/maven2/org/osgi/osgi.annotation/%{version}/osgi.annotation-%{version}.pom - -BuildArch: noarch -BuildRequires: maven-local mvn(org.apache.felix:maven-bundle-plugin) -Provides: %{name}-javadoc = %{version}-%{release} -Obsoletes: %{name}-javadoc < %{version}-%{release} +Name: osgi-annotation +Version: 7.0.0 +Release: 1 +Summary: Annotations for use in compiling OSGi bundles +License: ASL 2.0 +URL: http://www.osgi.org/ +Source0: https://repo1.maven.org/maven2/org/osgi/osgi.annotation/%{version}/osgi.annotation-%{version}.jar +Source1: https://repo1.maven.org/maven2/org/osgi/osgi.annotation/%{version}/osgi.annotation-%{version}.pom +BuildRequires: maven-local mvn(org.apache.felix:maven-bundle-plugin) +BuildArch: noarch %description -%{summary} +Annotations for use in compiling OSGi bundles. This package is not normally +needed at run-time. + +%package javadoc +Summary: API documentation for %{name} + +%description javadoc +This package contains the API documentation for %{name}. %prep -%autosetup -c -n %{name}-%{version} - -mkdir -p src/main/resources -mv about.html src/main/resources -mkdir -p src/main/java -mv org src/main/java +%setup -c -q +mkdir -p src/main/java && mv OSGI-OPT/src/org src/main/java +rm -r org OSGI-OPT cp -p %{SOURCE1} pom.xml - %pom_xpath_inject pom:project " bundle @@ -42,7 +41,6 @@ cp -p %{SOURCE1} pom.xml " - %mvn_alias org.osgi:osgi.annotation org.osgi:org.osgi.annotation %build @@ -51,16 +49,18 @@ cp -p %{SOURCE1} pom.xml %install %mvn_install -%files -%defattr(-,root,root) +%files -f .mfiles %license LICENSE +%doc about.html %dir %{_javadir}/osgi-annotation %dir %{_mavenpomdir}/osgi-annotation -%{_datadir}/java/* -%{_datadir}/javadoc/* -%{_datadir}/maven-poms/* -%{_datadir}/maven-metadata/* + +%files javadoc -f .mfiles-javadoc +%doc LICENSE %changelog +* Thu Aug 13 2020 leiju - 7.0.0-1 +- Update from 6.0.0 to 7.0.0 + * Wed Dec 4 2019 openEuler Buildteam - 6.0.0-9 - Package init diff --git a/osgi-annotation.yaml b/osgi-annotation.yaml new file mode 100644 index 0000000..00bbaf0 --- /dev/null +++ b/osgi-annotation.yaml @@ -0,0 +1,4 @@ +version_control: NA +src_repo: NA +tag_prefix: NA +seperator: NA diff --git a/osgi.annotation-6.0.0-sources.jar b/osgi.annotation-6.0.0-sources.jar deleted file mode 100644 index ff7b72e..0000000 Binary files a/osgi.annotation-6.0.0-sources.jar and /dev/null differ diff --git a/osgi.annotation-7.0.0.jar b/osgi.annotation-7.0.0.jar new file mode 100644 index 0000000..317c0f9 Binary files /dev/null and b/osgi.annotation-7.0.0.jar differ diff --git a/osgi.annotation-6.0.0.pom b/osgi.annotation-7.0.0.pom similarity index 54% rename from osgi.annotation-6.0.0.pom rename to osgi.annotation-7.0.0.pom index 42c7d0a..9b41058 100644 --- a/osgi.annotation-6.0.0.pom +++ b/osgi.annotation-7.0.0.pom @@ -3,25 +3,27 @@ 4.0.0 org.osgi osgi.annotation - 6.0.0 - OSGi Annotation Release 6, Annotations for use in compiling bundles. + 7.0.0 + OSGi Annotation Release 7, Annotations for use in compiling bundles org.osgi:osgi.annotation - http://www.osgi.org/ + https://www.osgi.org/ OSGi Alliance - http://www.osgi.org/ + https://www.osgi.org/ - Apache License, Version 2.0 - http://opensource.org/licenses/apache2.0.php + Apache-2.0 + http://www.apache.org/licenses/LICENSE-2.0 repo + Apache License, Version 2.0 - https://www.osgi.org/members/git/build.git - scm:git:https://www.osgi.org/members/git/build.git - scm:git:https://www.osgi.org/members/git/build.git + https://osgi.org/gitweb/build.git + scm:git:https://osgi.org/git/build.git + scm:git:https://osgi.org/git/build.git + hudson-build.core-1432 @@ -29,6 +31,7 @@ info@osgi.org OSGi Alliance OSGi Alliance + https://www.osgi.org/