[incubator-netbeans] branch master updated: Fix nbbuild + libs.xerces project.xml

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

matthiasblaesing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git


The following commit(s) were added to refs/heads/master by this push:
     new f2e3a16  Fix nbbuild + libs.xerces project.xml
f2e3a16 is described below

commit f2e3a1633f6a6cdaa41c7de6e24fb4b4ab94f049
Author: Matthias Bläsing <mb...@doppel-helix.eu>
AuthorDate: Fri Nov 3 22:43:29 2017 +0100

    Fix nbbuild + libs.xerces project.xml
---
 libs.xerces/nbproject/project.xml                                    | 2 +-
 nbbuild/test/unit/src/org/netbeans/nbbuild/ModuleListParserTest.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs.xerces/nbproject/project.xml b/libs.xerces/nbproject/project.xml
index 1b8b20b..1cc04d5 100644
--- a/libs.xerces/nbproject/project.xml
+++ b/libs.xerces/nbproject/project.xml
@@ -30,7 +30,7 @@
             </public-packages>
             <class-path-extension>
                 <runtime-relative-path>ext/xerces-2.8.0.jar</runtime-relative-path>
-                <binary-origin>external/xerces-2.8.0.jar</binary-origin>
+                <binary-origin>external/xercesImpl-2.8.0.jar</binary-origin>
             </class-path-extension>
         </data>
     </configuration>
diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/ModuleListParserTest.java b/nbbuild/test/unit/src/org/netbeans/nbbuild/ModuleListParserTest.java
index e776405..6c34cd2 100644
--- a/nbbuild/test/unit/src/org/netbeans/nbbuild/ModuleListParserTest.java
+++ b/nbbuild/test/unit/src/org/netbeans/nbbuild/ModuleListParserTest.java
@@ -91,7 +91,7 @@ public class ModuleListParserTest extends TestBase {
         assertEquals("org.netbeans.libs.xerces", e.getCnb());
         assertEquals("unknown module put in extra cluster by default", file(build, "extra/modules/org-netbeans-libs-xerces.jar"), e.getJar());
         assertEquals("correct CP extensions (using <binary-origin> and relative paths)",
-            Collections.singletonList(file(nball, "libs.xerces/external/xerces-2.8.0.jar")),
+            Collections.singletonList(file(nball, "libs.xerces/external/xercesImpl-2.8.0.jar")),
             Arrays.asList(e.getClassPathExtensions()));
         e = p.findByCodeNameBase("org.netbeans.swing.tabcontrol");
         assertNotNull("found module in a subsubdir", e);

-- 
To stop receiving notification emails like this one, please contact
['"commits@netbeans.apache.org" <co...@netbeans.apache.org>'].