[netbeans] 06/10: Use junit4 4.10
Markus Koschany
apo-guest at moszumanska.debian.org
Tue Jun 16 15:07:33 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 7d2524555073e0125369b57d0e186c2c6bea380a
Author: Markus Koschany <apo at gambaru.de>
Date: Tue Jun 16 13:31:54 2015 +0200
Use junit4 4.10
---
debian/patches/netbeans-include-junit.patch | 42 ++++++++++++++---------------
1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/debian/patches/netbeans-include-junit.patch b/debian/patches/netbeans-include-junit.patch
index 930bf4c..98ecb87 100644
--- a/debian/patches/netbeans-include-junit.patch
+++ b/debian/patches/netbeans-include-junit.patch
@@ -11,31 +11,31 @@ Forwarded: not-needed
---
junitlib/build.xml | 6 +
junitlib/external/junit-3.8.2-license.txt | 220 +++++++++++++++++++++
- junitlib/external/junit-4.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.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.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.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.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.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
@@ -276,19 +276,19 @@ index 0000000..75e380c
+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.8.2-license.txt b/junitlib/external/junit-4.8.2-license.txt
+diff --git a/junitlib/external/junit-4.10-license.txt b/junitlib/external/junit-4.8.2-license.txt
new file mode 100644
index 0000000..bbf82f5
--- /dev/null
-+++ b/junitlib/external/junit-4.8.2-license.txt
++++ b/junitlib/external/junit-4.10-license.txt
@@ -0,0 +1,220 @@
+Name: JUnit
-+Version: 4.8.2
++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.8.2-api.zip, junit-4.8.2-src.jar
++Files: junit-4.10-api.zip, junit-4.8.2-src.jar
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC
+LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
@@ -524,8 +524,8 @@ index 0000000..af6fe52
+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.8.2-api.zip=docs/junit-4.8.2-api.zip
-+#release.external/junit-4.8.2-src.jar=docs/junit-4.8.2-src.jar
++#release.external/junit-4.10-api.zip=docs/junit-4.8.2-api.zip
++#release.external/junit-4.10-src.jar=docs/junit-4.8.2-src.jar
+nbm.target.cluster=java
diff --git a/junitlib/nbproject/project.xml b/junitlib/nbproject/project.xml
new file mode 100644
@@ -560,15 +560,15 @@ index 0000000..c71e217
+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.8.2-api.zip.external b/junitlib/release/docs/junit-4.8.2-api.zip.external
+diff --git a/junitlib/release/docs/junit-4.10-api.zip.external b/junitlib/release/docs/junit-4.8.2-api.zip.external
new file mode 100644
index 0000000..083c169
--- /dev/null
-+++ b/junitlib/release/docs/junit-4.8.2-api.zip.external
++++ b/junitlib/release/docs/junit-4.10-api.zip.external
@@ -0,0 +1,3 @@
+CRC:1619551478
-+URL:m2:/junit:junit:4.8.2:jar:javadoc
-+URL:http://repo1.maven.org/maven2/junit/junit/4.8.2/junit-4.8.2-javadoc.jar
++URL:m2:/junit:junit:4.10:jar:javadoc
++URL:http://repo1.maven.org/maven2/junit/junit/4.10/junit-4.8.2-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
@@ -590,7 +590,7 @@ index 0000000..6681d08
+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.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
@@ -612,11 +612,11 @@ index 0000000..7a2ad09
+ <resource>file:/usr/share/doc/junit-doc/doc/api/</resource>
+ </volume>
+</library>
-diff --git a/junitlib/src/org/netbeans/modules/junitlib/junit-4.8.2.xml b/junitlib/src/org/netbeans/modules/junitlib/junit-4.8.2.xml
+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..9a3ac3f
--- /dev/null
-+++ b/junitlib/src/org/netbeans/modules/junitlib/junit-4.8.2.xml
++++ 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">
@@ -626,7 +626,7 @@ index 0000000..9a3ac3f
+ <localizing-bundle>org.netbeans.modules.junitlib.Bundle</localizing-bundle>
+ <volume>
+ <type>classpath</type>
-+ <resource>jar:nbinst://org.netbeans.libs.junit4/modules/ext/junit-4.8.2.jar!/</resource>
++ <resource>jar:nbinst://org.netbeans.libs.junit4/modules/ext/junit-4.10.jar!/</resource>
+ </volume>
+ <volume>
+ <type>javadoc</type>
@@ -647,7 +647,7 @@ index 0000000..d7fcba5
+ <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.8.2.xml" url="junit-4.8.2.xml">
++ <file name="junit-4.10.xml" url="junit-4.10.xml">
+ <attr name="displayName" bundlevalue="org.netbeans.modules.junitlib.Bundle#junit_4"/>
+ </file>
+ </folder>
--
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