This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository netbeans.
commit 73207b2c601b4754120002ece54fbacccc36dfc0 Author: Markus Koschany <[email protected]> Date: Tue Jun 16 13:58:27 2015 +0200 Move libs.junit4 module to java cluster --- debian/patches/netbeans-cluster-properties.patch | 57 ++++++++++++++---------- debian/patches/netbeans-include-junit.patch | 28 ++++++------ debian/patches/netbeans-slf4j.dummy.patch | 4 +- 3 files changed, 49 insertions(+), 40 deletions(-) diff --git a/debian/patches/netbeans-cluster-properties.patch b/debian/patches/netbeans-cluster-properties.patch index dd10ac6..1f28089 100644 --- a/debian/patches/netbeans-cluster-properties.patch +++ b/debian/patches/netbeans-cluster-properties.patch @@ -7,11 +7,11 @@ are not in Debian yet or cause other build failures. Forwarded: not-needed --- - nbbuild/cluster.properties | 97 +--------------------------------------------- - 1 file changed, 2 insertions(+), 95 deletions(-) + nbbuild/cluster.properties | 99 ++-------------------------------------------- + 1 file changed, 3 insertions(+), 96 deletions(-) diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties -index 27fb4ec..1da0278 100644 +index 27fb4ec..d845f9b 100644 --- a/nbbuild/cluster.properties +++ b/nbbuild/cluster.properties @@ -104,10 +104,8 @@ clusters.config.java.list=\ @@ -25,7 +25,15 @@ index 27fb4ec..1da0278 100644 nb.cluster.nb clusters.config.enterprise.list=\ -@@ -267,10 +265,6 @@ nb.cluster.ide=\ +@@ -211,6 +209,7 @@ nb.cluster.platform=\ + libs.jna,\ + libs.jna.platform,\ + libs.jsr223,\ ++ libs.junit4,\ + libs.osgi,\ + libs.testng,\ + masterfs,\ +@@ -267,10 +266,6 @@ nb.cluster.ide=\ api.debugger,\ api.java.classpath,\ api.xml,\ @@ -36,7 +44,7 @@ index 27fb4ec..1da0278 100644 c.jcraft.jsch,\ c.jcraft.jzlib,\ code.analysis,\ -@@ -329,21 +323,15 @@ nb.cluster.ide=\ +@@ -329,21 +324,15 @@ nb.cluster.ide=\ editor.util,\ extbrowser,\ extexecution,\ @@ -58,7 +66,7 @@ index 27fb4ec..1da0278 100644 hudson,\ hudson.git,\ hudson.mercurial,\ -@@ -354,13 +342,6 @@ nb.cluster.ide=\ +@@ -354,13 +343,6 @@ nb.cluster.ide=\ image,\ javaewah.dummy,\ javascript2.debug,\ @@ -72,7 +80,7 @@ index 27fb4ec..1da0278 100644 jellytools.ide,\ jumpto,\ languages,\ -@@ -381,17 +362,13 @@ nb.cluster.ide=\ +@@ -381,17 +363,13 @@ nb.cluster.ide=\ libs.json_simple,\ libs.jvyamlb,\ libs.lucene,\ @@ -90,7 +98,7 @@ index 27fb4ec..1da0278 100644 notifications,\ o.apache.commons.codec,\ o.apache.commons.httpclient,\ -@@ -400,28 +377,8 @@ nb.cluster.ide=\ +@@ -400,28 +378,8 @@ nb.cluster.ide=\ o.apache.commons.logging,\ o.apache.ws.commons.util,\ o.apache.xml.resolver,\ @@ -119,7 +127,7 @@ index 27fb4ec..1da0278 100644 o.n.swing.dirchooser,\ o.openidex.util,\ options.editor,\ -@@ -446,7 +403,6 @@ nb.cluster.ide=\ +@@ -446,7 +404,6 @@ nb.cluster.ide=\ spellchecker.apimodule,\ spellchecker.bindings.htmlxml,\ spellchecker.bindings.properties,\ @@ -127,7 +135,7 @@ index 27fb4ec..1da0278 100644 spellchecker.kit,\ spi.debugger.ui,\ spi.editor.hints,\ -@@ -504,7 +460,6 @@ nb.cluster.java.depends=\ +@@ -504,7 +461,6 @@ nb.cluster.java.depends=\ nb.cluster.ide,\ nb.cluster.extide,\ nb.cluster.platform,\ @@ -135,7 +143,7 @@ index 27fb4ec..1da0278 100644 nb.cluster.harness nb.cluster.java=\ ant.browsetask,\ -@@ -514,7 +469,6 @@ nb.cluster.java=\ +@@ -514,7 +470,6 @@ nb.cluster.java=\ ant.kit,\ api.debugger.jpda,\ api.java,\ @@ -143,7 +151,7 @@ index 27fb4ec..1da0278 100644 beans,\ classfile,\ dbschema,\ -@@ -532,21 +486,15 @@ nb.cluster.java=\ +@@ -532,21 +487,15 @@ nb.cluster.java=\ form.kit,\ form.nb,\ form.refactoring,\ @@ -165,7 +173,7 @@ index 27fb4ec..1da0278 100644 j2ee.persistenceapi,\ java.api.common,\ java.debug,\ -@@ -588,24 +536,6 @@ nb.cluster.java=\ +@@ -588,24 +537,6 @@ nb.cluster.java=\ libs.cglib,\ libs.javacapi,\ libs.javacimpl,\ @@ -190,7 +198,7 @@ index 27fb4ec..1da0278 100644 nashorn.execution,\ o.jdesktop.beansbinding,\ performance,\ -@@ -615,13 +545,8 @@ nb.cluster.java=\ +@@ -615,13 +546,8 @@ nb.cluster.java=\ refactoring.java,\ spellchecker.bindings.java,\ spi.java.hints,\ @@ -204,7 +212,7 @@ index 27fb4ec..1da0278 100644 whitelist,\ xml.jaxb,\ xml.tools.java -@@ -639,16 +564,12 @@ nb.cluster.apisupport.depends=\ +@@ -639,16 +565,12 @@ nb.cluster.apisupport.depends=\ nb.cluster.apisupport=\ apisupport.ant,\ apisupport.crudsample,\ @@ -222,7 +230,7 @@ index 27fb4ec..1da0278 100644 nb.cluster.enterprise.dir=enterprise nb.cluster.enterprise.depends=\ -@@ -662,7 +583,6 @@ nb.cluster.enterprise.depends=\ +@@ -662,7 +584,6 @@ nb.cluster.enterprise.depends=\ nb.cluster.harness nb.cluster.enterprise=\ api.web.webmodule,\ @@ -230,7 +238,7 @@ index 27fb4ec..1da0278 100644 cloud.amazon,\ cloud.common,\ el.lexer,\ -@@ -710,9 +630,6 @@ nb.cluster.enterprise=\ +@@ -710,9 +631,6 @@ nb.cluster.enterprise=\ libs.glassfish.sdk,\ libs.glassfish_logging,\ libs.jstl,\ @@ -240,7 +248,7 @@ index 27fb4ec..1da0278 100644 performance.javaee,\ performance.scripting,\ performance.web,\ -@@ -789,7 +706,6 @@ nb.cluster.nb.depends=\ +@@ -789,7 +707,6 @@ nb.cluster.nb.depends=\ nb.cluster.harness nb.cluster.nb=\ autoupdate.pluginimporter,\ @@ -248,7 +256,7 @@ index 27fb4ec..1da0278 100644 deadlock.detector,\ ide.branding,\ ide.branding.kit,\ -@@ -819,7 +735,6 @@ nb.cluster.profiler=\ +@@ -819,7 +736,6 @@ nb.cluster.profiler=\ lib.profiler.charts,\ lib.profiler.common,\ lib.profiler.ui,\ @@ -256,7 +264,7 @@ index 27fb4ec..1da0278 100644 profiler,\ profiler.api,\ profiler.attach,\ -@@ -905,9 +820,7 @@ nb.cluster.groovy=\ +@@ -905,9 +821,7 @@ nb.cluster.groovy=\ groovy.refactoring,\ groovy.samples,\ groovy.support,\ @@ -267,7 +275,7 @@ index 27fb4ec..1da0278 100644 nb.cluster.mobility.dir=mobility nb.cluster.mobility.depends=\ nb.cluster.platform,\ -@@ -1042,8 +955,6 @@ nb.cluster.jira=\ +@@ -1042,8 +956,6 @@ nb.cluster.jira=\ o.apache.axis,\ o.apache.commons.discovery,\ o.codehaus.jettison,\ @@ -276,7 +284,7 @@ index 27fb4ec..1da0278 100644 o.joda.time nb.cluster.odcs.dir=extra -@@ -1077,7 +988,6 @@ nb.cluster.stableuc.depends=${clusters.config.full.list} +@@ -1077,7 +989,6 @@ nb.cluster.stableuc.depends=${clusters.config.full.list} nb.cluster.stableuc=\ apisupport.apidocs,\ avatar_js.project,\ @@ -284,7 +292,7 @@ index 27fb4ec..1da0278 100644 cloud.oracle,\ db.mysql.sakila,\ deployment.deviceanywhere,\ -@@ -1103,7 +1013,6 @@ nb.cluster.stableuc=\ +@@ -1103,16 +1014,13 @@ nb.cluster.stableuc=\ junitlib,\ kenai,\ kenai.kit,\ @@ -292,7 +300,8 @@ index 27fb4ec..1da0278 100644 kenai.ui,\ lib.cvsclient,\ libs.aguiswinglayout,\ -@@ -1112,7 +1021,6 @@ nb.cluster.stableuc=\ + libs.findbugs,\ +- libs.junit4,\ libs.oracle.cloud,\ libs.ppawtlayout,\ loadgenerator,\ diff --git a/debian/patches/netbeans-include-junit.patch b/debian/patches/netbeans-include-junit.patch index 98ecb87..85af66c 100644 --- a/debian/patches/netbeans-include-junit.patch +++ b/debian/patches/netbeans-include-junit.patch @@ -11,16 +11,16 @@ 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/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 + + 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 ++ + .../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(-) @@ -276,9 +276,9 @@ 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.10-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.10-license.txt new file mode 100644 -index 0000000..bbf82f5 +index 0000000..3029a93 --- /dev/null +++ b/junitlib/external/junit-4.10-license.txt @@ -0,0 +1,220 @@ @@ -516,7 +516,7 @@ index 0000000..e49c3d6 + diff --git a/junitlib/nbproject/project.properties b/junitlib/nbproject/project.properties new file mode 100644 -index 0000000..af6fe52 +index 0000000..015eabf --- /dev/null +++ b/junitlib/nbproject/project.properties @@ -0,0 +1,7 @@ @@ -560,9 +560,9 @@ 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.10-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.10-api.zip.external new file mode 100644 -index 0000000..083c169 +index 0000000..7741524 --- /dev/null +++ b/junitlib/release/docs/junit-4.10-api.zip.external @@ -0,0 +1,3 @@ @@ -580,7 +580,7 @@ index 0000000..dd52afb +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..6681d08 +index 0000000..bf31625 --- /dev/null +++ b/junitlib/src/org/netbeans/modules/junitlib/Bundle.properties @@ -0,0 +1,7 @@ @@ -614,7 +614,7 @@ index 0000000..7a2ad09 +</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..9a3ac3f +index 0000000..359ad71 --- /dev/null +++ b/junitlib/src/org/netbeans/modules/junitlib/junit-4.10.xml @@ -0,0 +1,15 @@ @@ -635,7 +635,7 @@ index 0000000..9a3ac3f +</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..d7fcba5 +index 0000000..40640f8 --- /dev/null +++ b/junitlib/src/org/netbeans/modules/junitlib/layer.xml @@ -0,0 +1,14 @@ @@ -654,10 +654,10 @@ index 0000000..d7fcba5 + </folder> +</filesystem> diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties -index 910581e..10ce18f 100644 +index cc6bf6e..f1a85b4 100644 --- a/nbbuild/cluster.properties +++ b/nbbuild/cluster.properties -@@ -533,6 +533,7 @@ nb.cluster.java=\ +@@ -534,6 +534,7 @@ nb.cluster.java=\ javawebstart,\ jellytools.java,\ junit,\ @@ -665,7 +665,7 @@ index 910581e..10ce18f 100644 lib.nbjavac,\ libs.cglib,\ libs.javacapi,\ -@@ -1011,7 +1012,6 @@ nb.cluster.stableuc=\ +@@ -1012,7 +1013,6 @@ nb.cluster.stableuc=\ jconsole,\ jmx,\ jmx.common,\ diff --git a/debian/patches/netbeans-slf4j.dummy.patch b/debian/patches/netbeans-slf4j.dummy.patch index 64ec842..30438d6 100644 --- a/debian/patches/netbeans-slf4j.dummy.patch +++ b/debian/patches/netbeans-slf4j.dummy.patch @@ -26,10 +26,10 @@ Forwarded: not-needed create mode 100644 slf4j.dummy/nbproject/project.xml diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties -index 1da0278..910581e 100644 +index d845f9b..cc6bf6e 100644 --- a/nbbuild/cluster.properties +++ b/nbbuild/cluster.properties -@@ -341,6 +341,7 @@ nb.cluster.ide=\ +@@ -342,6 +342,7 @@ nb.cluster.ide=\ ide.kit,\ image,\ javaewah.dummy,\ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/netbeans.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
