diff --git a/.github/workflows/pr-testing.yml b/.github/workflows/pr-testing.yml index 3d0925df..e9ad36c6 100644 --- a/.github/workflows/pr-testing.yml +++ b/.github/workflows/pr-testing.yml @@ -21,7 +21,11 @@ jobs: with: java-version: '11' distribution: 'adopt' - + + - name: Load custom deps + run: | + mvn install -DskipTests=true --file pom.xml + - name: Run all tests run: | mvn -B clean test -DskipTests=false --file pom.xml diff --git a/README.md b/README.md index fa4d1213..7718163c 100644 --- a/README.md +++ b/README.md @@ -15,20 +15,31 @@ Building the future one block at a time. Welcome to Qortal. # Building the Qortal Core from Source -## Build / run +## Build / Run - Requires Java 11. OpenJDK 11 recommended over Java SE. - Install Maven - Use Maven to fetch dependencies and build: `mvn clean package` +- Update Maven dependencies: `mvn install` - Built JAR should be something like `target/qortal-1.0.jar` - Create basic *settings.json* file: `echo '{}' > settings.json` - Run JAR in same working directory as *settings.json*: `java -jar target/qortal-1.0.jar` - Wrap in shell script, add JVM flags, redirection, backgrounding, etc. as necessary. - Or use supplied example shell script: *start.sh* +## IntelliJ IDEA Configuration + +- Run -> Edit Configurations +- Add New Application +- Name: qortal +- SDK: java 11 +- Main Class: org.qortal.controller.Controller +- Program arguments: settings.json -Dlog4j.configurationFile=log4j2.properties -ea +- Environment variables: Djava.net.preferIPv4Stack=false + # Using a pre-built Qortal 'jar' binary -If you would prefer to utilize a released version of Qortal, you may do so by downloading one of the available releases from the releases page, that are also linked on https://qortal.org and https://qortal.dev. +If you prefer to utilize a released version of Qortal, you may do so by downloading one of the available releases from the releases page, that are also linked on https://qortal.org and https://qortal.dev. # Learning Q-App Development diff --git a/lib/org/hsqldb/hsqldb/2.7.4/Notes.txt b/lib/org/hsqldb/hsqldb/2.7.4/Notes.txt new file mode 100644 index 00000000..e4e16f85 --- /dev/null +++ b/lib/org/hsqldb/hsqldb/2.7.4/Notes.txt @@ -0,0 +1,5 @@ +This is the production hsqldb-2.7.4 with the manifest file updated + +Sealed: false + +Allows the addition of the custom Qortal HSQLDBPool and Monitoring Classes diff --git a/lib/org/hsqldb/hsqldb/2.7.4/hsqldb.jar b/lib/org/hsqldb/hsqldb/2.7.4/hsqldb.jar new file mode 100644 index 00000000..31db01c2 Binary files /dev/null and b/lib/org/hsqldb/hsqldb/2.7.4/hsqldb.jar differ diff --git a/pom.xml b/pom.xml index 0923bbc8..13ad4807 100644 --- a/pom.xml +++ b/pom.xml @@ -9,6 +9,7 @@ UTF-8 true + 7dc8c6f 7dc8c6f 0.15.10 1.70 @@ -49,6 +50,7 @@ 0.17 3.3.1 3.6.0 + 3.1.3 3.5.2 3.25.3 1.5.3 @@ -303,6 +305,30 @@ + + + org.apache.maven.plugins + maven-install-plugin + ${maven-install-plugin.version} + + org.hsqldb + hsqldb + ${hsqldb.version} + jar + + + + install + + install-file + + + ${project.basedir}/lib/org/hsqldb/hsqldb/${hsqldb.version}/hsqldb.jar + + + + + org.apache.maven.plugins maven-shade-plugin @@ -450,7 +476,7 @@ provided - + org.hsqldb hsqldb diff --git a/src/test/resources/test-settings-v2-block-archive.json b/src/test/resources/test-settings-v2-block-archive.json index 209ce92d..4948fb73 100644 --- a/src/test/resources/test-settings-v2-block-archive.json +++ b/src/test/resources/test-settings-v2-block-archive.json @@ -10,5 +10,6 @@ "minPeers": 0, "pruneBlockLimit": 100, "repositoryPath": "dbtest", - "defaultArchiveVersion": 1 + "defaultArchiveVersion": 1, + "archivingPause": 5 }