forked from pool/google-guice
Accepting request 1084445 from Java:packages
5.1.0 OBS-URL: https://build.opensuse.org/request/show/1084445 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/google-guice?expand=0&rev=5
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
f0f9706795
14
_service
Normal file
14
_service
Normal file
@ -0,0 +1,14 @@
|
||||
<services>
|
||||
<service name="tar_scm" mode="disabled">
|
||||
<param name="scm">git</param>
|
||||
<param name="url">https://github.com/google/guice.git</param>
|
||||
<param name="revision">5.1.0</param>
|
||||
<param name="versionformat">@PARENT_TAG@</param>
|
||||
<param name="filename">google-guice</param>
|
||||
</service>
|
||||
<service name="recompress" mode="disabled">
|
||||
<param name="file">*.tar</param>
|
||||
<param name="compression">xz</param>
|
||||
</service>
|
||||
<service name="set_version" mode="disabled"/>
|
||||
</services>
|
||||
@ -1,17 +0,0 @@
|
||||
#!/bin/sh
|
||||
set -e -x
|
||||
test $# -eq 1
|
||||
test ! -d guice
|
||||
git clone https://github.com/google/guice.git
|
||||
cd ./guice
|
||||
git checkout ${1}
|
||||
git branch unbundled-${1}
|
||||
git checkout unbundled-${1}
|
||||
rm -rf $(ls . | grep -E -v 'core|extensions|pom|bom|jdk8-tests|COPYING|common.xml|build.xml|build.properties|lib')
|
||||
find . -name "*.jar" -and ! -name munge.jar -delete
|
||||
find . -name "*.class" -delete
|
||||
find lib -type f -and ! -name munge.jar -delete
|
||||
git commit -a -m "Remove unneeded stuff"
|
||||
git tag unbundled-${1}
|
||||
git archive --format=tar --prefix=google-guice-${1}/ unbundled-${1} \
|
||||
| xz >../google-guice-${1}.tar.xz
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ad9a303c0b69065b67fc4295b9f4acfdde49920f2886cdb2823153d7b59edab0
|
||||
size 383200
|
||||
BIN
google-guice-5.1.0.tar.xz
(Stored with Git LFS)
Normal file
BIN
google-guice-5.1.0.tar.xz
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
google-guice-build.tar.xz
(Stored with Git LFS)
Normal file
BIN
google-guice-build.tar.xz
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -1,33 +0,0 @@
|
||||
--- google-guice-4.1/common.xml 2021-06-10 12:08:42.237189651 +0200
|
||||
+++ google-guice-4.1/common.xml 2021-06-10 12:10:20.765834983 +0200
|
||||
@@ -14,7 +14,7 @@
|
||||
<javac srcdir="${src.dir}"
|
||||
debug="on"
|
||||
destdir="${build.dir}/classes"
|
||||
- source="1.6" target="1.6" encoding="UTF-8" includeantruntime="false">
|
||||
+ source="1.8" target="1.8" encoding="UTF-8" includeantruntime="false">
|
||||
<compilerarg value="-Xlint:all,-serial"/>
|
||||
<classpath refid="compile.classpath"/>
|
||||
</javac>
|
||||
@@ -39,7 +39,7 @@
|
||||
<property name="Bundle-DocURL" value="https://github.com/google/guice"/>
|
||||
<property name="Bundle-Copyright" value="Copyright (C) 2006 Google Inc."/>
|
||||
<property name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
|
||||
- <property name="Bundle-RequiredExecutionEnvironment" value="JavaSE-1.6"/>
|
||||
+ <property name="Bundle-RequiredExecutionEnvironment" value="JavaSE-1.8"/>
|
||||
<property name="Bundle-Vendor" value="Google, Inc."/>
|
||||
|
||||
<property name="Export-Package" value="!${module}.internal.*,${module}.*;version=${api.version}"/>
|
||||
@@ -82,7 +82,7 @@
|
||||
<javac srcdir="${test.dir}"
|
||||
debug="on"
|
||||
destdir="${build.dir}/test"
|
||||
- source="1.6" target="1.6" encoding="UTF-8" includeantruntime="false">
|
||||
+ source="1.8" target="1.8" encoding="UTF-8" includeantruntime="false">
|
||||
<classpath path="${build.dir}/classes"/>
|
||||
<classpath path="${build.dir}/test"/>
|
||||
<classpath refid="compile.classpath"/>
|
||||
Only in google-guice-4.1/core: pom.xml.orig
|
||||
Only in google-guice-4.1/extensions: pom.xml.orig
|
||||
Only in google-guice-4.1/jdk8-tests: pom.xml.orig
|
||||
Only in google-guice-4.1: pom.xml.orig
|
||||
@ -1,3 +1,80 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed May 3 11:27:41 UTC 2023 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Upgrade to upstream version 5.1.0
|
||||
* Changes of 4.2:
|
||||
+ Java 9 and JPMS support
|
||||
+ Multibindings are now in the Guice core artifact.
|
||||
The multibindings artifact is empty to prevent confusion
|
||||
during upgrading and will be removed in a later release.
|
||||
+ Improve the performance of guice provisioning (by about 20%)
|
||||
by changing the way errors are reported. Guice will no longer
|
||||
report multiple errors during provisioning (Guice still
|
||||
reports multiple errors during injector creation).
|
||||
+ Better error messages for a missing binding.
|
||||
+ Various optimizations.
|
||||
+ AbstractModule.configure() is non-abstract to allow modules
|
||||
with only @Provides/@ProvidesIntoSet/... methods.
|
||||
+ Add a CheckedProviders class.
|
||||
+ Change the way Singletons work to not rely on ThreadLocals nor
|
||||
WeakReferences.
|
||||
+ Add MapBinderBinding.getEntries(Iterable).
|
||||
+ Deprecate ProvisionListener.ProvisionInvocation
|
||||
.getDependencyChain().
|
||||
+ Ensure that Struts interceptors are populated even if they are
|
||||
created after the injector (Fixes #1081, #1075).
|
||||
+ Add support for multibindings with annotations in the Guice
|
||||
DaggerMethodScanner.
|
||||
* Changes of 4.2.1
|
||||
+ Java10 support (updated cglib & asm).
|
||||
+ Minor updates to the testlib extension.
|
||||
* Changes of 4.2.2
|
||||
+ Java11 support (updated cglib & asm)
|
||||
* Changes of 4.2.3
|
||||
+ Java14 support (updated asm).
|
||||
+ Added Injector.getElements API, to expose all Element SPI
|
||||
types from the Injector.
|
||||
+ Added Injector.getAllMembersInjectorInjectionPoints API,
|
||||
to expose injection points created by arbitrary members
|
||||
injection.
|
||||
+ Added getAlternateKeys to Multibinder SPI types
|
||||
(MultibinderBinding, MapBinderBinding, OptionalBinderBinding),
|
||||
to explicitly list the other keys these bindings are
|
||||
available as.
|
||||
+ Scan for (and bind) @Provides-like methods in a consistent
|
||||
ordering, rather than relying on the non-deterministic
|
||||
Class.getDeclaredMembers ordering.
|
||||
+ Update DaggerAdapter to work with newer dagger code.
|
||||
+ Fixed a subtle bug with eager singleton evaluation.
|
||||
+ Updated @RequestScope's scope annotation to the JSR330 @Scope,
|
||||
so it can be reused by non-Guice DI systems.
|
||||
+ Clarified the error message when an injectable constructor is
|
||||
missing.
|
||||
+ Add deprecated overloads to various Modules methods, to make
|
||||
it clearer when calling them is unnecessary.
|
||||
+ Added factory methods to Modules for common Binder
|
||||
configuration methods, to make it easier to configure them.
|
||||
* Changes of 5.0.1:
|
||||
+ Added Java15 support (updated asm and bug fixes).
|
||||
+ Removed cglib as a core dependency. (#1359)
|
||||
+ Improved error messages.
|
||||
+ Improved support for using Guice with Kotlin.
|
||||
+ Added a mechanism to restrict who can bind types or
|
||||
annotations, to allow library authors to control their
|
||||
bindings.
|
||||
+ Removed no-aop build variant.
|
||||
+ Fixed 'illegal reflective access' warnings.
|
||||
* Changes of 5.1.0:
|
||||
+ This minor release adds support for Java 17.
|
||||
- Removed patches:
|
||||
* google-guice-throwingproviderbinder.patch
|
||||
* guice-4.1-disabledextensions.patch
|
||||
* guice-4.1-fixup-ant.patch
|
||||
* guice-4.1-javadoc.patch
|
||||
- Fetch sources using source service, which allows us to clean up
|
||||
the tarball if needed
|
||||
- Generate the ant build system using the maven pom files.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 27 11:52:34 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file
|
||||
#
|
||||
# Copyright (c) 2022 SUSE LLC
|
||||
# Copyright (c) 2023 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
%global short_name guice
|
||||
Name: google-%{short_name}
|
||||
Version: 4.1
|
||||
Version: 5.1.0
|
||||
Release: 0
|
||||
Summary: Dependency injection framework for Java 5 and above
|
||||
License: Apache-2.0
|
||||
@ -26,21 +26,21 @@ Group: Development/Libraries/Java
|
||||
URL: https://github.com/google/%{short_name}
|
||||
# ./create-tarball.sh %%{version}
|
||||
Source0: %{name}-%{version}.tar.xz
|
||||
Source1: create-tarball.sh
|
||||
Patch0: guice-4.1-fixup-ant.patch
|
||||
Patch1: guice-4.1-disabledextensions.patch
|
||||
Patch2: guice-4.1-javadoc.patch
|
||||
Patch3: google-guice-throwingproviderbinder.patch
|
||||
Source1: %{name}-build.tar.xz
|
||||
BuildRequires: ant
|
||||
BuildRequires: aqute-bnd
|
||||
BuildRequires: aopalliance
|
||||
BuildRequires: atinject
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: glassfish-servlet-api
|
||||
BuildRequires: google-errorprone-annotations
|
||||
BuildRequires: guava
|
||||
BuildRequires: java-devel >= 1.8
|
||||
BuildRequires: javapackages-local
|
||||
Requires: mvn(com.google.guava:guava)
|
||||
Requires: mvn(javax.inject:javax.inject)
|
||||
BuildRequires: jsr-305
|
||||
BuildRequires: objectweb-asm
|
||||
Provides: %{short_name}-multibindings = %{version}
|
||||
Obsoletes: %{short_name}-multibindings < %{version}
|
||||
Obsoletes: %{short_name}-testlibs
|
||||
BuildArch: noarch
|
||||
|
||||
%description
|
||||
@ -63,7 +63,6 @@ and above. This package provides parent POM for Guice modules.
|
||||
%package -n %{short_name}-assistedinject
|
||||
Summary: AssistedInject extension module for Guice
|
||||
Group: Development/Libraries/Java
|
||||
Requires: mvn(com.google.inject:guice)
|
||||
|
||||
%description -n %{short_name}-assistedinject
|
||||
Guice is a dependency injection framework for Java 5
|
||||
@ -72,7 +71,6 @@ and above. This package provides AssistedInject module for Guice.
|
||||
%package -n %{short_name}-extensions
|
||||
Summary: Extensions for Guice
|
||||
Group: Development/Libraries/Java
|
||||
Requires: mvn(com.google.inject:guice-parent:pom:)
|
||||
|
||||
%description -n %{short_name}-extensions
|
||||
Guice is a dependency injection framework for Java 5
|
||||
@ -81,9 +79,6 @@ and above. This package provides extensions POM for Guice.
|
||||
%package -n %{short_name}-grapher
|
||||
Summary: Grapher extension module for Guice
|
||||
Group: Development/Libraries/Java
|
||||
Requires: mvn(com.google.inject.extensions:guice-assistedinject)
|
||||
Requires: mvn(com.google.inject.extensions:guice-multibindings)
|
||||
Requires: mvn(com.google.inject:guice)
|
||||
|
||||
%description -n %{short_name}-grapher
|
||||
Guice is a dependency injection framework for Java 5
|
||||
@ -92,7 +87,6 @@ and above. This package provides Grapher module for Guice.
|
||||
%package -n %{short_name}-jmx
|
||||
Summary: JMX extension module for Guice
|
||||
Group: Development/Libraries/Java
|
||||
Requires: mvn(com.google.inject:guice)
|
||||
|
||||
%description -n %{short_name}-jmx
|
||||
Guice is a dependency injection framework for Java 5
|
||||
@ -101,43 +95,22 @@ and above. This package provides JMX module for Guice.
|
||||
%package -n %{short_name}-jndi
|
||||
Summary: JNDI extension module for Guice
|
||||
Group: Development/Libraries/Java
|
||||
Requires: mvn(com.google.inject:guice)
|
||||
|
||||
%description -n %{short_name}-jndi
|
||||
Guice is a dependency injection framework for Java 5
|
||||
and above. This package provides JNDI module for Guice.
|
||||
|
||||
%package -n %{short_name}-multibindings
|
||||
Summary: MultiBindings extension module for Guice
|
||||
Group: Development/Libraries/Java
|
||||
Requires: mvn(com.google.inject:guice)
|
||||
|
||||
%description -n %{short_name}-multibindings
|
||||
Guice is a dependency injection framework for Java 5
|
||||
and above. This package provides MultiBindings module for Guice.
|
||||
|
||||
%package -n %{short_name}-servlet
|
||||
Summary: Servlet extension module for Guice
|
||||
Group: Development/Libraries/Java
|
||||
Requires: mvn(com.google.inject:guice)
|
||||
|
||||
%description -n %{short_name}-servlet
|
||||
Guice is a dependency injection framework for Java 5
|
||||
and above. This package provides Servlet module for Guice.
|
||||
|
||||
%package -n %{short_name}-testlib
|
||||
Summary: TestLib extension module for Guice
|
||||
Group: Development/Libraries/Java
|
||||
Requires: mvn(com.google.inject:guice)
|
||||
|
||||
%description -n %{short_name}-testlib
|
||||
Guice is a dependency injection framework for Java 5
|
||||
and above. This package provides TestLib module for Guice.
|
||||
|
||||
%package -n %{short_name}-throwingproviders
|
||||
Summary: ThrowingProviders extension module for Guice
|
||||
Group: Development/Libraries/Java
|
||||
Requires: mvn(com.google.inject:guice)
|
||||
|
||||
%description -n %{short_name}-throwingproviders
|
||||
Guice is a dependency injection framework for Java 5
|
||||
@ -146,7 +119,6 @@ and above. This package provides ThrowingProviders module for Guice.
|
||||
%package -n %{short_name}-bom
|
||||
Summary: Bill of Materials for Guice
|
||||
Group: Development/Libraries/Java
|
||||
Requires: mvn(com.google.inject:guice-parent:pom:)
|
||||
|
||||
%description -n %{short_name}-bom
|
||||
Guice is a dependency injection framework for Java 5
|
||||
@ -160,18 +132,17 @@ Group: Documentation/HTML
|
||||
This package provides %{summary}.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
find . -name "*.jar" -and ! -name "munge.jar" -delete
|
||||
find . -name "*.class" -delete
|
||||
%setup -q -a1
|
||||
|
||||
# We don't have struts2.
|
||||
%pom_disable_module struts2 extensions
|
||||
# Android-specific extension
|
||||
%pom_disable_module dagger-adapter extensions
|
||||
|
||||
# Remove additional build profiles, which we don't use anyways
|
||||
# and which are only pulling additional dependencies.
|
||||
%pom_xpath_remove "pom:profile[pom:id='guice.with.jarjar']" core
|
||||
|
||||
# Fix OSGi metadata due to not using jarjar
|
||||
%pom_xpath_set "pom:instructions/pom:Import-Package" \
|
||||
"!com.google.inject.*,*" core
|
||||
@ -189,112 +160,91 @@ find . -name "*.class" -delete
|
||||
# remove test dependency to make sure we don't produce requires
|
||||
# see #1007498
|
||||
%pom_remove_dep :guava-testlib extensions
|
||||
%pom_xpath_remove "pom:dependency[pom:classifier[text()='tests']]" extensions
|
||||
%pom_xpath_remove "pom:dependency[pom:classifier='tests']" extensions
|
||||
|
||||
%pom_remove_parent
|
||||
|
||||
%pom_disable_module persist extensions
|
||||
%pom_disable_module spring extensions
|
||||
%pom_disable_module testlib extensions
|
||||
|
||||
%pom_change_dep -r -f ::::: :::::
|
||||
%pom_remove_parent
|
||||
|
||||
%pom_remove_parent core
|
||||
%pom_xpath_inject pom:project "
|
||||
<groupId>com.google.inject</groupId>
|
||||
<version>4.1.0</version>" core
|
||||
<version>%{version}</version>" core
|
||||
|
||||
for mdl in assistedinject dagger-adapter grapher jmx jndi multibindings persist servlet spring struts2 testlib throwingproviders; do
|
||||
for mdl in assistedinject dagger-adapter grapher jmx jndi persist servlet spring struts2 testlib throwingproviders; do
|
||||
%pom_remove_parent extensions/${mdl}
|
||||
%pom_xpath_inject pom:project "
|
||||
<groupId>com.google.inject.extensions</groupId>
|
||||
<version>4.1.0</version>" extensions/${mdl}
|
||||
<version>%{version}</version>" extensions/${mdl}
|
||||
done
|
||||
|
||||
%pom_disable_module persist extensions
|
||||
%pom_disable_module spring extensions
|
||||
|
||||
%pom_disable_module jdk8-tests
|
||||
|
||||
%pom_remove_plugin :maven-remote-resources-plugin
|
||||
%pom_remove_plugin :maven-bundle-plugin
|
||||
%pom_remove_plugin :maven-source-plugin
|
||||
|
||||
%pom_remove_plugin :maven-remote-resources-plugin extensions
|
||||
%pom_remove_plugin :maven-bundle-plugin extensions
|
||||
%pom_remove_plugin :maven-source-plugin extensions
|
||||
|
||||
%pom_xpath_remove "pom:dependency[pom:scope[text()='test']]" core
|
||||
%pom_xpath_remove "pom:profiles" core
|
||||
%pom_xpath_remove "pom:build" core
|
||||
%pom_xpath_remove "pom:optional" core
|
||||
|
||||
%build
|
||||
mkdir -p lib/build
|
||||
build-jar-repository -s -p lib/build \
|
||||
guava javax.inject glassfish-servlet-api aqute-bnd
|
||||
%{ant} clean.all no_aop
|
||||
pushd build/no_aop
|
||||
mkdir -p extensions/servlet/lib/build
|
||||
%pom_remove_dep :aopalliance core
|
||||
%pom_remove_dep :asm core
|
||||
%pom_remove_dep :cglib core
|
||||
%{ant} -Dversion=%{version} dist javadoc
|
||||
popd
|
||||
mkdir -p lib
|
||||
build-jar-repository -s lib \
|
||||
aopalliance \
|
||||
atinject \
|
||||
glassfish-servlet-api \
|
||||
google-errorprone/annotations \
|
||||
guava/guava \
|
||||
jsr-305 \
|
||||
objectweb-asm/asm \
|
||||
|
||||
%{ant} -Dtest.skip=true package javadoc
|
||||
|
||||
%install
|
||||
# jars
|
||||
install -dm 0755 %{buildroot}%{_javadir}/%{short_name}
|
||||
install -pm 0644 build/no_aop/build/guice-%{version}.jar %{buildroot}%{_javadir}/%{short_name}/%{name}.jar
|
||||
install -pm 0644 core/target/guice-%{version}.jar %{buildroot}%{_javadir}/%{short_name}/%{name}.jar
|
||||
# Provide symlinks for all jars that existed, no_aop and aop
|
||||
ln -sf %{short_name}/%{name}.jar %{buildroot}%{_javadir}/%{name}.jar
|
||||
ln -sf %{name}.jar %{buildroot}%{_javadir}/%{short_name}/%{name}-no_aop.jar
|
||||
ln -sf %{short_name}/%{name}.jar %{buildroot}%{_javadir}/%{name}-no_aop.jar
|
||||
|
||||
install -pm 0644 build/no_aop/build/dist/guice-jmx-%{version}.jar \
|
||||
install -pm 0644 extensions/jmx/target/guice-jmx-%{version}.jar \
|
||||
%{buildroot}%{_javadir}/%{short_name}/guice-jmx.jar
|
||||
install -pm 0644 build/no_aop/build/dist/guice-assistedinject-%{version}.jar \
|
||||
install -pm 0644 extensions/assistedinject/target/guice-assistedinject-%{version}.jar \
|
||||
%{buildroot}%{_javadir}/%{short_name}/guice-assistedinject.jar
|
||||
install -pm 0644 build/no_aop/build/dist/guice-multibindings-%{version}.jar \
|
||||
%{buildroot}%{_javadir}/%{short_name}/guice-multibindings.jar
|
||||
install -pm 0644 build/no_aop/build/dist/guice-throwingproviders-%{version}.jar \
|
||||
install -pm 0644 extensions/throwingproviders/target/guice-throwingproviders-%{version}.jar \
|
||||
%{buildroot}%{_javadir}/%{short_name}/guice-throwingproviders.jar
|
||||
install -pm 0644 build/no_aop/build/dist/guice-servlet-%{version}.jar \
|
||||
install -pm 0644 extensions/servlet/target/guice-servlet-%{version}.jar \
|
||||
%{buildroot}%{_javadir}/%{short_name}/guice-servlet.jar
|
||||
install -pm 0644 build/no_aop/build/dist/guice-jndi-%{version}.jar \
|
||||
install -pm 0644 extensions/jndi/target/guice-jndi-%{version}.jar \
|
||||
%{buildroot}%{_javadir}/%{short_name}/guice-jndi.jar
|
||||
install -pm 0644 build/no_aop/build/dist/guice-testlib-%{version}.jar \
|
||||
%{buildroot}%{_javadir}/%{short_name}/guice-testlib.jar
|
||||
install -pm 0644 build/no_aop/build/dist/guice-grapher-%{version}.jar \
|
||||
install -pm 0644 extensions/grapher/target/guice-grapher-%{version}.jar \
|
||||
%{buildroot}%{_javadir}/%{short_name}/guice-grapher.jar
|
||||
|
||||
# poms
|
||||
install -dm 0755 %{buildroot}%{_mavenpomdir}/%{short_name}
|
||||
install -pm 0644 build/no_aop/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-parent.pom
|
||||
install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-parent.pom
|
||||
%add_maven_depmap %{short_name}/guice-parent.pom -f parent
|
||||
install -pm 0644 build/no_aop/bom/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-bom.pom
|
||||
install -pm 0644 bom/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-bom.pom
|
||||
%add_maven_depmap %{short_name}/guice-bom.pom -f bom
|
||||
install -pm 0644 build/no_aop/extensions/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/extensions-parent.pom
|
||||
install -pm 0644 extensions/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/extensions-parent.pom
|
||||
%add_maven_depmap %{short_name}/extensions-parent.pom -a org.sonatype.sisu.inject:extensions-parent -f extensions
|
||||
|
||||
install -pm 0644 build/no_aop/core/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/%{name}.pom
|
||||
install -pm 0644 core/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/%{name}.pom
|
||||
%add_maven_depmap %{short_name}/%{name}.pom %{short_name}/%{name}.jar -a "org.sonatype.sisu:sisu-guice,com.google.inject:guice::no_aop:,org.sonatype.sisu:sisu-guice::no_aop:"
|
||||
|
||||
install -pm 0644 build/no_aop/extensions/jmx/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-jmx.pom
|
||||
install -pm 0644 extensions/jmx/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-jmx.pom
|
||||
%add_maven_depmap %{short_name}/guice-jmx.pom %{short_name}/guice-jmx.jar -a org.sonatype.sisu.inject:guice-jmx -f jmx
|
||||
install -pm 0644 build/no_aop/extensions/assistedinject/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-assistedinject.pom
|
||||
install -pm 0644 extensions/assistedinject/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-assistedinject.pom
|
||||
%add_maven_depmap %{short_name}/guice-assistedinject.pom %{short_name}/guice-assistedinject.jar -a org.sonatype.sisu.inject:guice-assistedinject -f assistedinject
|
||||
install -pm 0644 build/no_aop/extensions/multibindings/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-multibindings.pom
|
||||
%add_maven_depmap %{short_name}/guice-multibindings.pom %{short_name}/guice-multibindings.jar -a org.sonatype.sisu.inject:guice-multibindings -f multibindings
|
||||
install -pm 0644 build/no_aop/extensions/throwingproviders/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-throwingproviders.pom
|
||||
install -pm 0644 extensions/throwingproviders/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-throwingproviders.pom
|
||||
%add_maven_depmap %{short_name}/guice-throwingproviders.pom %{short_name}/guice-throwingproviders.jar -a org.sonatype.sisu.inject:guice-throwingproviders -f throwingproviders
|
||||
install -pm 0644 build/no_aop/extensions/servlet/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-servlet.pom
|
||||
install -pm 0644 extensions/servlet/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-servlet.pom
|
||||
%add_maven_depmap %{short_name}/guice-servlet.pom %{short_name}/guice-servlet.jar -a org.sonatype.sisu.inject:guice-servlet -f servlet
|
||||
install -pm 0644 build/no_aop/extensions/jndi/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-jndi.pom
|
||||
install -pm 0644 extensions/jndi/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-jndi.pom
|
||||
%add_maven_depmap %{short_name}/guice-jndi.pom %{short_name}/guice-jndi.jar -a org.sonatype.sisu.inject:guice-jndi -f jndi
|
||||
install -pm 0644 build/no_aop/extensions/testlib/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-testlib.pom
|
||||
%add_maven_depmap %{short_name}/guice-testlib.pom %{short_name}/guice-testlib.jar -a org.sonatype.sisu.inject:guice-testlib -f testlib
|
||||
install -pm 0644 build/no_aop/extensions/grapher/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-grapher.pom
|
||||
install -pm 0644 extensions/grapher/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-grapher.pom
|
||||
%add_maven_depmap %{short_name}/guice-grapher.pom %{short_name}/guice-grapher.jar -a org.sonatype.sisu.inject:guice-grapher -f grapher
|
||||
|
||||
# javadoc
|
||||
install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
|
||||
cp -pr build/no_aop/build/docs/javadoc/* %{buildroot}%{_javadocdir}/%{name}/
|
||||
cp -pr core/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
|
||||
%fdupes -s %{buildroot}%{_javadocdir}
|
||||
|
||||
%files -f .mfiles
|
||||
@ -315,12 +265,8 @@ cp -pr build/no_aop/build/docs/javadoc/* %{buildroot}%{_javadocdir}/%{name}/
|
||||
|
||||
%files -n %{short_name}-jndi -f .mfiles-jndi
|
||||
|
||||
%files -n %{short_name}-multibindings -f .mfiles-multibindings
|
||||
|
||||
%files -n %{short_name}-servlet -f .mfiles-servlet
|
||||
|
||||
%files -n %{short_name}-testlib -f .mfiles-testlib
|
||||
|
||||
%files -n %{short_name}-throwingproviders -f .mfiles-throwingproviders
|
||||
|
||||
%files -n %{short_name}-bom -f .mfiles-bom
|
||||
|
||||
@ -1,102 +0,0 @@
|
||||
--- guice-4.1/build.xml 2018-10-30 11:38:11.568428971 +0100
|
||||
+++ guice-4.1/build.xml 2018-10-30 11:38:32.188523986 +0100
|
||||
@@ -25,15 +25,11 @@
|
||||
<target name="dist" depends="distjars, javadoc"
|
||||
description="Build entire distribution.">
|
||||
<ant antfile="extensions/servlet/build.xml" target="distjars" inheritAll="false"/>
|
||||
- <ant antfile="extensions/spring/build.xml" target="distjars" inheritAll="false"/>
|
||||
- <ant antfile="extensions/struts2/build.xml" target="distjars" inheritAll="false"/>
|
||||
<ant antfile="extensions/assistedinject/build.xml" target="distjars" inheritAll="false"/>
|
||||
<ant antfile="extensions/jmx/build.xml" target="distjars" inheritAll="false"/>
|
||||
<ant antfile="extensions/jndi/build.xml" target="distjars" inheritAll="false"/>
|
||||
<ant antfile="extensions/throwingproviders/build.xml" target="distjars" inheritAll="false"/>
|
||||
<ant antfile="extensions/multibindings/build.xml" target="distjars" inheritAll="false"/>
|
||||
- <ant antfile="extensions/dagger-adapter/build.xml" target="distjars" inheritAll="false"/>
|
||||
- <ant antfile="extensions/persist/build.xml" target="distjars" inheritAll="false"/>
|
||||
<ant antfile="extensions/grapher/build.xml" target="distjars" inheritAll="false"/>
|
||||
<ant antfile="extensions/testlib/build.xml" target="distjars" inheritAll="false"/>
|
||||
|
||||
@@ -41,12 +37,6 @@
|
||||
<fileset dir="extensions/servlet/build" includes="*.jar"/>
|
||||
</copy>
|
||||
<copy toDir="${build.dir}/dist">
|
||||
- <fileset dir="extensions/spring/build" includes="*.jar"/>
|
||||
- </copy>
|
||||
- <copy toDir="${build.dir}/dist">
|
||||
- <fileset dir="extensions/struts2/build" includes="*.jar"/>
|
||||
- </copy>
|
||||
- <copy toDir="${build.dir}/dist">
|
||||
<fileset dir="extensions/assistedinject/build" includes="*.jar"/>
|
||||
</copy>
|
||||
<copy toDir="${build.dir}/dist">
|
||||
@@ -62,12 +52,6 @@
|
||||
<fileset dir="extensions/multibindings/build" includes="*.jar"/>
|
||||
</copy>
|
||||
<copy toDir="${build.dir}/dist">
|
||||
- <fileset dir="extensions/dagger-adapter/build" includes="*.jar"/>
|
||||
- </copy>
|
||||
- <copy toDir="${build.dir}/dist">
|
||||
- <fileset dir="extensions/persist/build" includes="*.jar"/>
|
||||
- </copy>
|
||||
- <copy toDir="${build.dir}/dist">
|
||||
<fileset dir="extensions/grapher/build" includes="*.jar"/>
|
||||
</copy>
|
||||
<copy toDir="${build.dir}/dist">
|
||||
@@ -154,15 +138,11 @@
|
||||
<exclude name="com/google/inject/internal/**"/>
|
||||
</fileset>
|
||||
<fileset dir="${servlet.src.dir}"/>
|
||||
- <fileset dir="${spring.src.dir}"/>
|
||||
<fileset dir="${assistedinject.src.dir}"/>
|
||||
<fileset dir="${jmx.src.dir}"/>
|
||||
<fileset dir="${jndi.src.dir}"/>
|
||||
<fileset dir="${throwingproviders.src.dir}"/>
|
||||
<fileset dir="${multibindings.src.dir}"/>
|
||||
- <fileset dir="${daggeradapter.src.dir}"/>
|
||||
- <fileset dir="${persist.src.dir}"/>
|
||||
- <fileset dir="${struts2.src.dir}"/>
|
||||
<fileset dir="${grapher.src.dir}"/>
|
||||
<fileset dir="${testlib.src.dir}"/>
|
||||
|
||||
@@ -216,9 +196,6 @@
|
||||
<group title="Multibinder Extension" packages="com.google.inject.multibindings"/>
|
||||
<fileset dir="${multibindings.src.dir}"/>
|
||||
|
||||
- <group title="Dagger Adapter" packages="com.google.inject.daggeradapter"/>
|
||||
- <fileset dir="${daggeradapter.src.dir}"/>
|
||||
-
|
||||
<group title="ThrowingProviders Extension" packages="com.google.inject.throwingproviders"/>
|
||||
<fileset dir="${throwingproviders.src.dir}"/>
|
||||
|
||||
@@ -228,15 +205,6 @@
|
||||
<group title="Grapher Extension" packages="com.google.inject.grapher:com.google.inject.grapher.*"/>
|
||||
<fileset dir="${grapher.src.dir}"/>
|
||||
|
||||
- <group title="Persist Extension" packages="com.google.inject.persist:com.google.inject.persist.*"/>
|
||||
- <fileset dir="${persist.src.dir}"/>
|
||||
-
|
||||
- <group title="Spring Extension" packages="com.google.inject.spring"/>
|
||||
- <fileset dir="${spring.src.dir}"/>
|
||||
-
|
||||
- <group title="Struts2 Extension" packages="com.google.inject.struts2"/>
|
||||
- <fileset dir="${struts2.src.dir}"/>
|
||||
-
|
||||
<group title="JNDI Extension" packages="com.google.inject.jndi"/>
|
||||
<fileset dir="${jndi.src.dir}"/>
|
||||
|
||||
@@ -300,15 +268,11 @@
|
||||
depends="clean"
|
||||
description="Remove generated files.">
|
||||
<ant dir="extensions/servlet" antfile="build.xml" target="clean"/>
|
||||
- <ant dir="extensions/spring" antfile="build.xml" target="clean"/>
|
||||
- <ant dir="extensions/struts2" antfile="build.xml" target="clean"/>
|
||||
<ant dir="extensions/assistedinject" antfile="build.xml" target="clean"/>
|
||||
<ant dir="extensions/jmx" antfile="build.xml" target="clean"/>
|
||||
<ant dir="extensions/jndi" antfile="build.xml" target="clean"/>
|
||||
<ant dir="extensions/throwingproviders" antfile="build.xml" target="clean"/>
|
||||
<ant dir="extensions/multibindings" antfile="build.xml" target="clean"/>
|
||||
- <ant dir="extensions/dagger-adapter" antfile="build.xml" target="clean"/>
|
||||
- <ant dir="extensions/persist" antfile="build.xml" target="clean"/>
|
||||
<ant dir="extensions/grapher" antfile="build.xml" target="clean"/>
|
||||
<ant dir="extensions/testlib" antfile="build.xml" target="clean"/>
|
||||
</target>
|
||||
@ -1,147 +0,0 @@
|
||||
diff -urEbwB guice-4.1/build.properties guice-4.1.new/build.properties
|
||||
--- guice-4.1/build.properties 2016-06-17 20:00:06.000000000 +0200
|
||||
+++ guice-4.1.new/build.properties 2019-02-13 23:51:02.592074396 +0100
|
||||
@@ -37,4 +37,4 @@
|
||||
com.google.inject.testing.fieldbinder
|
||||
test.class=com.google.inject.AllTests
|
||||
module=com.google.inject
|
||||
-imports=!net.sf.cglib.*,!org.objectweb.asm.*
|
||||
+imports=net.sf.cglib.*,org.objectweb.asm.*
|
||||
diff -urEbwB guice-4.1/build.xml guice-4.1.new/build.xml
|
||||
--- guice-4.1/build.xml 2016-06-17 20:00:06.000000000 +0200
|
||||
+++ guice-4.1.new/build.xml 2019-02-13 23:51:02.596074414 +0100
|
||||
@@ -18,10 +18,10 @@
|
||||
</path>
|
||||
|
||||
|
||||
- <target name="jar" depends="jar.withdeps, manifest" description="Build jar.">
|
||||
- <jar jarfile="${build.dir}/dist/guice-${version}.jar"
|
||||
+ <target name="jar" depends="compile, manifest" description="Build jar.">
|
||||
+ <jar destfile="${build.dir}/${ant.project.name}-${version}.jar"
|
||||
manifest="${build.dir}/META-INF/MANIFEST.MF">
|
||||
- <zipfileset src="${build.dir}/${ant.project.name}-with-deps.jar"/>
|
||||
+ <fileset dir="${build.dir}/classes" />
|
||||
</jar>
|
||||
</target>
|
||||
|
||||
@@ -118,16 +118,8 @@
|
||||
<classpath>
|
||||
<pathelement location="${build.dir}/guice-${version}-tests.jar"/>
|
||||
<pathelement location="${build.dir}/dist/guice-${version}.jar"/>
|
||||
- <pathelement location="lib/javax.inject.jar"/>
|
||||
- <pathelement location="lib/aopalliance.jar"/>
|
||||
- <pathelement location="lib/guava-19.0.jar"/>
|
||||
- <pathelement location="lib/build/guava-testlib-19.0.jar"/>
|
||||
- <pathelement location="lib/build/junit.jar"/>
|
||||
- <pathelement location="lib/build/servlet-api-2.5.jar"/>
|
||||
- <pathelement location="lib/build/easymock.jar"/>
|
||||
- <pathelement location="lib/build/javax.inject-tck.jar"/>
|
||||
- <pathelement location="lib/build/bnd-0.0.384.jar"/>
|
||||
- <pathelement location="lib/build/felix-2.0.5.jar"/>
|
||||
+ <fileset dir="${lib.dir}" includes="*.jar"/>
|
||||
+ <fileset dir="${lib.dir}/build" includes="*.jar"/>
|
||||
</classpath>
|
||||
<arg value="com.google.inject.AllTests"/>
|
||||
<jvmarg value="${jvmarg-value}"/>
|
||||
diff -urEbwB guice-4.1/common.xml guice-4.1.new/common.xml
|
||||
--- guice-4.1/common.xml 2016-06-17 20:00:06.000000000 +0200
|
||||
+++ guice-4.1.new/common.xml 2019-02-13 23:51:18.596146420 +0100
|
||||
@@ -14,7 +14,7 @@
|
||||
<javac srcdir="${src.dir}"
|
||||
debug="on"
|
||||
destdir="${build.dir}/classes"
|
||||
- source="1.6" target="1.6" includeantruntime="false">
|
||||
+ source="1.6" target="1.6" encoding="UTF-8" includeantruntime="false">
|
||||
<compilerarg value="-Xlint:all,-serial"/>
|
||||
<classpath refid="compile.classpath"/>
|
||||
</javac>
|
||||
@@ -26,7 +26,7 @@
|
||||
<target name="manifest" description="Generate OSGi manifest." depends="compile">
|
||||
<dirname property="common.basedir" file="${ant.file.common}"/>
|
||||
<taskdef resource="aQute/bnd/ant/taskdef.properties"
|
||||
- classpath="${common.basedir}/lib/build/bnd-0.0.384.jar"/>
|
||||
+ classpathref="compile.classpath"/>
|
||||
|
||||
<fail unless="module" message="Missing 'module' property (use the primary package name in this jar)"/>
|
||||
<property name="imports" value=""/>
|
||||
@@ -48,7 +48,7 @@
|
||||
<equals arg1="${module}" arg2="com.google.inject"/>
|
||||
</condition>
|
||||
|
||||
- <condition property="Import-Package" value="!com.google.inject.*,*" else="!${module}.*,${imports},*">
|
||||
+ <condition property="Import-Package" value="!com.google.inject.*,*" else="!${module}.*,*">
|
||||
<istrue value="${fragment}"/>
|
||||
</condition>
|
||||
|
||||
@@ -60,13 +60,19 @@
|
||||
|
||||
<property name="-removeheaders" value="Bnd-LastModified,Ignore-Package,Include-Resource,Private-Package,Tool"/>
|
||||
|
||||
- <bndwrap jars="${build.dir}/classes" output="${build.dir}"/>
|
||||
+ <jar destfile="${build.dir}/classes.jar" basedir="${build.dir}/classes"/>
|
||||
+
|
||||
+ <bndwrap jars="${build.dir}/classes.jar" output="${build.dir}/classes.bar"/>
|
||||
+
|
||||
+ <delete file="${build.dir}/classes.jar"/>
|
||||
|
||||
<unjar src="${build.dir}/classes.bar" dest="${build.dir}">
|
||||
<patternset>
|
||||
<include name="META-INF/MANIFEST.MF"/>
|
||||
</patternset>
|
||||
</unjar>
|
||||
+
|
||||
+ <delete file="${build.dir}/classes.bar"/>
|
||||
</target>
|
||||
|
||||
<target name="test.compile"
|
||||
@@ -76,7 +82,7 @@
|
||||
<javac srcdir="${test.dir}"
|
||||
debug="on"
|
||||
destdir="${build.dir}/test"
|
||||
- source="1.6" target="1.6" includeantruntime="false">
|
||||
+ source="1.6" target="1.6" encoding="UTF-8" includeantruntime="false">
|
||||
<classpath path="${build.dir}/classes"/>
|
||||
<classpath path="${build.dir}/test"/>
|
||||
<classpath refid="compile.classpath"/>
|
||||
@@ -120,37 +126,16 @@
|
||||
description="Build jar files"/>
|
||||
|
||||
<target name="test.withdeps" depends="test.compile"
|
||||
- description="Build a jar of tests with internal.util refocused.">
|
||||
+ description="Build a jar of tests.">
|
||||
<mkdir dir="${build.dir}/dist"/>
|
||||
<dirname property="common.basedir" file="${ant.file.common}"/>
|
||||
- <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask"
|
||||
- classpath="${common.basedir}/lib/build/jarjar-1.1.jar"/>
|
||||
- <jarjar jarfile="${build.dir}/${ant.project.name}-${version}-tests.jar">
|
||||
- <fileset dir="${build.dir}/test"/>
|
||||
- <rule pattern="net.sf.cglib.*" result="com.google.inject.internal.cglib.$@1"/>
|
||||
- <rule pattern="net.sf.cglib.**.*" result="com.google.inject.internal.cglib.@1.$@2"/>
|
||||
- <rule pattern="org.objectweb.asm.*" result="com.google.inject.internal.asm.$@1"/>
|
||||
- <rule pattern="org.objectweb.asm.**.*" result="com.google.inject.internal.asm.@1.$@2"/>
|
||||
- <keep pattern="com.google.inject.**"/>
|
||||
- <keep pattern="com.googlecode.**"/>
|
||||
- </jarjar>
|
||||
+ <jar destfile="${build.dir}/${ant.project.name}-${version}-tests.jar" basedir="${build.dir}/test"/>
|
||||
</target>
|
||||
|
||||
<target name="jar.withdeps" depends="compile"
|
||||
- description="Build jar with dependencies embedded.">
|
||||
+ description="Build jar.">
|
||||
<mkdir dir="${build.dir}/dist"/>
|
||||
<dirname property="common.basedir" file="${ant.file.common}"/>
|
||||
- <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask"
|
||||
- classpath="${common.basedir}/lib/build/jarjar-1.1.jar"/>
|
||||
- <jarjar jarfile="${build.dir}/${ant.project.name}-with-deps.jar">
|
||||
- <fileset dir="${build.dir}/classes"/>
|
||||
- <zipfileset src="${common.basedir}/lib/build/cglib-3.2.jar"/>
|
||||
- <zipfileset src="${common.basedir}/lib/build/asm-5.0.3.jar"/>
|
||||
- <rule pattern="net.sf.cglib.*" result="com.google.inject.internal.cglib.$@1"/>
|
||||
- <rule pattern="net.sf.cglib.**.*" result="com.google.inject.internal.cglib.@1.$@2"/>
|
||||
- <rule pattern="org.objectweb.asm.*" result="com.google.inject.internal.asm.$@1"/>
|
||||
- <rule pattern="org.objectweb.asm.**.*" result="com.google.inject.internal.asm.@1.$@2"/>
|
||||
- <keep pattern="com.google.inject.**"/>
|
||||
- </jarjar>
|
||||
+ <jar destfile="${build.dir}/${ant.project.name}-with-deps.jar" basedir="${build.dir}/classes"/>
|
||||
</target>
|
||||
</project>
|
||||
@ -1,46 +0,0 @@
|
||||
diff -urEbwB guice-4.1/build.xml guice-4.1.new/build.xml
|
||||
--- guice-4.1/build.xml 2019-02-13 23:43:35.806063663 +0100
|
||||
+++ guice-4.1.new/build.xml 2019-02-13 23:46:22.818815271 +0100
|
||||
@@ -126,7 +126,7 @@
|
||||
<!-- Generate API for current version. -->
|
||||
<javadoc packagenames="com.google.*"
|
||||
docletpath="${jdiff.home}/jdiff.jar${path.separator}${jdiff.home}/xerces.jar"
|
||||
- maxmemory="1024M"
|
||||
+ maxmemory="1024M" source="1.8" encoding="UTF-8"
|
||||
classpathref="javadoc.classpath">
|
||||
<fileset dir="${src.dir}" defaultexcludes="yes">
|
||||
<include name="com/google/**"/>
|
||||
@@ -151,7 +151,7 @@
|
||||
<javadoc packagenames="com.google.*"
|
||||
destdir="${jdiff.tmp}"
|
||||
docletpath="${jdiff.home}/jdiff.jar${path.separator}${jdiff.home}/xerces.jar"
|
||||
- maxmemory="512M"
|
||||
+ maxmemory="512M" source="1.8" encoding="UTF-8"
|
||||
sourcefiles="${jdiff.home}/Null.java"
|
||||
classpathref="javadoc.classpath">
|
||||
<doclet name="jdiff.JDiff">
|
||||
@@ -170,9 +170,9 @@
|
||||
<target name="javadoc" depends="compile">
|
||||
<javadoc packagenames="com.google.*"
|
||||
destdir="build/docs/javadoc"
|
||||
- maxmemory="512M"
|
||||
+ maxmemory="512M" source="1.8" encoding="UTF-8"
|
||||
classpathref="javadoc.classpath"
|
||||
- additionalparam="-Xdoclint:none -notimestamp"
|
||||
+ additionalparam="-notimestamp"
|
||||
windowtitle="Guice ${new.api} API"
|
||||
author="false"
|
||||
protected="true">
|
||||
@@ -205,12 +205,6 @@
|
||||
|
||||
<group title="JMX Extension" packages="com.google.inject.tools.jmx"/>
|
||||
<fileset dir="${jmx.src.dir}"/>
|
||||
-
|
||||
- <link href="http://aopalliance.sourceforge.net/doc/"/>
|
||||
- <link href="http://docs.oracle.com/javase/7/docs/api/"/>
|
||||
- <link href="http://atinject.googlecode.com/svn/trunk/javadoc/"/>
|
||||
- <link href="http://docs.guava-libraries.googlecode.com/git/javadoc/"/>
|
||||
- <link href="https://tomcat.apache.org/tomcat-5.5-doc/servletapi/"/>
|
||||
</javadoc>
|
||||
</target>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user