Skip to content

Commit 594b6dd

Browse files
committed
BAEL-1461 refactored
1 parent 21bd180 commit 594b6dd

File tree

47 files changed

+45
-62
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+45
-62
lines changed
Lines changed: 3 additions & 1 deletion
File renamed without changes.
Lines changed: 3 additions & 1 deletion
Lines changed: 24 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?xml version="1.0"?>
2-
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
2+
<project
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
4+
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
35
<modelVersion>4.0.0</modelVersion>
46
<groupId>com.baeldung.ethereumj</groupId>
57
<artifactId>ethereumj</artifactId>
@@ -11,9 +13,18 @@
1113
<artifactId>parent-boot-5</artifactId>
1214
<groupId>com.baeldung</groupId>
1315
<version>0.0.1-SNAPSHOT</version>
14-
<relativePath>../parent-boot-5</relativePath>
16+
<relativePath>../../parent-boot-5</relativePath>
1517
</parent>
1618

19+
<properties>
20+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
21+
<java.version>1.8</java.version>
22+
<tomcat.version>8.5.4</tomcat.version>
23+
<ethereumj-core.version>1.5.0-RELEASE</ethereumj-core.version>
24+
<web3j.core.version>3.3.1</web3j.core.version>
25+
<jackson-databind.version>2.5.0</jackson-databind.version>
26+
</properties>
27+
1728
<repositories>
1829
<repository>
1930
<id>Ethereum</id>
@@ -23,7 +34,6 @@
2334
</repositories>
2435

2536
<dependencies>
26-
2737
<!-- Spring Boot Dependencies -->
2838
<dependency>
2939
<groupId>org.springframework.boot</groupId>
@@ -33,28 +43,24 @@
3343
<groupId>org.springframework.boot</groupId>
3444
<artifactId>spring-boot-starter-tomcat</artifactId>
3545
</dependency>
36-
3746
<!-- Unit Testing -->
3847
<dependency>
3948
<groupId>org.springframework.boot</groupId>
4049
<artifactId>spring-boot-starter-test</artifactId>
4150
<scope>test</scope>
4251
</dependency>
43-
4452
<!-- Ethereum -->
4553
<dependency>
4654
<groupId>org.ethereum</groupId>
4755
<artifactId>ethereumj-core</artifactId>
48-
<version>1.5.0-RELEASE</version>
56+
<version>${ethereumj-core.version}</version>
4957
</dependency>
50-
5158
<!-- Web3j -->
5259
<dependency>
5360
<groupId>org.web3j</groupId>
5461
<artifactId>core</artifactId>
55-
<version>3.3.1</version>
62+
<version>${web3j.core.version}</version>
5663
</dependency>
57-
5864
<!-- JSTL/JSP -->
5965
<dependency>
6066
<groupId>javax.servlet</groupId>
@@ -63,12 +69,20 @@
6369
<dependency>
6470
<groupId>com.fasterxml.jackson.core</groupId>
6571
<artifactId>jackson-databind</artifactId>
66-
<version>2.5.0</version>
72+
<version>${jackson-databind.version}</version>
6773
</dependency>
6874
</dependencies>
6975

7076
<build>
7177
<plugins>
78+
<plugin>
79+
<artifactId>maven-compiler-plugin</artifactId>
80+
<version>3.1</version>
81+
<configuration>
82+
<source>1.8</source>
83+
<target>1.8</target>
84+
</configuration>
85+
</plugin>
7286
<plugin>
7387
<groupId>org.springframework.boot</groupId>
7488
<artifactId>spring-boot-maven-plugin</artifactId>
@@ -77,40 +91,4 @@
7791
<finalName>ethereumj</finalName>
7892
</build>
7993

80-
<profiles>
81-
<profile>
82-
<id>integration</id>
83-
<build>
84-
<plugins>
85-
<plugin>
86-
<groupId>org.apache.maven.plugins</groupId>
87-
<artifactId>maven-surefire-plugin</artifactId>
88-
<executions>
89-
<execution>
90-
<phase>integration-test</phase>
91-
<goals>
92-
<goal>test</goal>
93-
</goals>
94-
<configuration>
95-
<excludes>
96-
<exclude>none</exclude>
97-
</excludes>
98-
<includes>
99-
<include>*/EthControllerTestOne.java</include>
100-
</includes>
101-
</configuration>
102-
</execution>
103-
</executions>
104-
</plugin>
105-
</plugins>
106-
</build>
107-
</profile>
108-
</profiles>
109-
110-
<properties>
111-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
112-
<java.version>1.8</java.version>
113-
<tomcat.version>8.5.4</tomcat.version>
114-
</properties>
115-
11694
</project>

0 commit comments

Comments
 (0)