diff --git a/duniter4j-core-client/src/test/java/org/duniter/core/client/service/bma/BlockchainRemoteServiceTest.java b/duniter4j-core-client/src/test/java/org/duniter/core/client/service/bma/BlockchainRemoteServiceTest.java
index 4ad23f8c84fad0de9bcaa67909ec48de6cb2c878..e51033fc59b063c7defc30a558d2d3881f62bd36 100644
--- a/duniter4j-core-client/src/test/java/org/duniter/core/client/service/bma/BlockchainRemoteServiceTest.java
+++ b/duniter4j-core-client/src/test/java/org/duniter/core/client/service/bma/BlockchainRemoteServiceTest.java
@@ -51,6 +51,7 @@ public class BlockchainRemoteServiceTest {
public static final TestResource resource = TestResource.create();
private BlockchainRemoteService service;
+ private Peer peer;
private boolean isWebSocketNewBlockReceived;
@@ -58,6 +59,7 @@ public class BlockchainRemoteServiceTest {
public void setUp() {
service = ServiceLocator.instance().getBlockchainRemoteService();
isWebSocketNewBlockReceived = false;
+ peer = createTestPeer();
}
@Test
@@ -74,7 +76,7 @@ public class BlockchainRemoteServiceTest {
@Test
public void getBlock() throws Exception {
- BlockchainBlock result = service.getBlock(createTestPeer(), 0);
+ BlockchainBlock result = service.getBlock(peer, 0);
Assert.assertNotNull(result);
Assert.assertNotNull(result.getCurrency());
@@ -93,26 +95,26 @@ public class BlockchainRemoteServiceTest {
// @FIXME timeout trop court
public void getBlockWithTx() throws Exception {
- long[] blocks = service.getBlocksWithTx(createTestPeer());
+ long[] blocks = service.getBlocksWithTx(peer);
if (blocks == null) return;
// Check first block with TX
- BlockchainBlock result = service.getBlock(createTestPeer(), blocks[0]);
+ BlockchainBlock result = service.getBlock(peer, blocks[0]);
Assert.assertNotNull(result);
Assert.assertNotNull(result.getTransactions());
Assert.assertTrue(result.getTransactions().length > 0);
// Check last block with TX
- result = service.getBlock(createTestPeer(), blocks[blocks.length-1]);
+ result = service.getBlock(peer, blocks[blocks.length-1]);
Assert.assertNotNull(result);
Assert.assertNotNull(result.getTransactions());
Assert.assertTrue(result.getTransactions().length > 0);
}
@Test
- public void getBlocksAsJson() throws Exception {
+ public void getBlocksAsJson() {
- String[] result= service.getBlocksAsJson(createTestPeer(), 10, 0);
+ String[] result= service.getBlocksAsJson(peer, 10, 0);
Assert.assertNotNull(result);
Assert.assertEquals(10, result.length);
@@ -135,8 +137,7 @@ public class BlockchainRemoteServiceTest {
}
@Test
- public void getLastUD() throws Exception {
- Peer peer = createTestPeer();
+ public void getLastUD() {
// Get the last UD
BlockchainRemoteService blockchainRemoteService = ServiceLocator.instance().getBlockchainRemoteService();
@@ -149,7 +150,7 @@ public class BlockchainRemoteServiceTest {
isWebSocketNewBlockReceived = false;
- service.addBlockListener(createTestPeer(), (message) -> {
+ service.addBlockListener(peer, (message) -> {
try {
BlockchainBlock block = JacksonUtils.getThreadObjectMapper().readValue(message, BlockchainBlock.class);
log.debug("Received block #" + block.getNumber());
@@ -175,7 +176,6 @@ public class BlockchainRemoteServiceTest {
// Wait for IP quota
Thread.sleep(5000);
- Peer peer = createTestPeer();
Wallet wallet = createTestWallet();
String uid = resource.getFixtures().getUid();
String currency = resource.getFixtures().getCurrency();
@@ -199,7 +199,6 @@ public class BlockchainRemoteServiceTest {
@Test
@Ignore //FIXME Timeout
public void getDifficulties() {
- Peer peer = createTestPeer();
BlockchainDifficulties result = service.getDifficulties(peer);
Assert.assertNotNull(result);
diff --git a/duniter4j-core-client/src/test/java/org/duniter/core/client/service/bma/WotRemoteServiceTest.java b/duniter4j-core-client/src/test/java/org/duniter/core/client/service/bma/WotRemoteServiceTest.java
index 927a994a53360a097cfcb891308814e0b580aefd..41e0a197db725d74e9c2e87e35bc5fc148d32cbd 100644
--- a/duniter4j-core-client/src/test/java/org/duniter/core/client/service/bma/WotRemoteServiceTest.java
+++ b/duniter4j-core-client/src/test/java/org/duniter/core/client/service/bma/WotRemoteServiceTest.java
@@ -51,10 +51,12 @@ public class WotRemoteServiceTest {
public static final TestResource resource = TestResource.create();
private WotRemoteService service;
+ private Peer peer;
@Before
public void setUp() {
service = ServiceLocator.instance().getWotRemoteService();
+ peer = createTestPeer();
}
@Test
@@ -176,7 +178,6 @@ public class WotRemoteServiceTest {
@Test
public void getMembers() {
- Peer peer = createTestPeer();
List<Member> result = service.getMembers(peer);
Assert.assertNotNull(result);
Assert.assertTrue(result.size() > 0);
@@ -184,7 +185,6 @@ public class WotRemoteServiceTest {
@Test
public void getPendingMemberships() {
- Peer peer = createTestPeer();
List<WotPendingMembership> result = service.getPendingMemberships(peer);
Assert.assertNotNull(result);
Assert.assertTrue(result.size() > 0);
@@ -192,7 +192,6 @@ public class WotRemoteServiceTest {
@Test
public void getRequirements() {
- Peer peer = createTestPeer();
List<WotPendingMembership> pendingMemberships = service.getPendingMemberships(peer);
Assume.assumeTrue(CollectionUtils.isNotEmpty(pendingMemberships));
diff --git a/pom.xml b/pom.xml
index be39cbcdcd053bb632444db3c91c051ca2c433f8..b40d08b2245429db6e5bd9d938a45503edd13a21 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,6 +9,18 @@
<packaging>pom</packaging>
<name>Duniter4j</name>
<description>a Duniter Java Client API</description>
+
+ <url>http://doc.e-is.pro/duniter4j/</url>
+ <inceptionYear>2023</inceptionYear>
+ <organization>
+ <name>Duniter Team</name>
+ <url>http://www.duniter.org</url>
+ </organization>
+
+ <prerequisites>
+ <maven>3.1.1</maven>
+ </prerequisites>
+
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<file.encoding>UTF-8</file.encoding>
@@ -34,6 +46,7 @@
<jTextUtilsVersion>0.3.3</jTextUtilsVersion>
<lombok.version>1.18.20</lombok.version>
<httpclient.version>4.5.13</httpclient.version>
+ <commons-net.version>3.9.0</commons-net.version>
<nuitonConfigVersion>3.0</nuitonConfigVersion>
<nuitonVersionVersion>1.0-rc-2</nuitonVersionVersion>
@@ -70,14 +83,15 @@
<helperPluginVersion>2.3.2</helperPluginVersion>
<!-- apache maven plugins version -->
- <jarPluginVersion>3.0.2</jarPluginVersion>
- <sitePluginVersion>3.6</sitePluginVersion>
+ <jarPluginVersion>3.2.0</jarPluginVersion>
+ <sitePluginVersion>3.10.0</sitePluginVersion>
<changesPluginVersion>2.12.1</changesPluginVersion>
+ <compilerPluginVersion>3.8.1</compilerPluginVersion>
<changelogPluginVersion>2.3</changelogPluginVersion>
- <projectInfoReportsPluginVersion>2.9</projectInfoReportsPluginVersion>
- <jrxPluginVersion>2.5</jrxPluginVersion>
- <surefirePluginVersion>2.20.1</surefirePluginVersion>
- <markdownPluginVersion>1.7</markdownPluginVersion>
+ <projectInfoReportsPluginVersion>3.1.2</projectInfoReportsPluginVersion>
+ <jrxPluginVersion>3.0.0</jrxPluginVersion>
+ <surefirePluginVersion>2.21.0</surefirePluginVersion>
+ <markdownPluginVersion>1.11.1</markdownPluginVersion>
<enforcerPluginVersion>1.4.1</enforcerPluginVersion>
<sourcePluginVersion>3.0.1</sourcePluginVersion>
<releasePluginVersion>2.5.3</releasePluginVersion>
@@ -125,19 +139,6 @@
<wagonSshVersion>2.12</wagonSshVersion>
</properties>
- <url>http://doc.e-is.pro/duniter4j/</url>
- <inceptionYear>2014</inceptionYear>
- <organization>
- <name>Duniter Team</name>
- <url>http://www.duniter.fr</url>
- </organization>
-
- <prerequisites>
- <maven>3.1.1</maven>
- </prerequisites>
-
-
-
<licenses>
<license>
<name>General Public License (GPL) v3</name>
@@ -160,8 +161,8 @@
</scm>
<issueManagement>
- <system>GitLab</system>
- <url>https://git.duniter.org/clients/java/duniter4j/issues</url>
+ <system>gitlab</system>
+ <url>https://git.duniter.org/clients/java/duniter4j/-/issues</url>
</issueManagement>
<dependencyManagement>
@@ -290,7 +291,7 @@
<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
- <version>3.4</version>
+ <version>${commons-net.version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
@@ -900,15 +901,14 @@
<reportSets>
<reportSet>
<reports>
- <report>project-team</report>
- <report>mailing-list</report>
- <!--<report>cim</report>-->
- <report>issue-tracking</report>
- <report>license</report>
+ <report>team</report>
+ <report>mailing-lists</report>
+ <report>issue-management</report>
+ <report>licenses</report>
<report>scm</report>
- <report>dependency-info</report>
<report>dependencies</report>
<report>dependency-convergence</report>
+ <report>dependency-info</report>
<report>plugin-management</report>
<report>plugins</report>
<report>dependency-management</report>
@@ -925,11 +925,13 @@
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<version>${jrxPluginVersion}</version>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
<version>${surefirePluginVersion}</version>
</plugin>
@@ -943,7 +945,7 @@
<escapeHTML>false</escapeHTML>
<feedType>rss_2.0</feedType>
<issueLinkTemplatePerSystem>
- <default>https://git.duniter.org/clients/java/duniter4j/issues/%ISSUE%</default>
+ <default>https://git.duniter.org/clients/java/duniter4j/-/issues/%ISSUE%</default>
</issueLinkTemplatePerSystem>
</configuration>
</plugin>