Compare commits

...

No commits in common. "c8-stream-201902" and "c8-beta-stream-202201" have entirely different histories.

5 changed files with 77 additions and 32 deletions

1
.gitignore vendored
View File

@ -1 +0,0 @@
SOURCES/osgi.annotation-7.0.0.jar

View File

@ -1 +0,0 @@
c8c21fdf695aa93d8df0547c15fb6b52f3395787 SOURCES/osgi.annotation-7.0.0.jar

Binary file not shown.

View File

@ -3,34 +3,33 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.osgi</groupId>
<artifactId>osgi.annotation</artifactId>
<version>7.0.0</version>
<description>OSGi Annotation Release 7, Annotations for use in compiling bundles</description>
<version>8.0.1</version>
<description>OSGi Annotation Release 8, Annotations for use in compiling bundles</description>
<name>org.osgi:osgi.annotation</name>
<url>https://www.osgi.org/</url>
<url>https://docs.osgi.org/</url>
<organization>
<name>OSGi Alliance</name>
<url>https://www.osgi.org/</url>
<name>Eclipse Foundation</name>
</organization>
<licenses>
<license>
<name>Apache-2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0</url>
<url>https://opensource.org/licenses/Apache-2.0</url>
<distribution>repo</distribution>
<comments>Apache License, Version 2.0</comments>
<comments>This program and the accompanying materials are made available under the terms of the Apache License, Version 2.0.</comments>
</license>
</licenses>
<scm>
<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>
<url>https://github.com/osgi/osgi</url>
<connection>scm:git:https://github.com/osgi/osgi.git</connection>
<developerConnection>scm:git:git@github.com:osgi/osgi.git</developerConnection>
<tag>r8-cmpn-final</tag>
</scm>
<developers>
<developer>
<id>osgi</id>
<email>info@osgi.org</email>
<name>OSGi Alliance</name>
<organization>OSGi Alliance</organization>
<email>osgi-wg@eclipse.org</email>
<name>OSGi Working Group</name>
<organization>Eclipse Foundation</organization>
<organizationUrl>https://www.osgi.org/</organizationUrl>
</developer>
</developers>

View File

@ -1,19 +1,25 @@
Name: osgi-annotation
Version: 7.0.0
Release: 3%{?dist}
Summary: Annotations for use in compiling OSGi bundles
%bcond_with bootstrap
Name: osgi-annotation
Version: 8.0.1
Release: 5%{?dist}
Summary: Annotations for use in compiling OSGi bundles
License: ASL 2.0
URL: https://www.osgi.org
BuildArch: noarch
ExclusiveArch: %{java_arches} noarch
License: ASL 2.0
URL: http://www.osgi.org/
# Upstream project is behind an account registration system with no anonymous
# read access, so we download the source from maven central instead
Source0: http://repo1.maven.org/maven2/org/osgi/osgi.annotation/%{version}/osgi.annotation-%{version}.jar
Source1: http://repo1.maven.org/maven2/org/osgi/osgi.annotation/%{version}/osgi.annotation-%{version}.pom
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
BuildArch: noarch
BuildRequires: maven-local
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
%if %{with bootstrap}
BuildRequires: javapackages-bootstrap
%else
BuildRequires: maven-local
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
%endif
%description
Annotations for use in compiling OSGi bundles. This package is not normally
@ -57,25 +63,67 @@ cp -p %{SOURCE1} pom.xml
%mvn_alias org.osgi:osgi.annotation org.osgi:org.osgi.annotation
%build
%mvn_build
%mvn_build -- -Dmaven.compiler.source=1.7 -Dmaven.compiler.target=1.7
%install
%mvn_install
%files -f .mfiles
%license LICENSE
%doc about.html
%license META-INF/LICENSE META-INF/NOTICE
%files javadoc -f .mfiles-javadoc
%doc LICENSE
%license META-INF/LICENSE META-INF/NOTICE
%changelog
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 8.0.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 8.0.1-4
- Rebuilt for java-17-openjdk as system jdk
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 8.0.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Tue Nov 02 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 8.0.1-2
- Set explicit Java compiler source/target levels to 1.7
* Wed Oct 13 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 8.0.1-1
- Update to upstream version 8.0.1
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 8.0.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 8.0.0-2
- Bootstrap build
- Non-bootstrap build
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 7.0.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Fri Jan 15 2021 Marian Koncek <mkoncek@redhat.com> - 8.0.0-1
- Update to upstream version 8.0.0
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.0.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 7.0.0-5
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.0.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.0.0-3
- Mass rebuild for javapackages-tools 201902
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 7.0.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.0.0-2
- Mass rebuild for javapackages-tools 201901
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 7.0.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Tue Nov 20 2018 Marian Koncek <mkoncek@redhat.com> - 7.0.0-1
- Update to upstream version 7.0.0