This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository libpicocontainer-java.
commit 6ed6e28e93b380ae10c5291b6d25b68db3a4249e Merge: 58c4ef3 a5f1952 Author: Markus Koschany <[email protected]> Date: Fri Oct 17 14:38:24 2014 +0200 Imported Debian patch 2.15-1 META-INF/MANIFEST.MF | 6 + debian/ant.properties | 4 - debian/build.xml | 23 - debian/changelog | 18 +- debian/compat | 2 +- debian/control | 58 +- debian/copyright | 87 +- debian/libpicocontainer-java-doc.javadoc | 1 + debian/libpicocontainer-java.jlibs | 1 + debian/libpicocontainer-java.poms | 1 + debian/orig-tar.sh | 20 - debian/pom.xml | 120 ++ debian/rules | 24 +- debian/source/format | 1 + debian/watch | 4 +- org/picocontainer/Behavior.java | 23 + org/picocontainer/BehaviorFactory.java | 27 + org/picocontainer/BindKey.java | 63 + org/picocontainer/Characteristics.java | 247 ++++ org/picocontainer/ComponentAdapter.java | 120 ++ org/picocontainer/ComponentFactory.java | 83 ++ org/picocontainer/ComponentLifecycle.java | 48 + org/picocontainer/ComponentMonitor.java | 149 +++ org/picocontainer/ComponentMonitorStrategy.java | 40 + org/picocontainer/Converters.java | 36 + org/picocontainer/Converting.java | 17 + org/picocontainer/DefaultPicoContainer.java | 1207 ++++++++++++++++++++ org/picocontainer/Disposable.java | 27 + org/picocontainer/Emjection.java | 56 + org/picocontainer/InjectionFactory.java | 13 + org/picocontainer/Injector.java | 30 + org/picocontainer/LifecycleStrategy.java | 65 ++ org/picocontainer/MutablePicoContainer.java | 218 ++++ org/picocontainer/NameBinding.java | 14 + org/picocontainer/ObjectReference.java | 34 + org/picocontainer/Parameter.java | 196 ++++ org/picocontainer/PicoBuilder.java | 373 ++++++ org/picocontainer/PicoClassNotFoundException.java | 18 + org/picocontainer/PicoCompositionException.java | 51 + org/picocontainer/PicoContainer.java | 154 +++ org/picocontainer/PicoException.java | 58 + org/picocontainer/PicoLifecycleException.java | 38 + org/picocontainer/PicoVerificationException.java | 60 + org/picocontainer/PicoVisitor.java | 74 ++ org/picocontainer/Startable.java | 37 + org/picocontainer/adapters/AbstractAdapter.java | 150 +++ org/picocontainer/adapters/InstanceAdapter.java | 142 +++ org/picocontainer/annotations/Bind.java | 12 + org/picocontainer/annotations/Cache.java | 20 + org/picocontainer/annotations/Inject.java | 21 + org/picocontainer/annotations/Nullable.java | 20 + org/picocontainer/behaviors/AbstractBehavior.java | 209 ++++ .../behaviors/AbstractBehaviorFactory.java | 126 ++ org/picocontainer/behaviors/AdaptingBehavior.java | 160 +++ org/picocontainer/behaviors/Automated.java | 32 + org/picocontainer/behaviors/Automating.java | 51 + org/picocontainer/behaviors/Behavior.java | 25 + org/picocontainer/behaviors/Behaviors.java | 53 + org/picocontainer/behaviors/Cached.java | 49 + org/picocontainer/behaviors/Caching.java | 67 ++ org/picocontainer/behaviors/Decorated.java | 47 + org/picocontainer/behaviors/Decorating.java | 45 + org/picocontainer/behaviors/FieldDecorated.java | 51 + org/picocontainer/behaviors/FieldDecorating.java | 55 + org/picocontainer/behaviors/Guarded.java | 46 + org/picocontainer/behaviors/Guarding.java | 61 + .../behaviors/HiddenImplementation.java | 109 ++ .../behaviors/ImplementationHiding.java | 57 + org/picocontainer/behaviors/Intercepted.java | 192 ++++ org/picocontainer/behaviors/Intercepting.java | 34 + org/picocontainer/behaviors/Locked.java | 52 + org/picocontainer/behaviors/Locking.java | 76 ++ org/picocontainer/behaviors/OptInCaching.java | 74 ++ .../behaviors/PropertyApplicator.java | 303 +++++ org/picocontainer/behaviors/PropertyApplying.java | 48 + org/picocontainer/behaviors/Stored.java | 212 ++++ org/picocontainer/behaviors/Storing.java | 103 ++ org/picocontainer/behaviors/Synchronized.java | 41 + org/picocontainer/behaviors/Synchronizing.java | 71 ++ org/picocontainer/behaviors/ThreadCached.java | 33 + org/picocontainer/behaviors/ThreadCaching.java | 65 ++ org/picocontainer/behaviors/package.html | 11 + .../classname/ClassLoadingPicoContainer.java | 56 + org/picocontainer/classname/ClassName.java | 46 + org/picocontainer/classname/ClassPathElement.java | 59 + .../DefaultClassLoadingPicoContainer.java | 632 ++++++++++ org/picocontainer/composers/RegexComposer.java | 62 + org/picocontainer/composers/package.html | 16 + .../AbstractDelegatingMutablePicoContainer.java | 111 ++ .../AbstractDelegatingPicoContainer.java | 120 ++ .../CommandLineArgumentsPicoContainer.java | 98 ++ .../containers/CommandLinePicoContainer.java | 116 ++ .../containers/CompositePicoContainer.java | 152 +++ .../containers/EmptyPicoContainer.java | 112 ++ .../containers/ImmutablePicoContainer.java | 117 ++ .../containers/PropertiesPicoContainer.java | 58 + .../containers/SystemPropertiesPicoContainer.java | 33 + .../containers/TieringPicoContainer.java | 198 ++++ .../containers/TransientPicoContainer.java | 34 + org/picocontainer/containers/package.html | 11 + org/picocontainer/converters/BooleanConverter.java | 17 + .../converters/BuiltInConverters.java | 62 + org/picocontainer/converters/ByteConverter.java | 17 + .../converters/CharacterConverter.java | 18 + org/picocontainer/converters/Converter.java | 25 + org/picocontainer/converters/ConvertsNothing.java | 18 + org/picocontainer/converters/DoubleConverter.java | 17 + org/picocontainer/converters/FileConverter.java | 18 + org/picocontainer/converters/FloatConverter.java | 17 + org/picocontainer/converters/IntegerConverter.java | 17 + org/picocontainer/converters/LongConverter.java | 17 + .../converters/NewInstanceConverter.java | 32 + org/picocontainer/converters/ShortConverter.java | 16 + org/picocontainer/converters/UrlConverter.java | 23 + org/picocontainer/converters/package.html | 17 + .../injectors/AbstractFieldInjector.java | 33 + .../injectors/AbstractInjectionFactory.java | 120 ++ org/picocontainer/injectors/AbstractInjector.java | 412 +++++++ org/picocontainer/injectors/AdaptingInjection.java | 237 ++++ .../injectors/AnnotatedFieldInjection.java | 53 + .../injectors/AnnotatedFieldInjector.java | 116 ++ .../injectors/AnnotatedMethodInjection.java | 67 ++ .../injectors/AnnotatedMethodInjector.java | 51 + .../injectors/CompositeInjection.java | 57 + org/picocontainer/injectors/CompositeInjector.java | 87 ++ .../injectors/ConstructorInjection.java | 63 + .../injectors/ConstructorInjector.java | 436 +++++++ org/picocontainer/injectors/FactoryInjector.java | 176 +++ .../injectors/ForgetfulConstructorInjection.java | 21 + org/picocontainer/injectors/InjectInto.java | 34 + org/picocontainer/injectors/Injector.java | 225 ++++ org/picocontainer/injectors/Injectors.java | 58 + org/picocontainer/injectors/IterativeInjector.java | 346 ++++++ org/picocontainer/injectors/MethodInjection.java | 93 ++ org/picocontainer/injectors/MethodInjector.java | 227 ++++ org/picocontainer/injectors/MultiInjection.java | 43 + org/picocontainer/injectors/MultiInjector.java | 34 + .../injectors/NamedFieldInjection.java | 59 + .../injectors/NamedFieldInjector.java | 121 ++ .../injectors/NamedMethodInjection.java | 36 + .../injectors/NamedMethodInjector.java | 69 ++ .../injectors/ParameterNameBinding.java | 43 + .../injectors/PrimitiveMemberChecker.java | 58 + org/picocontainer/injectors/Provider.java | 20 + org/picocontainer/injectors/ProviderAdapter.java | 160 +++ org/picocontainer/injectors/Reinjection.java | 51 + org/picocontainer/injectors/Reinjector.java | 145 +++ org/picocontainer/injectors/SetterInjection.java | 79 ++ org/picocontainer/injectors/SetterInjector.java | 111 ++ .../injectors/SingleMemberInjector.java | 131 +++ .../injectors/TypedFieldInjection.java | 56 + .../injectors/TypedFieldInjector.java | 117 ++ org/picocontainer/injectors/package.html | 11 + .../AbstractMonitoringLifecycleStrategy.java | 59 + .../lifecycle/CompositeLifecycleStrategy.java | 63 + .../lifecycle/DefaultLifecycleState.java | 118 ++ .../lifecycle/JavaEE5LifecycleStrategy.java | 108 ++ org/picocontainer/lifecycle/LifecycleState.java | 71 ++ .../lifecycle/NullLifecycleStrategy.java | 48 + .../lifecycle/ReflectionLifecycleException.java | 33 + .../lifecycle/ReflectionLifecycleStrategy.java | 176 +++ .../lifecycle/StartableLifecycleStrategy.java | 161 +++ org/picocontainer/lifecycle/package.html | 17 + .../monitors/AbstractComponentMonitor.java | 152 +++ .../monitors/ComponentMonitorHelper.java | 99 ++ org/picocontainer/monitors/ComposingMonitor.java | 49 + .../monitors/ConsoleComponentMonitor.java | 152 +++ .../monitors/LifecycleComponentMonitor.java | 151 +++ .../monitors/NullComponentMonitor.java | 94 ++ .../monitors/WriterComponentMonitor.java | 121 ++ org/picocontainer/monitors/package.html | 12 + org/picocontainer/package.html | 27 + .../parameters/AbstractParameter.java | 30 + .../parameters/BasicComponentParameter.java | 299 +++++ .../parameters/CollectionComponentParameter.java | 412 +++++++ .../parameters/ComponentParameter.java | 181 +++ .../parameters/ConstantParameter.java | 109 ++ .../parameters/DefaultConstructorParameter.java | 82 ++ org/picocontainer/parameters/NullParameter.java | 90 ++ org/picocontainer/references/SimpleReference.java | 37 + .../references/ThreadLocalMapObjectReference.java | 38 + .../references/ThreadLocalReference.java | 32 + .../security/CustomPermissionsURLClassLoader.java | 89 ++ .../visitors/AbstractPicoVisitor.java | 94 ++ .../visitors/MethodCallingVisitor.java | 119 ++ .../visitors/TraversalCheckingVisitor.java | 64 ++ org/picocontainer/visitors/VerifyingVisitor.java | 126 ++ 187 files changed, 16887 insertions(+), 113 deletions(-) diff --cc debian/changelog index 3f65368,0000000..02048cf mode 100644,000000..100644 --- a/debian/changelog +++ b/debian/changelog @@@ -1,106 -1,0 +1,104 @@@ - libpicocontainer-java (2.9-3) UNRELEASED; urgency=medium ++libpicocontainer-java (2.15-1) unstable; urgency=low + - * Moved the package to Git ++ * Reintroduction of libpicocontainer-java. (Closes: #766253) ++ * Switch to dh sequencer, javahelper and maven_repo_helper. ++ * Declare compliance with Debian Policy 3.9.6. ++ * Use Git repository for packaging. ++ * Add libpicocontainer-java-doc binary package. ++ * Use compat level 9 and require debhelper >= 9. + - -- Markus Koschany <[email protected]> Fri, 24 Oct 2014 18:23:21 +0200 - - libpicocontainer-java (2.9-2) unstable; urgency=low - - * QA upload. - * Orphaning package. - - -- Torsten Werner <[email protected]> Tue, 16 Aug 2011 15:52:52 +0200 ++ -- Markus Koschany <[email protected]> Fri, 17 Oct 2014 14:38:24 +0200 + +libpicocontainer-java (2.9-1) unstable; urgency=low + + * New upstream release. + * Build-Depends on debhelper (>= 7). + * Moved default-jdk and ant to Build-Depends. + * Tighten Build-Depends on libparanamer-java. + * Added myseld to Uploaders. + + -- Michael Koch <[email protected]> Wed, 04 Nov 2009 20:01:14 +0100 + +libpicocontainer-java (2.8-2) unstable; urgency=low + + * Switch to default-java. (Closes: #543060) + * Add missing ${misc:Depends}. + * Change Section: java. + * Update Standards-Version: 3.8.3. + + -- Torsten Werner <[email protected]> Sun, 23 Aug 2009 11:21:58 +0200 + +libpicocontainer-java (2.8-1) unstable; urgency=low + + * New upstream release + + -- Varun Hiremath <[email protected]> Sun, 01 Mar 2009 15:30:32 -0500 + +libpicocontainer-java (2.7-1) unstable; urgency=low + + * New upstream release + * Disable compiler warnings. + + -- Torsten Werner <[email protected]> Tue, 17 Feb 2009 22:33:42 +0100 + +libpicocontainer-java (2.6+dak1-1) unstable; urgency=low + + * Move package to main. + + -- Torsten Werner <[email protected]> Tue, 18 Nov 2008 21:45:18 +0100 + +libpicocontainer-java (2.6-1) unstable; urgency=low + + * new upstream release + + -- Torsten Werner <[email protected]> Sat, 08 Nov 2008 23:14:44 +0100 + +libpicocontainer-java (2.5-1) unstable; urgency=low + + * new upstream release + * Fix debian/orig-tar.sh. + + -- Torsten Werner <[email protected]> Mon, 11 Aug 2008 20:41:39 +0200 + +libpicocontainer-java (2.4-1) unstable; urgency=low + + * New upstream release + * Bump Standards-Version to 3.8.0 + + -- Varun Hiremath <[email protected]> Thu, 03 Jul 2008 00:57:00 +0530 + +libpicocontainer-java (2.3-1) unstable; urgency=low + + * New upstream release (Closes: #482863) + * Add libjboss-ejb3x-java to Build-Depends + * Move package to contrib + + -- Varun Hiremath <[email protected]> Sat, 31 May 2008 19:57:28 +0530 + +libpicocontainer-java (2.1-1) unstable; urgency=low + + * New upstream release + + -- Varun Hiremath <[email protected]> Tue, 08 Apr 2008 13:04:46 +0530 + +libpicocontainer-java (2.0-1) unstable; urgency=low + + * New upstream release + * Bump Standards-Version to 3.7.3 + * Bump debhelper compat to 6 + * Add libparanamer-java to Build-Depends-Indep + * debian/orig-tar.sh: exclude .svn files from orig.tar.gz + + -- Varun Hiremath <[email protected]> Wed, 06 Feb 2008 17:00:20 +0530 + +libpicocontainer-java (1.3-2) unstable; urgency=low + + * Make debian/copyright more verbose. + + -- Torsten Werner <[email protected]> Sun, 09 Dec 2007 20:56:12 +0100 + +libpicocontainer-java (1.3-1) unstable; urgency=low + + * initial version (Closes: #453469) + + -- Torsten Werner <[email protected]> Mon, 26 Nov 2007 16:31:34 +0100 diff --cc debian/compat index 7f8f011,0000000..ec63514 mode 100644,000000..100644 --- a/debian/compat +++ b/debian/compat @@@ -1,1 -1,0 +1,1 @@@ - 7 ++9 diff --cc debian/control index de39701,0000000..bc9fd3a mode 100644,000000..100644 --- a/debian/control +++ b/debian/control @@@ -1,25 -1,0 +1,51 @@@ +Source: libpicocontainer-java +Section: java +Priority: optional - Maintainer: Debian QA Group <[email protected]> - Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant - Build-Depends-Indep: libparanamer-java (>= 2.1), libjboss-ejb3x-java - Standards-Version: 3.8.3 - Homepage: http://www.picocontainer.org ++Maintainer: Debian Java Maintainers <[email protected]> ++Uploaders: ++ Markus Koschany <[email protected]> ++Build-Depends: ++ debhelper (>= 9), ++ javahelper, ++ maven-repo-helper (>= 1.6~) ++Build-Depends-Indep: ++ default-jdk, ++ default-jdk-doc, ++ libparanamer-java ++Standards-Version: 3.9.6 ++Homepage: http://picocontainer.com +Vcs-Git: git://anonscm.debian.org/pkg-java/libpicocontainer-java.git - Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/libpicocontainer-java.git ++Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/libpicocontainer-java.git + +Package: libpicocontainer-java +Architecture: all - Depends: default-jre | java2-runtime, ${misc:Depends} ++Depends: ++ ${java:Depends}, ++ ${misc:Depends} ++Recommends: ++ ${java:Recommends} ++Suggests: ++ libpicocontainer-java-doc +Description: Java library implementing the Dependency Injection pattern - PicoContainer is a highly embeddable full service Inversion of Control - (IoC) container for components honour the Dependency Injection pattern. - It can be used as a lightweight alternative to Sun's J2EE patterns for - web applications or general solutions. ++ PicoContainer is a highly embeddable full service Inversion of Control (IoC) ++ container for components that honour the Dependency Injection pattern. It can ++ be used as a lightweight alternative to Sun's J2EE patterns for web ++ applications or general solutions. + . - Despite it being very compact in size (the core is ~128K and it has no - mandatory dependencies outside the JDK), PicoContainer supports - different dependency injection types (Constructor, Setter, Annotated - Field and Method) and offers multiple lifecycle and monitoring - strategies. ++ Despite it being very compact in size, PicoContainer supports different ++ dependency injection types (Constructor, Setter, Annotated Field and Method) ++ and offers multiple lifecycle and monitoring strategies. ++ ++Package: libpicocontainer-java-doc ++Section: doc ++Architecture: all ++Depends: ++ ${misc:Depends} ++Recommends: ++ default-jdk-doc, ++ ${java:Recommends} ++Description: Java library implementing the Dependency Injection pattern -- docs ++ PicoContainer is a highly embeddable full service Inversion of Control (IoC) ++ container for components that honour the Dependency Injection pattern. ++ . ++ This package contains the Javadoc API documentation for libpicocontainer-java. diff --cc debian/copyright index a4b4434,0000000..a6b1e3d mode 100644,000000..100644 --- a/debian/copyright +++ b/debian/copyright @@@ -1,29 -1,0 +1,62 @@@ - This package was debianized by Torsten Werner <[email protected]> on - Mon, 26 Nov 2007 16:31:34 +0100. ++Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ ++Upstream-Name: PicoContainer ++Source: http://repo1.maven.org/maven2/org/picocontainer/picocontainer ++Comment: ++ PicoContainer was downloaded from the central Maven repository because Maven ++ is currently the only platform where recent source tarballs of PicoContainer ++ are published. However the full license text of PicoContainer can be found in ++ the official development repository at codehaus.org. ++ . ++ https://svn.codehaus.org/picocontainer/java/2.x/trunk/pico/LICENSE.txt + - It was downloaded from http://www.picocontainer.org ++Files: * ++Copyright: 2004 - 2011, PicoContainer Organization ++License: BSD-3-clause ++ Copyright (c) 2004 - 2011 PicoContainer Organization ++ All rights reserved. ++ . ++ Redistribution and use in source and binary forms, with or without ++ modification, are permitted provided that the following conditions are met: ++ . ++ Redistributions of source code must retain the above copyright notice, this ++ list of conditions and the following disclaimer. ++ . ++ Redistributions in binary form must reproduce the above copyright notice, ++ this list of conditions and the following disclaimer in the documentation ++ and/or other materials provided with the distribution. ++ . ++ Neither the name of the PicoContainer Committers, 2010 nor the names of its ++ contributors may be used to endorse or promote products derived from this ++ software without specific prior written permission. ++ . ++ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" ++ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ++ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE ++ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL ++ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR ++ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER ++ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, ++ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ++ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + - Upstream Authors: Paul Hammant, Konstantin Pribluda, Jörg Schaible, - Mauro Talevi, Michael Ward, Michael Rimov, Jose Peleteiro - - Copyright: (C) 2008 PicoContainer Organization. All rights reserved. - - License: - - Pico is BSD licensed. At least, with us as copyright holder instead - of "Regents of the University of California". - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - 3. Neither the name of the University nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - - The full text of the BSD license can be found in - /usr/share/common-licenses/BSD on Debian GNU/Linux systems. ++Files: debian/* ++Copyright: 2014, Markus Koschany <[email protected]> ++License: Expat ++ Permission is hereby granted, free of charge, to any person obtaining a copy ++ of this software and associated documentation files (the "Software"), to deal ++ in the Software without restriction, including without limitation the rights ++ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++ copies of the Software, and to permit persons to whom the Software is ++ furnished to do so, subject to the following conditions: ++ . ++ The above copyright notice and this permission notice shall be included in all ++ copies or substantial portions of the Software. ++ . ++ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ++ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE ++ SOFTWARE. diff --cc debian/libpicocontainer-java-doc.javadoc index 0000000,0000000..ce83b25 new file mode 100644 --- /dev/null +++ b/debian/libpicocontainer-java-doc.javadoc @@@ -1,0 -1,0 +1,1 @@@ ++internal diff --cc debian/libpicocontainer-java.jlibs index 0000000,0000000..6fe9a1d new file mode 100644 --- /dev/null +++ b/debian/libpicocontainer-java.jlibs @@@ -1,0 -1,0 +1,1 @@@ ++picocontainer-2.15.jar diff --cc debian/libpicocontainer-java.poms index 0000000,0000000..aaf2313 new file mode 100644 --- /dev/null +++ b/debian/libpicocontainer-java.poms @@@ -1,0 -1,0 +1,1 @@@ ++debian/pom.xml --no-parent --usj-name=picocontainer diff --cc debian/pom.xml index 0000000,0000000..2c0f4fa new file mode 100644 --- /dev/null +++ b/debian/pom.xml @@@ -1,0 -1,0 +1,120 @@@ ++<?xml version="1.0" encoding="UTF-8"?> ++<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> ++ <parent> ++ <artifactId>picocontainer-parent</artifactId> ++ <groupId>org.picocontainer</groupId> ++ <version>2.15</version> ++ </parent> ++ <modelVersion>4.0.0</modelVersion> ++ <artifactId>picocontainer</artifactId> ++ <name>PicoContainer Core</name> ++ <build> ++ <plugins> ++ <plugin> ++ <groupId>com.thoughtworks.paranamer</groupId> ++ <artifactId>paranamer-maven-plugin</artifactId> ++ <version>2.5.1</version> ++ <executions> ++ <execution> ++ <id>generate</id> ++ <phase>test</phase> ++ <goals> ++ <goal>generate</goal> ++ </goals> ++ </execution> ++ </executions> ++ <configuration> ++ <sourceDirectory>src/test</sourceDirectory> ++ <outputDirectory>target/test-classes</outputDirectory> ++ </configuration> ++ </plugin> ++ <plugin> ++ <artifactId>maven-shade-plugin</artifactId> ++ <version>2.1</version> ++ <executions> ++ <execution> ++ <phase>package</phase> ++ <goals> ++ <goal>shade</goal> ++ </goals> ++ <configuration> ++ <shadedArtifactId>picocontainer</shadedArtifactId> ++ <artifactSet> ++ <excludes> ++ <exclude>javax.annotation:jsr250-api</exclude> ++ <exclude>javax.inject:javax.inject</exclude> ++ </excludes> ++ </artifactSet> ++ <filters> ++ <filter> ++ <artifact>com.thoughtworks.paranamer:paranamer</artifact> ++ <excludes> ++ <exclude>com/thoughtworks/paranamer/Javadoc*</exclude> ++ <exclude>com/thoughtworks/paranamer/Null*</exclude> ++ </excludes> ++ </filter> ++ </filters> ++ <relocations> ++ <relocation> ++ <pattern>com.thoughtworks.paranamer</pattern> ++ <shadedPattern>org.picocontainer.paranamer</shadedPattern> ++ </relocation> ++ </relocations> ++ </configuration> ++ </execution> ++ </executions> ++ </plugin> ++ </plugins> ++ </build> ++ <dependencies> ++ <dependency> ++ <groupId>javax.annotation</groupId> ++ <artifactId>jsr250-api</artifactId> ++ <version>1.0</version> ++ <scope>compile</scope> ++ <optional>true</optional> ++ </dependency> ++ <dependency> ++ <groupId>javax.inject</groupId> ++ <artifactId>javax.inject</artifactId> ++ <version>1</version> ++ <scope>compile</scope> ++ <optional>true</optional> ++ </dependency> ++ <dependency> ++ <groupId>org.jmock</groupId> ++ <artifactId>jmock-junit4</artifactId> ++ <version>2.5.1</version> ++ <scope>test</scope> ++ <exclusions> ++ <exclusion> ++ <artifactId>jmock</artifactId> ++ <groupId>org.jmock</groupId> ++ </exclusion> ++ <exclusion> ++ <artifactId>junit-dep</artifactId> ++ <groupId>junit</groupId> ++ </exclusion> ++ </exclusions> ++ </dependency> ++ <dependency> ++ <groupId>com.thoughtworks.xstream</groupId> ++ <artifactId>xstream</artifactId> ++ <version>1.4.3</version> ++ <scope>test</scope> ++ <exclusions> ++ <exclusion> ++ <artifactId>xmlpull</artifactId> ++ <groupId>xmlpull</groupId> ++ </exclusion> ++ </exclusions> ++ </dependency> ++ <dependency> ++ <groupId>xpp3</groupId> ++ <artifactId>xpp3_min</artifactId> ++ <version>1.1.3.4.O</version> ++ <scope>test</scope> ++ </dependency> ++ </dependencies> ++</project> ++ diff --cc debian/rules index 1ff1cce,0000000..b76ce76 mode 100755,000000..100755 --- a/debian/rules +++ b/debian/rules @@@ -1,15 -1,0 +1,19 @@@ +#!/usr/bin/make -f ++# export DH_VERBOSE=1 ++PKD = $(abspath $(dir $(MAKEFILE_LIST))) ++VER ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{^Version:\s*([\d\.]+)}') ++export JAVA_HOME=/usr/lib/jvm/default-java ++export CLASSPATH=/usr/share/java/paranamer.jar + - include /usr/share/cdbs/1/class/ant.mk - include /usr/share/cdbs/1/rules/debhelper.mk ++%: ++ dh $@ --parallel --with javahelper,jh_maven_repo_helper + - JAVA_HOME := /usr/lib/jvm/default-java - DEB_ANT_BUILDFILE := debian/build.xml - DEB_JARS := paranamer jboss-ejb3x - - install/libpicocontainer-java:: - install -m644 -D picocontainer.jar $(DEB_DESTDIR)/usr/share/java/picocontainer-$(DEB_UPSTREAM_VERSION).jar - dh_link -plibpicocontainer-java /usr/share/java/picocontainer-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/picocontainer.jar ++override_dh_auto_build: ++ jh_build --javadoc picocontainer-$(VER).jar org + +get-orig-source: - uscan --force-download --rename ++ uscan --verbose --repack --compression xz --force-download ++ ++get-orig-pom: ++ wget -O debian/pom.xml \ ++ http://repo1.maven.org/maven2/org/picocontainer/picocontainer/$(VER)/picocontainer-$(VER).pom diff --cc debian/source/format index 0000000,0000000..163aaf8 new file mode 100644 --- /dev/null +++ b/debian/source/format @@@ -1,0 -1,0 +1,1 @@@ ++3.0 (quilt) diff --cc debian/watch index f9a12a8,0000000..6d33248 mode 100644,000000..100644 --- a/debian/watch +++ b/debian/watch @@@ -1,3 -1,0 +1,3 @@@ +version=3 - http://repository.codehaus.org/org/picocontainer/picocontainer/(\d\.\d)/picocontainer-(\d\.\d)-sources.jar \ - debian debian/orig-tar.sh ++http://repo1.maven.org/maven2/org/picocontainer/picocontainer/(\d.*)/\ ++ picocontainer-(\d.*)-sources\.jar -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libpicocontainer-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

