Skip to content

Commit e55e7a1

Browse files
committed
Merge pull request #15 from innokenty/master
Revert adding equals() and hashCode() to beans
2 parents 63fc871 + b910cd4 commit e55e7a1

File tree

3 files changed

+1
-24
lines changed

3 files changed

+1
-24
lines changed

config/pom.xml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,11 @@
1515
<plugin>
1616
<groupId>org.jvnet.jaxb2.maven2</groupId>
1717
<artifactId>maven-jaxb2-plugin</artifactId>
18-
<configuration>
19-
<args>
20-
<arg>-Xinheritance</arg>
21-
<arg>-Xvalue-constructor</arg>
22-
<arg>-Xequals</arg>
23-
<arg>-XhashCode</arg>
24-
</args>
25-
</configuration>
2618
</plugin>
2719
</plugins>
2820
</build>
2921

3022
<dependencies>
31-
<!-- Commons -->
3223
<dependency>
3324
<groupId>commons-io</groupId>
3425
<artifactId>commons-io</artifactId>
@@ -43,13 +34,6 @@
4334
<version>1.10</version>
4435
</dependency>
4536

46-
<!-- JAXB runtime -->
47-
<dependency>
48-
<groupId>org.jvnet.jaxb2_commons</groupId>
49-
<artifactId>jaxb2-basics-runtime</artifactId>
50-
<version>0.9.5</version>
51-
</dependency>
52-
5337
<!-- Tests -->
5438
<dependency>
5539
<groupId>junit</groupId>

config/src/main/resources/xsd/bindings.xjb

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
77
xsi:schemaLocation="http://java.sun.com/xml/ns/jaxb http://java.sun.com/xml/ns/jaxb/bindingschema_2_1.xsd"
88
xmlns:inheritance="http://jaxb2-commons.dev.java.net/basic/inheritance"
9-
xmlns:equals="http://jaxb2-commons.dev.java.net/basic/equals"
10-
xmlns:hashcode="http://jaxb2-commons.dev.java.net/basic/hashCode"
119
jaxb:extensionBindingPrefixes="xjc annox"
1210
schemaLocation="config.xsd"
1311
version="2.1">
@@ -36,11 +34,6 @@
3634
<inheritance:implements>ru.qatools.gridrouter.config.WithCount</inheritance:implements>
3735
</jaxb:bindings>
3836

39-
<jaxb:bindings node="//xs:complexType[@name='Host']/xs:attribute[@name = 'count']">
40-
<equals:ignored/>
41-
<hashcode:ignored/>
42-
</jaxb:bindings>
43-
4437
<jaxb:globalBindings>
4538
<jaxb:serializable/>
4639
<xjc:simple/>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@
153153
<plugin>
154154
<groupId>org.jvnet.jaxb2_commons</groupId>
155155
<artifactId>jaxb2-basics</artifactId>
156-
<version>0.9.5</version>
156+
<version>0.9.4</version>
157157
</plugin>
158158
<plugin>
159159
<groupId>org.jvnet.jaxb2_commons</groupId>

0 commit comments

Comments
 (0)