Accepting request 947160 from Java:packages
0.3.5 OBS-URL: https://build.opensuse.org/request/show/947160 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sisu?expand=0&rev=2
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
94b24c5e1a
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b3485561cd3bfe874b70aa773fac0d2de9038c25b794ea21594b05b20c172ade
|
||||
size 213620
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:424bc833be5096407e6b6fb4dc93d3cbe503be0b78e40f0ef497570b4e8403b8
|
||||
size 361580
|
||||
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9fe54646eba5cdd6c2ca57626b307a18740f0701fd89f10cb8337fd2e38e3c0f
|
||||
size 1964
|
||||
oid sha256:75b75b12cf4129c75f8a1f7adadb965c9c881934632b9facbc645cc325e66244
|
||||
size 1984
|
||||
|
||||
BIN
sisu-inject-0.3.5.tar.gz
(Stored with Git LFS)
Normal file
BIN
sisu-inject-0.3.5.tar.gz
(Stored with Git LFS)
Normal file
Binary file not shown.
84
sisu-no-dependency-on-glassfish-servlet-api.patch
Normal file
84
sisu-no-dependency-on-glassfish-servlet-api.patch
Normal file
@ -0,0 +1,84 @@
|
||||
--- sisu-inject/org.eclipse.sisu.inject/src/org/eclipse/sisu/inject/Implementations.java
|
||||
+++ 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();
|
||||
- }
|
||||
- }
|
||||
}
|
||||
BIN
sisu-plexus-0.3.5.tar.gz
(Stored with Git LFS)
Normal file
BIN
sisu-plexus-0.3.5.tar.gz
(Stored with Git LFS)
Normal file
Binary file not shown.
17
sisu.changes
17
sisu.changes
@ -1,3 +1,20 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 18 07:16:24 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Update to upstream version 0.3.5
|
||||
- Changes of 0.3.5
|
||||
* beo#539791 - Update cdi-api dependency to 1.2
|
||||
* beo#575952 - Support turning off URLConnection caching for
|
||||
container related resources
|
||||
- Changes of 0.3.4
|
||||
* beo#552642 - Support reproducible builds by sorting generated
|
||||
javax.inject.Named index
|
||||
* beo#546874 - Relax bytecode check in scanner so it can scan up
|
||||
to and including Java14
|
||||
- Added patch:
|
||||
* sisu-no-dependency-on-glassfish-servlet-api.patch
|
||||
+ remove dependency on glassfish-servlet-api
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Apr 1 23:11:49 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
|
||||
31
sisu.spec
31
sisu.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package sisu
|
||||
#
|
||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2022 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -17,21 +17,21 @@
|
||||
|
||||
|
||||
%global reltype release
|
||||
#global reltag .M1
|
||||
Name: sisu
|
||||
Version: 0.3.3
|
||||
Version: 0.3.5
|
||||
Release: 0
|
||||
Summary: Eclipse dependency injection framework
|
||||
# sisu is EPL-1.0, bundled asm is BSD
|
||||
License: EPL-1.0 AND BSD-3-Clause
|
||||
License: BSD-3-Clause AND EPL-1.0
|
||||
Group: Development/Libraries/Java
|
||||
URL: http://eclipse.org/sisu
|
||||
Source0: http://git.eclipse.org/c/%{name}/org.eclipse.%{name}.inject.git/snapshot/%{reltype}s/%{version}%{?reltag}.tar.xz#/org.eclipse.%{name}.inject-%{version}%{?reltag}.tar.xz
|
||||
Source1: http://git.eclipse.org/c/%{name}/org.eclipse.%{name}.plexus.git/snapshot/%{reltype}s/%{version}%{?reltag}.tar.xz#/org.eclipse.%{name}.plexus-%{version}%{?reltag}.tar.xz
|
||||
URL: https://www.eclipse.org/sisu/
|
||||
Source0: https://github.com/eclipse/sisu.inject/archive/refs/tags/releases/%{version}.tar.gz#/sisu-inject-%{version}.tar.gz
|
||||
Source1: https://github.com/eclipse/sisu.plexus/archive/refs/tags/releases/%{version}.tar.gz#/sisu-plexus-%{version}.tar.gz
|
||||
Source2: %{name}-build.tar.xz
|
||||
Source100: %{name}-inject.pom
|
||||
Source101: %{name}-plexus.pom
|
||||
Patch0: %{name}-OSGi-import-guava.patch
|
||||
Patch1: %{name}-no-dependency-on-glassfish-servlet-api.patch
|
||||
Patch2: %{name}-ignored-tests.patch
|
||||
Patch3: %{name}-osgi-api.patch
|
||||
BuildRequires: ant
|
||||
@ -39,7 +39,6 @@ BuildRequires: atinject
|
||||
BuildRequires: cdi-api
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: glassfish-annotation-api
|
||||
BuildRequires: glassfish-servlet-api
|
||||
BuildRequires: google-guice
|
||||
BuildRequires: guice-servlet
|
||||
BuildRequires: javapackages-local
|
||||
@ -50,6 +49,7 @@ BuildRequires: plexus-containers-component-annotations
|
||||
BuildRequires: plexus-utils
|
||||
BuildRequires: slf4j
|
||||
BuildRequires: testng
|
||||
BuildRequires: unzip
|
||||
BuildRequires: xmvn-install
|
||||
BuildRequires: xmvn-resolve
|
||||
BuildRequires: xz
|
||||
@ -83,16 +83,20 @@ This package contains %{summary}.
|
||||
|
||||
%prep
|
||||
%setup -q -c -T
|
||||
tar -xf %{SOURCE0} && mv %{reltype}s/* sisu-inject && rmdir %{reltype}s
|
||||
tar xf %{SOURCE0} && mv sisu.inject-releases-%{version} sisu-inject
|
||||
tar xf %{SOURCE1} && mv sisu.plexus-releases-%{version} sisu-plexus
|
||||
tar xf %{SOURCE2}
|
||||
|
||||
cp %{SOURCE100} sisu-inject/pom.xml
|
||||
tar -xf %{SOURCE1} && mv %{reltype}s/* sisu-plexus && rmdir %{reltype}s
|
||||
cp %{SOURCE101} sisu-plexus/pom.xml
|
||||
tar -xf %{SOURCE2}
|
||||
|
||||
%patch0
|
||||
%patch1
|
||||
%patch2
|
||||
%patch3
|
||||
|
||||
%pom_remove_dep :servlet-api sisu-inject
|
||||
|
||||
for i in inject plexus; do
|
||||
%pom_xpath_set -r /pom:project/pom:version %{version} %{name}-${i}
|
||||
done
|
||||
@ -105,7 +109,6 @@ done
|
||||
mkdir -p lib
|
||||
build-jar-repository -s lib \
|
||||
glassfish-annotation-api \
|
||||
glassfish-servlet-api \
|
||||
google-guice-no_aop \
|
||||
guice/guice-servlet \
|
||||
javax.enterprise.inject/cdi-api \
|
||||
@ -117,10 +120,10 @@ build-jar-repository -s lib \
|
||||
plexus-containers/plexus-component-annotations \
|
||||
slf4j/api \
|
||||
testng
|
||||
%ant package javadoc
|
||||
%{ant} package javadoc
|
||||
|
||||
for i in inject plexus; do
|
||||
%mvn_artifact %{name}-${i}/pom.xml %{name}-${i}/target/org.eclipse.sisu.${i}-%{version}.jar
|
||||
%{mvn_artifact} %{name}-${i}/pom.xml %{name}-${i}/target/org.eclipse.sisu.${i}-%{version}.jar
|
||||
done
|
||||
|
||||
%install
|
||||
|
||||
Loading…
Reference in New Issue
Block a user