Accepting request 1178808 from Java:packages
Add EPL-2.0 OBS-URL: https://build.opensuse.org/request/show/1178808 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sisu?expand=0&rev=10
This commit is contained in:
Ana Guerrero
Git OBS Bridge
commit
365d7a72a7
4
_multibuild
Normal file
4
_multibuild
Normal file
@ -0,0 +1,4 @@
|
||||
<multibuild>
|
||||
<package>sisu-mojos</package>
|
||||
</multibuild>
|
||||
|
||||
BIN
sisu-build.tar.xz
(Stored with Git LFS)
BIN
sisu-build.tar.xz
(Stored with Git LFS)
Binary file not shown.
BIN
sisu-inject-0.9.0.M2.tar.gz
(Stored with Git LFS)
BIN
sisu-inject-0.9.0.M2.tar.gz
(Stored with Git LFS)
Binary file not shown.
57
sisu-mojos.changes
Normal file
57
sisu-mojos.changes
Normal file
@ -0,0 +1,57 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 5 14:00:52 UTC 2024 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Upgrade to upstream milestone 0.9.0.M3
|
||||
* Changes
|
||||
+ Annotate new method
|
||||
+ Update workflow to run on Java 21
|
||||
+ Build with final Java 21 on GitHub
|
||||
+ Switch to JUnit5
|
||||
+ Disable annotation processor by default
|
||||
+ Do not silently fail in case of class scanning exceptions
|
||||
+ Formatting issues
|
||||
+ Update to ASM 9.7
|
||||
+ Update CONTRIBUTING.md
|
||||
+ Align Plexus ASM version
|
||||
+ Rename release profile
|
||||
+ Fix Jacoco coverage repots in Sonar
|
||||
+ Add a method to allow LifecycleManager to free keys
|
||||
+ Licence change: From EPL1 to EPL2
|
||||
+ update documentation for exposed core extensions, fix anchors
|
||||
+ Trigger Sonarcloud analysis from GHA
|
||||
- Build sisu-mojos as a second spec within sisu package, since the
|
||||
sources of sisu-mojos, sisu-inject and sisu-plexus were joined in
|
||||
the same upstream project
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 19 11:11:52 UTC 2023 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Do not require maven-javadoc-plugin that we don't use
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Sep 6 13:38:16 UTC 2023 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Upgrade to 0.9.0 milestone 2
|
||||
* Changes of 0.9.0.M2
|
||||
+ Add m2e support
|
||||
+ Convert APT to MD
|
||||
+ Update plugin
|
||||
+ Align to latest Maven plugins
|
||||
* Changes of 0.9.0.M1
|
||||
+ On debug, emit scanned entries
|
||||
+ Enable Java CI workflow
|
||||
+ Enable CodeQL analysis
|
||||
+ Avoid rewriting the index if it has not changed
|
||||
* Changes of 0.3.5
|
||||
+ Build against CDI API 1.2
|
||||
* Changes of 0.3.4
|
||||
+ Reproducible builds
|
||||
* Changes of 0.3.3
|
||||
+ Lifecycle maintenance
|
||||
* Changes of 0.3.2
|
||||
+ Java9+Jigsaw support
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri May 5 08:10:40 UTC 2023 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Initial packaging with version 0.3.1
|
||||
97
sisu-mojos.spec
Normal file
97
sisu-mojos.spec
Normal file
@ -0,0 +1,97 @@
|
||||
#
|
||||
# spec file for package sisu-mojos
|
||||
#
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
# upon. The license for this file, and modifications and additions to the
|
||||
# file, is the same license as for the pristine package itself (unless the
|
||||
# license for the pristine package is not an Open Source License, in which
|
||||
# case the license is the MIT License). An "Open Source License" is a
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
%global reltype milestones
|
||||
Name: sisu-mojos
|
||||
Version: 0.9.0.M3
|
||||
Release: 0
|
||||
Summary: Sisu plugin for Apache Maven
|
||||
License: EPL-1.0 AND EPL-2.0
|
||||
Group: Development/Libraries/Java
|
||||
URL: https://www.eclipse.org/sisu
|
||||
Source0: https://github.com/eclipse-sisu/sisu-project/archive/refs/tags/%{reltype}/%{version}.tar.gz#/sisu-project-%{version}.tar.gz
|
||||
Patch1: sisu-no-dependency-on-glassfish-servlet-api.patch
|
||||
Patch3: sisu-osgi-api.patch
|
||||
Patch4: sisu-reproducible-index.patch
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: maven-local
|
||||
BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin)
|
||||
BuildRequires: mvn(org.apache.maven.shared:maven-common-artifact-filters)
|
||||
BuildRequires: mvn(org.apache.maven:maven-artifact)
|
||||
BuildRequires: mvn(org.apache.maven:maven-core)
|
||||
BuildRequires: mvn(org.apache.maven:maven-model)
|
||||
BuildRequires: mvn(org.apache.maven:maven-plugin-api)
|
||||
BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
|
||||
BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.inject) >= %{version}
|
||||
BuildRequires: mvn(org.slf4j:slf4j-nop)
|
||||
BuildRequires: mvn(org.sonatype.plexus:plexus-build-api)
|
||||
#!BuildIgnore: maven-javadoc-plugin
|
||||
#!BuildIgnore: maven-javadoc-plugin-bootstrap
|
||||
BuildArch: noarch
|
||||
|
||||
%description
|
||||
The Sisu Plugin for Maven provides mojos to generate
|
||||
META-INF/sisu/javax.inject.Named index files for the Sisu container.
|
||||
|
||||
%package javadoc
|
||||
Summary: API documentation for %{name}
|
||||
|
||||
%description javadoc
|
||||
This package contains %{summary}.
|
||||
|
||||
%prep
|
||||
%setup -q -n sisu-project-%{reltype}-%{version}
|
||||
|
||||
%patch -P 1 -p1
|
||||
%patch -P 3 -p1
|
||||
%patch -P 4 -p2
|
||||
|
||||
%pom_remove_plugin -r :maven-enforcer-plugin
|
||||
# it is scope "import" but used only for tests that we don't run
|
||||
%pom_remove_dep :junit-bom
|
||||
|
||||
pushd org.eclipse.sisu.mojos
|
||||
%pom_add_dep org.eclipse.sisu:org.eclipse.sisu.plexus:%{version}
|
||||
%pom_add_plugin org.apache.maven.plugins:maven-resources-plugin:3.3.1
|
||||
%{mvn_alias} : org.sonatype.plugins:
|
||||
popd
|
||||
|
||||
%build
|
||||
pushd org.eclipse.sisu.mojos
|
||||
%{mvn_build} -f -- \
|
||||
%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
|
||||
-Dmaven.compiler.release=8 \
|
||||
%endif
|
||||
-Dsource=8
|
||||
popd
|
||||
|
||||
%install
|
||||
pushd org.eclipse.sisu.mojos
|
||||
%mvn_install
|
||||
popd
|
||||
%fdupes -s %{buildroot}%{_javadocdir}
|
||||
|
||||
%files -f org.eclipse.sisu.mojos/.mfiles
|
||||
%dir %{_javadir}/%{name}
|
||||
%license LICENSE.txt
|
||||
|
||||
%files javadoc -f org.eclipse.sisu.mojos/.mfiles-javadoc
|
||||
%license LICENSE.txt
|
||||
|
||||
%changelog
|
||||
BIN
sisu-plexus-0.9.0.M2.tar.gz
(Stored with Git LFS)
BIN
sisu-plexus-0.9.0.M2.tar.gz
(Stored with Git LFS)
Binary file not shown.
BIN
sisu-project-0.9.0.M3.tar.gz
(Stored with Git LFS)
Normal file
BIN
sisu-project-0.9.0.M3.tar.gz
(Stored with Git LFS)
Normal file
Binary file not shown.
25
sisu.changes
25
sisu.changes
@ -1,3 +1,28 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 5 14:00:52 UTC 2024 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Upgrade to upstream milestone 0.9.0.M3
|
||||
* Changes
|
||||
+ Annotate new method
|
||||
+ Update workflow to run on Java 21
|
||||
+ Build with final Java 21 on GitHub
|
||||
+ Switch to JUnit5
|
||||
+ Disable annotation processor by default
|
||||
+ Do not silently fail in case of class scanning exceptions
|
||||
+ Formatting issues
|
||||
+ Update to ASM 9.7
|
||||
+ Update CONTRIBUTING.md
|
||||
+ Align Plexus ASM version
|
||||
+ Rename release profile
|
||||
+ Fix Jacoco coverage repots in Sonar
|
||||
+ Add a method to allow LifecycleManager to free keys
|
||||
+ Licence change: From EPL1 to EPL2
|
||||
+ update documentation for exposed core extensions, fix anchors
|
||||
+ Trigger Sonarcloud analysis from GHA
|
||||
- Build sisu-mojos as a second spec within sisu package, since the
|
||||
sources of sisu-mojos, sisu-inject and sisu-plexus were joined in
|
||||
the same upstream project
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu May 16 13:08:26 UTC 2024 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
|
||||
41
sisu.spec
41
sisu.spec
@ -18,19 +18,17 @@
|
||||
|
||||
%global reltype milestones
|
||||
Name: sisu
|
||||
Version: 0.9.0.M2
|
||||
Version: 0.9.0.M3
|
||||
Release: 0
|
||||
Summary: Eclipse dependency injection framework
|
||||
# sisu is EPL-1.0, bundled asm is BSD
|
||||
License: BSD-3-Clause AND EPL-1.0
|
||||
License: BSD-3-Clause AND EPL-1.0 AND EPL-2.0
|
||||
Group: Development/Libraries/Java
|
||||
URL: https://www.eclipse.org/sisu/
|
||||
Source0: https://github.com/eclipse/sisu.inject/archive/refs/tags/%{reltype}/%{version}.tar.gz#/sisu-inject-%{version}.tar.gz
|
||||
Source1: https://github.com/eclipse/sisu.plexus/archive/refs/tags/%{reltype}/%{version}.tar.gz#/sisu-plexus-%{version}.tar.gz
|
||||
Source2: %{name}-build.tar.xz
|
||||
Patch1: %{name}-no-dependency-on-glassfish-servlet-api.patch
|
||||
Patch3: %{name}-osgi-api.patch
|
||||
Patch4: %{name}-reproducible-index.patch
|
||||
Source0: https://github.com/eclipse-sisu/sisu-project/archive/refs/tags/%{reltype}/%{version}.tar.gz#/sisu-project-%{version}.tar.gz
|
||||
Source1: %{name}-build.tar.xz
|
||||
Patch1: sisu-no-dependency-on-glassfish-servlet-api.patch
|
||||
Patch3: sisu-osgi-api.patch
|
||||
Patch4: sisu-reproducible-index.patch
|
||||
BuildRequires: ant
|
||||
BuildRequires: atinject
|
||||
BuildRequires: cdi-api
|
||||
@ -82,14 +80,11 @@ Group: Documentation/HTML
|
||||
This package contains %{summary}.
|
||||
|
||||
%prep
|
||||
%setup -q -c -T
|
||||
tar xf %{SOURCE0} && mv sisu.inject-%{reltype}-%{version} sisu-inject
|
||||
tar xf %{SOURCE1} && mv sisu.plexus-%{reltype}-%{version} sisu-plexus
|
||||
tar xf %{SOURCE2}
|
||||
%setup -q -n sisu-project-%{reltype}-%{version} -a1
|
||||
|
||||
%patch -P 1
|
||||
%patch -P 3
|
||||
%patch -P 4 -p1
|
||||
%patch -P 1 -p1
|
||||
%patch -P 3 -p1
|
||||
%patch -P 4 -p2
|
||||
|
||||
%build
|
||||
mkdir -p lib
|
||||
@ -112,9 +107,9 @@ build-jar-repository -s lib \
|
||||
%install
|
||||
# jar
|
||||
install -dm 0755 %{buildroot}%{_javadir}
|
||||
install -pm 0644 %{name}-inject/org.eclipse.sisu.inject/target/org.eclipse.sisu.inject-%{version}.jar \
|
||||
install -pm 0644 org.eclipse.sisu.inject/target/org.eclipse.sisu.inject-%{version}.jar \
|
||||
%{buildroot}%{_javadir}/org.eclipse.sisu.inject.jar
|
||||
install -pm 0644 %{name}-plexus/org.eclipse.sisu.plexus/target/org.eclipse.sisu.plexus-%{version}.jar \
|
||||
install -pm 0644 org.eclipse.sisu.plexus/target/org.eclipse.sisu.plexus-%{version}.jar \
|
||||
%{buildroot}%{_javadir}/org.eclipse.sisu.plexus.jar
|
||||
# Compatibility symlink
|
||||
install -dm 0755 %{buildroot}%{_javadir}/plexus-containers
|
||||
@ -122,26 +117,26 @@ ln -sf %{_javadir}/org.eclipse.sisu.plexus.jar %{buildroot}%{_javadir}/plexus-co
|
||||
|
||||
# pom
|
||||
install -dm 0755 %{buildroot}%{_mavenpomdir}
|
||||
%{mvn_install_pom} %{name}-inject/org.eclipse.sisu.inject/pom.xml %{buildroot}%{_mavenpomdir}/org.eclipse.sisu.inject.pom
|
||||
%{mvn_install_pom} org.eclipse.sisu.inject/pom.xml %{buildroot}%{_mavenpomdir}/org.eclipse.sisu.inject.pom
|
||||
%add_maven_depmap org.eclipse.sisu.inject.pom org.eclipse.sisu.inject.jar -f inject
|
||||
%{mvn_install_pom} %{name}-plexus/org.eclipse.sisu.plexus/pom.xml %{buildroot}%{_mavenpomdir}/org.eclipse.sisu.plexus.pom
|
||||
%{mvn_install_pom} org.eclipse.sisu.plexus/pom.xml %{buildroot}%{_mavenpomdir}/org.eclipse.sisu.plexus.pom
|
||||
%add_maven_depmap org.eclipse.sisu.plexus.pom org.eclipse.sisu.plexus.jar -f plexus -a org.sonatype.sisu:sisu-inject-plexus,org.codehaus.plexus:plexus-container-default
|
||||
|
||||
# javadoc
|
||||
for i in inject plexus; do
|
||||
install -dm 0755 %{buildroot}%{_javadocdir}/%{name}/%{name}-${i}
|
||||
cp -pr %{name}-${i}/org.eclipse.sisu.${i}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/%{name}-${i}/
|
||||
cp -pr org.eclipse.sisu.${i}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/%{name}-${i}/
|
||||
done
|
||||
%fdupes -s %{buildroot}%{_javadocdir}
|
||||
|
||||
%files inject -f .mfiles-inject
|
||||
%license sisu-inject/LICENSE.txt
|
||||
%license LICENSE.txt
|
||||
|
||||
%files plexus -f .mfiles-plexus
|
||||
%{_javadir}/plexus-containers
|
||||
|
||||
%files javadoc
|
||||
%license sisu-inject/LICENSE.txt
|
||||
%license LICENSE.txt
|
||||
%{_javadocdir}/%{name}
|
||||
|
||||
%changelog
|
||||
|
||||
Loading…
Reference in New Issue
Block a user