Merge pull request #2 from ericglau/develop

Update to Besu 1.4
ericglau · Mar 1, 2020 · 5fec140 · 5fec140
2 parents 2284219 + 4841099
commit 5fec140
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 15 deletions.
diff --git a/besu-appsody-stacks/java-besu-gradle/image/Dockerfile-stack b/besu-appsody-stacks/java-besu-gradle/image/Dockerfile-stack
@@ -23,7 +23,7 @@ ENV APPSODY_WATCH_DIR=/project/user-app
 ENV APPSODY_WATCH_IGNORE_DIR=/project/user-app/target
 ENV APPSODY_WATCH_REGEX="^.*(.sol|.java)$"
 
-ENV APPSODY_INSTALL="touch logfile.log ; /project/user-app/gradlew --gradle-user-home=/gradle --console=plain build installBesu && echo 'Starting Hyperledger Besu...' && build/besu-1.3.8/bin/besu --config-file=config.toml 2>&1 | tee logfile.log & tail -f -n0 logfile.log | grep -q 'Ethereum main loop is up'"
+ENV APPSODY_INSTALL="touch logfile.log ; /project/user-app/gradlew --gradle-user-home=/gradle --console=plain build installBesu && echo 'Starting Hyperledger Besu...' && build/besu-1.4.0/bin/besu --config-file=config.toml 2>&1 | tee logfile.log & tail -f -n0 logfile.log | grep -q 'Ethereum main loop is up'"
 
 ENV APPSODY_RUN="/project/user-app/gradlew --gradle-user-home=/gradle --console=plain run"
 ENV APPSODY_RUN_ON_CHANGE=

diff --git a/besu-appsody-stacks/java-besu-gradle/templates/hello/README.md b/besu-appsody-stacks/java-besu-gradle/templates/hello/README.md
@@ -6,7 +6,7 @@
 `gradle clean build installBesu`
 
 2. Start Hyperledger Besu:  
-`build/besu-1.3.8/bin/besu --config-file=config.toml`
+`build/besu-1.4.0/bin/besu --config-file=config.toml`
 
 3. Wait until you see `Ethereum main loop is up`
 

diff --git a/besu-appsody-stacks/java-besu-gradle/templates/hello/build.gradle b/besu-appsody-stacks/java-besu-gradle/templates/hello/build.gradle
@@ -42,7 +42,7 @@ application {
 }
 
 task installBesu(type: Copy) {
-    def dependency = project.dependencies.create('hyperledger-org:besu-repo:besu-1.3.8@zip')
+    def dependency = project.dependencies.create('hyperledger-org:besu-repo:besu-1.4.0@zip')
     def config = project.configurations.detachedConfiguration(dependency)
 
     File resolvedFile;

diff --git a/besu-appsody-stacks/java-besu-maven/image/Dockerfile-stack b/besu-appsody-stacks/java-besu-maven/image/Dockerfile-stack
@@ -23,7 +23,7 @@ ENV APPSODY_WATCH_DIR=/project/user-app
 ENV APPSODY_WATCH_IGNORE_DIR=/project/user-app/target
 ENV APPSODY_WATCH_REGEX="^.*(.sol|.java)$"
 
-ENV APPSODY_INSTALL="touch logfile.log ; mvn -B -Dmaven.repo.local=/mvn/repository install -DskipTests && echo 'Starting Hyperledger Besu...' && target/besu-1.3.8/bin/besu --config-file=config.toml 2>&1 | tee logfile.log & tail -f -n0 logfile.log | grep -q 'Ethereum main loop is up'"
+ENV APPSODY_INSTALL="touch logfile.log ; mvn -B -Dmaven.repo.local=/mvn/repository install -DskipTests && echo 'Starting Hyperledger Besu...' && target/besu-1.4.0/bin/besu --config-file=config.toml 2>&1 | tee logfile.log & tail -f -n0 logfile.log | grep -q 'Ethereum main loop is up'"
 
 ENV APPSODY_RUN="mvn -B -Dmaven.repo.local=/mvn/repository exec:java -Dexec.mainClass='com.sample.App'"
 ENV APPSODY_RUN_ON_CHANGE=

diff --git a/besu-appsody-stacks/java-besu-maven/templates/hello/README.md b/besu-appsody-stacks/java-besu-maven/templates/hello/README.md
@@ -6,7 +6,7 @@
 `mvn clean install`
 
 2. Start Hyperledger Besu:  
-`target/besu-1.3.8/bin/besu --config-file=config.toml`
+`target/besu-1.4.0/bin/besu --config-file=config.toml`
 
 3. Wait until you see `Ethereum main loop is up`
 

diff --git a/besu-appsody-stacks/java-besu-maven/templates/hello/pom.xml b/besu-appsody-stacks/java-besu-maven/templates/hello/pom.xml
@@ -75,9 +75,8 @@
                 <goal>wget</goal>
               </goals>
               <configuration>
-                <url>https://bintray.com/api/ui/download/hyperledger-org/besu-repo/besu-1.3.8.zip</url>
+                <url>https://bintray.com/api/ui/download/hyperledger-org/besu-repo/besu-1.4.0.zip</url>
                 <unpack>true</unpack>
-                <md5>36937e2717da41de15b9a033ff1377ad</md5>
               </configuration>
             </execution>
           </executions>

diff --git a/besu-appsody-stacks/java-besu-plugins/README.md b/besu-appsody-stacks/java-besu-plugins/README.md
@@ -1,6 +1,6 @@
 # Appsody Stack for Hyperledger Besu Plugins
 
-[Appsody](https://appsody.dev/) stack for developers writing Java plugins using the Hyperledger Besu Plugins API.
+[Appsody](https://appsody.dev/) stack for developers writing Java plugins using the [Hyperledger Besu Plugin API](https://besu.hyperledger.org/en/stable/Reference/Plugin-API-Interfaces/).
 
 Developers can initialize a sample project based on [PluginsAPIDemo](https://github.com/PegaSysEng/PluginsAPIDemo) with a single command, and use another command to start their development runtime entirely on a container.  Once the project is running, iterative development is enabled which will update the plugin when source changes are detected.
 

diff --git a/besu-appsody-stacks/java-besu-plugins/image/Dockerfile-stack b/besu-appsody-stacks/java-besu-plugins/image/Dockerfile-stack
@@ -27,9 +27,9 @@ ENV APPSODY_WATCH_REGEX="^(build.gradle|.*(.java))$"
 ENV APPSODY_PREP="/project/user-app/gradlew --gradle-user-home=/gradle --console=plain installBesu"
 
 # Run: Build project, create plugins directory, copy jar to plugins directory, start Besu
-ENV APPSODY_RUN="/project/user-app/gradlew --gradle-user-home=/gradle --console=plain build && mkdir build/besu-1.4.0-beta3/plugins && cp build/libs/*.jar build/besu-1.4.0-beta3/plugins && build/besu-1.4.0-beta3/bin/besu --config-file=demo-options.toml"
+ENV APPSODY_RUN="/project/user-app/gradlew --gradle-user-home=/gradle --console=plain build && mkdir build/besu-1.4.0/plugins && cp build/libs/*.jar build/besu-1.4.0/plugins && build/besu-1.4.0/bin/besu --config-file=demo-options.toml"
 # On source change: Build project, copy jar to plugins directory, start Besu
-ENV APPSODY_RUN_ON_CHANGE="/project/user-app/gradlew --gradle-user-home=/gradle --console=plain build && cp build/libs/*.jar build/besu-1.4.0-beta3/plugins && build/besu-1.4.0-beta3/bin/besu --config-file=demo-options.toml"
+ENV APPSODY_RUN_ON_CHANGE="/project/user-app/gradlew --gradle-user-home=/gradle --console=plain build && cp build/libs/*.jar build/besu-1.4.0/plugins && build/besu-1.4.0/bin/besu --config-file=demo-options.toml"
 ENV APPSODY_RUN_KILL=true
 
 ENV APPSODY_DEBUG=

diff --git a/besu-appsody-stacks/java-besu-plugins/templates/demo/build.gradle b/besu-appsody-stacks/java-besu-plugins/templates/demo/build.gradle
@@ -26,13 +26,13 @@ dependencies {
     compileOnly 'info.picocli:picocli:3.9.5'
     compileOnly 'org.apache.logging.log4j:log4j-api:2.12.0'
     compileOnly 'org.apache.logging.log4j:log4j-core:2.12.0'
-    compileOnly 'org.hyperledger.besu:plugin-api:1.4.0-beta3-SNAPSHOT'
+    compileOnly 'org.hyperledger.besu:plugin-api:1.4.0'
 
     testImplementation 'junit:junit:4.12'
 }
 
 task installBesu(type: Copy) {
-    def dependency = project.dependencies.create('hyperledger-org:besu-repo:besu-1.4.0-beta3@zip')
+    def dependency = project.dependencies.create('hyperledger-org:besu-repo:besu-1.4.0@zip')
     def config = project.configurations.detachedConfiguration(dependency)
 
     File resolvedFile;

diff --git a/besu-maven-archetype/README.md b/besu-maven-archetype/README.md
@@ -22,7 +22,7 @@ Prerequisites:
 `mvn clean install`
 
 2. Start Hyperledger Besu:  
-`target/besu-1.3.8/bin/besu --config-file=config.toml`
+`target/besu-1.4.0/bin/besu --config-file=config.toml`
 
 3. Wait until you see `Ethereum main loop is up`
 

diff --git a/besu-maven-archetype/src/main/resources/archetype-resources/pom.xml b/besu-maven-archetype/src/main/resources/archetype-resources/pom.xml
@@ -75,9 +75,8 @@
                 <goal>wget</goal>
               </goals>
               <configuration>
-                <url>https://bintray.com/api/ui/download/hyperledger-org/besu-repo/besu-1.3.8.zip</url>
+                <url>https://bintray.com/api/ui/download/hyperledger-org/besu-repo/besu-1.4.0.zip</url>
                 <unpack>true</unpack>
-                <md5>36937e2717da41de15b9a033ff1377ad</md5>
               </configuration>
             </execution>
           </executions>