From ccdab653b89e4cb6f07c7f696509de753ed494b7 Mon Sep 17 00:00:00 2001 From: huanghaiquan Date: Mon, 16 Dec 2019 16:08:49 +0800 Subject: [PATCH] Refactored directories of framework projects; --- framework/base/pom.xml | 4 +- framework/binary-proto/pom.xml | 4 +- framework/consensus-framework/pom.xml | 4 +- framework/contract-framework/pom.xml | 4 +- framework/crypto/crypto-classic/pom.xml | 4 +- framework/crypto/crypto-framework/pom.xml | 2 +- framework/crypto/crypto-sm/pom.xml | 2 +- framework/crypto/pom.xml | 7 +- framework/ledger-model/pom.xml | 4 +- framework/pom.xml | 65 +++ framework/sdk/pom.xml | 7 +- framework/sdk/sdk-base/pom.xml | 2 +- framework/sdk/sdk-client/pom.xml | 2 +- framework/storage/pom.xml | 38 +- framework/storage/storage-composite/pom.xml | 2 +- framework/storage/storage-service/pom.xml | 2 +- framework/utils/pom.xml | 25 +- framework/utils/utils-common/pom.xml | 3 +- framework/utils/utils-http/pom.xml | 2 +- framework/utils/utils-serialize/pom.xml | 2 +- framework/utils/utils-test/pom.xml | 2 +- framework/utils/utils-web-server/pom.xml | 2 +- framework/utils/utils-web/pom.xml | 2 +- pom.xml | 513 +------------------- project/dependencies/pom.xml | 412 ++++++++++++++++ project/parent/pom.xml | 63 +++ project/pom.xml | 17 + 27 files changed, 612 insertions(+), 584 deletions(-) create mode 100644 framework/pom.xml create mode 100644 project/dependencies/pom.xml create mode 100644 project/parent/pom.xml create mode 100644 project/pom.xml diff --git a/framework/base/pom.xml b/framework/base/pom.xml index ca3f56cf..02c660ad 100644 --- a/framework/base/pom.xml +++ b/framework/base/pom.xml @@ -4,8 +4,8 @@ 4.0.0 com.jd.blockchain - jdchain-root - 1.1.2.RELEASE + jdchain-framework + 1.2.0-SNAPSHOT base diff --git a/framework/binary-proto/pom.xml b/framework/binary-proto/pom.xml index 50c1debc..36bf8e5c 100644 --- a/framework/binary-proto/pom.xml +++ b/framework/binary-proto/pom.xml @@ -4,8 +4,8 @@ 4.0.0 com.jd.blockchain - jdchain-root - 1.1.2.RELEASE + jdchain-framework + 1.2.0-SNAPSHOT binary-proto diff --git a/framework/consensus-framework/pom.xml b/framework/consensus-framework/pom.xml index 9409e169..6336aa3f 100644 --- a/framework/consensus-framework/pom.xml +++ b/framework/consensus-framework/pom.xml @@ -4,8 +4,8 @@ 4.0.0 com.jd.blockchain - consensus - 1.1.2.RELEASE + jdchain-framework + 1.2.0-SNAPSHOT consensus-framework diff --git a/framework/contract-framework/pom.xml b/framework/contract-framework/pom.xml index cf934009..2f9bda0f 100644 --- a/framework/contract-framework/pom.xml +++ b/framework/contract-framework/pom.xml @@ -4,8 +4,8 @@ 4.0.0 com.jd.blockchain - contract - 1.1.2.RELEASE + jdchain-framework + 1.2.0-SNAPSHOT contract-framework diff --git a/framework/crypto/crypto-classic/pom.xml b/framework/crypto/crypto-classic/pom.xml index 1b15926b..14f2917b 100644 --- a/framework/crypto/crypto-classic/pom.xml +++ b/framework/crypto/crypto-classic/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain crypto - 1.1.2.RELEASE + 1.2.0-SNAPSHOT crypto-classic @@ -15,11 +15,9 @@ crypto-framework ${project.version} - org.bouncycastle bcpkix-jdk15on - 1.61 diff --git a/framework/crypto/crypto-framework/pom.xml b/framework/crypto/crypto-framework/pom.xml index b720b24a..04a196dc 100644 --- a/framework/crypto/crypto-framework/pom.xml +++ b/framework/crypto/crypto-framework/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain crypto - 1.1.2.RELEASE + 1.2.0-SNAPSHOT crypto-framework diff --git a/framework/crypto/crypto-sm/pom.xml b/framework/crypto/crypto-sm/pom.xml index 9aa68f29..390e9661 100644 --- a/framework/crypto/crypto-sm/pom.xml +++ b/framework/crypto/crypto-sm/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain crypto - 1.1.2.RELEASE + 1.2.0-SNAPSHOT crypto-sm diff --git a/framework/crypto/pom.xml b/framework/crypto/pom.xml index f9774b54..599bb663 100644 --- a/framework/crypto/pom.xml +++ b/framework/crypto/pom.xml @@ -4,8 +4,8 @@ 4.0.0 com.jd.blockchain - jdchain-root - 1.1.2.RELEASE + jdchain-framework + 1.2.0-SNAPSHOT crypto pom @@ -14,9 +14,6 @@ crypto-framework crypto-classic crypto-sm - - crypto-adv - crypto-pki \ No newline at end of file diff --git a/framework/ledger-model/pom.xml b/framework/ledger-model/pom.xml index 90b5a759..0405ddc3 100644 --- a/framework/ledger-model/pom.xml +++ b/framework/ledger-model/pom.xml @@ -5,8 +5,8 @@ com.jd.blockchain - ledger - 1.1.2.RELEASE + jdchain-framework + 1.2.0-SNAPSHOT ledger-model diff --git a/framework/pom.xml b/framework/pom.xml new file mode 100644 index 00000000..6b527dbf --- /dev/null +++ b/framework/pom.xml @@ -0,0 +1,65 @@ + + 4.0.0 + + com.jd.blockchain + jdchain-parent + 1.1.1.RELEASE + + + jdchain-framework + 1.2.0-SNAPSHOT + pom + Root project of jdchain framewrok. + + + utils + base + binary-proto + crypto + ledger-model + contract-framework + consensus-framework + storage + sdk + + + + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + https://github.com/blockchain-jd-com/jdchain-framework.git + https://github.com/blockchain-jd-com/jdchain-framework.git + https://github.com/blockchain-jd-com/jdchain-framework.git + + + + + jdchain + git-jdchain@jd.com + https://github.com/blockchain-jd-com/jdchain-framework.git + + + + + + disable-javadoc-doclint + + [1.8,) + + + -Xdoclint:none + + + + + + diff --git a/framework/sdk/pom.xml b/framework/sdk/pom.xml index c4037224..1694f141 100644 --- a/framework/sdk/pom.xml +++ b/framework/sdk/pom.xml @@ -3,18 +3,15 @@ 4.0.0 com.jd.blockchain - jdchain-root - 1.1.2.RELEASE + jdchain-framework + 1.2.0-SNAPSHOT sdk pom sdk-base - sdk-client - sdk-samples - \ No newline at end of file diff --git a/framework/sdk/sdk-base/pom.xml b/framework/sdk/sdk-base/pom.xml index 6ce41769..35f3d418 100644 --- a/framework/sdk/sdk-base/pom.xml +++ b/framework/sdk/sdk-base/pom.xml @@ -4,7 +4,7 @@ com.jd.blockchain sdk - 1.1.2.RELEASE + 1.2.0-SNAPSHOT sdk-base diff --git a/framework/sdk/sdk-client/pom.xml b/framework/sdk/sdk-client/pom.xml index e2e995f4..6cca87b7 100644 --- a/framework/sdk/sdk-client/pom.xml +++ b/framework/sdk/sdk-client/pom.xml @@ -4,7 +4,7 @@ com.jd.blockchain sdk - 1.1.2.RELEASE + 1.2.0-SNAPSHOT sdk-client diff --git a/framework/storage/pom.xml b/framework/storage/pom.xml index 7e432edd..f0a75691 100644 --- a/framework/storage/pom.xml +++ b/framework/storage/pom.xml @@ -1,29 +1,17 @@ - - 4.0.0 - + + 4.0.0 + com.jd.blockchain - jdchain-root - 1.1.2.RELEASE + jdchain-framework + 1.2.0-SNAPSHOT - storage - pom - - storage-service - storage-redis - storage-rocksdb - storage-composite - + storage + pom + + storage-service + storage-composite + - - - - org.apache.maven.plugins - maven-deploy-plugin - 2.8.2 - - true - - - - \ No newline at end of file diff --git a/framework/storage/storage-composite/pom.xml b/framework/storage/storage-composite/pom.xml index 176a447e..9957f4d3 100644 --- a/framework/storage/storage-composite/pom.xml +++ b/framework/storage/storage-composite/pom.xml @@ -4,7 +4,7 @@ com.jd.blockchain storage - 1.1.2.RELEASE + 1.2.0-SNAPSHOT storage-composite diff --git a/framework/storage/storage-service/pom.xml b/framework/storage/storage-service/pom.xml index 5e50de10..c6672b83 100644 --- a/framework/storage/storage-service/pom.xml +++ b/framework/storage/storage-service/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain storage - 1.1.2.RELEASE + 1.2.0-SNAPSHOT storage-service diff --git a/framework/utils/pom.xml b/framework/utils/pom.xml index a9233b6d..99d50f62 100644 --- a/framework/utils/pom.xml +++ b/framework/utils/pom.xml @@ -1,10 +1,11 @@ - 4.0.0 com.jd.blockchain - jdchain-root - 1.1.2.RELEASE + jdchain-framework + 1.2.0-SNAPSHOT utils pom @@ -42,18 +43,8 @@ - + \ No newline at end of file diff --git a/framework/utils/utils-common/pom.xml b/framework/utils/utils-common/pom.xml index 04fec308..b7e6028b 100644 --- a/framework/utils/utils-common/pom.xml +++ b/framework/utils/utils-common/pom.xml @@ -4,7 +4,7 @@ com.jd.blockchain utils - 1.1.2.RELEASE + 1.2.0-SNAPSHOT utils-common @@ -27,7 +27,6 @@ commons-io commons-io - 2.4 diff --git a/framework/utils/utils-http/pom.xml b/framework/utils/utils-http/pom.xml index 5f6236f4..4ebf530f 100644 --- a/framework/utils/utils-http/pom.xml +++ b/framework/utils/utils-http/pom.xml @@ -4,7 +4,7 @@ com.jd.blockchain utils - 1.1.2.RELEASE + 1.2.0-SNAPSHOT diff --git a/framework/utils/utils-serialize/pom.xml b/framework/utils/utils-serialize/pom.xml index acdd4ed2..35769588 100644 --- a/framework/utils/utils-serialize/pom.xml +++ b/framework/utils/utils-serialize/pom.xml @@ -4,7 +4,7 @@ com.jd.blockchain utils - 1.1.2.RELEASE + 1.2.0-SNAPSHOT utils-serialize diff --git a/framework/utils/utils-test/pom.xml b/framework/utils/utils-test/pom.xml index 0fce0b58..ebeeab34 100644 --- a/framework/utils/utils-test/pom.xml +++ b/framework/utils/utils-test/pom.xml @@ -4,7 +4,7 @@ com.jd.blockchain utils - 1.1.2.RELEASE + 1.2.0-SNAPSHOT utils-test diff --git a/framework/utils/utils-web-server/pom.xml b/framework/utils/utils-web-server/pom.xml index 109fd82e..d654c613 100644 --- a/framework/utils/utils-web-server/pom.xml +++ b/framework/utils/utils-web-server/pom.xml @@ -4,7 +4,7 @@ com.jd.blockchain utils - 1.1.2.RELEASE + 1.2.0-SNAPSHOT utils-web-server diff --git a/framework/utils/utils-web/pom.xml b/framework/utils/utils-web/pom.xml index b635dfb0..055dcef4 100644 --- a/framework/utils/utils-web/pom.xml +++ b/framework/utils/utils-web/pom.xml @@ -4,7 +4,7 @@ com.jd.blockchain utils - 1.1.2.RELEASE + 1.2.0-SNAPSHOT utils-web diff --git a/pom.xml b/pom.xml index d2195de0..fd2fede6 100644 --- a/pom.xml +++ b/pom.xml @@ -3,519 +3,20 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 2.0.6.RELEASE - - com.jd.blockchain jdchain-root - 1.1.2.RELEASE + 1.2.0-SNAPSHOT pom - jdchain + jdchain root project - utils - base - binary-proto - crypto - runtime - ledger - contract - consensus - storage - gateway - peer - manager - sdk - tools + framework + core + deploy + project test - deployment + sample - - 0.3.0.RELEASE - 1.1.2.RELEASE - 1.1.2.RELEASE - 2.4 - 3.3.0 - 1.2.2 - 1.8.8 - 1.2.60 - - 0.5.35 - 1.0.18 - 1.2.2 - 1.2.4 - 3.3.0 - 5.1.37 - - 3.1.0 - 1.2 - - 2.10.0 - 1.7.25 - - 4.12 - 1.10.19 - - 4.5.1 - 9.4.17.v20190418 - 1.2.3 - - 3.3.6 - 3.0.1 - 2.9.0 - 6.3.6 - 3.4.6 - 3.5.12 - 3.5.3 - 1.1.0 - 2.4 - 3.4.2 - - - - - - junit - junit - test - - - org.mockito - mockito-core - test - - - - - - org.springframework.boot - spring-boot-dependencies - 2.0.6.RELEASE - pom - import - - - - com.jd.blockchain - bft-smart - ${bft-smart.version} - - - - com.jd.blockchain - data-explorer - ${data-explorer.version} - - - - com.jd.blockchain - manager-explorer - ${manager-explorer.version} - - - - commons-io - commons-io - ${commons-io.version} - - - - - junit - junit - ${junit.version} - - - org.mockito - mockito-core - ${mockito.version} - - - - - javax.servlet - javax.servlet-api - ${servlet.version} - - - javax.servlet - jstl - ${jstl.version} - - - - com.lmax - disruptor - ${disruptor.version} - - - - org.bitbucket.mstrobel - procyon-core - ${procyon.version} - - - org.bitbucket.mstrobel - procyon-expressions - ${procyon.version} - - - org.bitbucket.mstrobel - procyon-reflection - ${procyon.version} - - - org.bitbucket.mstrobel - procyon-compilertools - ${procyon.version} - - - - com.alibaba - fastjson - ${fastjson.version} - - - - com.github.javaparser - javaparser-core - ${javaparser.version} - - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.slf4j - slf4j-log4j12 - ${slf4j.version} - - - org.apache.logging.log4j - log4j-api - ${log4j.version} - - - org.apache.logging.log4j - log4j-core - ${log4j.version} - - - - org.aspectj - aspectjrt - ${aspectj.version} - - - org.aspectj - aspectjweaver - ${aspectj.version} - - - org.aspectj - aspectjtools - ${aspectj.version} - - - - - - org.apache.httpcomponents - httpclient - ${httpclient.version} - - - - org.eclipse.jetty - jetty-server - ${jetty.version} - - - org.eclipse.jetty - jetty-io - ${jetty.version} - - - org.eclipse.jetty - jetty-http - ${jetty.version} - - - org.eclipse.jetty - jetty-util - ${jetty.version} - - - org.eclipse.jetty - jetty-webapp - ${jetty.version} - - - org.eclipse.jetty - jetty-xml - ${jetty.version} - - - org.eclipse.jetty - jetty-security - ${jetty.version} - - - org.eclipse.jetty - jetty-servlet - ${jetty.version} - - - - redis.clients - jedis - ${jedis.version} - - - - org.rocksdb - rocksdbjni - ${rocksdb.version} - - - - io.grpc - grpc-netty - 1.9.0 - - - io.grpc - grpc-protobuf - 1.9.0 - - - io.grpc - grpc-stub - 1.9.0 - - - - org.bouncycastle - bcprov-jdk15on - 1.61 - - - - io.nats - jnats - 2.2.0 - - - net.i2p.crypto - eddsa - - - - - - org.apache.commons - commons-collections4 - 4.1 - - - - - org.reflections - reflections - 0.9.10 - - - com.google.guava - guava - - - - - - com.google.guava - guava - 19.0 - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - UTF-8 - false - true - false - false - - - - - - - org.apache.maven.plugins - maven-resources-plugin - - UTF-8 - - - - - - org.apache.maven.plugins - maven-dependency-plugin - ${maven-dependency-plugin.version} - - - copy-dependencies - package - - copy-dependencies - - - - ${project.build.directory}/libs - false - false - runtime - - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - - true - lib - false - - - - - - - - org.apache.maven.plugins - maven-assembly-plugin - 2.4.1 - - - make-assembly - package - - single - - - - - - - org.apache.maven.plugins - maven-war-plugin - 2.6 - - false - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.4 - - - attach-javadocs - package - - jar - - - ${javadoc.opts} - - - - - - - - - - - - - - - - - - - - - - - - - - kr.motd.maven - os-maven-plugin - 1.4.1.Final - - - - - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - https://github.com/blockchain-jd-com/jdchain.git - https://github.com/blockchain-jd-com/jdchain.git - https://github.com/blockchain-jd-com/jdchain.git - - - - - jdchain - git-jdchain@jd.com - https://github.com/blockchain-jd-com/jdchain.git - - - - - - disable-javadoc-doclint - - [1.8,) - - - -Xdoclint:none - - - - diff --git a/project/dependencies/pom.xml b/project/dependencies/pom.xml new file mode 100644 index 00000000..d11317cd --- /dev/null +++ b/project/dependencies/pom.xml @@ -0,0 +1,412 @@ + + 4.0.0 + + + org.springframework.boot + spring-boot-starter-parent + 2.0.6.RELEASE + + + com.jd.blockchain + jdchain-dependencies + 1.1.1.RELEASE + pom + jdchain-dependencies + + + + + 0.3.0.RELEASE + 1.61 + 1.61 + 2.4 + 3.3.0 + 1.2.2 + 1.8.8 + 1.2.60 + + 0.5.35 + 1.0.18 + 1.2.2 + 1.2.4 + 3.3.0 + 5.1.37 + + 3.1.0 + 1.2 + + 2.10.0 + 1.7.25 + + 4.12 + 1.10.19 + + 4.5.1 + 9.4.17.v20190418 + 1.2.3 + + 3.3.6 + 3.0.1 + 2.9.0 + 6.3.6 + 3.4.6 + 3.5.12 + 3.5.3 + 1.1.0 + 2.4 + 3.4.2 + + + + + + + commons-io + commons-io + ${commons-io.version} + + + + org.bouncycastle + bcpkix-jdk15on + ${bouncycastle.version} + + + + + junit + junit + ${junit.version} + + + org.mockito + mockito-core + ${mockito.version} + + + + + javax.servlet + javax.servlet-api + ${servlet.version} + + + javax.servlet + jstl + ${jstl.version} + + + + com.lmax + disruptor + ${disruptor.version} + + + + org.bitbucket.mstrobel + procyon-core + ${procyon.version} + + + org.bitbucket.mstrobel + procyon-expressions + ${procyon.version} + + + org.bitbucket.mstrobel + procyon-reflection + ${procyon.version} + + + org.bitbucket.mstrobel + procyon-compilertools + ${procyon.version} + + + + com.alibaba + fastjson + ${fastjson.version} + + + + com.github.javaparser + javaparser-core + ${javaparser.version} + + + + org.slf4j + slf4j-api + ${slf4j.version} + + + org.slf4j + slf4j-log4j12 + ${slf4j.version} + + + org.apache.logging.log4j + log4j-api + ${log4j.version} + + + org.apache.logging.log4j + log4j-core + ${log4j.version} + + + + org.aspectj + aspectjrt + ${aspectj.version} + + + org.aspectj + aspectjweaver + ${aspectj.version} + + + org.aspectj + aspectjtools + ${aspectj.version} + + + + + + org.apache.httpcomponents + httpclient + ${httpclient.version} + + + + org.eclipse.jetty + jetty-server + ${jetty.version} + + + org.eclipse.jetty + jetty-io + ${jetty.version} + + + org.eclipse.jetty + jetty-http + ${jetty.version} + + + org.eclipse.jetty + jetty-util + ${jetty.version} + + + org.eclipse.jetty + jetty-webapp + ${jetty.version} + + + org.eclipse.jetty + jetty-xml + ${jetty.version} + + + org.eclipse.jetty + jetty-security + ${jetty.version} + + + org.eclipse.jetty + jetty-servlet + ${jetty.version} + + + + redis.clients + jedis + ${jedis.version} + + + + org.rocksdb + rocksdbjni + ${rocksdb.version} + + + + io.grpc + grpc-netty + 1.9.0 + + + io.grpc + grpc-protobuf + 1.9.0 + + + io.grpc + grpc-stub + 1.9.0 + + + + org.bouncycastle + bcprov-jdk15on + 1.61 + + + + io.nats + jnats + 2.2.0 + + + net.i2p.crypto + eddsa + + + + + + org.apache.commons + commons-collections4 + 4.1 + + + + + org.reflections + reflections + 0.9.10 + + + com.google.guava + guava + + + + + + com.google.guava + guava + 19.0 + + + + + + + + + org.apache.maven.plugins + maven-resources-plugin + + UTF-8 + + + + + + org.apache.maven.plugins + maven-dependency-plugin + ${maven-dependency-plugin.version} + + + copy-dependencies + package + + copy-dependencies + + + + ${project.build.directory}/libs + false + false + runtime + + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + true + lib + false + + + + + + + + org.apache.maven.plugins + maven-assembly-plugin + 2.4.1 + + + make-assembly + package + + single + + + + + + + org.apache.maven.plugins + maven-war-plugin + 2.6 + + false + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10.4 + + + attach-javadocs + package + + jar + + + ${javadoc.opts} + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/project/parent/pom.xml b/project/parent/pom.xml new file mode 100644 index 00000000..68af2168 --- /dev/null +++ b/project/parent/pom.xml @@ -0,0 +1,63 @@ + + 4.0.0 + + + com.jd.blockchain + jdchain-dependencies + 1.1.1.RELEASE + ../dependencies + + + com.jd.blockchain + jdchain-parent + pom + jdchain-parent + + + + + + + junit + junit + test + + + org.mockito + mockito-core + test + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + UTF-8 + false + true + false + false + + + + + + + kr.motd.maven + os-maven-plugin + 1.4.1.Final + + + + + diff --git a/project/pom.xml b/project/pom.xml new file mode 100644 index 00000000..1f1aa770 --- /dev/null +++ b/project/pom.xml @@ -0,0 +1,17 @@ + + 4.0.0 + + com.jd.blockchain + jdchain-project + 1.2.0-SNAPSHOT + pom + jdchain + + + parent + dependencies + + +