update gradle for publish step, add MAINTAINERS.md and cleaning of th…

…e code (#5) Signed-off-by: Karim TAAM <[email protected]>
hyperledger · Nov 7, 2023 · 2f9c877 · 2f9c877
1 parent c3dff8c
commit 2f9c877
Show file tree

Hide file tree

Showing 10 changed files with 48 additions and 79 deletions.
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
@@ -0,0 +1,4 @@
+# Maintainers
+
+Maintainers for this repository are the same as
+for [Hyperledger Besu](https://github.com/hyperledger/besu/blob/master/MAINTAINERS.md)
diff --git a/build.gradle b/build.gradle
@@ -51,6 +51,7 @@ dependencies {
   implementation 'io.tmio:tuweni-units'
   implementation 'io.tmio:tuweni-rlp'
   implementation 'org.hyperledger.besu:ipa-multipoint'
+  implementation 'org.hyperledger.besu.internal:trie:23.1.3-SNAPSHOT'
 
   testImplementation 'org.junit.jupiter:junit-jupiter-api'
   testImplementation 'org.junit.jupiter:junit-jupiter-params'
@@ -83,18 +84,44 @@ allprojects {
     archives jar
   }
 
+  jar {
+    archiveBaseName = 'besu-verkle.trie'
+    includeEmptyDirs = false
+    manifest {
+      attributes(
+        'Specification-Title': archiveBaseName,
+        'Specification-Version': project.version,
+        'Implementation-Title': archiveBaseName,
+        'Implementation-Version': project.version,
+        'Automatic-Module-Name': 'org.hyperledger.besu.verkle.trie'
+        )
+    }
+  }
+
+  task sourcesJar(type: Jar, dependsOn: classes) {
+    archiveBaseName = 'besu-verkle.trie'
+    classifier = 'sources'
+    from sourceSets.main.allSource
+  }
+
+  task javadocJar(type: Jar, dependsOn: javadoc) {
+    archiveBaseName = 'besu-verkle.trie'
+    classifier = 'javadoc'
+    from javadoc.destinationDir
+  }
+
   publishing {
     publications {
-      MavenDeployment(MavenPublication) { publication ->
-        from components.java
+      mavenJava(MavenPublication) {
 
         groupId = 'org.hyperledger.besu'  // Updated groupId
         artifactId = 'besu-verkle-trie'   // Updated artifactId
         version "${project.version}"
-        versionMapping {
-          usage('java-api') { fromResolutionOf('runtimeClasspath') }
-          usage('java-runtime') { fromResolutionResult() }
-        }
+
+        from components.java
+        artifact sourcesJar
+        artifact javadocJar
+
         pom {
           name = "Verkle Tries - ${project.name}"
           description = 'VerkleTries'
@@ -106,8 +133,8 @@ allprojects {
             }
           }
           scm {
-            connection = 'scm:git:git://github.com/hyperledger/besu-verkle-trie'
-            developerConnection = 'scm:git:ssh://github.com/hyperledger/besu-verkle-trie'
+            connection = 'scm:git:git://github.com/hyperledger/besu-verkle-trie.git'
+            developerConnection = 'scm:git:ssh://github.com/hyperledger/besu-verkle-trie.git'
             url = 'https://github.com/hyperledger/besu-verkle-trie'
           }
         }

diff --git a/src/main/java/org/hyperledger/besu/ethereum/trie/verkle/NodeLoader.java b/src/main/java/org/hyperledger/besu/ethereum/trie/verkle/NodeLoader.java
diff --git a/src/main/java/org/hyperledger/besu/ethereum/trie/verkle/NodeUpdater.java b/src/main/java/org/hyperledger/besu/ethereum/trie/verkle/NodeUpdater.java
diff --git a/src/main/java/org/hyperledger/besu/ethereum/trie/verkle/SimpleVerkleTrie.java b/src/main/java/org/hyperledger/besu/ethereum/trie/verkle/SimpleVerkleTrie.java
@@ -17,6 +17,7 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import org.hyperledger.besu.ethereum.trie.NodeUpdater;
 import org.hyperledger.besu.ethereum.trie.verkle.node.Node;
 import org.hyperledger.besu.ethereum.trie.verkle.node.NullNode;
 import org.hyperledger.besu.ethereum.trie.verkle.visitor.CommitVisitor;

diff --git a/src/main/java/org/hyperledger/besu/ethereum/trie/verkle/VerkleTrie.java b/src/main/java/org/hyperledger/besu/ethereum/trie/verkle/VerkleTrie.java
@@ -15,6 +15,8 @@
  */
 package org.hyperledger.besu.ethereum.trie.verkle;
 
+import org.hyperledger.besu.ethereum.trie.NodeUpdater;
+
 import java.util.Optional;
 
 import org.apache.tuweni.bytes.Bytes32;

diff --git a/src/main/java/org/hyperledger/besu/ethereum/trie/verkle/factory/StoredNodeFactory.java b/src/main/java/org/hyperledger/besu/ethereum/trie/verkle/factory/StoredNodeFactory.java
@@ -15,7 +15,7 @@
  */
 package org.hyperledger.besu.ethereum.trie.verkle.factory;
 
-import org.hyperledger.besu.ethereum.trie.verkle.NodeLoader;
+import org.hyperledger.besu.ethereum.trie.NodeLoader;
 import org.hyperledger.besu.ethereum.trie.verkle.node.BranchNode;
 import org.hyperledger.besu.ethereum.trie.verkle.node.LeafNode;
 import org.hyperledger.besu.ethereum.trie.verkle.node.Node;

diff --git a/src/main/java/org/hyperledger/besu/ethereum/trie/verkle/visitor/CommitVisitor.java b/src/main/java/org/hyperledger/besu/ethereum/trie/verkle/visitor/CommitVisitor.java
@@ -15,7 +15,7 @@
  */
 package org.hyperledger.besu.ethereum.trie.verkle.visitor;
 
-import org.hyperledger.besu.ethereum.trie.verkle.NodeUpdater;
+import org.hyperledger.besu.ethereum.trie.NodeUpdater;
 import org.hyperledger.besu.ethereum.trie.verkle.node.BranchNode;
 import org.hyperledger.besu.ethereum.trie.verkle.node.LeafNode;
 import org.hyperledger.besu.ethereum.trie.verkle.node.Node;

diff --git a/src/test/java/org/hyperledger/besu/ethereum/trie/verkle/NodeLoaderMock.java b/src/test/java/org/hyperledger/besu/ethereum/trie/verkle/NodeLoaderMock.java
@@ -15,6 +15,8 @@
  */
 package org.hyperledger.besu.ethereum.trie.verkle;
 
+import org.hyperledger.besu.ethereum.trie.NodeLoader;
+
 import java.util.HashMap;
 import java.util.Optional;
 

diff --git a/src/test/java/org/hyperledger/besu/ethereum/trie/verkle/NodeUpdaterMock.java b/src/test/java/org/hyperledger/besu/ethereum/trie/verkle/NodeUpdaterMock.java
@@ -15,6 +15,8 @@
  */
 package org.hyperledger.besu.ethereum.trie.verkle;
 
+import org.hyperledger.besu.ethereum.trie.NodeUpdater;
+
 import java.util.HashMap;
 
 import org.apache.tuweni.bytes.Bytes;