pool/google-guice
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/google-guice?expand=0&rev=1

Browse Source
This commit is contained in:
Fridrich Strba 2019-03-16 18:47:20 +00:00 committed by Git OBS Bridge
commit 949a380ca6
7 changed files with 607 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
.gitattributes vendored Normal file
View File

@ -0,0 +1,23 @@
## Default LFS
*.7z filter=lfs diff=lfs merge=lfs -text
*.bsp filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text
*.gem filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text
*.jar filter=lfs diff=lfs merge=lfs -text
*.lz filter=lfs diff=lfs merge=lfs -text
*.lzma filter=lfs diff=lfs merge=lfs -text
*.obscpio filter=lfs diff=lfs merge=lfs -text
*.oxt filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.rpm filter=lfs diff=lfs merge=lfs -text
*.tbz filter=lfs diff=lfs merge=lfs -text
*.tbz2 filter=lfs diff=lfs merge=lfs -text
*.tgz filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
*.txz filter=lfs diff=lfs merge=lfs -text
*.whl filter=lfs diff=lfs merge=lfs -text
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
.osc

3
4.1.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:77650231a0b12c0f0551202ae4dcfc1a4364e090f461cc3d21616d45bfc49537
size 23212767

285
google-guice.spec Normal file
View File

@ -0,0 +1,285 @@
#
# spec file for package google
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# 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 short_name guice
Name: google-%{short_name}
Version: 4.1
Release: 0
Summary: Lightweight dependency injection framework for Java 5 and above
License: Apache-2.0
Group: Development/Libraries/Java
URL: https://github.com/google/%{short_name}
BuildArch: noarch
Source0: https://github.com/google/%{short_name}/archive/%{version}.tar.gz
Patch0: guice-4.1-fixup-ant.patch
Patch1: guice-4.1-disabledextensions.patch
Patch2: guice-4.1-javadoc.patch
BuildRequires: ant
BuildRequires: aopalliance
BuildRequires: aqute-bnd
BuildRequires: atinject
BuildRequires: cglib
BuildRequires: fdupes
BuildRequires: glassfish-servlet-api
BuildRequires: guava20
BuildRequires: jarjar
BuildRequires: java-devel >= 1.7
BuildRequires: javapackages-local
BuildRequires: objectweb-asm
BuildRequires: slf4j
BuildRequires: xmvn-install
BuildRequires: xmvn-resolve
%description
Put simply, Guice alleviates the need for factories and the use of new
in your Java code. Think of Guice's @Inject as the new new. You will
still need to write factories in some cases, but your code will not
depend directly on them. Your code will be easier to change, unit test
and reuse in other contexts.
Guice embraces Java's type safe nature, especially when it comes to
features introduced in Java 5 such as generics and annotations. You
might think of Guice as filling in missing features for core
Java. Ideally, the language itself would provide most of the same
features, but until such a language comes along, we have Guice.
Guice helps you design better APIs, and the Guice API itself sets a
good example. Guice is not a kitchen sink. We justify each feature
with at least three use cases. When in doubt, we leave it out. We
build general functionality which enables you to extend Guice rather
than adding every feature to the core framework.
%package -n %{short_name}-parent
Summary: Guice parent POM
Group: Development/Libraries/Java
%description -n %{short_name}-parent
Guice is a lightweight dependency injection framework for Java 5
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
%description -n %{short_name}-assistedinject
Guice is a lightweight dependency injection framework for Java 5
and above. This package provides AssistedInject module for Guice.
%package -n %{short_name}-extensions
Summary: Extensions for Guice
Group: Development/Libraries/Java
%description -n %{short_name}-extensions
Guice is a lightweight dependency injection framework for Java 5
and above. This package provides extensions POM for Guice.
%package -n %{short_name}-grapher
Summary: Grapher extension module for Guice
Group: Development/Libraries/Java
%description -n %{short_name}-grapher
Guice is a lightweight dependency injection framework for Java 5
and above. This package provides Grapher module for Guice.
%package -n %{short_name}-jmx
Summary: JMX extension module for Guice
Group: Development/Libraries/Java
%description -n %{short_name}-jmx
Guice is a lightweight dependency injection framework for Java 5
and above. This package provides JMX module for Guice.
%package -n %{short_name}-jndi
Summary: JNDI extension module for Guice
Group: Development/Libraries/Java
%description -n %{short_name}-jndi
Guice is a lightweight 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
%description -n %{short_name}-multibindings
Guice is a lightweight 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
%description -n %{short_name}-servlet
Guice is a lightweight 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
%description -n %{short_name}-testlib
Guice is a lightweight 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
%description -n %{short_name}-throwingproviders
Guice is a lightweight dependency injection framework for Java 5
and above. This package provides ThrowingProviders module for Guice.
%package -n %{short_name}-bom
Summary: Bill of Materials for Guice
Group: Development/Libraries/Java
%description -n %{short_name}-bom
Guice is a lightweight dependency injection framework for Java 5
and above. This package provides Bill of Materials module for Guice.
%package javadoc
Summary: API documentation for Guice
Group: Documentation/HTML
%description javadoc
This package provides %{summary}.
%prep
%setup -q -n %{short_name}-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
find . -name "*.jar" -and ! -name "munge.jar" -delete
find . -name "*.class" -delete
# We don't have struts2 in Fedora yet.
%pom_disable_module struts2 extensions
# Android-specific extension
%pom_disable_module dagger-adapter extensions
# Fix OSGi metadata due to not using jarjar
%pom_xpath_set "pom:instructions/pom:Import-Package" \
"!com.google.inject.*,*" core
# Animal sniffer is only causing problems. Disable it for now.
%pom_remove_plugin :animal-sniffer-maven-plugin core
%pom_remove_plugin :animal-sniffer-maven-plugin extensions
%pom_remove_plugin :maven-gpg-plugin
# We don't have the custom doclet used by upstream. Remove
# maven-javadoc-plugin to generate javadocs with default style.
%pom_remove_plugin -r :maven-javadoc-plugin
# 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_remove_parent
%pom_set_parent com.google.inject:guice-parent:%{version} jdk8-tests
%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
%mvn_alias "com.google.inject.extensions:" "org.sonatype.sisu.inject:"
%mvn_package :::no_aop: guice
%mvn_package :{*} @1
%mvn_file ":guice-{*}" %{short_name}/guice-@1
%mvn_file ":guice" %{short_name}/%{name} %{name}
%mvn_alias ":guice" "org.sonatype.sisu:sisu-guice"
build-jar-repository -s -p lib/build \
guava20 javax.inject glassfish-servlet-api aopalliance cglib objectweb-asm aqute-bnd jarjar
%ant clean.all no_aop
pushd build/no_aop
%pom_xpath_inject "pom:project" "<classifier>no_aop</classifier>" core
%ant -Dversion=%{version} jar
popd
%ant -Dversion=%{version} dist javadoc
%mvn_artifact pom.xml
%mvn_artifact bom/pom.xml
%mvn_artifact build/no_aop/core/pom.xml build/no_aop/build/guice-%{version}.jar
# a huge hack to force the no_aop classifier to the version 2.3.0 reactor
perl -pi -e 's#<ns0:artifactId>guice</ns0:artifactId>#<ns0:artifactId>guice</ns0:artifactId><ns0:classifier>no_aop</ns0:classifier>#g' .xmvn-reactor
%mvn_artifact core/pom.xml build/guice-%{version}.jar
%mvn_artifact extensions/pom.xml
%mvn_artifact extensions/jmx/pom.xml build/dist/guice-jmx-%{version}.jar
%mvn_artifact extensions/assistedinject/pom.xml build/dist/guice-assistedinject-%{version}.jar
%mvn_artifact extensions/multibindings/pom.xml build/dist/guice-multibindings-%{version}.jar
%mvn_artifact extensions/throwingproviders/pom.xml build/dist/guice-throwingproviders-%{version}.jar
%mvn_artifact extensions/servlet/pom.xml build/dist/guice-servlet-%{version}.jar
%mvn_artifact extensions/jndi/pom.xml build/dist/guice-jndi-%{version}.jar
%mvn_artifact extensions/testlib/pom.xml build/dist/guice-testlib-%{version}.jar
%mvn_artifact extensions/grapher/pom.xml build/dist/guice-grapher-%{version}.jar
%install
%mvn_install -J build/docs/javadoc
%fdupes -s %{buildroot}%{_javadocdir}
%files -f .mfiles-guice
%dir %{_javadir}/%{short_name}
%files -n %{short_name}-parent -f .mfiles-guice-parent
%doc COPYING
%files -n %{short_name}-assistedinject -f .mfiles-guice-assistedinject
%files -n %{short_name}-extensions -f .mfiles-extensions-parent
%files -n %{short_name}-grapher -f .mfiles-guice-grapher
%files -n %{short_name}-jmx -f .mfiles-guice-jmx
%files -n %{short_name}-jndi -f .mfiles-guice-jndi
%files -n %{short_name}-multibindings -f .mfiles-guice-multibindings
%if %{with jpa}
%files -n %{short_name}-persist -f .mfiles-guice-persist
%endif
%files -n %{short_name}-servlet -f .mfiles-guice-servlet
%if %{with spring}
%files -n %{short_name}-spring -f .mfiles-guice-spring
%endif
%files -n %{short_name}-testlib -f .mfiles-guice-testlib
%files -n %{short_name}-throwingproviders -f .mfiles-guice-throwingproviders
%files -n %{short_name}-bom -f .mfiles-guice-bom
%files javadoc -f .mfiles-javadoc
%doc COPYING
%changelog

102
guice-4.1-disabledextensions.patch Normal file
View File

@ -0,0 +1,102 @@
--- 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>

147
guice-4.1-fixup-ant.patch Normal file
View File

@ -0,0 +1,147 @@
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>

46
guice-4.1-javadoc.patch Normal file
View File

@ -0,0 +1,46 @@
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.6" 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.6" 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.6" 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>