[netbeans] 07/13: Readd xml.jaxb module to cluster properties.

Markus Koschany apo-guest at moszumanska.debian.org
Thu Jun 11 22:38:19 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 43537414f404fb2a43a346c16f26526c7e4621fe
Author: Markus Koschany <apo at gambaru.de>
Date:   Thu Jun 11 22:15:54 2015 +0200

    Readd xml.jaxb module to cluster properties.
---
 debian/patches/netbeans-cluster-properties.patch | 34 +++++++++++-------------
 debian/patches/netbeans-html.parser.patch        |  2 +-
 debian/patches/netbeans-httpserver.patch         |  2 +-
 3 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/debian/patches/netbeans-cluster-properties.patch b/debian/patches/netbeans-cluster-properties.patch
index 2307e62..662c203 100644
--- a/debian/patches/netbeans-cluster-properties.patch
+++ b/debian/patches/netbeans-cluster-properties.patch
@@ -3,11 +3,11 @@ Date: Sun, 7 Jun 2015 13:53:31 +0200
 Subject: netbeans cluster properties
 
 ---
- nbbuild/cluster.properties | 99 +---------------------------------------------
- 1 file changed, 2 insertions(+), 97 deletions(-)
+ nbbuild/cluster.properties | 98 +---------------------------------------------
+ 1 file changed, 2 insertions(+), 96 deletions(-)
 
 diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
-index 27fb4ec..fcfb1a9 100644
+index 27fb4ec..150b544 100644
 --- a/nbbuild/cluster.properties
 +++ b/nbbuild/cluster.properties
 @@ -104,10 +104,8 @@ clusters.config.java.list=\
@@ -182,7 +182,7 @@ index 27fb4ec..fcfb1a9 100644
          o.jdesktop.beansbinding,\
          performance,\
          performance.java,\
-@@ -615,15 +544,9 @@ nb.cluster.java=\
+@@ -615,13 +544,8 @@ nb.cluster.java=\
          refactoring.java,\
          spellchecker.bindings.java,\
          spi.java.hints,\
@@ -194,11 +194,9 @@ index 27fb4ec..fcfb1a9 100644
 -        websvc.jaxws21api,\
 -        websvc.saas.codegen.java,\
          whitelist,\
--        xml.jaxb,\
+         xml.jaxb,\
          xml.tools.java
- validation.nb.cluster.java=\
-         java.hints,\
-@@ -639,16 +562,12 @@ nb.cluster.apisupport.depends=\
+@@ -639,16 +563,12 @@ nb.cluster.apisupport.depends=\
  nb.cluster.apisupport=\
          apisupport.ant,\
          apisupport.crudsample,\
@@ -216,7 +214,7 @@ index 27fb4ec..fcfb1a9 100644
  
  nb.cluster.enterprise.dir=enterprise
  nb.cluster.enterprise.depends=\
-@@ -662,7 +581,6 @@ nb.cluster.enterprise.depends=\
+@@ -662,7 +582,6 @@ nb.cluster.enterprise.depends=\
          nb.cluster.harness
  nb.cluster.enterprise=\
          api.web.webmodule,\
@@ -224,7 +222,7 @@ index 27fb4ec..fcfb1a9 100644
          cloud.amazon,\
          cloud.common,\
          el.lexer,\
-@@ -710,9 +628,6 @@ nb.cluster.enterprise=\
+@@ -710,9 +629,6 @@ nb.cluster.enterprise=\
          libs.glassfish.sdk,\
          libs.glassfish_logging,\
          libs.jstl,\
@@ -234,7 +232,7 @@ index 27fb4ec..fcfb1a9 100644
          performance.javaee,\
          performance.scripting,\
          performance.web,\
-@@ -789,7 +704,6 @@ nb.cluster.nb.depends=\
+@@ -789,7 +705,6 @@ nb.cluster.nb.depends=\
          nb.cluster.harness
  nb.cluster.nb=\
          autoupdate.pluginimporter,\
@@ -242,7 +240,7 @@ index 27fb4ec..fcfb1a9 100644
          deadlock.detector,\
          ide.branding,\
          ide.branding.kit,\
-@@ -819,7 +733,6 @@ nb.cluster.profiler=\
+@@ -819,7 +734,6 @@ nb.cluster.profiler=\
          lib.profiler.charts,\
          lib.profiler.common,\
          lib.profiler.ui,\
@@ -250,7 +248,7 @@ index 27fb4ec..fcfb1a9 100644
          profiler,\
          profiler.api,\
          profiler.attach,\
-@@ -905,9 +818,7 @@ nb.cluster.groovy=\
+@@ -905,9 +819,7 @@ nb.cluster.groovy=\
          groovy.refactoring,\
          groovy.samples,\
          groovy.support,\
@@ -261,7 +259,7 @@ index 27fb4ec..fcfb1a9 100644
  nb.cluster.mobility.dir=mobility
  nb.cluster.mobility.depends=\
          nb.cluster.platform,\
-@@ -1042,8 +953,6 @@ nb.cluster.jira=\
+@@ -1042,8 +954,6 @@ nb.cluster.jira=\
          o.apache.axis,\
          o.apache.commons.discovery,\
          o.codehaus.jettison,\
@@ -270,7 +268,7 @@ index 27fb4ec..fcfb1a9 100644
          o.joda.time
  
  nb.cluster.odcs.dir=extra
-@@ -1077,7 +986,6 @@ nb.cluster.stableuc.depends=${clusters.config.full.list}
+@@ -1077,7 +987,6 @@ nb.cluster.stableuc.depends=${clusters.config.full.list}
  nb.cluster.stableuc=\
          apisupport.apidocs,\
          avatar_js.project,\
@@ -278,7 +276,7 @@ index 27fb4ec..fcfb1a9 100644
          cloud.oracle,\
          db.mysql.sakila,\
          deployment.deviceanywhere,\
-@@ -1103,7 +1011,6 @@ nb.cluster.stableuc=\
+@@ -1103,7 +1012,6 @@ nb.cluster.stableuc=\
          junitlib,\
          kenai,\
          kenai.kit,\
@@ -286,7 +284,7 @@ index 27fb4ec..fcfb1a9 100644
          kenai.ui,\
          lib.cvsclient,\
          libs.aguiswinglayout,\
-@@ -1112,7 +1019,6 @@ nb.cluster.stableuc=\
+@@ -1112,7 +1020,6 @@ nb.cluster.stableuc=\
          libs.oracle.cloud,\
          libs.ppawtlayout,\
          loadgenerator,\
@@ -294,7 +292,7 @@ index 27fb4ec..fcfb1a9 100644
          mobility.antext,\
          mobility.cldcplatform.catalog,\
          mobility.deployment.ftpscp,\
-@@ -1187,7 +1093,6 @@ nb.cluster.betauc=\
+@@ -1187,7 +1094,6 @@ nb.cluster.betauc=\
          contrib/modulemanager,\
          contrib/quickfilechooser,\
          contrib/selenium,\
diff --git a/debian/patches/netbeans-html.parser.patch b/debian/patches/netbeans-html.parser.patch
index 5cfb215..3beb37b 100644
--- a/debian/patches/netbeans-html.parser.patch
+++ b/debian/patches/netbeans-html.parser.patch
@@ -30,7 +30,7 @@ index 8ae93f4..91e0cc6 100644
                      <code-name-base>org.netbeans.modules.image</code-name-base>
                      <run-dependency>
 diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
-index fcfb1a9..285abc9 100644
+index 150b544..0c9cd27 100644
 --- a/nbbuild/cluster.properties
 +++ b/nbbuild/cluster.properties
 @@ -333,6 +333,7 @@ nb.cluster.ide=\
diff --git a/debian/patches/netbeans-httpserver.patch b/debian/patches/netbeans-httpserver.patch
index b558cf5..03d2ad4 100644
--- a/debian/patches/netbeans-httpserver.patch
+++ b/debian/patches/netbeans-httpserver.patch
@@ -31,7 +31,7 @@ index 1c3c371..36c6ca5 100644
                      <code-name-base>org.netbeans.modules.jumpto</code-name-base>
                      <run-dependency>
 diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
-index 285abc9..fcfb1a9 100644
+index 0c9cd27..150b544 100644
 --- a/nbbuild/cluster.properties
 +++ b/nbbuild/cluster.properties
 @@ -333,7 +333,6 @@ nb.cluster.ide=\

-- 
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