!2 Update from 6.0.0 to 7.0.0

Merge pull request !2 from 雷炬/master
This commit is contained in:
openeuler-ci-bot 2020-08-18 17:18:23 +08:00 committed by Gitee
commit 3d5d6da06c
7 changed files with 45 additions and 113 deletions

View File

@ -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/)

View File

@ -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/)

View File

@ -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 "
<packaging>bundle</packaging>
<build>
@ -42,7 +41,6 @@ cp -p %{SOURCE1} pom.xml
</plugin>
</plugins>
</build>"
%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 <leiju4@huawei.com> - 7.0.0-1
- Update from 6.0.0 to 7.0.0
* Wed Dec 4 2019 openEuler Buildteam <buildteam@openeuler.org> - 6.0.0-9
- Package init

4
osgi-annotation.yaml Normal file
View File

@ -0,0 +1,4 @@
version_control: NA
src_repo: NA
tag_prefix: NA
seperator: NA

Binary file not shown.

BIN
osgi.annotation-7.0.0.jar Normal file

Binary file not shown.

View File

@ -3,25 +3,27 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.osgi</groupId>
<artifactId>osgi.annotation</artifactId>
<version>6.0.0</version>
<description>OSGi Annotation Release 6, Annotations for use in compiling bundles.</description>
<version>7.0.0</version>
<description>OSGi Annotation Release 7, Annotations for use in compiling bundles</description>
<name>org.osgi:osgi.annotation</name>
<url>http://www.osgi.org/</url>
<url>https://www.osgi.org/</url>
<organization>
<name>OSGi Alliance</name>
<url>http://www.osgi.org/</url>
<url>https://www.osgi.org/</url>
</organization>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
<url>http://opensource.org/licenses/apache2.0.php</url>
<name>Apache-2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0</url>
<distribution>repo</distribution>
<comments>Apache License, Version 2.0</comments>
</license>
</licenses>
<scm>
<url>https://www.osgi.org/members/git/build.git</url>
<connection>scm:git:https://www.osgi.org/members/git/build.git</connection>
<developerConnection>scm:git:https://www.osgi.org/members/git/build.git</developerConnection>
<url>https://osgi.org/gitweb/build.git</url>
<connection>scm:git:https://osgi.org/git/build.git</connection>
<developerConnection>scm:git:https://osgi.org/git/build.git</developerConnection>
<tag>hudson-build.core-1432</tag>
</scm>
<developers>
<developer>
@ -29,6 +31,7 @@
<email>info@osgi.org</email>
<name>OSGi Alliance</name>
<organization>OSGi Alliance</organization>
<organizationUrl>https://www.osgi.org/</organizationUrl>
</developer>
</developers>
</project>