[pkg-java] r17649 - in trunk/libcodemodel-java/debian: . patches
Timo Aaltonen
tjaalton-guest at moszumanska.debian.org
Wed Jan 8 16:34:49 UTC 2014
Author: tjaalton-guest
Date: 2014-01-08 16:34:49 +0000 (Wed, 08 Jan 2014)
New Revision: 17649
Added:
trunk/libcodemodel-java/debian/patches/
trunk/libcodemodel-java/debian/patches/remove-istack-commons-dependency.patch
trunk/libcodemodel-java/debian/patches/series
Modified:
trunk/libcodemodel-java/debian/changelog
trunk/libcodemodel-java/debian/compat
trunk/libcodemodel-java/debian/control
trunk/libcodemodel-java/debian/copyright
trunk/libcodemodel-java/debian/libcodemodel-java.poms
trunk/libcodemodel-java/debian/maven.properties
trunk/libcodemodel-java/debian/maven.rules
trunk/libcodemodel-java/debian/orig-tar.sh
trunk/libcodemodel-java/debian/watch
Log:
* New upstream release.
* control, compat: Bump debhelper to 9.
* control:
- Build-depend on junit4, drop duplicate libmaven-javadoc-plugin-java
build-dep.
- Bump policy to 3.9.5, no changes.
- Use anonscm urls.
* orig-tar.sh, watch: Fix & update get-orig-source.
* maven.properties: Use UTF-8 encoding.
* remove-istack-commons-dependency.patch: Avoid bootstrapping issues,
istack-commons depends on libcodemodel-java.
* maven.rules: Modify to work with junit4.
* libcodemodel-java.poms: Add --no-parent for pom.xml to fix the
build.
* copyright: Update to 1.0 format and otherwise.
Modified: trunk/libcodemodel-java/debian/changelog
===================================================================
--- trunk/libcodemodel-java/debian/changelog 2014-01-07 00:07:38 UTC (rev 17648)
+++ trunk/libcodemodel-java/debian/changelog 2014-01-08 16:34:49 UTC (rev 17649)
@@ -1,3 +1,23 @@
+libcodemodel-java (2.6-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ * control, compat: Bump debhelper to 9.
+ * control:
+ - Build-depend on junit4, drop duplicate libmaven-javadoc-plugin-java
+ build-dep.
+ - Bump policy to 3.9.5, no changes.
+ - Use anonscm urls.
+ * orig-tar.sh, watch: Fix & update get-orig-source.
+ * maven.properties: Use UTF-8 encoding.
+ * remove-istack-commons-dependency.patch: Avoid bootstrapping issues,
+ istack-commons depends on libcodemodel-java.
+ * maven.rules: Modify to work with junit4.
+ * libcodemodel-java.poms: Add --no-parent for pom.xml to fix the
+ build.
+ * copyright: Update to 1.0 format and otherwise.
+
+ -- Timo Aaltonen <tjaalton at ubuntu.com> Wed, 08 Jan 2014 16:57:08 +0200
+
libcodemodel-java (2.1-1) unstable; urgency=low
[ James Page ]
Modified: trunk/libcodemodel-java/debian/compat
===================================================================
--- trunk/libcodemodel-java/debian/compat 2014-01-07 00:07:38 UTC (rev 17648)
+++ trunk/libcodemodel-java/debian/compat 2014-01-08 16:34:49 UTC (rev 17649)
@@ -1 +1 @@
-7
+9
Modified: trunk/libcodemodel-java/debian/control
===================================================================
--- trunk/libcodemodel-java/debian/control 2014-01-07 00:07:38 UTC (rev 17648)
+++ trunk/libcodemodel-java/debian/control 2014-01-08 16:34:49 UTC (rev 17649)
@@ -7,21 +7,20 @@
Torsten Werner <twerner at debian.org>,
Michael Koch <konqueror at gmx.de>,
James Page <james.page at canonical.com>
-Build-Depends: cdbs, debhelper (>= 7), default-jdk, maven-debian-helper
+Build-Depends: cdbs, debhelper (>= 9), default-jdk, maven-debian-helper
Build-Depends-Indep:
ant,
ant-doc,
default-jdk-doc,
- junit,
+ junit4,
libmaven-compiler-plugin-java (>= 2.0.2),
libmaven-install-plugin-java,
- libmaven-javadoc-plugin-java,
libmaven-javadoc-plugin-java (>= 2.6.1),
libsurefire-java (>= 2.4.3)
-Standards-Version: 3.9.1
+Standards-Version: 3.9.5
Homepage: http://codemodel.java.net/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcodemodel-java
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcodemodel-java
+Vcs-Svn: svn://anonscm.debian.org/svn/pkg-java/trunk/libcodemodel-java
+Vcs-Browser: http://anonscm.debian.org/wsvn/pkg-java/trunk/libcodemodel-java
Package: libcodemodel-java
Architecture: all
Modified: trunk/libcodemodel-java/debian/copyright
===================================================================
--- trunk/libcodemodel-java/debian/copyright 2014-01-07 00:07:38 UTC (rev 17648)
+++ trunk/libcodemodel-java/debian/copyright 2014-01-08 16:34:49 UTC (rev 17649)
@@ -1,399 +1,385 @@
-This package was debianized by Varun Hiremath <varun at debian.org> on
-Wed, 12 Dec 2007 14:21:59 +0530
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Codemodel
+Source: http://codemodel.java.net/
-It was downloaded from https://codemodel.dev.java.net/svn/codemodel/
+Files: *
+Copyright: 2005-2013, Oracle
+License: CDDL or GPL-2 with classpath exception
-Copyright: © 2005-2008 Sun Microsystems
+Files: debian/*
+Copyright: 2007, Varun Hiremath <varun at debian.org>
+ 2013, Ade Lee <alee at redhat.com>
+License: GPL
+ On Debian systems, the full text of the GPL license
+ can be found in the file '/usr/share/common-licenses/GPL'
-Upstream Authors:
- Bhakti Mehta
- Kohsuke Kawaguchi
- Mark Reinhold
- Ryan Shoemaker
+License: GPL-2 with classpath exception
+ This program is free software; you can redistribute it
+ and/or modify it under the terms of the GNU General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later
+ version.
+ .
+ This program is distributed in the hope that it will be
+ useful, but WITHOUT ANY WARRANTY; without even the implied
+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE. See the GNU General Public License for more
+ details.
+ .
+ You should have received a copy of the GNU General Public
+ License along with this package; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA 02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
+ .
+ "CLASSPATH" EXCEPTION TO THE GPL VERSION 2
+ .
+ Certain source files distributed by Oracle are subject to the following
+ clarification and special exception to the GPL Version 2, but only where
+ Oracle has expressly included in the particular source file's header the
+ words "Oracle designates this particular file as subject to the
+ "Classpath" exception as provided by Oracle in the License file that
+ accompanied this code."
+ .
+ Linking this library statically or dynamically with other modules is
+ making a combined work based on this library. Thus, the terms and
+ conditions of the GNU General Public License Version 2 cover the whole
+ combination.
+ .
+ As a special exception, the copyright holders of this library give you
+ permission to link this library with independent modules to produce an
+ executable, regardless of the license terms of these independent
+ modules, and to copy and distribute the resulting executable under terms
+ of your choice, provided that you also meet, for each linked independent
+ module, the terms and conditions of the license of that module. An
+ independent module is a module which is not derived from or based on
+ this library. If you modify this library, you may extend this exception
+ to your version of the library, but you are not obligated to do so. If
+ you do not wish to do so, delete this exception statement from your
+ version.
-License:
- COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
- 1. Definitions.
-
- 1.1. "Contributor" means each individual or entity that
- creates or contributes to the creation of Modifications.
-
- 1.2. "Contributor Version" means the combination of the
- Original Software, prior Modifications used by a
- Contributor (if any), and the Modifications made by that
- particular Contributor.
-
- 1.3. "Covered Software" means (a) the Original Software, or
- (b) Modifications, or (c) the combination of files
- containing Original Software with files containing
+License: CDDL
+ COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)Version 1.1
+ .
+ 1. Definitions.
+ .
+ 1.1. "Contributor" means each individual or entity that creates or contributes to
+ the creation of Modifications.
+ .
+ 1.2. "Contributor Version" means the combination of the Original Software, prior
+ Modifications used by a Contributor (if any), and the Modifications made by
+ that particular Contributor.
+ .
+ 1.3. "Covered Software" means (a) the Original Software, or (b) Modifications, or
+ (c) the combination of files containing Original Software with files containing
Modifications, in each case including portions thereof.
-
- 1.4. "Executable" means the Covered Software in any form
- other than Source Code.
-
- 1.5. "Initial Developer" means the individual or entity
- that first makes Original Software available under this
- License.
-
- 1.6. "Larger Work" means a work which combines Covered
- Software or portions thereof with code not governed by the
- terms of this License.
-
- 1.7. "License" means this document.
-
- 1.8. "Licensable" means having the right to grant, to the
- maximum extent possible, whether at the time of the initial
- grant or subsequently acquired, any and all of the rights
- conveyed herein.
-
- 1.9. "Modifications" means the Source Code and Executable
- form of any of the following:
-
- A. Any file that results from an addition to,
- deletion from or modification of the contents of a
- file containing Original Software or previous
- Modifications;
-
- B. Any new file that contains any part of the
- Original Software or previous Modification; or
-
- C. Any new file that is contributed or otherwise made
- available under the terms of this License.
-
- 1.10. "Original Software" means the Source Code and
- Executable form of computer software code that is
- originally released under this License.
-
- 1.11. "Patent Claims" means any patent claim(s), now owned
- or hereafter acquired, including without limitation,
- method, process, and apparatus claims, in any patent
- Licensable by grantor.
-
- 1.12. "Source Code" means (a) the common form of computer
- software code in which modifications are made and (b)
- associated documentation included in or with such code.
-
- 1.13. "You" (or "Your") means an individual or a legal
- entity exercising rights under, and complying with all of
- the terms of, this License. For legal entities, "You"
- includes any entity which controls, is controlled by, or is
- under common control with You. For purposes of this
- definition, "control" means (a) the power, direct or
- indirect, to cause the direction or management of such
- entity, whether by contract or otherwise, or (b) ownership
- of more than fifty percent (50%) of the outstanding shares
- or beneficial ownership of such entity.
-
- 2. License Grants.
-
- 2.1. The Initial Developer Grant.
-
- Conditioned upon Your compliance with Section 3.1 below and
- subject to third party intellectual property claims, the
- Initial Developer hereby grants You a world-wide,
- royalty-free, non-exclusive license:
-
- (a) under intellectual property rights (other than
- patent or trademark) Licensable by Initial Developer,
- to use, reproduce, modify, display, perform,
- sublicense and distribute the Original Software (or
- portions thereof), with or without Modifications,
- and/or as part of a Larger Work; and
-
- (b) under Patent Claims infringed by the making,
- using or selling of Original Software, to make, have
- made, use, practice, sell, and offer for sale, and/or
- otherwise dispose of the Original Software (or
- portions thereof).
-
- (c) The licenses granted in Sections 2.1(a) and (b)
- are effective on the date Initial Developer first
- distributes or otherwise makes the Original Software
- available to a third party under the terms of this
- License.
-
- (d) Notwithstanding Section 2.1(b) above, no patent
- license is granted: (1) for code that You delete from
- the Original Software, or (2) for infringements
- caused by: (i) the modification of the Original
- Software, or (ii) the combination of the Original
- Software with other software or devices.
-
- 2.2. Contributor Grant.
-
- Conditioned upon Your compliance with Section 3.1 below and
- subject to third party intellectual property claims, each
- Contributor hereby grants You a world-wide, royalty-free,
- non-exclusive license:
-
- (a) under intellectual property rights (other than
- patent or trademark) Licensable by Contributor to
- use, reproduce, modify, display, perform, sublicense
- and distribute the Modifications created by such
- Contributor (or portions thereof), either on an
- unmodified basis, with other Modifications, as
- Covered Software and/or as part of a Larger Work; and
-
-
- (b) under Patent Claims infringed by the making,
- using, or selling of Modifications made by that
- Contributor either alone and/or in combination with
- its Contributor Version (or portions of such
- combination), to make, use, sell, offer for sale,
- have made, and/or otherwise dispose of: (1)
- Modifications made by that Contributor (or portions
- thereof); and (2) the combination of Modifications
- made by that Contributor with its Contributor Version
- (or portions of such combination).
-
- (c) The licenses granted in Sections 2.2(a) and
- 2.2(b) are effective on the date Contributor first
- distributes or otherwise makes the Modifications
- available to a third party.
-
- (d) Notwithstanding Section 2.2(b) above, no patent
- license is granted: (1) for any code that Contributor
- has deleted from the Contributor Version; (2) for
- infringements caused by: (i) third party
- modifications of Contributor Version, or (ii) the
- combination of Modifications made by that Contributor
- with other software (except as part of the
- Contributor Version) or other devices; or (3) under
- Patent Claims infringed by Covered Software in the
- absence of Modifications made by that Contributor.
-
- 3. Distribution Obligations.
-
- 3.1. Availability of Source Code.
-
- Any Covered Software that You distribute or otherwise make
- available in Executable form must also be made available in
- Source Code form and that Source Code form must be
- distributed only under the terms of this License. You must
- include a copy of this License with every copy of the
- Source Code form of the Covered Software You distribute or
- otherwise make available. You must inform recipients of any
- such Covered Software in Executable form as to how they can
- obtain such Covered Software in Source Code form in a
- reasonable manner on or through a medium customarily used
- for software exchange.
-
- 3.2. Modifications.
-
- The Modifications that You create or to which You
- contribute are governed by the terms of this License. You
- represent that You believe Your Modifications are Your
- original creation(s) and/or You have sufficient rights to
- grant the rights conveyed by this License.
-
- 3.3. Required Notices.
-
- You must include a notice in each of Your Modifications
- that identifies You as the Contributor of the Modification.
- You may not remove or alter any copyright, patent or
- trademark notices contained within the Covered Software, or
- any notices of licensing or any descriptive text giving
- attribution to any Contributor or the Initial Developer.
-
- 3.4. Application of Additional Terms.
-
- You may not offer or impose any terms on any Covered
- Software in Source Code form that alters or restricts the
- applicable version of this License or the recipientsÕ
- rights hereunder. You may choose to offer, and to charge a
- fee for, warranty, support, indemnity or liability
- obligations to one or more recipients of Covered Software.
- However, you may do so only on Your own behalf, and not on
- behalf of the Initial Developer or any Contributor. You
- must make it absolutely clear that any such warranty,
- support, indemnity or liability obligation is offered by
- You alone, and You hereby agree to indemnify the Initial
- Developer and every Contributor for any liability incurred
- by the Initial Developer or such Contributor as a result of
- warranty, support, indemnity or liability terms You offer.
-
-
- 3.5. Distribution of Executable Versions.
-
- You may distribute the Executable form of the Covered
- Software under the terms of this License or under the terms
- of a license of Your choice, which may contain terms
- different from this License, provided that You are in
- compliance with the terms of this License and that the
- license for the Executable form does not attempt to limit
- or alter the recipientÕs rights in the Source Code form
- from the rights set forth in this License. If You
- distribute the Covered Software in Executable form under a
- different license, You must make it absolutely clear that
- any terms which differ from this License are offered by You
- alone, not by the Initial Developer or Contributor. You
- hereby agree to indemnify the Initial Developer and every
- Contributor for any liability incurred by the Initial
- Developer or such Contributor as a result of any such terms
- You offer.
-
- 3.6. Larger Works.
-
- You may create a Larger Work by combining Covered Software
- with other code not governed by the terms of this License
- and distribute the Larger Work as a single product. In such
- a case, You must make sure the requirements of this License
- are fulfilled for the Covered Software.
-
- 4. Versions of the License.
-
- 4.1. New Versions.
-
- Sun Microsystems, Inc. is the initial license steward and
- may publish revised and/or new versions of this License
- from time to time. Each version will be given a
- distinguishing version number. Except as provided in
- Section 4.3, no one other than the license steward has the
- right to modify this License.
-
- 4.2. Effect of New Versions.
-
- You may always continue to use, distribute or otherwise
- make the Covered Software available under the terms of the
- version of the License under which You originally received
- the Covered Software. If the Initial Developer includes a
- notice in the Original Software prohibiting it from being
- distributed or otherwise made available under any
- subsequent version of the License, You must distribute and
- make the Covered Software available under the terms of the
- version of the License under which You originally received
- the Covered Software. Otherwise, You may also choose to
- use, distribute or otherwise make the Covered Software
- available under the terms of any subsequent version of the
- License published by the license steward.
-
- 4.3. Modified Versions.
-
- When You are an Initial Developer and You want to create a
- new license for Your Original Software, You may create and
- use a modified version of this License if You: (a) rename
- the license and remove any references to the name of the
- license steward (except to note that the license differs
- from this License); and (b) otherwise make it clear that
- the license contains terms which differ from this License.
-
-
- 5. DISCLAIMER OF WARRANTY.
-
- COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS"
- BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
- INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED
- SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR
- PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND
- PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY
- COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE
- INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF
- ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF
- WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
- ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS
- DISCLAIMER.
-
- 6. TERMINATION.
-
- 6.1. This License and the rights granted hereunder will
- terminate automatically if You fail to comply with terms
- herein and fail to cure such breach within 30 days of
- becoming aware of the breach. Provisions which, by their
- nature, must remain in effect beyond the termination of
- this License shall survive.
-
- 6.2. If You assert a patent infringement claim (excluding
- declaratory judgment actions) against Initial Developer or
- a Contributor (the Initial Developer or Contributor against
- whom You assert such claim is referred to as "Participant")
- alleging that the Participant Software (meaning the
- Contributor Version where the Participant is a Contributor
- or the Original Software where the Participant is the
- Initial Developer) directly or indirectly infringes any
- patent, then any and all rights granted directly or
- indirectly to You by such Participant, the Initial
- Developer (if the Initial Developer is not the Participant)
- and all Contributors under Sections 2.1 and/or 2.2 of this
- License shall, upon 60 days notice from Participant
- terminate prospectively and automatically at the expiration
- of such 60 day notice period, unless if within such 60 day
- period You withdraw Your claim with respect to the
- Participant Software against such Participant either
- unilaterally or pursuant to a written agreement with
+ .
+ 1.4. "Executable" means the Covered Software in any form other than Source Code.
+ .
+ 1.5. "Initial Developer" means the individual or entity that first makes Original
+ Software available under this License.
+ .
+ 1.6. "Larger Work" means a work which combines Covered Software or portions thereof
+ with code not governed by the terms of this License.
+ .
+ 1.7. "License" means this document.
+ .
+ 1.8. "Licensable" means having the right to grant, to the maximum extent possible,
+ whether at the time of the initial grant or subsequently acquired, any and all
+ of the rights conveyed herein.
+ .
+ 1.9. "Modifications" means the Source Code and Executable form of any of the
+ following:
+ .
+ A. Any file that results from an addition to, deletion from or modification of the
+ contents of a file containing Original Software or previous Modifications;
+ .
+ B. Any new file that contains any part of the Original Software or previous
+ Modification; or
+ .
+ C. Any new file that is contributed or otherwise made available under the terms of
+ this License.
+ .
+ 1.10. "Original Software" means the Source Code and Executable form of computer
+ software code that is originally released under this License.
+ .
+ 1.11. "Patent Claims" means any patent claim(s), now owned or hereafter acquired,
+ including without limitation, method, process, and apparatus claims, in any patent
+ Licensable by grantor.
+ .
+ 1.12. "Source Code" means (a) the common form of computer software code in which
+ modifications are made and (b) associated documentation included in or with
+ such code.
+ .
+ 1.13. "You" (or "Your") means an individual or a legal entity exercising rights
+ under, and complying with all of the terms of, this License. For legal
+ entities, "You" includes any entity which controls, is controlled by, or is
+ under common control with You. For purposes of this definition, "control"
+ means (a) the power, direct or indirect, to cause the direction or management
+ of such entity, whether by contract or otherwise, or (b) ownership of more
+ than fifty percent (50%) of the outstanding shares or beneficial ownership of
+ such entity.
+ .
+ 2. License Grants.
+ .
+ 2.1. The Initial Developer Grant.
+ .
+ Conditioned upon Your compliance with Section 3.1 below and subject to third party
+ intellectual property claims, the Initial Developer hereby grants You a world-wide,
+ royalty-free, non-exclusive license:
+ .
+ (a) under intellectual property rights (other than patent or trademark) Licensable
+ by Initial Developer, to use, reproduce, modify, display, perform, sublicense
+ and distribute the Original Software (or portions thereof), with or without
+ Modifications, and/or as part of a Larger Work; and
+ .
+ (b) under Patent Claims infringed by the making, using or selling of Original
+ Software, to make, have made, use, practice, sell, and offer for sale, and/or
+ otherwise dispose of the Original Software (or portions thereof).
+ .
+ (c) The licenses granted in Sections 2.1(a) and (b) are effective on the date
+ Initial Developer first distributes or otherwise makes the Original Software
+ available to a third party under the terms of this License.
+ .
+ (d) Notwithstanding Section 2.1(b) above, no patent license is granted: (1) for code
+ that You delete from the Original Software, or (2) for infringements caused by:
+ (i) the modification of the Original Software, or (ii) the combination of the
+ Original Software with other software or devices.
+ .
+ 2.2. Contributor Grant.
+ .
+ Conditioned upon Your compliance with Section 3.1 below and subject to third party
+ intellectual property claims, each Contributor hereby grants You a world-wide,
+ royalty-free, non-exclusive license:
+ .
+ (a) under intellectual property rights (other than patent or trademark) Licensable
+ by Contributor to use, reproduce, modify, display, perform, sublicense and
+ distribute the Modifications created by such Contributor (or portions thereof),
+ either on an unmodified basis, with other Modifications, as Covered Software
+ and/or as part of a Larger Work; and
+ .
+ (b) under Patent Claims infringed by the making, using, or selling of Modifications
+ made by that Contributor either alone and/or in combination with its Contributor
+ Version (or portions of such combination), to make, use, sell, offer for sale,
+ have made, and/or otherwise dispose of: (1) Modifications made by that
+ Contributor (or portions thereof); and (2) the combination of Modifications made
+ by that Contributor with its Contributor Version (or portions of such
+ combination).
+ .
+ (c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective on the date
+ Contributor first distributes or otherwise makes the Modifications available to a third
+ party.
+ .
+ (d) Notwithstanding Section 2.2(b) above, no patent license is granted: (1) for any
+ code that Contributor has deleted from the Contributor Version; (2) for
+ infringements caused by: (i) third party modifications of Contributor Version,
+ or (ii) the combination of Modifications made by that Contributor with other
+ software (except as part of the Contributor Version) or other devices; or (3)
+ under Patent Claims infringed by Covered Software in the absence of
+ Modifications made by that Contributor.
+ .
+ 3. Distribution Obligations.
+ .
+ 3.1. Availability of Source Code.
+ .
+ Any Covered Software that You distribute or otherwise make available in Executable
+ form must also be made available in Source Code form and that Source Code form must
+ be distributed only under the terms of this License. You must include a copy of this
+ License with every copy of the Source Code form of the Covered Software You
+ distribute or otherwise make available. You must inform recipients of any such
+ Covered Software in Executable form as to how they can obtain such Covered Software
+ in Source Code form in a reasonable manner on or through a medium customarily used
+ for software exchange.
+ .
+ 3.2. Modifications.
+ .
+ The Modifications that You create or to which You contribute are governed by the
+ terms of this License. You represent that You believe Your Modifications are Your
+ original creation(s) and/or You have sufficient rights to grant the rights conveyed by
+ this License.
+ .
+ 3.3. Required Notices.
+ .
+ You must include a notice in each of Your Modifications that identifies You as the
+ Contributor of the Modification. You may not remove or alter any copyright, patent
+ or trademark notices contained within the Covered Software, or any notices of
+ licensing or any descriptive text giving attribution to any Contributor or the Initial
+ Developer.
+ .
+ 3.4. Application of Additional Terms.
+ .
+ You may not offer or impose any terms on any Covered Software in Source Code form
+ that alters or restricts the applicable version of this License or the recipients'
+ rights hereunder. You may choose to offer, and to charge a fee for, warranty,
+ support, indemnity or liability obligations to one or more recipients of Covered
+ Software. However, you may do so only on Your own behalf, and not on behalf of the
+ Initial Developer or any Contributor. You must make it absolutely clear that any
+ such warranty, support, indemnity or liability obligation is offered by You alone,
+ and You hereby agree to indemnify the Initial Developer and every Contributor for
+ any liability incurred by the Initial Developer or such Contributor as a result of
+ warranty, support, indemnity or liability terms You offer.
+ .
+ 3.5. Distribution of Executable Versions.
+ .
+ You may distribute the Executable form of the Covered Software under the terms of
+ this License or under the terms of a license of Your choice, which may contain terms
+ different from this License, provided that You are in compliance with the terms of
+ this License and that the license for the Executable form does not attempt to limit
+ or alter the recipient's rights in the Source Code form from the rights set forth in
+ this License. If You distribute the Covered Software in Executable form under a
+ different license, You must make it absolutely clear that any terms which differ
+ from this License are offered by You alone, not by the Initial Developer or
+ Contributor. You hereby agree to indemnify the Initial Developer and every
+ Contributor for any liability incurred by the Initial Developer or such Contributor
+ as a result of any such terms You offer.
+ .
+ 3.6. Larger Works.
+ .
+ You may create a Larger Work by combining Covered Software with other code not
+ governed by the terms of this License and distribute the Larger Work as a single
+ product. In such a case, You must make sure the requirements of this License are
+ fulfilled for the Covered Software.
+ .
+ 4. Versions of the License.
+ .
+ 4.1. New Versions.
+ .
+ Oracle is the initial license steward and may publish revised and/or new versions of
+ this License from time to time. Each version will be given a distinguishing version
+ number. Except as provided in Section 4.3, no one other than the license steward has
+ the right to modify this License.
+ .
+ 4.2. Effect of New Versions.
+ .
+ You may always continue to use, distribute or otherwise make the Covered Software
+ available under the terms of the version of the License under which You originally
+ received the Covered Software. If the Initial Developer includes a notice in the
+ Original Software prohibiting it from being distributed or otherwise made available
+ under any subsequent version of the License, You must distribute and make the
+ Covered Software available under the terms of the version of the License under which
+ You originally received the Covered Software. Otherwise, You may also choose to use,
+ distribute or otherwise make the Covered Software available under the terms of any
+ subsequent version of the License published by the license steward.
+ .
+ 4.3. Modified Versions.
+ .
+ When You are an Initial Developer and You want to create a new license for Your
+ Original Software, You may create and use a modified version of this License if You:
+ (a) rename the license and remove any references to the name of the license steward
+ (except to note that the license differs from this License); and (b) otherwise make
+ it clear that the license contains terms which differ from this License.
+ .
+ 5. DISCLAIMER OF WARRANTY.
+ .
+ COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT
+ WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION,
+ WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A
+ PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND
+ PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE
+ DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR)
+ ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF
+ WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED
+ SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+ .
+ 6. TERMINATION.
+ .
+ 6.1. This License and the rights granted hereunder will terminate automatically if
+ You fail to comply with terms herein and fail to cure such breach within 30
+ days of becoming aware of the breach. Provisions which, by their nature, must
+ remain in effect beyond the termination of this License shall survive.
+ .
+ 6.2. If You assert a patent infringement claim (excluding declaratory judgment
+ actions) against Initial Developer or a Contributor (the Initial Developer or
+ Contributor against whom You assert such claim is referred to as "Participant")
+ alleging that the Participant Software (meaning the Contributor Version where
+ the Participant is a Contributor or the Original Software where the Participant
+ is the Initial Developer) directly or indirectly infringes any patent, then any
+ and all rights granted directly or indirectly to You by such Participant, the
+ Initial Developer (if the Initial Developer is not the Participant) and all
+ Contributors under Sections 2.1 and/or 2.2 of this License shall, upon 60 days
+ notice from Participant terminate prospectively and automatically at the
+ expiration of such 60 day notice period, unless if within such 60 day period
+ You withdraw Your claim with respect to the Participant Software against such
+ Participant either unilaterally or pursuant to a written agreement with
Participant.
-
- 6.3. In the event of termination under Sections 6.1 or 6.2
- above, all end user licenses that have been validly granted
- by You or any distributor hereunder prior to termination
- (excluding licenses granted to You by any distributor)
+ .
+ 6.3. If You assert a patent infringement claim against Participant alleging that the
+ Participant Software directly or indirectly infringes any patent where such
+ claim is resolved (such as by license or settlement) prior to the initiation of
+ patent infringement litigation, then the reasonable value of the licenses
+ granted by such Participant under Sections 2.1 or 2.2 shall be taken into
+ account in determining the amount or value of any payment or license.
+ .
+ 6.4. In the event of termination under Sections 6.1 or 6.2 above, all end user
+ licenses that have been validly granted by You or any distributor hereunder
+ prior to termination (excluding licenses granted to You by any distributor)
shall survive termination.
+ .
+ 7. LIMITATION OF LIABILITY.
+ .
+ UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING
+ NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER
+ CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH
+ PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
+ CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR
+ LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL
+ OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF
+ THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO
+ LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE
+ EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
+ EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION
+ AND LIMITATION MAY NOT APPLY TO YOU.
+ .
+ 8. U.S. GOVERNMENT END USERS.
+ .
+ The Covered Software is a "commercial item," as that term is defined in 48 C.F.R.
+ 2.101 (Oct. 1995), consisting of "commercial computer software" (as that term is
+ defined at 48 C.F.R. ? 252.227-7014(a)(1)) and "commercial computer software
+ documentation" as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent
+ with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all
+ U.S. Government End Users acquire Covered Software with only those rights set forth
+ herein. This U.S. Government Rights clause is in lieu of, and supersedes, any other
+ FAR, DFAR, or other clause or provision that addresses Government rights in computer
+ software under this License.
+ .
+ 9. MISCELLANEOUS.
+ .
+ This License represents the complete agreement concerning subject matter hereof. If
+ any provision of this License is held to be unenforceable, such provision shall be
+ reformed only to the extent necessary to make it enforceable. This License shall be
+ governed by the law of the jurisdiction specified in a notice contained within the
+ Original Software (except to the extent applicable law, if any, provides otherwise),
+ excluding such jurisdiction's conflict-of-law provisions. Any litigation relating to
+ this License shall be subject to the jurisdiction of the courts located in the
+ jurisdiction and venue specified in a notice contained within the Original Software,
+ with the losing party responsible for costs, including, without limitation, court
+ costs and reasonable attorneys' fees and expenses. The application of the United
+ Nations Convention on Contracts for the International Sale of Goods is expressly
+ excluded. Any law or regulation which provides that the language of a contract shall
+ be construed against the drafter shall not apply to this License. You agree that You
+ alone are responsible for compliance with the United States export administration
+ regulations (and the export control laws and regulation of any other countries) when
+ You use, distribute or otherwise make available any Covered Software.
+ .
+ 10. RESPONSIBILITY FOR CLAIMS.
+ .
+ As between Initial Developer and the Contributors, each party is responsible for
+ claims and damages arising, directly or indirectly, out of its utilization of rights
+ under this License and You agree to work with Initial Developer and Contributors to
+ distribute such responsibility on an equitable basis. Nothing herein is intended or
+ shall be deemed to constitute any admission of liability.
+ .
+ ----------
+ NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)
+ The code released under the CDDL shall be governed by the laws of the State of
+ California (excluding conflict-of-law provisions). Any litigation relating to this
+ License shall be subject to the jurisdiction of the Federal Courts of the Northern
+ District of California and the state courts of the State of California, with venue lying
+ in Santa Clara County, California.
- 7. LIMITATION OF LIABILITY.
- UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
- (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE
- INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF
- COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE
- LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
- CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
- LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
- STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
- COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
- INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
- LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL
- INJURY RESULTING FROM SUCH PARTYÕS NEGLIGENCE TO THE EXTENT
- APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO
- NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
- CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT
- APPLY TO YOU.
- 8. U.S. GOVERNMENT END USERS.
- The Covered Software is a "commercial item," as that term is
- defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial
- computer software" (as that term is defined at 48 C.F.R. ¤
- 252.227-7014(a)(1)) and "commercial computer software
- documentation" as such terms are used in 48 C.F.R. 12.212 (Sept.
- 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
- through 227.7202-4 (June 1995), all U.S. Government End Users
- acquire Covered Software with only those rights set forth herein.
- This U.S. Government Rights clause is in lieu of, and supersedes,
- any other FAR, DFAR, or other clause or provision that addresses
- Government rights in computer software under this License.
-
- 9. MISCELLANEOUS.
-
- This License represents the complete agreement concerning subject
- matter hereof. If any provision of this License is held to be
- unenforceable, such provision shall be reformed only to the
- extent necessary to make it enforceable. This License shall be
- governed by the law of the jurisdiction specified in a notice
- contained within the Original Software (except to the extent
- applicable law, if any, provides otherwise), excluding such
- jurisdictionÕs conflict-of-law provisions. Any litigation
- relating to this License shall be subject to the jurisdiction of
- the courts located in the jurisdiction and venue specified in a
- notice contained within the Original Software, with the losing
- party responsible for costs, including, without limitation, court
- costs and reasonable attorneysÕ fees and expenses. The
- application of the United Nations Convention on Contracts for the
- International Sale of Goods is expressly excluded. Any law or
- regulation which provides that the language of a contract shall
- be construed against the drafter shall not apply to this License.
- You agree that You alone are responsible for compliance with the
- United States export administration regulations (and the export
- control laws and regulation of any other countries) when You use,
- distribute or otherwise make available any Covered Software.
-
- 10. RESPONSIBILITY FOR CLAIMS.
-
- As between Initial Developer and the Contributors, each party is
- responsible for claims and damages arising, directly or
- indirectly, out of its utilization of rights under this License
- and You agree to work with Initial Developer and Contributors to
- distribute such responsibility on an equitable basis. Nothing
- herein is intended or shall be deemed to constitute any admission
- of liability.
-
-The Debian packaging is (C) 2007, Varun Hiremath <varun at debian.org> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
Modified: trunk/libcodemodel-java/debian/libcodemodel-java.poms
===================================================================
--- trunk/libcodemodel-java/debian/libcodemodel-java.poms 2014-01-07 00:07:38 UTC (rev 17648)
+++ trunk/libcodemodel-java/debian/libcodemodel-java.poms 2014-01-08 16:34:49 UTC (rev 17649)
@@ -4,6 +4,6 @@
# where option can be:
# --ignore: ignore this POM or
# --no-parent: remove the <parent> tag from the POM
-pom.xml
+pom.xml --no-parent
codemodel/pom.xml
codemodel-annotation-compiler/pom.xml
Modified: trunk/libcodemodel-java/debian/maven.properties
===================================================================
--- trunk/libcodemodel-java/debian/maven.properties 2014-01-07 00:07:38 UTC (rev 17648)
+++ trunk/libcodemodel-java/debian/maven.properties 2014-01-08 16:34:49 UTC (rev 17649)
@@ -2,3 +2,4 @@
# For example:
# maven.test.skip=true
+project.build.sourceEncoding=UTF-8
Modified: trunk/libcodemodel-java/debian/maven.rules
===================================================================
--- trunk/libcodemodel-java/debian/maven.rules 2014-01-07 00:07:38 UTC (rev 17648)
+++ trunk/libcodemodel-java/debian/maven.rules 2014-01-08 16:34:49 UTC (rev 17649)
@@ -16,5 +16,5 @@
# and version starting with 3., replacing the version with 3.x
# junit junit jar s/3\\..*/3.x/
-junit junit jar s/3\..*/3.x/ * *
+junit junit jar s/4\..*/4.x/ * *
s/ant/org.apache.ant/ * * s/.*/debian/ * *
Modified: trunk/libcodemodel-java/debian/orig-tar.sh
===================================================================
--- trunk/libcodemodel-java/debian/orig-tar.sh 2014-01-07 00:07:38 UTC (rev 17648)
+++ trunk/libcodemodel-java/debian/orig-tar.sh 2014-01-08 16:34:49 UTC (rev 17649)
@@ -1,18 +1,24 @@
#!/bin/sh -e
VERSION=$2
-TAR=../libcodemodel-java_$VERSION.orig.tar.gz
-DIR=libcodemodel-java-$VERSION.orig
+TAR=../libcodemodel-java_$VERSION.orig.tar.xz
+DIR=libcodemodel-java-$VERSION
+TAG=$(echo "codemodel-project-$VERSION" | sed -re's/~(alpha|beta)/-\1-/')
-# clean up the upstream tarball
-svn export https://svn.java.net/svn/codemodel~svn/tags/codemodel-$VERSION/ \
- $DIR
-GZIP=--best tar -c -z -f $TAR --exclude '*.jar' --exclude '*.class' $DIR
-rm -rf $DIR
+svn export https://svn.java.net/svn/codemodel~svn/tags/${TAG}/ $DIR
+XZ_OPT=--best tar -c -J -f $TAR \
+ --exclude '*.jar' \
+ --exclude '*.class' \
+ --exclude '*.ipr' \
+ --exclude '*.iml' \
+ --exclude '.settings' \
+ --exclude '.project' \
+ --exclude '.classpath' \
+ $DIR
+rm -rf $DIR ../$TAG
# move to directory 'tarballs'
if [ -r .svn/deb-layout ]; then
. .svn/deb-layout
- mv $TAR $origDir
- echo "moved $TAR to $origDir"
+ mv $TAR $origDir && echo "moved $TAR to $origDir"
fi
Added: trunk/libcodemodel-java/debian/patches/remove-istack-commons-dependency.patch
===================================================================
--- trunk/libcodemodel-java/debian/patches/remove-istack-commons-dependency.patch (rev 0)
+++ trunk/libcodemodel-java/debian/patches/remove-istack-commons-dependency.patch 2014-01-08 16:34:49 UTC (rev 17649)
@@ -0,0 +1,130 @@
+commit 1c15b90aa77cbc242bcec7ea3b38eb46e4c037cb
+Author: Juan Hernandez <juan.hernandez at redhat.com>
+Date: Sat Mar 31 16:25:02 2012 +0200
+
+ Remove the dependency on istack-commons
+
+diff --git a/codemodel-annotation-compiler/pom.xml b/codemodel-annotation-compiler/pom.xml
+index 100e084..e1459bc 100644
+--- a/codemodel-annotation-compiler/pom.xml
++++ b/codemodel-annotation-compiler/pom.xml
+@@ -60,17 +60,6 @@
+ <version>2.6</version>
+ </dependency>
+ <dependency>
+- <groupId>com.sun.istack</groupId>
+- <artifactId>istack-commons-tools</artifactId>
+- <version>2.5</version>
+- <exclusions>
+- <exclusion>
+- <groupId>org.apache.ant</groupId>
+- <artifactId>ant</artifactId>
+- </exclusion>
+- </exclusions>
+- </dependency>
+- <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.7.0</version>
+diff --git a/codemodel-annotation-compiler/src/main/java/com/sun/codemodel/ac/ACTask.java b/codemodel-annotation-compiler/src/main/java/com/sun/codemodel/ac/ACTask.java
+index d5b0a14..c6d799d 100644
+--- a/codemodel-annotation-compiler/src/main/java/com/sun/codemodel/ac/ACTask.java
++++ b/codemodel-annotation-compiler/src/main/java/com/sun/codemodel/ac/ACTask.java
+@@ -64,7 +64,6 @@ import com.sun.codemodel.JDefinedClass;
+ import com.sun.codemodel.JMod;
+ import com.sun.codemodel.JPackage;
+ import com.sun.codemodel.JType;
+-import com.sun.istack.tools.MaskingClassLoader;
+ import java.io.Closeable;
+ import java.net.MalformedURLException;
+ import java.net.URL;
+diff --git a/codemodel-annotation-compiler/src/main/java/com/sun/codemodel/ac/MaskingClassLoader.java b/codemodel-annotation-compiler/src/main/java/com/sun/codemodel/ac/MaskingClassLoader.java
+new file mode 100644
+index 0000000..d303c11
+--- /dev/null
++++ b/codemodel-annotation-compiler/src/main/java/com/sun/codemodel/ac/MaskingClassLoader.java
+@@ -0,0 +1,84 @@
++/*
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
++ *
++ * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
++ *
++ * The contents of this file are subject to the terms of either the GNU
++ * General Public License Version 2 only ("GPL") or the Common Development
++ * and Distribution License("CDDL") (collectively, the "License"). You
++ * may not use this file except in compliance with the License. You can
++ * obtain a copy of the License at
++ * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
++ * or packager/legal/LICENSE.txt. See the License for the specific
++ * language governing permissions and limitations under the License.
++ *
++ * When distributing the software, include this License Header Notice in each
++ * file and include the License file at packager/legal/LICENSE.txt.
++ *
++ * GPL Classpath Exception:
++ * Oracle designates this particular file as subject to the "Classpath"
++ * exception as provided by Oracle in the GPL Version 2 section of the License
++ * file that accompanied this code.
++ *
++ * Modifications:
++ * If applicable, add the following below the License Header, with the fields
++ * enclosed by brackets [] replaced by your own identifying information:
++ * "Portions Copyright [year] [name of copyright owner]"
++ *
++ * Contributor(s):
++ * If you wish your version of this file to be governed by only the CDDL or
++ * only the GPL Version 2, indicate your decision by adding "[Contributor]
++ * elects to include this software in this distribution under the [CDDL or GPL
++ * Version 2] license." If you don't indicate a single choice of license, a
++ * recipient has the option to distribute your version of this file under
++ * either the CDDL, the GPL Version 2 or to extend the choice of license to
++ * its licensees as provided above. However, if you add GPL Version 2 code
++ * and therefore, elected the GPL Version 2 license, then the option applies
++ * only if the new code is made subject to such option by the copyright
++ * holder.
++ */
++
++package com.sun.codemodel.ac;
++
++import java.util.Collection;
++
++/**
++ * {@link ClassLoader} that masks a specified set of classes
++ * from its parent class loader.
++ *
++ * <p>
++ * This code is used to create an isolated environment.
++ *
++ * @author Kohsuke Kawaguchi
++ */
++public class MaskingClassLoader extends ClassLoader {
++
++ private final String[] masks;
++
++ public MaskingClassLoader(String... masks) {
++ this.masks = masks;
++ }
++
++ public MaskingClassLoader(Collection<String> masks) {
++ this(masks.toArray(new String[masks.size()]));
++ }
++
++ public MaskingClassLoader(ClassLoader parent, String... masks) {
++ super(parent);
++ this.masks = masks;
++ }
++
++ public MaskingClassLoader(ClassLoader parent, Collection<String> masks) {
++ this(parent, masks.toArray(new String[masks.size()]));
++ }
++
++ @Override
++ protected synchronized Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
++ for (String mask : masks) {
++ if(name.startsWith(mask))
++ throw new ClassNotFoundException();
++ }
++
++ return super.loadClass(name, resolve);
++ }
++}
Added: trunk/libcodemodel-java/debian/patches/series
===================================================================
--- trunk/libcodemodel-java/debian/patches/series (rev 0)
+++ trunk/libcodemodel-java/debian/patches/series 2014-01-08 16:34:49 UTC (rev 17649)
@@ -0,0 +1 @@
+remove-istack-commons-dependency.patch
Modified: trunk/libcodemodel-java/debian/watch
===================================================================
--- trunk/libcodemodel-java/debian/watch 2014-01-07 00:07:38 UTC (rev 17648)
+++ trunk/libcodemodel-java/debian/watch 2014-01-08 16:34:49 UTC (rev 17649)
@@ -1,4 +1,4 @@
version=3
opts="uversionmangle=s/-(alpha|beta)-/~$1/" \
- http://java.net/projects/codemodel/sources/svn/show/tags \
- /projects/codemodel/sources/svn/show/tags/codemodel-(\d+).(\d+).* debian debian/orig-tar.sh
+ https://svn.java.net/svn/codemodel~svn/tags/ \
+ codemodel-project-(\d.*)/ debian debian/orig-tar.sh
More information about the pkg-java-commits
mailing list