[netbeans] 20/49: Drop netbeans-include-junit.patch
Markus Koschany
apo-guest at moszumanska.debian.org
Sat Dec 26 20:44:49 UTC 2015
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository netbeans.
commit b382c9d9a09059a7ab98344cb30b9a9bc07319f5
Author: Markus Koschany <apo at debian.org>
Date: Thu Dec 17 01:45:34 2015 +0100
Drop netbeans-include-junit.patch
---
debian/patches/netbeans-include-junit.patch | 678 ----------------------------
debian/patches/series | 1 -
2 files changed, 679 deletions(-)
diff --git a/debian/patches/netbeans-include-junit.patch b/debian/patches/netbeans-include-junit.patch
deleted file mode 100644
index b19f4a8..0000000
--- a/debian/patches/netbeans-include-junit.patch
+++ /dev/null
@@ -1,678 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Tue, 16 Jun 2015 00:13:01 +0200
-Subject: netbeans include junit
-
-Include the junitlib module as part of the java cluster. This provides the
-necessary references to the junit jars (junit.jar and junit4.jar) in order
-to use the junit testing framework. This module would otherwise have to be
-downloaded from the Netbeans site.
-
-It is also necessary to add netbeans-platform-junit4.patch to
-libnb-platform-java and to include junit4 as part of the platform cluster.
-
-Forwarded: not-needed
----
- junitlib/build.xml | 6 +
- junitlib/external/junit-3.8.2-license.txt | 220 +++++++++++++++++++++
- junitlib/external/junit-4.10-license.txt | 220 +++++++++++++++++++++
- junitlib/manifest.mf | 6 +
- junitlib/nbproject/project.properties | 7 +
- junitlib/nbproject/project.xml | 18 ++
- junitlib/release/docs/junit-3.8.2-api.zip.external | 3 +
- junitlib/release/docs/junit-4.10-api.zip.external | 3 +
- .../release/modules/ext/junit-3.8.2.jar.external | 3 +
- .../netbeans/modules/junitlib/Bundle.properties | 7 +
- .../org/netbeans/modules/junitlib/junit-3.8.2.xml | 15 ++
- .../org/netbeans/modules/junitlib/junit-4.10.xml | 15 ++
- .../src/org/netbeans/modules/junitlib/layer.xml | 14 ++
- nbbuild/cluster.properties | 2 +-
- 14 files changed, 538 insertions(+), 1 deletion(-)
- create mode 100644 junitlib/build.xml
- create mode 100644 junitlib/external/junit-3.8.2-license.txt
- create mode 100644 junitlib/external/junit-4.10-license.txt
- create mode 100644 junitlib/manifest.mf
- create mode 100644 junitlib/nbproject/project.properties
- create mode 100644 junitlib/nbproject/project.xml
- create mode 100644 junitlib/release/docs/junit-3.8.2-api.zip.external
- create mode 100644 junitlib/release/docs/junit-4.10-api.zip.external
- create mode 100644 junitlib/release/modules/ext/junit-3.8.2.jar.external
- create mode 100644 junitlib/src/org/netbeans/modules/junitlib/Bundle.properties
- create mode 100644 junitlib/src/org/netbeans/modules/junitlib/junit-3.8.2.xml
- create mode 100644 junitlib/src/org/netbeans/modules/junitlib/junit-4.10.xml
- create mode 100644 junitlib/src/org/netbeans/modules/junitlib/layer.xml
-
-diff --git a/junitlib/build.xml b/junitlib/build.xml
-new file mode 100644
-index 0000000..383fe22
---- /dev/null
-+++ b/junitlib/build.xml
-@@ -0,0 +1,6 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<project basedir="." default="netbeans" name="junitlib">
-+ <property name="license.file" location="../nbbuild/licenses/CPL-1.0"/>
-+ <target name="-create-license.file"/>
-+ <import file="../nbbuild/templates/projectized.xml"/>
-+</project>
-diff --git a/junitlib/external/junit-3.8.2-license.txt b/junitlib/external/junit-3.8.2-license.txt
-new file mode 100644
-index 0000000..75e380c
---- /dev/null
-+++ b/junitlib/external/junit-3.8.2-license.txt
-@@ -0,0 +1,220 @@
-+Name: JUnit
-+Version: 3.8.2
-+License: CPL-1.0
-+OSR: 1221
-+Origin: http://www.junit.org/index.htm
-+Description: JUnit is a regression testing framework
-+Files: junit-3.8.2-api.zip, junit-3.8.2.jar
-+
-+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC
-+LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
-+CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-+
-+1. DEFINITIONS
-+
-+"Contribution" means:
-+
-+ a) in the case of the initial Contributor, the initial code and
-+documentation distributed under this Agreement, and
-+b) in the case of each subsequent Contributor:
-+
-+i) changes to the Program, and
-+
-+ii) additions to the Program;
-+
-+where such changes and/or additions to the Program originate from and are
-+distributed by that particular Contributor. A Contribution 'originates' from a
-+Contributor if it was added to the Program by such Contributor itself or anyone
-+acting on such Contributor's behalf. Contributions do not include additions to
-+the Program which: (i) are separate modules of software distributed in
-+conjunction with the Program under their own license agreement, and (ii) are not
-+derivative works of the Program.
-+
-+"Contributor" means any person or entity that distributes the Program.
-+
-+"Licensed Patents " mean patent claims licensable by a Contributor which are
-+necessarily infringed by the use or sale of its Contribution alone or when
-+combined with the Program.
-+
-+"Program" means the Contributions distributed in accordance with this Agreement.
-+
-+"Recipient" means anyone who receives the Program under this Agreement,
-+including all Contributors.
-+
-+2. GRANT OF RIGHTS
-+
-+a) Subject to the terms of this Agreement, each Contributor hereby grants
-+Recipient a non-exclusive, worldwide, royalty-free copyright license to
-+reproduce, prepare derivative works of, publicly display, publicly perform,
-+distribute and sublicense the Contribution of such Contributor, if any, and such
-+derivative works, in source code and object code form.
-+
-+b) Subject to the terms of this Agreement, each Contributor hereby grants
-+Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed
-+Patents to make, use, sell, offer to sell, import and otherwise transfer the
-+Contribution of such Contributor, if any, in source code and object code form.
-+This patent license shall apply to the combination of the Contribution and the
-+Program if, at the time the Contribution is added by the Contributor, such
-+addition of the Contribution causes such combination to be covered by the
-+Licensed Patents. The patent license shall not apply to any other combinations
-+which include the Contribution. No hardware per se is licensed hereunder.
-+
-+c) Recipient understands that although each Contributor grants the licenses to
-+its Contributions set forth herein, no assurances are provided by any
-+Contributor that the Program does not infringe the patent or other intellectual
-+property rights of any other entity. Each Contributor disclaims any liability to
-+Recipient for claims brought by any other entity based on infringement of
-+intellectual property rights or otherwise. As a condition to exercising the
-+rights and licenses granted hereunder, each Recipient hereby assumes sole
-+responsibility to secure any other intellectual property rights needed, if any.
-+For example, if a third party patent license is required to allow Recipient to
-+distribute the Program, it is Recipient's responsibility to acquire that license
-+before distributing the Program.
-+
-+d) Each Contributor represents that to its knowledge it has sufficient copyright
-+rights in its Contribution, if any, to grant the copyright license set forth in
-+this Agreement.
-+
-+3. REQUIREMENTS
-+
-+A Contributor may choose to distribute the Program in object code form under its
-+own license agreement, provided that:
-+
-+a) it complies with the terms and conditions of this Agreement; and
-+
-+b) its license agreement:
-+
-+i) effectively disclaims on behalf of all Contributors all warranties and
-+conditions, express and implied, including warranties or conditions of title and
-+non-infringement, and implied warranties or conditions of merchantability and
-+fitness for a particular purpose;
-+
-+ii) effectively excludes on behalf of all Contributors all liability for
-+damages, including direct, indirect, special, incidental and consequential
-+damages, such as lost profits;
-+
-+iii) states that any provisions which differ from this Agreement are offered by
-+that Contributor alone and not by any other party; and
-+
-+iv) states that source code for the Program is available from such Contributor,
-+and informs licensees how to obtain it in a reasonable manner on or through a
-+medium customarily used for software exchange.
-+
-+When the Program is made available in source code form:
-+
-+a) it must be made available under this Agreement; and
-+
-+b) a copy of this Agreement must be included with each copy of the Program.
-+
-+Contributors may not remove or alter any copyright notices contained within the
-+Program.
-+
-+Each Contributor must identify itself as the originator of its Contribution, if
-+any, in a manner that reasonably allows subsequent Recipients to identify the
-+originator of the Contribution.
-+
-+
-+4. COMMERCIAL DISTRIBUTION
-+
-+Commercial distributors of software may accept certain responsibilities with
-+respect to end users, business partners and the like. While this license is
-+intended to facilitate the commercial use of the Program, the Contributor who
-+includes the Program in a commercial product offering should do so in a manner
-+which does not create potential liability for other Contributors. Therefore, if
-+a Contributor includes the Program in a commercial product offering, such
-+Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
-+every other Contributor ("Indemnified Contributor") against any losses, damages
-+and costs (collectively "Losses") arising from claims, lawsuits and other legal
-+actions brought by a third party against the Indemnified Contributor to the
-+extent caused by the acts or omissions of such Commercial Contributor in
-+connection with its distribution of the Program in a commercial product
-+offering. The obligations in this section do not apply to any claims or Losses
-+relating to any actual or alleged intellectual property infringement. In order
-+to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-+Contributor in writing of such claim, and b) allow the Commercial Contributor to
-+control, and cooperate with the Commercial Contributor in, the defense and any
-+related settlement negotiations. The Indemnified Contributor may participate in
-+any such claim at its own expense.
-+
-+For example, a Contributor might include the Program in a commercial product
-+offering, Product X. That Contributor is then a Commercial Contributor. If that
-+Commercial Contributor then makes performance claims, or offers warranties
-+related to Product X, those performance claims and warranties are such
-+Commercial Contributor's responsibility alone. Under this section, the
-+Commercial Contributor would have to defend claims against the other
-+Contributors related to those performance claims and warranties, and if a court
-+requires any other Contributor to pay any damages as a result, the Commercial
-+Contributor must pay those damages.
-+
-+5. NO WARRANTY
-+
-+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN
-+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
-+IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
-+NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each
-+Recipient is solely responsible for determining the appropriateness of using and
-+distributing the Program and assumes all risks associated with its exercise of
-+rights under this Agreement, including but not limited to the risks and costs of
-+program errors, compliance with applicable laws, damage to or loss of data,
-+programs or equipment, and unavailability or interruption of operations.
-+
-+6. DISCLAIMER OF LIABILITY
-+
-+
-+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
-+CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
-+PROFITS), 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 OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
-+GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-+
-+7. GENERAL
-+
-+If any provision of this Agreement is invalid or unenforceable under applicable
-+law, it shall not affect the validity or enforceability of the remainder of the
-+terms of this Agreement, and without further action by the parties hereto, such
-+provision shall be reformed to the minimum extent necessary to make such
-+provision valid and enforceable.
-+
-+If Recipient institutes patent litigation against a Contributor with respect to
-+a patent applicable to software (including a cross-claim or counterclaim in a
-+lawsuit), then any patent licenses granted by that Contributor to such Recipient
-+under this Agreement shall terminate as of the date such litigation is filed. In
-+addition, if Recipient institutes patent litigation against any entity
-+(including a cross-claim or counterclaim in a lawsuit) alleging that the Program
-+itself (excluding combinations of the Program with other software or hardware)
-+infringes such Recipient's patent(s), then such Recipient's rights granted under
-+Section 2(b) shall terminate as of the date such litigation is filed.
-+
-+All Recipient's rights under this Agreement shall terminate if it fails to
-+comply with any of the material terms or conditions of this Agreement and does
-+not cure such failure in a reasonable period of time after becoming aware of
-+such noncompliance. If all Recipient's rights under this Agreement terminate,
-+Recipient agrees to cease use and distribution of the Program as soon as
-+reasonably practicable. However, Recipient's obligations under this Agreement
-+and any licenses granted by Recipient relating to the Program shall continue and
-+survive.
-+
-+Everyone is permitted to copy and distribute copies of this Agreement, but in
-+order to avoid inconsistency the Agreement is copyrighted and may only be
-+modified in the following manner. The Agreement Steward reserves the right to
-+publish new versions (including revisions) of this Agreement from time to time.
-+No one other than the Agreement Steward has the right to modify this Agreement.
-+IBM is the initial Agreement Steward. IBM may assign the responsibility to serve
-+as the Agreement Steward to a suitable separate entity. Each new version of the
-+Agreement will be given a distinguishing version number. The Program (including
-+Contributions) may always be distributed subject to the version of the Agreement
-+under which it was received. In addition, after a new version of the Agreement
-+is published, Contributor may elect to distribute the Program (including its
-+Contributions) under the new version. Except as expressly stated in Sections
-+2(a) and 2(b) above, Recipient receives no rights or licenses to the
-+intellectual property of any Contributor under this Agreement, whether
-+expressly, by implication, estoppel or otherwise. All rights in the Program not
-+expressly granted under this Agreement are reserved.
-+
-+This Agreement is governed by the laws of the State of New York and the
-+intellectual property laws of the United States of America. No party to this
-+Agreement will bring a legal action under this Agreement more than one year
-+after the cause of action arose. Each party waives its rights to a jury trial in
-+any resulting litigation.
-diff --git a/junitlib/external/junit-4.10-license.txt b/junitlib/external/junit-4.10-license.txt
-new file mode 100644
-index 0000000..c00defb
---- /dev/null
-+++ b/junitlib/external/junit-4.10-license.txt
-@@ -0,0 +1,220 @@
-+Name: JUnit
-+Version: 4.10
-+License: CPL-1.0
-+OSR: 6529
-+Origin: http://www.junit.org/index.htm
-+Description: JUnit is a regression testing framework
-+Files: junit-4.10-api.zip, junit-4.10-src.jar
-+
-+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC
-+LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
-+CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-+
-+1. DEFINITIONS
-+
-+"Contribution" means:
-+
-+ a) in the case of the initial Contributor, the initial code and
-+documentation distributed under this Agreement, and
-+b) in the case of each subsequent Contributor:
-+
-+i) changes to the Program, and
-+
-+ii) additions to the Program;
-+
-+where such changes and/or additions to the Program originate from and are
-+distributed by that particular Contributor. A Contribution 'originates' from a
-+Contributor if it was added to the Program by such Contributor itself or anyone
-+acting on such Contributor's behalf. Contributions do not include additions to
-+the Program which: (i) are separate modules of software distributed in
-+conjunction with the Program under their own license agreement, and (ii) are not
-+derivative works of the Program.
-+
-+"Contributor" means any person or entity that distributes the Program.
-+
-+"Licensed Patents " mean patent claims licensable by a Contributor which are
-+necessarily infringed by the use or sale of its Contribution alone or when
-+combined with the Program.
-+
-+"Program" means the Contributions distributed in accordance with this Agreement.
-+
-+"Recipient" means anyone who receives the Program under this Agreement,
-+including all Contributors.
-+
-+2. GRANT OF RIGHTS
-+
-+a) Subject to the terms of this Agreement, each Contributor hereby grants
-+Recipient a non-exclusive, worldwide, royalty-free copyright license to
-+reproduce, prepare derivative works of, publicly display, publicly perform,
-+distribute and sublicense the Contribution of such Contributor, if any, and such
-+derivative works, in source code and object code form.
-+
-+b) Subject to the terms of this Agreement, each Contributor hereby grants
-+Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed
-+Patents to make, use, sell, offer to sell, import and otherwise transfer the
-+Contribution of such Contributor, if any, in source code and object code form.
-+This patent license shall apply to the combination of the Contribution and the
-+Program if, at the time the Contribution is added by the Contributor, such
-+addition of the Contribution causes such combination to be covered by the
-+Licensed Patents. The patent license shall not apply to any other combinations
-+which include the Contribution. No hardware per se is licensed hereunder.
-+
-+c) Recipient understands that although each Contributor grants the licenses to
-+its Contributions set forth herein, no assurances are provided by any
-+Contributor that the Program does not infringe the patent or other intellectual
-+property rights of any other entity. Each Contributor disclaims any liability to
-+Recipient for claims brought by any other entity based on infringement of
-+intellectual property rights or otherwise. As a condition to exercising the
-+rights and licenses granted hereunder, each Recipient hereby assumes sole
-+responsibility to secure any other intellectual property rights needed, if any.
-+For example, if a third party patent license is required to allow Recipient to
-+distribute the Program, it is Recipient's responsibility to acquire that license
-+before distributing the Program.
-+
-+d) Each Contributor represents that to its knowledge it has sufficient copyright
-+rights in its Contribution, if any, to grant the copyright license set forth in
-+this Agreement.
-+
-+3. REQUIREMENTS
-+
-+A Contributor may choose to distribute the Program in object code form under its
-+own license agreement, provided that:
-+
-+a) it complies with the terms and conditions of this Agreement; and
-+
-+b) its license agreement:
-+
-+i) effectively disclaims on behalf of all Contributors all warranties and
-+conditions, express and implied, including warranties or conditions of title and
-+non-infringement, and implied warranties or conditions of merchantability and
-+fitness for a particular purpose;
-+
-+ii) effectively excludes on behalf of all Contributors all liability for
-+damages, including direct, indirect, special, incidental and consequential
-+damages, such as lost profits;
-+
-+iii) states that any provisions which differ from this Agreement are offered by
-+that Contributor alone and not by any other party; and
-+
-+iv) states that source code for the Program is available from such Contributor,
-+and informs licensees how to obtain it in a reasonable manner on or through a
-+medium customarily used for software exchange.
-+
-+When the Program is made available in source code form:
-+
-+a) it must be made available under this Agreement; and
-+
-+b) a copy of this Agreement must be included with each copy of the Program.
-+
-+Contributors may not remove or alter any copyright notices contained within the
-+Program.
-+
-+Each Contributor must identify itself as the originator of its Contribution, if
-+any, in a manner that reasonably allows subsequent Recipients to identify the
-+originator of the Contribution.
-+
-+
-+4. COMMERCIAL DISTRIBUTION
-+
-+Commercial distributors of software may accept certain responsibilities with
-+respect to end users, business partners and the like. While this license is
-+intended to facilitate the commercial use of the Program, the Contributor who
-+includes the Program in a commercial product offering should do so in a manner
-+which does not create potential liability for other Contributors. Therefore, if
-+a Contributor includes the Program in a commercial product offering, such
-+Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
-+every other Contributor ("Indemnified Contributor") against any losses, damages
-+and costs (collectively "Losses") arising from claims, lawsuits and other legal
-+actions brought by a third party against the Indemnified Contributor to the
-+extent caused by the acts or omissions of such Commercial Contributor in
-+connection with its distribution of the Program in a commercial product
-+offering. The obligations in this section do not apply to any claims or Losses
-+relating to any actual or alleged intellectual property infringement. In order
-+to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-+Contributor in writing of such claim, and b) allow the Commercial Contributor to
-+control, and cooperate with the Commercial Contributor in, the defense and any
-+related settlement negotiations. The Indemnified Contributor may participate in
-+any such claim at its own expense.
-+
-+For example, a Contributor might include the Program in a commercial product
-+offering, Product X. That Contributor is then a Commercial Contributor. If that
-+Commercial Contributor then makes performance claims, or offers warranties
-+related to Product X, those performance claims and warranties are such
-+Commercial Contributor's responsibility alone. Under this section, the
-+Commercial Contributor would have to defend claims against the other
-+Contributors related to those performance claims and warranties, and if a court
-+requires any other Contributor to pay any damages as a result, the Commercial
-+Contributor must pay those damages.
-+
-+5. NO WARRANTY
-+
-+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN
-+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
-+IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
-+NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each
-+Recipient is solely responsible for determining the appropriateness of using and
-+distributing the Program and assumes all risks associated with its exercise of
-+rights under this Agreement, including but not limited to the risks and costs of
-+program errors, compliance with applicable laws, damage to or loss of data,
-+programs or equipment, and unavailability or interruption of operations.
-+
-+6. DISCLAIMER OF LIABILITY
-+
-+
-+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
-+CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
-+PROFITS), 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 OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
-+GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-+
-+7. GENERAL
-+
-+If any provision of this Agreement is invalid or unenforceable under applicable
-+law, it shall not affect the validity or enforceability of the remainder of the
-+terms of this Agreement, and without further action by the parties hereto, such
-+provision shall be reformed to the minimum extent necessary to make such
-+provision valid and enforceable.
-+
-+If Recipient institutes patent litigation against a Contributor with respect to
-+a patent applicable to software (including a cross-claim or counterclaim in a
-+lawsuit), then any patent licenses granted by that Contributor to such Recipient
-+under this Agreement shall terminate as of the date such litigation is filed. In
-+addition, if Recipient institutes patent litigation against any entity
-+(including a cross-claim or counterclaim in a lawsuit) alleging that the Program
-+itself (excluding combinations of the Program with other software or hardware)
-+infringes such Recipient's patent(s), then such Recipient's rights granted under
-+Section 2(b) shall terminate as of the date such litigation is filed.
-+
-+All Recipient's rights under this Agreement shall terminate if it fails to
-+comply with any of the material terms or conditions of this Agreement and does
-+not cure such failure in a reasonable period of time after becoming aware of
-+such noncompliance. If all Recipient's rights under this Agreement terminate,
-+Recipient agrees to cease use and distribution of the Program as soon as
-+reasonably practicable. However, Recipient's obligations under this Agreement
-+and any licenses granted by Recipient relating to the Program shall continue and
-+survive.
-+
-+Everyone is permitted to copy and distribute copies of this Agreement, but in
-+order to avoid inconsistency the Agreement is copyrighted and may only be
-+modified in the following manner. The Agreement Steward reserves the right to
-+publish new versions (including revisions) of this Agreement from time to time.
-+No one other than the Agreement Steward has the right to modify this Agreement.
-+IBM is the initial Agreement Steward. IBM may assign the responsibility to serve
-+as the Agreement Steward to a suitable separate entity. Each new version of the
-+Agreement will be given a distinguishing version number. The Program (including
-+Contributions) may always be distributed subject to the version of the Agreement
-+under which it was received. In addition, after a new version of the Agreement
-+is published, Contributor may elect to distribute the Program (including its
-+Contributions) under the new version. Except as expressly stated in Sections
-+2(a) and 2(b) above, Recipient receives no rights or licenses to the
-+intellectual property of any Contributor under this Agreement, whether
-+expressly, by implication, estoppel or otherwise. All rights in the Program not
-+expressly granted under this Agreement are reserved.
-+
-+This Agreement is governed by the laws of the State of New York and the
-+intellectual property laws of the United States of America. No party to this
-+Agreement will bring a legal action under this Agreement more than one year
-+after the cause of action arose. Each party waives its rights to a jury trial in
-+any resulting litigation.
-diff --git a/junitlib/manifest.mf b/junitlib/manifest.mf
-new file mode 100644
-index 0000000..e49c3d6
---- /dev/null
-+++ b/junitlib/manifest.mf
-@@ -0,0 +1,6 @@
-+Manifest-Version: 1.0
-+OpenIDE-Module: org.netbeans.modules.junitlib
-+OpenIDE-Module-Layer: org/netbeans/modules/junitlib/layer.xml
-+OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/junitlib/Bundle.properties
-+OpenIDE-Module-Specification-Version: 1.0
-+
-diff --git a/junitlib/nbproject/project.properties b/junitlib/nbproject/project.properties
-new file mode 100644
-index 0000000..36bfb43
---- /dev/null
-+++ b/junitlib/nbproject/project.properties
-@@ -0,0 +1,7 @@
-+javac.source=1.6
-+javac.compilerargs=-Xlint -Xlint:-serial
-+release.external/junit-3.8.2.jar=modules/ext/junit-3.8.2.jar
-+#release.external/junit-3.8.2-api.zip=docs/junit-3.8.2-api.zip
-+#release.external/junit-4.10-api.zip=docs/junit-4.10-api.zip
-+#release.external/junit-4.10-src.jar=docs/junit-4.10-src.jar
-+nbm.target.cluster=java
-diff --git a/junitlib/nbproject/project.xml b/junitlib/nbproject/project.xml
-new file mode 100644
-index 0000000..3d70c18
---- /dev/null
-+++ b/junitlib/nbproject/project.xml
-@@ -0,0 +1,18 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<project xmlns="http://www.netbeans.org/ns/project/1">
-+ <type>org.netbeans.modules.apisupport.project</type>
-+ <configuration>
-+ <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
-+ <code-name-base>org.netbeans.modules.junitlib</code-name-base>
-+ <module-dependencies>
-+ <dependency>
-+ <code-name-base>org.netbeans.libs.junit4</code-name-base>
-+ <run-dependency>
-+ <specification-version>1.13</specification-version>
-+ </run-dependency>
-+ </dependency>
-+ </module-dependencies>
-+ <public-packages/>
-+ </data>
-+ </configuration>
-+</project>
-diff --git a/junitlib/release/docs/junit-3.8.2-api.zip.external b/junitlib/release/docs/junit-3.8.2-api.zip.external
-new file mode 100644
-index 0000000..c71e217
---- /dev/null
-+++ b/junitlib/release/docs/junit-3.8.2-api.zip.external
-@@ -0,0 +1,3 @@
-+CRC:1744174913
-+URL:m2:/junit:junit:3.8.2:jar:javadoc
-+URL:http://repo1.maven.org/maven2/junit/junit/3.8.2/junit-3.8.2-javadoc.jar
-diff --git a/junitlib/release/docs/junit-4.10-api.zip.external b/junitlib/release/docs/junit-4.10-api.zip.external
-new file mode 100644
-index 0000000..6646ca3
---- /dev/null
-+++ b/junitlib/release/docs/junit-4.10-api.zip.external
-@@ -0,0 +1,3 @@
-+CRC:1619551478
-+URL:m2:/junit:junit:4.10:jar:javadoc
-+URL:http://repo1.maven.org/maven2/junit/junit/4.10/junit-4.10-javadoc.jar
-diff --git a/junitlib/release/modules/ext/junit-3.8.2.jar.external b/junitlib/release/modules/ext/junit-3.8.2.jar.external
-new file mode 100644
-index 0000000..dd52afb
---- /dev/null
-+++ b/junitlib/release/modules/ext/junit-3.8.2.jar.external
-@@ -0,0 +1,3 @@
-+CRC:857334496
-+URL:m2:/junit:junit:3.8.2:jar
-+URL:http://repo1.maven.org/maven2/junit/junit/3.8.2/junit-3.8.2.jar
-diff --git a/junitlib/src/org/netbeans/modules/junitlib/Bundle.properties b/junitlib/src/org/netbeans/modules/junitlib/Bundle.properties
-new file mode 100644
-index 0000000..bf31625
---- /dev/null
-+++ b/junitlib/src/org/netbeans/modules/junitlib/Bundle.properties
-@@ -0,0 +1,7 @@
-+OpenIDE-Module-Name=JUnit
-+OpenIDE-Module-Display-Category=Java SE
-+OpenIDE-Module-Short-Description=Bundles the JUnit testing library.
-+OpenIDE-Module-Long-Description=\
-+ Includes the JUnit unit testing library and corresponding library definitions. 3.x and 4.x versions are both included.
-+junit=JUnit 3.8.2
-+junit_4=JUnit 4.10
-diff --git a/junitlib/src/org/netbeans/modules/junitlib/junit-3.8.2.xml b/junitlib/src/org/netbeans/modules/junitlib/junit-3.8.2.xml
-new file mode 100644
-index 0000000..7a2ad09
---- /dev/null
-+++ b/junitlib/src/org/netbeans/modules/junitlib/junit-3.8.2.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!DOCTYPE library PUBLIC "-//NetBeans//DTD Library Declaration 1.0//EN" "http://www.netbeans.org/dtds/library-declaration-1_0.dtd">
-+<library version="1.0">
-+ <name>junit</name>
-+ <type>j2se</type>
-+ <localizing-bundle>org.netbeans.modules.junitlib.Bundle</localizing-bundle>
-+ <volume>
-+ <type>classpath</type>
-+ <resource>jar:nbinst://org.netbeans.modules.junitlib/modules/ext/junit-3.8.2.jar!/</resource>
-+ </volume>
-+ <volume>
-+ <type>javadoc</type>
-+ <resource>file:/usr/share/doc/junit-doc/doc/api/</resource>
-+ </volume>
-+</library>
-diff --git a/junitlib/src/org/netbeans/modules/junitlib/junit-4.10.xml b/junitlib/src/org/netbeans/modules/junitlib/junit-4.10.xml
-new file mode 100644
-index 0000000..359ad71
---- /dev/null
-+++ b/junitlib/src/org/netbeans/modules/junitlib/junit-4.10.xml
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!DOCTYPE library PUBLIC "-//NetBeans//DTD Library Declaration 1.0//EN" "http://www.netbeans.org/dtds/library-declaration-1_0.dtd">
-+<library version="1.0">
-+ <name>junit_4</name>
-+ <type>j2se</type>
-+ <localizing-bundle>org.netbeans.modules.junitlib.Bundle</localizing-bundle>
-+ <volume>
-+ <type>classpath</type>
-+ <resource>jar:nbinst://org.netbeans.libs.junit4/modules/ext/junit-4.10.jar!/</resource>
-+ </volume>
-+ <volume>
-+ <type>javadoc</type>
-+ <resource>file:/usr/share/doc/junit4/api/</resource>
-+ </volume>
-+</library>
-diff --git a/junitlib/src/org/netbeans/modules/junitlib/layer.xml b/junitlib/src/org/netbeans/modules/junitlib/layer.xml
-new file mode 100644
-index 0000000..40640f8
---- /dev/null
-+++ b/junitlib/src/org/netbeans/modules/junitlib/layer.xml
-@@ -0,0 +1,14 @@
-+<?xml version="1.0"?>
-+<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">
-+<filesystem>
-+ <folder name="org-netbeans-api-project-libraries">
-+ <folder name="Libraries">
-+ <file name="junit-3.8.2.xml" url="junit-3.8.2.xml">
-+ <attr name="displayName" bundlevalue="org.netbeans.modules.junitlib.Bundle#junit"/>
-+ </file>
-+ <file name="junit-4.10.xml" url="junit-4.10.xml">
-+ <attr name="displayName" bundlevalue="org.netbeans.modules.junitlib.Bundle#junit_4"/>
-+ </file>
-+ </folder>
-+ </folder>
-+</filesystem>
-diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
-index 910581e..10ce18f 100644
---- a/nbbuild/cluster.properties
-+++ b/nbbuild/cluster.properties
-@@ -533,6 +533,7 @@ nb.cluster.java=\
- javawebstart,\
- jellytools.java,\
- junit,\
-+ junitlib,\
- lib.nbjavac,\
- libs.cglib,\
- libs.javacapi,\
-@@ -1011,7 +1012,6 @@ nb.cluster.stableuc=\
- jconsole,\
- jmx,\
- jmx.common,\
-- junitlib,\
- kenai,\
- kenai.kit,\
- kenai.ui,\
diff --git a/debian/patches/series b/debian/patches/series
index 943613a..61e1de6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,6 +14,5 @@ netbeans-libs.jaxb.patch
netbeans-xml.jaxb.api.patch
netbeans-build.patch
netbeans-updatecenters.patch
-netbeans-include-junit.patch
reproducible-build.patch
antlr-3.5.2.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/netbeans.git
More information about the pkg-java-commits
mailing list