Skip to content

Commit

Permalink
Swapped old jaxb maven plugin for Mojohaus' and fixed a couple of mis…
Browse files Browse the repository at this point in the history 
…sed warnings
  • Loading branch information
@Bohlski
Bohlski committed Aug 6, 2021
1 parent d8ae8ce commit 259a8c0
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 77 deletions.
4 changes: 2 additions & 2 deletions .../src/test/java/org/bitrepository/access/getchecksums/GetChecksumsClientComponentTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -280,8 +280,8 @@ public void testPaging() throws Exception {
Date timestamp3 = new Date();
Date timestamp2 = new Date(timestamp3.getTime() - 100);
Date timestamp1 = new Date(timestamp3.getTime() - 1000);
ContributorQuery query1 = new ContributorQuery(PILLAR1_ID, timestamp1, timestamp2, new Integer(1));
ContributorQuery query2 = new ContributorQuery(PILLAR2_ID, timestamp2, timestamp3, new Integer(2));
ContributorQuery query1 = new ContributorQuery(PILLAR1_ID, timestamp1, timestamp2, 1);
ContributorQuery query2 = new ContributorQuery(PILLAR2_ID, timestamp2, timestamp3, 2);
getChecksumsClient.getChecksums(collectionID, new ContributorQuery[]{query1, query2}, null, null, null,
testEventHandler, null);

Expand Down
4 changes: 2 additions & 2 deletions ...ient/src/test/java/org/bitrepository/access/getfileids/GetFileIDsClientComponentTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -308,8 +308,8 @@ public void testPaging() throws Exception {
Date timestamp3 = new Date();
Date timestamp2 = new Date(timestamp3.getTime() - 100);
Date timestamp1 = new Date(timestamp3.getTime() - 1000);
ContributorQuery query1 = new ContributorQuery(PILLAR1_ID, timestamp1, timestamp2, new Integer(1));
ContributorQuery query2 = new ContributorQuery(PILLAR2_ID, timestamp2, timestamp3, new Integer(2));
ContributorQuery query1 = new ContributorQuery(PILLAR1_ID, timestamp1, timestamp2, 1);
ContributorQuery query2 = new ContributorQuery(PILLAR2_ID, timestamp2, timestamp3, 2);
client.getFileIDs(collectionID, new ContributorQuery[]{query1, query2}, null, null, testEventHandler);

IdentifyPillarsForGetFileIDsRequest receivedIdentifyRequestMessage = collectionReceiver.waitForMessage(
Expand Down
81 changes: 18 additions & 63 deletions bitrepository-reference-settings/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,6 @@
<artifactId>bitrepository-reference-settings</artifactId>
<name>Bitrepository Reference Settings</name>
<description>Settings functionality for the reference code.</description>
<dependencies>
<!--
<dependency>
<groupId>org.jvnet.jaxb2_commons</groupId>
<artifactId>jaxb2-basics-runtime</artifactId>
<version>0.11.1</version>
</dependency>-->
</dependencies>

<build>
<sourceDirectory>target/generated-sources/jaxb</sourceDirectory>
Expand Down Expand Up @@ -75,62 +67,25 @@
<xjbSource>${project.build.directory}/xsd/bindings-reference-settings.xjb</xjbSource>
</xjbSources>
<extension>true</extension>
<args>
<arg>-XtoString</arg>
<arg>-Xequals</arg>
<arg>-XhashCode</arg>
<arg>-Xannotate</arg>
</args>
<plugins>
<plugin>
<groupId>org.jvnet.jaxb2_commons</groupId>
<artifactId>jaxb2-basics</artifactId>
<version>0.12.0</version>
</plugin>
<plugin>
<groupId>org.jvnet.jaxb2_commons</groupId>
<artifactId>jaxb2-basics-annotate</artifactId>
<version>1.1.0</version>
</plugin>
</plugins>
<arguments>
<argument>-XtoString</argument>
<argument>-Xequals</argument>
<argument>-XhashCode</argument>
<argument>-Xannotate</argument>
</arguments>
</configuration>
<!-- <groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin</artifactId>
<executions>
<execution>
<id>generate-classes-from-xsds</id>
<goals>
<goal>generate</goal>
</goals>
<phase>generate-sources</phase>
<configuration>
<schemaDirectory>${project.build.directory}/xsd</schemaDirectory>
<schemaIncludes>
<include>*.xsd</include>
</schemaIncludes>
<generateDirectory>${project.build.directory}/generated-sources/jaxb</generateDirectory>
<extension>true</extension>
<args>
<arg>-XtoString</arg>
<arg>-Xequals</arg>
<arg>-XhashCode</arg>
<arg>-Xannotate</arg>
</args>
<plugins>
<plugin>
<groupId>org.jvnet.jaxb2_commons</groupId>
<artifactId>jaxb2-basics</artifactId>
<version>0.11.1</version>
</plugin>
<plugin>
<groupId>org.jvnet.jaxb2_commons</groupId>
<artifactId>jaxb2-basics-annotate</artifactId>
<version>1.1.0</version>
</plugin>
</plugins>
</configuration>
</execution>
</executions> -->
<dependencies>
<dependency>
<groupId>org.jvnet.jaxb2_commons</groupId>
<artifactId>jaxb2-basics</artifactId>
<version>0.11.1</version>
</dependency>
<dependency>
<groupId>org.jvnet.jaxb2_commons</groupId>
<artifactId>jaxb2-basics-annotate</artifactId>
<version>1.1.0</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
Expand Down
17 changes: 7 additions & 10 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,14 +124,16 @@
<artifactId>logback-classic</artifactId>
<version>1.2.3</version>
</dependency>
<!-- <dependency>
<!-- Updating org.jvnet jaxb2 dependencies to 0.12.0 causes problems for the jaxb2-maven-plugin
when trying to use toString, hashCode etc.
(sort of described here: https://github.com/highsource/jaxb2-basics/issues/95) -->
<dependency>
<groupId>org.jvnet.jaxb2_commons</groupId>
<artifactId>jaxb2-basics-runtime</artifactId>
<version>0.11.1</version>
</dependency> -->
<!-- javax.xml.bind and jakarta.activation should be swapped for javax.xml.bind once
a JAXB-plugin actually supports the new jakarta dependencies without going through
weird hoops to get things working. -->
</dependency>
<!-- javax.xml.bind should be swapped for jakarta.xml.bind once a JAXB-plugin actually
supports the new jakarta dependencies without going through weird hoops to get things working. -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
Expand All @@ -148,11 +150,6 @@
<version>3.0.1</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.sun.activation</groupId>
<artifactId>jakarta.activation</artifactId>
<version>2.0.1</version>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
Expand Down

0 comments on commit 259a8c0

Please sign in to comment.