pool/sisu
SHA256
17
0
Fork 2
Code Issues Pull Requests Activity

Compare commits

merge into: pool:slfo-main
Branches Tags
pool:factory pool:slfo-1.2 pool:slfo-main
...
pull from: pool:factory
Branches Tags
pool:factory pool:slfo-1.2 pool:slfo-main

1 Commits
slfo-main ... factory

Author SHA256 Message Date
Fridrich Štrba
8e0c354876 1.0.0 2026-02-11 14:59:54 +01:00
12 changed files with 161 additions and 83 deletions
Expand all files Collapse all files

BIN
sisu-build.tar.xz LFS
View File

Binary file not shown.

27
sisu-extenders.changes
View File

@@ -1,3 +1,30 @@
-------------------------------------------------------------------
Wed Feb 11 13:51:23 UTC 2026 - Fridrich Strba <fstrba@suse.com>
- Upgrade to upstream release 1.0.0
* Changes
+ Bump actions/checkout from 4 to 6
+ Bump actions/setup-java from 4 to 5
+ Bump github/codeql-action from 3 to 4
+ Update key deps and plugins
+ Switch to maintained Build API
+ Get rid of ancient logback
+ Increase test coverage
+ Improve test
+ Source formatting and license headers
+ Update TestNG
+ Modernize codebase
+ Update m-fluido-s to 2.1.0
+ Build with Java 25
+ Update sonar-m-p to 5.5.0.6356
+ Expose GitHub secret only as env variable in build step
+ Remove "Incubation" from bundle names
- Modified patches:
* sisu-no-dependency-on-glassfish-servlet-api.patch
* sisu-osgi-api.patch
* sisu-reproducible-index.patch
+ rediff
-------------------------------------------------------------------
Tue Nov 4 08:10:15 UTC 2025 - Fridrich Strba <fstrba@suse.com>

17
sisu-extenders.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package sisu-extenders
#
# Copyright (c) 2025 SUSE LLC and contributors
# Copyright (c) 2026 SUSE LLC and contributors
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,18 +16,18 @@
#
%global reltype milestones
%global reltype releases
Name: sisu-extenders
Version: 0.9.0.M4
Version: 1.0.0
Release: 0
Summary: Sisu Extenders
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
Patch0: sisu-no-dependency-on-glassfish-servlet-api.patch
Patch1: sisu-osgi-api.patch
Patch2: sisu-reproducible-index.patch
BuildRequires: fdupes
BuildRequires: maven-local
BuildRequires: mvn(biz.aQute.bnd:bnd-maven-plugin)
@@ -56,12 +56,13 @@ container
%prep
%setup -q -n sisu-project-%{reltype}-%{version}
%patch -P 0 -p1
%patch -P 1 -p1
%patch -P 3 -p1
%patch -P 4 -p2
%patch -P 2 -p1
%pom_remove_plugin -r :maven-enforcer-plugin
%pom_remove_plugin -r :maven-invoker-plugin
%pom_remove_plugin -r :spotless-maven-plugin
# it is scope "import" but used only for tests that we don't run
%pom_remove_dep :junit-bom
%pom_xpath_remove pom:project/pom:build/pom:extensions

27
sisu-mojos.changes
View File

@@ -1,3 +1,30 @@
-------------------------------------------------------------------
Wed Feb 11 13:51:23 UTC 2026 - Fridrich Strba <fstrba@suse.com>
- Upgrade to upstream release 1.0.0
* Changes
+ Bump actions/checkout from 4 to 6
+ Bump actions/setup-java from 4 to 5
+ Bump github/codeql-action from 3 to 4
+ Update key deps and plugins
+ Switch to maintained Build API
+ Get rid of ancient logback
+ Increase test coverage
+ Improve test
+ Source formatting and license headers
+ Update TestNG
+ Modernize codebase
+ Update m-fluido-s to 2.1.0
+ Build with Java 25
+ Update sonar-m-p to 5.5.0.6356
+ Expose GitHub secret only as env variable in build step
+ Remove "Incubation" from bundle names
- Modified patches:
* sisu-no-dependency-on-glassfish-servlet-api.patch
* sisu-osgi-api.patch
* sisu-reproducible-index.patch
+ rediff
-------------------------------------------------------------------
Tue Jun 3 10:39:53 UTC 2025 - Fridrich Strba <fstrba@suse.com>

20
sisu-mojos.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package sisu-mojos
#
# Copyright (c) 2025 SUSE LLC and contributors
# Copyright (c) 2026 SUSE LLC and contributors
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,18 +16,18 @@
#
%global reltype milestones
%global reltype releases
Name: sisu-mojos
Version: 0.9.0.M4
Version: 1.0.0
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
Patch0: sisu-no-dependency-on-glassfish-servlet-api.patch
Patch1: sisu-osgi-api.patch
Patch2: sisu-reproducible-index.patch
BuildRequires: fdupes
BuildRequires: maven-local
BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
@@ -37,10 +37,11 @@ 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-build-api)
BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.inject) >= %{version}
BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.plexus) >= %{version}
BuildRequires: mvn(org.slf4j:slf4j-nop)
BuildRequires: mvn(org.sonatype.plexus:plexus-build-api)
#!BuildRequires: maven-compiler-plugin-bootstrap
#!BuildRequires: maven-jar-plugin-bootstrap
#!BuildRequires: maven-javadoc-plugin-bootstrap
@@ -62,12 +63,13 @@ This package contains %{summary}.
%prep
%setup -q -n sisu-project-%{reltype}-%{version}
%patch -P 0 -p1
%patch -P 1 -p1
%patch -P 3 -p1
%patch -P 4 -p2
%patch -P 2 -p1
%pom_remove_plugin -r :maven-enforcer-plugin
%pom_remove_plugin -r :maven-invoker-plugin
%pom_remove_plugin -r :spotless-maven-plugin
# it is scope "import" but used only for tests that we don't run
%pom_remove_dep :junit-bom
%pom_xpath_remove pom:project/pom:build/pom:extensions

64
sisu-no-dependency-on-glassfish-servlet-api.patch
View File

@@ -1,24 +1,21 @@
--- sisu-inject/org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/inject/Implementations.java 2024-04-09 19:53:29.797479006 +0200
+++ sisu-inject/org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/inject/Implementations.java 2024-04-09 19:59:23.506494426 +0200
@@ -39,17 +39,6 @@
--- a/org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/inject/Implementations.java 2026-02-11 14:25:02.494361564 +0100
+++ b/org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/inject/Implementations.java 2026-02-11 14:28:52.321660010 +0100
@@ -36,14 +36,6 @@
// ----------------------------------------------------------------------
static
{
static {
- boolean hasGuiceServlet;
- try
- {
- hasGuiceServlet = BindingTargetVisitor.class.isInstance( ServletFinder.THIS );
- }
- catch ( final LinkageError e )
- {
- try {
- hasGuiceServlet = BindingTargetVisitor.class.isInstance(ServletFinder.THIS);
- } catch (final LinkageError e) {
- hasGuiceServlet = false;
- }
- HAS_GUICE_SERVLET = hasGuiceServlet;
-
boolean hasJsr250Priority;
try
{
@@ -66,8 +55,6 @@
try {
hasJsr250Priority = javax.annotation.Priority.class.isAnnotation();
@@ -57,8 +49,6 @@
// Constants
// ----------------------------------------------------------------------
@@ -27,17 +24,16 @@
private static final boolean HAS_JSR250_PRIORITY;
// ----------------------------------------------------------------------
@@ -107,8 +94,7 @@
@@ -96,7 +86,7 @@
final Class<?> annotationSource =
// when looking for @Priority also consider annotations on providers (and servlets/filters if available)
- binding.acceptTargetVisitor( isPriority ? ( HAS_GUICE_SERVLET ? ServletFinder.THIS : ProviderFinder.THIS )
- : ClassFinder.THIS );
+ binding.acceptTargetVisitor( isPriority ? ProviderFinder.THIS : ClassFinder.THIS );
// when looking for @Priority also consider annotations on providers (and servlets/filters if available)
binding.acceptTargetVisitor(
- isPriority ? (HAS_GUICE_SERVLET ? ServletFinder.THIS : ProviderFinder.THIS) : ClassFinder.THIS);
+ isPriority ? ProviderFinder.THIS : ClassFinder.THIS);
T annotation = null;
if ( null != annotationSource )
@@ -253,45 +239,4 @@
if (null != annotationSource) {
@@ -223,43 +213,4 @@
return binding.getProviderKey().getTypeLiteral().getRawType();
}
}
@@ -45,39 +41,37 @@
- /**
- * {@link ProviderFinder} that also returns servlet/filter implementations.
- */
- static final class ServletFinder
- extends ProviderFinder
- implements com.google.inject.servlet.ServletModuleTargetVisitor<Object, Class<?>>
- {
- static final class ServletFinder extends ProviderFinder
- implements com.google.inject.servlet.ServletModuleTargetVisitor<Object, Class<?>> {
- // ----------------------------------------------------------------------
- // Constants
- // ----------------------------------------------------------------------
-
- @SuppressWarnings( "hiding" )
- @SuppressWarnings("hiding")
- static final BindingTargetVisitor<Object, Class<?>> THIS = new ServletFinder();
-
- // ----------------------------------------------------------------------
- // Public methods
- // ----------------------------------------------------------------------
-
- public Class<?> visit( final com.google.inject.servlet.InstanceFilterBinding binding )
- {
- @Override
- public Class<?> visit(final com.google.inject.servlet.InstanceFilterBinding binding) {
- return binding.getFilterInstance().getClass();
- }
-
- public Class<?> visit( final com.google.inject.servlet.InstanceServletBinding binding )
- {
- @Override
- public Class<?> visit(final com.google.inject.servlet.InstanceServletBinding binding) {
- return binding.getServletInstance().getClass();
- }
-
- public Class<?> visit( final com.google.inject.servlet.LinkedFilterBinding binding )
- {
- @Override
- public Class<?> visit(final com.google.inject.servlet.LinkedFilterBinding binding) {
- // this assumes only one level of indirection: api-->impl
- return binding.getLinkedKey().getTypeLiteral().getRawType();
- }
-
- public Class<?> visit( final com.google.inject.servlet.LinkedServletBinding binding )
- {
- @Override
- public Class<?> visit(final com.google.inject.servlet.LinkedServletBinding binding) {
- // this assumes only one level of indirection: api-->impl
- return binding.getLinkedKey().getTypeLiteral().getRawType();
- }

16
sisu-osgi-api.patch
View File

@@ -1,11 +1,11 @@
--- sisu-plexus/org.eclipse.sisu.plexus/src/main/java/org/eclipse/sisu/plexus/PlexusBundlePlan.java~ 2015-09-13 20:15:37.000000000 +0200
+++ sisu-plexus/org.eclipse.sisu.plexus/src/main/java/org/eclipse/sisu/plexus/PlexusBundlePlan.java 2017-01-29 19:56:51.608151337 +0100
@@ -80,7 +80,7 @@
--- a/org.eclipse.sisu.plexus/src/main/java/org/eclipse/sisu/plexus/PlexusBundlePlan.java 2026-02-11 14:32:16.549734202 +0100
+++ b/org.eclipse.sisu.plexus/src/main/java/org/eclipse/sisu/plexus/PlexusBundlePlan.java 2026-02-11 14:34:11.116176056 +0100
@@ -73,7 +73,7 @@
// ----------------------------------------------------------------------
protected static boolean hasPlexusAnnotations( final Bundle bundle )
{
- final String imports = bundle.getHeaders().get( Constants.IMPORT_PACKAGE );
+ final String imports = bundle.getHeaders().get( Constants.IMPORT_PACKAGE ).toString();
return null != imports && imports.contains( "org.codehaus.plexus.component.annotations" );
protected static boolean hasPlexusAnnotations(final Bundle bundle) {
- final String imports = bundle.getHeaders().get(Constants.IMPORT_PACKAGE);
+ final String imports = bundle.getHeaders().get(Constants.IMPORT_PACKAGE).toString();
return null != imports && imports.contains("org.codehaus.plexus.component.annotations");
}

3
sisu-project-0.9.0.M4.tar.gz
View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9b2d4e7f797401872a76edb39e8be355b4511fca17d98168605bccf687be332a
size 2810435

BIN
sisu-project-1.0.0.tar.gz LFS Normal file
View File

Binary file not shown.

20
sisu-reproducible-index.patch
View File

@@ -1,11 +1,11 @@
--- sisu-0.3.5/sisu-inject/org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/space/AbstractSisuIndex.java 2023-09-05 15:00:59.314655718 +0200
+++ sisu-0.3.5/sisu-inject/org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/space/AbstractSisuIndex.java 2023-09-05 15:04:15.889547023 +0200
@@ -158,7 +158,7 @@
final BufferedWriter writer = new BufferedWriter( getWriter( INDEX_FOLDER + name ) );
try
{
- for ( final String line : table )
+ for ( final String line : new TreeSet<String>( table ) )
{
writer.write( line );
--- a/org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/space/AbstractSisuIndex.java 2026-02-11 14:36:37.906142024 +0100
+++ b/org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/space/AbstractSisuIndex.java 2026-02-11 14:38:32.910020678 +0100
@@ -139,7 +139,7 @@
private void writeTable(final Object name, final Set<String> table) {
try {
try (BufferedWriter writer = new BufferedWriter(getWriter(INDEX_FOLDER + name))) {
- for (final String line : table) {
+ for (final String line : new TreeSet<String>(table)) {
writer.write(line);
writer.newLine();
}

27
sisu.changes
View File

@@ -1,3 +1,30 @@
-------------------------------------------------------------------
Wed Feb 11 13:51:23 UTC 2026 - Fridrich Strba <fstrba@suse.com>
- Upgrade to upstream release 1.0.0
* Changes
+ Bump actions/checkout from 4 to 6
+ Bump actions/setup-java from 4 to 5
+ Bump github/codeql-action from 3 to 4
+ Update key deps and plugins
+ Switch to maintained Build API
+ Get rid of ancient logback
+ Increase test coverage
+ Improve test
+ Source formatting and license headers
+ Update TestNG
+ Modernize codebase
+ Update m-fluido-s to 2.1.0
+ Build with Java 25
+ Update sonar-m-p to 5.5.0.6356
+ Expose GitHub secret only as env variable in build step
+ Remove "Incubation" from bundle names
- Modified patches:
* sisu-no-dependency-on-glassfish-servlet-api.patch
* sisu-osgi-api.patch
* sisu-reproducible-index.patch
+ rediff
-------------------------------------------------------------------
Tue Jun 3 10:39:53 UTC 2025 - Fridrich Strba <fstrba@suse.com>

16
sisu.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package sisu
#
# Copyright (c) 2025 SUSE LLC and contributors
# Copyright (c) 2026 SUSE LLC and contributors
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,9 +16,9 @@
#
%global reltype milestones
%global reltype releases
Name: sisu
Version: 0.9.0.M4
Version: 1.0.0
Release: 0
Summary: Eclipse dependency injection framework
License: BSD-3-Clause AND EPL-1.0 AND EPL-2.0
@@ -26,9 +26,9 @@ 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
Source1: %{name}-build.tar.xz
Patch1: sisu-no-dependency-on-glassfish-servlet-api.patch
Patch3: sisu-osgi-api.patch
Patch4: sisu-reproducible-index.patch
Patch0: sisu-no-dependency-on-glassfish-servlet-api.patch
Patch1: sisu-osgi-api.patch
Patch2: sisu-reproducible-index.patch
BuildRequires: ant
BuildRequires: atinject
BuildRequires: cdi-api
@@ -83,9 +83,9 @@ This package contains %{summary}.
%prep
%setup -q -n sisu-project-%{reltype}-%{version} -a1
%patch -P 0 -p1
%patch -P 1 -p1
%patch -P 3 -p1
%patch -P 4 -p2
%patch -P 2 -p1
%build
mkdir -p lib