From 234fd8a43cc7975ff2b9911e11d5dc0b2493ba46 Mon Sep 17 00:00:00 2001 From: Roland Kofler Date: Sun, 22 Jun 2014 17:15:50 +0200 Subject: [PATCH 1/2] - Added m2e plugin to prevent eclipse error "m2e: copy-dependencies is not supported by m2e" --- ethereumj-core/pom.xml | 40 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/ethereumj-core/pom.xml b/ethereumj-core/pom.xml index ec658d75..0f8a2c44 100644 --- a/ethereumj-core/pom.xml +++ b/ethereumj-core/pom.xml @@ -193,7 +193,6 @@ mvn clean package -Dmaven.test.skip=true - maven-antrun-plugin 1.3 @@ -214,9 +213,42 @@ mvn clean package -Dmaven.test.skip=true - - - + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + org.apache.maven.plugins + + + maven-dependency-plugin + + + [2.0,) + + + unpack + + + + + + + + + + + + + From daffe648c128c42481ca7ba641795e488b761104 Mon Sep 17 00:00:00 2001 From: Roland Kofler Date: Sun, 22 Jun 2014 17:16:00 +0200 Subject: [PATCH 2/2] - added required inheritance method in MockDB to prevent compile error --- .../src/test/java/org/ethereum/trie/MockDB.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/ethereumj-core/src/test/java/org/ethereum/trie/MockDB.java b/ethereumj-core/src/test/java/org/ethereum/trie/MockDB.java index 2ed8c9c3..bc5e4523 100644 --- a/ethereumj-core/src/test/java/org/ethereum/trie/MockDB.java +++ b/ethereumj-core/src/test/java/org/ethereum/trie/MockDB.java @@ -1,6 +1,9 @@ package org.ethereum.trie; import java.io.IOException; +import java.util.Map.Entry; +import java.util.Spliterator; +import java.util.function.Consumer; import org.iq80.leveldb.DB; import org.iq80.leveldb.DBException; @@ -128,5 +131,17 @@ public class MockDB implements DB { public int getAddedItems() { return addedItems; } + + @Override + public void forEach(Consumer> action) { + // TODO Auto-generated method stub + + } + + @Override + public Spliterator> spliterator() { + // TODO Auto-generated method stub + return null; + } } \ No newline at end of file