Skip to content
This repository was archived by the owner on Sep 26, 2020. It is now read-only.

Commit 12ffaee

Browse files
tbroyertbroyer
committed
Fix dependencies (htmlunit vs. xercesImpl, typo in protobuf)
1 parent bce649e commit 12ffaee

File tree

4 files changed

+48
-44
lines changed

4 files changed

+48
-44
lines changed

‎dev/gwt-compiler/pom.xml

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -53,20 +53,6 @@
5353
</build>
5454

5555
<dependencies>
56-
<dependency>
57-
<groupId>net.sourceforge.htmlunit</groupId>
58-
<artifactId>htmlunit</artifactId>
59-
<exclusions>
60-
<exclusion>
61-
<groupId>xalan</groupId>
62-
<artifactId>xalan</artifactId>
63-
</exclusion>
64-
<exclusion>
65-
<groupId>xerces</groupId>
66-
<artifactId>xercesImpl</artifactId>
67-
</exclusion>
68-
</exclusions>
69-
</dependency>
7056
<dependency>
7157
<groupId>com.google.gwt.util</groupId>
7258
<artifactId>gwt-shared</artifactId>
@@ -117,29 +103,7 @@
117103
<groupId>ant</groupId>
118104
<artifactId>ant</artifactId>
119105
</dependency>
120-
<!--
121-
<dependency>
122-
<groupId>xerces</groupId>
123-
<artifactId>xercesImpl</artifactId>
124-
<version>2.9.1</version>
125-
<scope>system</scope>
126-
<systemPath>${GWT_TOOLS}/lib/xerces/xerces-2_9_1/xercesImpl-NoMetaInf.jar</systemPath>
127-
</dependency>
128-
<dependency>
129-
<groupId>xerces</groupId>
130-
<artifactId>serializer</artifactId>
131-
<version>2.9.1</version>
132-
<scope>system</scope>
133-
<systemPath>${GWT_TOOLS}/lib/xerces/xerces-2_9_1/serializer.jar</systemPath>
134-
</dependency>
135-
<dependency>
136-
<groupId>xml-apis</groupId>
137-
<artifactId>xml-apis</artifactId>
138-
<version>2.9.1</version>
139-
<scope>system</scope>
140-
<systemPath>${GWT_TOOLS}/lib/xerces/xerces-2_9_1/xml-apis.jar</systemPath>
141-
</dependency>
142-
-->
106+
143107
<dependency>
144108
<groupId>junit</groupId>
145109
<artifactId>junit</artifactId>

‎dev/gwt-dev-ext/pom.xml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,20 @@
3636
<groupId>com.google.guava</groupId>
3737
<artifactId>guava</artifactId>
3838
</dependency>
39+
40+
<dependency>
41+
<groupId>junit</groupId>
42+
<artifactId>junit</artifactId>
43+
</dependency>
3944
<dependency>
4045
<groupId>net.sourceforge.htmlunit</groupId>
4146
<artifactId>htmlunit</artifactId>
47+
<scope>test</scope>
4248
</dependency>
4349
<dependency>
4450
<groupId>net.sourceforge.htmlunit</groupId>
4551
<artifactId>htmlunit-core-js</artifactId>
46-
</dependency>
47-
48-
<dependency>
49-
<groupId>junit</groupId>
50-
<artifactId>junit</artifactId>
52+
<scope>test</scope>
5153
</dependency>
5254
</dependencies>
5355
</project>

‎dev/gwt-devmode/pom.xml

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,47 @@
3838
<artifactId>guava</artifactId>
3939
</dependency>
4040
<dependency>
41-
<groupId>com.google.protobug</groupId>
41+
<groupId>com.google.protobuf</groupId>
4242
<artifactId>protobuf-java</artifactId>
4343
</dependency>
44+
<dependency>
45+
<groupId>net.sourceforge.htmlunit</groupId>
46+
<artifactId>htmlunit</artifactId>
47+
</dependency>
48+
<dependency>
49+
<groupId>net.sourceforge.htmlunit</groupId>
50+
<artifactId>htmlunit-core-js</artifactId>
51+
<exclusions>
52+
<!-- See: http://old.nabble.com/-HtmlUnit%2D-Not-depending-on-xercesImpl.jar-td25053687.html -->
53+
<exclusion>
54+
<groupId>xerces</groupId>
55+
<artifactId>xerces</artifactId>
56+
</exclusion>
57+
</exclusions>
58+
</dependency>
59+
<dependency>
60+
<groupId>xerces</groupId>
61+
<artifactId>xercesImpl</artifactId>
62+
<version>2.9.1</version>
63+
<scope>system</scope>
64+
<systemPath>${GWT_TOOLS}/lib/xerces/xerces-2_9_1/xercesImpl-NoMetaInf.jar</systemPath>
65+
</dependency>
66+
<!--
67+
<dependency>
68+
<groupId>xalan</groupId>
69+
<artifactId>serializer</artifactId>
70+
<version>2.9.1</version>
71+
<scope>system</scope>
72+
<systemPath>${GWT_TOOLS}/lib/xerces/xerces-2_9_1/serializer.jar</systemPath>
73+
</dependency>
74+
<dependency>
75+
<groupId>xml-apis</groupId>
76+
<artifactId>xml-apis</artifactId>
77+
<version>2.9.1</version>
78+
<scope>system</scope>
79+
<systemPath>${GWT_TOOLS}/lib/xerces/xerces-2_9_1/xml-apis.jar</systemPath>
80+
</dependency>
81+
-->
4482

4583
<dependency>
4684
<groupId>junit</groupId>

‎dev/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<systemPath>${GWT_TOOLS}/lib/jscomp/r1649/compiler-rebased.jar</systemPath>
4747
</dependency>
4848
<dependency>
49-
<groupId>com.google.protobug</groupId>
49+
<groupId>com.google.protobuf</groupId>
5050
<artifactId>protobuf-java</artifactId>
5151
<version>2.2.0-gwt-rebased</version>
5252
<scope>system</scope>

0 commit comments

Comments
 (0)