diff --git a/ethereumj-core/build.gradle b/ethereumj-core/build.gradle index 3c2e1ff394..4f01d7a188 100644 --- a/ethereumj-core/build.gradle +++ b/ethereumj-core/build.gradle @@ -135,18 +135,13 @@ dependencies { compile "com.google.guava:guava:24.1-jre" compile "com.cedarsoftware:java-util:1.8.0" // for deep equals - compile "org.javassist:javassist:3.15.0-GA" compile "org.slf4j:slf4j-api:${slf4jVersion}" compile "ch.qos.logback:logback-classic:1.1.7" - compile "org.codehaus.jackson:jackson-mapper-asl:1.9.13" - compile "com.google.code.findbugs:jsr305:3.0.0" compile "com.fasterxml.jackson.core:jackson-databind:2.5.1" compile "org.apache.commons:commons-collections4:4.0" compile "org.apache.commons:commons-lang3:3.4" compile "commons-codec:commons-codec:1.10" compile "org.springframework:spring-context:${springVersion}" - compile "org.springframework:spring-tx:${springVersion}" - compile "org.springframework:spring-orm:${springVersion}" compile "com.typesafe:config:1.2.1" compile "com.googlecode.concurrent-locks:concurrent-locks:1.0.0" diff --git a/ethereumj-core/src/main/java/org/ethereum/config/CommonConfig.java b/ethereumj-core/src/main/java/org/ethereum/config/CommonConfig.java index 0621cc35ab..371e443aed 100644 --- a/ethereumj-core/src/main/java/org/ethereum/config/CommonConfig.java +++ b/ethereumj-core/src/main/java/org/ethereum/config/CommonConfig.java @@ -17,7 +17,7 @@ */ package org.ethereum.config; -import org.ethereum.core.*; +import org.ethereum.core.Repository; import org.ethereum.crypto.HashUtil; import org.ethereum.datasource.*; import org.ethereum.datasource.inmem.HashMapDB; @@ -35,7 +35,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.context.annotation.*; -import org.springframework.transaction.annotation.EnableTransactionManagement; import java.util.ArrayList; import java.util.HashSet; @@ -45,7 +44,6 @@ import static java.util.Arrays.asList; @Configuration -@EnableTransactionManagement @ComponentScan( basePackages = "org.ethereum", excludeFilters = @ComponentScan.Filter(NoAutoscan.class)) diff --git a/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/GitHubJSONTestSuite.java b/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/GitHubJSONTestSuite.java index 080ee29f23..e5e50aa42f 100644 --- a/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/GitHubJSONTestSuite.java +++ b/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/GitHubJSONTestSuite.java @@ -17,8 +17,8 @@ */ package org.ethereum.jsontestsuite; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.type.JavaType; +import com.fasterxml.jackson.databind.JavaType; +import com.fasterxml.jackson.databind.ObjectMapper; import org.ethereum.config.BlockchainNetConfig; import org.ethereum.config.SystemProperties; import org.ethereum.config.blockchain.*; @@ -30,10 +30,8 @@ import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; import org.json.simple.parser.ParseException; - import org.junit.Assert; import org.junit.Assume; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/GitHubRLPTest.java b/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/GitHubRLPTest.java index d7444cb298..f233782bac 100644 --- a/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/GitHubRLPTest.java +++ b/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/GitHubRLPTest.java @@ -17,12 +17,15 @@ */ package org.ethereum.jsontestsuite; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.type.JavaType; +import com.fasterxml.jackson.databind.JavaType; +import com.fasterxml.jackson.databind.ObjectMapper; import org.ethereum.jsontestsuite.suite.JSONReader; import org.ethereum.jsontestsuite.suite.RLPTestCase; import org.json.simple.parser.ParseException; -import org.junit.*; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.FixMethodOrder; +import org.junit.Test; import org.junit.runners.MethodSorters; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/ABITestCase.java b/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/ABITestCase.java index 140eed64a7..4edfa98915 100644 --- a/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/ABITestCase.java +++ b/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/ABITestCase.java @@ -17,7 +17,7 @@ */ package org.ethereum.jsontestsuite.suite; -import org.codehaus.jackson.annotate.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnore; import org.ethereum.core.CallTransaction; import org.spongycastle.util.encoders.Hex; diff --git a/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/ABITestSuite.java b/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/ABITestSuite.java index fcfae41fac..c5156bb599 100644 --- a/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/ABITestSuite.java +++ b/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/ABITestSuite.java @@ -17,8 +17,8 @@ */ package org.ethereum.jsontestsuite.suite; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.type.JavaType; +import com.fasterxml.jackson.databind.JavaType; +import com.fasterxml.jackson.databind.ObjectMapper; import java.io.IOException; import java.util.*; diff --git a/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/BlockTestCase.java b/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/BlockTestCase.java index 416e6d4825..88df2265a1 100644 --- a/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/BlockTestCase.java +++ b/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/BlockTestCase.java @@ -17,7 +17,7 @@ */ package org.ethereum.jsontestsuite.suite; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import org.ethereum.config.BlockchainNetConfig; import org.ethereum.jsontestsuite.GitHubJSONTestSuite; import org.ethereum.jsontestsuite.suite.model.AccountTck; diff --git a/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/BlockTestSuite.java b/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/BlockTestSuite.java index 88b71e2805..c05f1e3815 100644 --- a/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/BlockTestSuite.java +++ b/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/BlockTestSuite.java @@ -17,8 +17,8 @@ */ package org.ethereum.jsontestsuite.suite; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.type.JavaType; +import com.fasterxml.jackson.databind.JavaType; +import com.fasterxml.jackson.databind.ObjectMapper; import org.ethereum.jsontestsuite.GitHubJSONTestSuite; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/DifficultyTestCase.java b/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/DifficultyTestCase.java index 0262a01413..9cef7da821 100644 --- a/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/DifficultyTestCase.java +++ b/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/DifficultyTestCase.java @@ -17,9 +17,8 @@ */ package org.ethereum.jsontestsuite.suite; -import org.codehaus.jackson.annotate.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnore; import org.ethereum.core.BlockHeader; -import org.spongycastle.util.encoders.Hex; import java.math.BigInteger; diff --git a/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/DifficultyTestSuite.java b/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/DifficultyTestSuite.java index 457b2dde82..e039089be0 100644 --- a/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/DifficultyTestSuite.java +++ b/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/DifficultyTestSuite.java @@ -17,8 +17,8 @@ */ package org.ethereum.jsontestsuite.suite; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.type.JavaType; +import com.fasterxml.jackson.databind.JavaType; +import com.fasterxml.jackson.databind.ObjectMapper; import java.io.IOException; import java.util.*; diff --git a/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/EthashTestCase.java b/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/EthashTestCase.java index 2b2ee49983..d48e051646 100644 --- a/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/EthashTestCase.java +++ b/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/EthashTestCase.java @@ -17,8 +17,8 @@ */ package org.ethereum.jsontestsuite.suite; -import org.codehaus.jackson.annotate.JsonIgnore; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; import org.ethereum.core.BlockHeader; import org.ethereum.util.RLP; import org.ethereum.util.RLPList; diff --git a/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/EthashTestSuite.java b/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/EthashTestSuite.java index 2c0e908f02..14712d5b1d 100644 --- a/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/EthashTestSuite.java +++ b/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/EthashTestSuite.java @@ -17,11 +17,14 @@ */ package org.ethereum.jsontestsuite.suite; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.type.JavaType; +import com.fasterxml.jackson.databind.JavaType; +import com.fasterxml.jackson.databind.ObjectMapper; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * @author Mikhail Kalinin diff --git a/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/Logs.java b/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/Logs.java index 7329b7f139..e050257ee4 100644 --- a/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/Logs.java +++ b/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/Logs.java @@ -17,20 +17,16 @@ */ package org.ethereum.jsontestsuite.suite; -import org.codehaus.jackson.JsonParser; -import org.codehaus.jackson.JsonProcessingException; -import org.codehaus.jackson.map.DeserializationContext; -import org.codehaus.jackson.map.JsonDeserializer; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.JsonDeserializer; import org.ethereum.crypto.HashUtil; -import org.ethereum.util.ByteUtil; import org.ethereum.util.FastByteComparisons; import org.ethereum.util.RLP; import org.ethereum.vm.DataWord; import org.ethereum.vm.LogInfo; - import org.json.simple.JSONArray; import org.json.simple.JSONObject; - import org.spongycastle.util.encoders.Hex; import java.io.IOException; diff --git a/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/StateTestCase.java b/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/StateTestCase.java index 0990301fa0..f711091fdf 100644 --- a/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/StateTestCase.java +++ b/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/StateTestCase.java @@ -17,12 +17,12 @@ */ package org.ethereum.jsontestsuite.suite; -import org.codehaus.jackson.map.annotate.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.ethereum.config.BlockchainNetConfig; import org.ethereum.jsontestsuite.GitHubJSONTestSuite; -import org.ethereum.jsontestsuite.suite.model.TransactionTck; import org.ethereum.jsontestsuite.suite.model.AccountTck; import org.ethereum.jsontestsuite.suite.model.EnvTck; +import org.ethereum.jsontestsuite.suite.model.TransactionTck; import java.util.Map; diff --git a/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/StateTestData.java b/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/StateTestData.java index 9817aa4a80..4c22b4415c 100644 --- a/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/StateTestData.java +++ b/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/StateTestData.java @@ -17,8 +17,8 @@ */ package org.ethereum.jsontestsuite.suite; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.type.JavaType; +import com.fasterxml.jackson.databind.JavaType; +import com.fasterxml.jackson.databind.ObjectMapper; import org.ethereum.jsontestsuite.GitHubJSONTestSuite; import java.io.IOException; diff --git a/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/StateTestDataEntry.java b/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/StateTestDataEntry.java index 6956a47e02..dbdb83ba97 100644 --- a/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/StateTestDataEntry.java +++ b/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/StateTestDataEntry.java @@ -17,11 +17,17 @@ */ package org.ethereum.jsontestsuite.suite; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import org.ethereum.jsontestsuite.GitHubJSONTestSuite; -import org.ethereum.jsontestsuite.suite.model.*; - -import java.util.*; +import org.ethereum.jsontestsuite.suite.model.AccountTck; +import org.ethereum.jsontestsuite.suite.model.EnvTck; +import org.ethereum.jsontestsuite.suite.model.PostDataTck; +import org.ethereum.jsontestsuite.suite.model.TransactionDataTck; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; /** * @author Mikhail Kalinin diff --git a/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/StateTestSuite.java b/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/StateTestSuite.java index 9d6bb7112a..4b556b440c 100644 --- a/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/StateTestSuite.java +++ b/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/StateTestSuite.java @@ -17,8 +17,8 @@ */ package org.ethereum.jsontestsuite.suite; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.type.JavaType; +import com.fasterxml.jackson.databind.JavaType; +import com.fasterxml.jackson.databind.ObjectMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/TransactionTestCase.java b/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/TransactionTestCase.java index 3bc735960f..f013a9e415 100644 --- a/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/TransactionTestCase.java +++ b/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/TransactionTestCase.java @@ -17,7 +17,7 @@ */ package org.ethereum.jsontestsuite.suite; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import org.ethereum.jsontestsuite.suite.model.TransactionTck; @JsonIgnoreProperties(ignoreUnknown = true) diff --git a/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/TransactionTestSuite.java b/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/TransactionTestSuite.java index d015b14187..3b7b77dcbd 100644 --- a/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/TransactionTestSuite.java +++ b/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/TransactionTestSuite.java @@ -17,8 +17,8 @@ */ package org.ethereum.jsontestsuite.suite; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.type.JavaType; +import com.fasterxml.jackson.databind.JavaType; +import com.fasterxml.jackson.databind.ObjectMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/TrieTestCase.java b/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/TrieTestCase.java index 5d6603b73f..ecb0c64db8 100644 --- a/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/TrieTestCase.java +++ b/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/TrieTestCase.java @@ -17,8 +17,8 @@ */ package org.ethereum.jsontestsuite.suite; -import org.codehaus.jackson.annotate.JsonIgnore; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import org.ethereum.datasource.NoDeleteSource; import org.ethereum.datasource.inmem.HashMapDB; import org.ethereum.trie.SecureTrie; diff --git a/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/TrieTestSuite.java b/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/TrieTestSuite.java index 52a5bef305..01b90f63ed 100644 --- a/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/TrieTestSuite.java +++ b/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/TrieTestSuite.java @@ -17,8 +17,8 @@ */ package org.ethereum.jsontestsuite.suite; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.type.JavaType; +import com.fasterxml.jackson.databind.JavaType; +import com.fasterxml.jackson.databind.ObjectMapper; import java.io.IOException; import java.util.*; diff --git a/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/model/BlockTck.java b/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/model/BlockTck.java index cd2bf2b36f..47c2091e87 100644 --- a/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/model/BlockTck.java +++ b/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/model/BlockTck.java @@ -18,7 +18,7 @@ package org.ethereum.jsontestsuite.suite.model; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import java.util.List; diff --git a/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/model/PostDataTck.java b/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/model/PostDataTck.java index 3d74350180..d85ba739e2 100644 --- a/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/model/PostDataTck.java +++ b/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/model/PostDataTck.java @@ -17,12 +17,10 @@ */ package org.ethereum.jsontestsuite.suite.model; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.map.annotate.JsonDeserialize; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.ethereum.jsontestsuite.suite.Logs; -import java.util.List; - /** * @author Mikhail Kalinin * @since 09.08.2017 diff --git a/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/model/TransactionDataTck.java b/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/model/TransactionDataTck.java index 29be0eb831..e23feda479 100644 --- a/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/model/TransactionDataTck.java +++ b/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/model/TransactionDataTck.java @@ -17,7 +17,7 @@ */ package org.ethereum.jsontestsuite.suite.model; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import java.util.List;