Compare commits
No commits in common. "stream-maven-3.5-rhel-8.10.0" and "c8-stream-3.6" have entirely different histories.
stream-mav
...
c8-stream-
30
.gitignore
vendored
30
.gitignore
vendored
@ -1,28 +1,2 @@
|
|||||||
/sonatype-sisu-sisu-1.4.2-0-gae9a407.tar.gz
|
SOURCES/org.eclipse.sisu.inject-0.3.4.tar.gz
|
||||||
/sisu-1.4.3.2.tar.gz
|
SOURCES/org.eclipse.sisu.plexus-0.3.4.tar.gz
|
||||||
/sisu-2.1.1.tar.bz2
|
|
||||||
/sisu-2.2.3.tar.xz
|
|
||||||
/sisu-2.3.0.tar.xz
|
|
||||||
/sisu-2.3.0.tar.gz
|
|
||||||
/org.eclipse.sisu.inject-0.0.0.M4.tar.bz2
|
|
||||||
/org.eclipse.sisu.plexus-0.0.0.M4.tar.bz2
|
|
||||||
/org.eclipse.sisu.inject-0.0.0.M5.tar.bz2
|
|
||||||
/org.eclipse.sisu.plexus-0.0.0.M5.tar.bz2
|
|
||||||
/org.eclipse.sisu.inject-0.1.0.tar.bz2
|
|
||||||
/org.eclipse.sisu.plexus-0.1.0.tar.bz2
|
|
||||||
/org.eclipse.sisu.inject-0.1.1.tar.bz2
|
|
||||||
/org.eclipse.sisu.plexus-0.1.1.tar.bz2
|
|
||||||
/org.eclipse.sisu.inject-0.2.0.tar.bz2
|
|
||||||
/org.eclipse.sisu.plexus-0.2.0.tar.bz2
|
|
||||||
/org.eclipse.sisu.inject-0.2.1.tar.bz2
|
|
||||||
/org.eclipse.sisu.plexus-0.2.1.tar.bz2
|
|
||||||
/org.eclipse.sisu.inject-0.3.0.M1.tar.bz2
|
|
||||||
/org.eclipse.sisu.plexus-0.3.0.M1.tar.bz2
|
|
||||||
/org.eclipse.sisu.inject-0.3.0.tar.bz2
|
|
||||||
/org.eclipse.sisu.plexus-0.3.0.tar.bz2
|
|
||||||
/org.eclipse.sisu.inject-0.3.1.tar.bz2
|
|
||||||
/org.eclipse.sisu.plexus-0.3.1.tar.bz2
|
|
||||||
/org.eclipse.sisu.inject-0.3.2.tar.bz2
|
|
||||||
/org.eclipse.sisu.plexus-0.3.2.tar.bz2
|
|
||||||
/org.eclipse.sisu.inject-0.3.3.tar.bz2
|
|
||||||
/org.eclipse.sisu.plexus-0.3.3.tar.bz2
|
|
||||||
|
2
.sisu.metadata
Normal file
2
.sisu.metadata
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
52bc0ce065136e67bedb1ebec4b5e89f66e94f22 SOURCES/org.eclipse.sisu.inject-0.3.4.tar.gz
|
||||||
|
3bd9315a76b32209d018c6ffe07bf55addd3c27c SOURCES/org.eclipse.sisu.plexus-0.3.4.tar.gz
|
@ -0,0 +1,98 @@
|
|||||||
|
From b14ee1ef509d9717eaa29e672282901847f2f735 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Marian Koncek <mkoncek@redhat.com>
|
||||||
|
Date: Mon, 16 Sep 2019 10:48:10 +0200
|
||||||
|
Subject: [PATCH] Remove dependency on glassfish-servlet-api
|
||||||
|
|
||||||
|
---
|
||||||
|
.../eclipse/sisu/inject/Implementations.java | 56 +------------------
|
||||||
|
1 file changed, 1 insertion(+), 55 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/sisu-inject/org.eclipse.sisu.inject/src/org/eclipse/sisu/inject/Implementations.java b/sisu-inject/org.eclipse.sisu.inject/src/org/eclipse/sisu/inject/Implementations.java
|
||||||
|
index 523c9b2..89db5da 100644
|
||||||
|
--- a/sisu-inject/org.eclipse.sisu.inject/src/org/eclipse/sisu/inject/Implementations.java
|
||||||
|
+++ b/sisu-inject/org.eclipse.sisu.inject/src/org/eclipse/sisu/inject/Implementations.java
|
||||||
|
@@ -38,17 +38,6 @@ final class Implementations
|
||||||
|
|
||||||
|
static
|
||||||
|
{
|
||||||
|
- boolean hasGuiceServlet;
|
||||||
|
- try
|
||||||
|
- {
|
||||||
|
- hasGuiceServlet = BindingTargetVisitor.class.isInstance( ServletFinder.THIS );
|
||||||
|
- }
|
||||||
|
- catch ( final LinkageError e )
|
||||||
|
- {
|
||||||
|
- hasGuiceServlet = false;
|
||||||
|
- }
|
||||||
|
- HAS_GUICE_SERVLET = hasGuiceServlet;
|
||||||
|
-
|
||||||
|
boolean hasJsr250Priority;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
@@ -65,8 +54,6 @@ final class Implementations
|
||||||
|
// Constants
|
||||||
|
// ----------------------------------------------------------------------
|
||||||
|
|
||||||
|
- private static final boolean HAS_GUICE_SERVLET;
|
||||||
|
-
|
||||||
|
private static final boolean HAS_JSR250_PRIORITY;
|
||||||
|
|
||||||
|
// ----------------------------------------------------------------------
|
||||||
|
@@ -106,7 +93,7 @@ final class Implementations
|
||||||
|
|
||||||
|
// peek behind servlet/filter extension bindings when checking priority, so we can order them by rank
|
||||||
|
final Class<?> implementation =
|
||||||
|
- binding.acceptTargetVisitor( HAS_GUICE_SERVLET && isPriority ? ServletFinder.THIS : ClassFinder.THIS );
|
||||||
|
+ binding.acceptTargetVisitor( ClassFinder.THIS );
|
||||||
|
|
||||||
|
T annotation = null;
|
||||||
|
if ( null != implementation )
|
||||||
|
@@ -215,45 +202,4 @@ final class Implementations
|
||||||
|
return binding.getPrivateElements().getInjector().getBinding( binding.getKey() ).acceptTargetVisitor( this );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
-
|
||||||
|
- /**
|
||||||
|
- * {@link ClassFinder} that can also peek behind servlet/filter bindings.
|
||||||
|
- */
|
||||||
|
- static final class ServletFinder
|
||||||
|
- extends ClassFinder
|
||||||
|
- implements com.google.inject.servlet.ServletModuleTargetVisitor<Object, Class<?>>
|
||||||
|
- {
|
||||||
|
- // ----------------------------------------------------------------------
|
||||||
|
- // Constants
|
||||||
|
- // ----------------------------------------------------------------------
|
||||||
|
-
|
||||||
|
- @SuppressWarnings( "hiding" )
|
||||||
|
- static final BindingTargetVisitor<Object, Class<?>> THIS = new ServletFinder();
|
||||||
|
-
|
||||||
|
- // ----------------------------------------------------------------------
|
||||||
|
- // Public methods
|
||||||
|
- // ----------------------------------------------------------------------
|
||||||
|
-
|
||||||
|
- public Class<?> visit( final com.google.inject.servlet.InstanceFilterBinding binding )
|
||||||
|
- {
|
||||||
|
- return binding.getFilterInstance().getClass();
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- public Class<?> visit( final com.google.inject.servlet.InstanceServletBinding binding )
|
||||||
|
- {
|
||||||
|
- return binding.getServletInstance().getClass();
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- 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 )
|
||||||
|
- {
|
||||||
|
- // this assumes only one level of indirection: api-->impl
|
||||||
|
- return binding.getLinkedKey().getTypeLiteral().getRawType();
|
||||||
|
- }
|
||||||
|
- }
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.21.0
|
||||||
|
|
@ -1,75 +1,52 @@
|
|||||||
# Release type, either "milestone" or "release"
|
|
||||||
%global reltype release
|
|
||||||
#global reltag .M1
|
|
||||||
|
|
||||||
Name: sisu
|
Name: sisu
|
||||||
Epoch: 1
|
Version: 0.3.4
|
||||||
Version: 0.3.3
|
Release: 2%{?dist}
|
||||||
Release: 6%{?dist}
|
|
||||||
Summary: Eclipse dependency injection framework
|
Summary: Eclipse dependency injection framework
|
||||||
# sisu is EPL-1.0
|
# sisu is EPL-1.0
|
||||||
# bundled asm is BSD
|
# bundled asm is BSD
|
||||||
License: EPL-1.0 and BSD
|
License: EPL-1.0 and BSD
|
||||||
URL: http://eclipse.org/sisu
|
URL: http://eclipse.org/sisu
|
||||||
|
|
||||||
Source0: http://git.eclipse.org/c/%{name}/org.eclipse.%{name}.inject.git/snapshot/%{reltype}s/%{version}%{?reltag}.tar.bz2#/org.eclipse.%{name}.inject-%{version}%{?reltag}.tar.bz2
|
|
||||||
Source1: http://git.eclipse.org/c/%{name}/org.eclipse.%{name}.plexus.git/snapshot/%{reltype}s/%{version}%{?reltag}.tar.bz2#/org.eclipse.%{name}.plexus-%{version}%{?reltag}.tar.bz2
|
|
||||||
|
|
||||||
Source100: %{name}-parent.pom
|
|
||||||
Source101: %{name}-inject.pom
|
|
||||||
Source102: %{name}-plexus.pom
|
|
||||||
|
|
||||||
Patch0: %{name}-OSGi-import-guava.patch
|
|
||||||
Patch2: %{name}-ignored-tests.patch
|
|
||||||
Patch3: %{name}-osgi-api.patch
|
|
||||||
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
BuildRequires: maven-local
|
Source0: http://git.eclipse.org/c/sisu/org.eclipse.sisu.inject.git/snapshot/releases/%{version}.tar.gz#/org.eclipse.sisu.inject-%{version}.tar.gz
|
||||||
|
Source1: http://git.eclipse.org/c/sisu/org.eclipse.sisu.plexus.git/snapshot/releases/%{version}.tar.gz#/org.eclipse.sisu.plexus-%{version}.tar.gz
|
||||||
|
|
||||||
|
Source100: sisu-parent.pom
|
||||||
|
Source101: sisu-inject.pom
|
||||||
|
Source102: sisu-plexus.pom
|
||||||
|
|
||||||
|
Patch0: sisu-OSGi-import-guava.patch
|
||||||
|
Patch2: sisu-ignored-tests.patch
|
||||||
|
Patch3: sisu-osgi-api.patch
|
||||||
|
Patch4: 0001-Remove-dependency-on-glassfish-servlet-api.patch
|
||||||
|
|
||||||
|
BuildRequires: maven-local-openjdk8
|
||||||
BuildRequires: mvn(com.google.inject.extensions:guice-servlet)
|
BuildRequires: mvn(com.google.inject.extensions:guice-servlet)
|
||||||
BuildRequires: mvn(com.google.inject:guice::no_aop:)
|
BuildRequires: mvn(com.google.inject:guice::no_aop:)
|
||||||
BuildRequires: mvn(javax.annotation:javax.annotation-api)
|
BuildRequires: mvn(javax.annotation:javax.annotation-api)
|
||||||
BuildRequires: mvn(javax.enterprise:cdi-api)
|
BuildRequires: %{?module_prefix}mvn(javax.enterprise:cdi-api)
|
||||||
BuildRequires: mvn(javax.inject:javax.inject)
|
BuildRequires: mvn(javax.inject:javax.inject)
|
||||||
BuildRequires: mvn(javax.servlet:servlet-api)
|
|
||||||
BuildRequires: mvn(junit:junit)
|
BuildRequires: mvn(junit:junit)
|
||||||
BuildRequires: mvn(org.codehaus.plexus:plexus-classworlds)
|
BuildRequires: %{?module_prefix}mvn(org.codehaus.plexus:plexus-classworlds)
|
||||||
BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations)
|
BuildRequires: %{?module_prefix}mvn(org.codehaus.plexus:plexus-component-annotations)
|
||||||
BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
|
BuildRequires: %{?module_prefix}mvn(org.codehaus.plexus:plexus-utils)
|
||||||
BuildRequires: mvn(org.osgi:osgi.core)
|
BuildRequires: mvn(org.osgi:osgi.core)
|
||||||
BuildRequires: mvn(org.slf4j:slf4j-api)
|
BuildRequires: mvn(org.slf4j:slf4j-api)
|
||||||
BuildRequires: mvn(org.testng:testng)
|
BuildRequires: mvn(org.testng:testng)
|
||||||
|
|
||||||
Provides: bundled(objectweb-asm)
|
Provides: bundled(objectweb-asm)
|
||||||
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Java dependency injection framework with backward support for plexus and bean
|
Java dependency injection framework with backward support for plexus and bean
|
||||||
style dependency injection.
|
style dependency injection.
|
||||||
|
|
||||||
%package inject
|
%{?module_package}
|
||||||
Summary: Sisu inject
|
%{?javadoc_package}
|
||||||
Obsoletes: %{name}-tests < 1:0.3.2-5
|
|
||||||
|
|
||||||
%description inject
|
|
||||||
This package contains %{summary}.
|
|
||||||
|
|
||||||
%package plexus
|
|
||||||
Summary: Sisu Plexus
|
|
||||||
|
|
||||||
%description plexus
|
|
||||||
This package contains %{summary}.
|
|
||||||
|
|
||||||
%package javadoc
|
|
||||||
Summary: API documentation for Sisu
|
|
||||||
|
|
||||||
%description javadoc
|
|
||||||
This package contains %{summary}.
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -c -T
|
%setup -q -c -T
|
||||||
tar xf %{SOURCE0} && mv %{reltype}s/* sisu-inject && rmdir %{reltype}s
|
tar xf %{SOURCE0} && mv releases/* sisu-inject && rmdir releases
|
||||||
tar xf %{SOURCE1} && mv %{reltype}s/* sisu-plexus && rmdir %{reltype}s
|
tar xf %{SOURCE1} && mv releases/* sisu-plexus && rmdir releases
|
||||||
|
|
||||||
cp %{SOURCE100} pom.xml
|
cp %{SOURCE100} pom.xml
|
||||||
cp %{SOURCE101} sisu-inject/pom.xml
|
cp %{SOURCE101} sisu-inject/pom.xml
|
||||||
@ -78,11 +55,14 @@ cp %{SOURCE102} sisu-plexus/pom.xml
|
|||||||
%patch0
|
%patch0
|
||||||
%patch2
|
%patch2
|
||||||
%patch3
|
%patch3
|
||||||
|
%patch4 -p1
|
||||||
|
|
||||||
|
%pom_remove_dep :servlet-api sisu-inject
|
||||||
|
|
||||||
%pom_xpath_set -r /pom:project/pom:version %{version}
|
%pom_xpath_set -r /pom:project/pom:version %{version}
|
||||||
|
|
||||||
%mvn_file ":{*}" @1
|
%mvn_file ":{*}" @1
|
||||||
%mvn_package ":*{inject,plexus}" @1
|
%mvn_package ":*{inject,plexus}"
|
||||||
%mvn_package : __noinstall
|
%mvn_package : __noinstall
|
||||||
%mvn_alias :org.eclipse.sisu.plexus org.sonatype.sisu:sisu-inject-plexus
|
%mvn_alias :org.eclipse.sisu.plexus org.sonatype.sisu:sisu-inject-plexus
|
||||||
|
|
||||||
@ -92,16 +72,25 @@ cp %{SOURCE102} sisu-plexus/pom.xml
|
|||||||
%install
|
%install
|
||||||
%mvn_install
|
%mvn_install
|
||||||
|
|
||||||
%files inject -f .mfiles-inject
|
%files -n %{?module_prefix}sisu -f .mfiles
|
||||||
%doc sisu-inject/LICENSE.txt
|
%license sisu-inject/LICENSE.txt
|
||||||
|
|
||||||
%files plexus -f .mfiles-plexus
|
|
||||||
|
|
||||||
%files javadoc -f .mfiles-javadoc
|
|
||||||
%doc sisu-inject/LICENSE.txt
|
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.3.4-2
|
||||||
|
- Build with OpenJDK 8
|
||||||
|
|
||||||
|
* Wed Nov 06 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.3.4-1
|
||||||
|
- Update to upstream version 0.3.4
|
||||||
|
|
||||||
|
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.3.3-9
|
||||||
|
- Mass rebuild for javapackages-tools 201902
|
||||||
|
|
||||||
|
* Fri Jun 28 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.3.3-8
|
||||||
|
- Merge inject and plexus subpackages
|
||||||
|
|
||||||
|
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.3.3-7
|
||||||
|
- Mass rebuild for javapackages-tools 201901
|
||||||
|
|
||||||
* Tue Jul 24 2018 Michael Simacek <msimacek@redhat.com> - 1:0.3.3-6
|
* Tue Jul 24 2018 Michael Simacek <msimacek@redhat.com> - 1:0.3.3-6
|
||||||
- Declare bundled objectweb-asm
|
- Declare bundled objectweb-asm
|
||||||
- Fix license tag to include BSD for asm
|
- Fix license tag to include BSD for asm
|
2
sources
2
sources
@ -1,2 +0,0 @@
|
|||||||
SHA512 (org.eclipse.sisu.inject-0.3.3.tar.bz2) = 5c99bba3bb9698394c76715c6f917f51041f9bc1f1c34b7036213a4a826746f5252c70def58283b75b97da1ecaba0e38704a46b8b993a1d54814e2e2050b15e0
|
|
||||||
SHA512 (org.eclipse.sisu.plexus-0.3.3.tar.bz2) = e9e73d51abbbdbd18a739650aa4f7ab084bd47de711d9ba1db107f054bdeac358a4dbc5ab6e050f86aca1f3e16dcef99c14bc93dc297039d7f986afe95fd71ce
|
|
Loading…
Reference in New Issue
Block a user