diff --git a/qqq-backend-core/.circleci/config.yml b/.circleci/config.yml similarity index 100% rename from qqq-backend-core/.circleci/config.yml rename to .circleci/config.yml diff --git a/qqq-backend-core/.circleci/mvn-settings.xml b/.circleci/mvn-settings.xml similarity index 100% rename from qqq-backend-core/.circleci/mvn-settings.xml rename to .circleci/mvn-settings.xml diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..2c7054c0 --- /dev/null +++ b/.gitignore @@ -0,0 +1,32 @@ +target/ +*.iml +.env + + +############################################# +## Original contents from github template: ## +############################################# +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* +.DS_Store diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 00000000..13566b81 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/checkstyle-idea.xml b/.idea/checkstyle-idea.xml new file mode 100644 index 00000000..e2be48c1 --- /dev/null +++ b/.idea/checkstyle-idea.xml @@ -0,0 +1,16 @@ + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 00000000..1624ce59 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 00000000..5432384c --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 00000000..ed4393b2 --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 00000000..67e1e611 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..35eb1ddf --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 00000000..af84786b --- /dev/null +++ b/README.md @@ -0,0 +1,37 @@ +# qqq + +This is the top-level/parent project of qqq. + +QQQ is a Low-code Application Framework for Engineers. + +## Artifacts +QQQ can be used with a single bundle or smaller fine grained jars. +The bundle contains all of the sub-jars. It is named: + +```qqq-${version}.jar``` + +You can also use fine grained jars: +- `qqq-backend-core`: The core module. Useful if you're developing other modules. +- `qqq-backend-module-rdbms`: Backend module for working with Relational Databases. +- `qqq-backend-module-filesystem`: Backend module for working with Filesystems (including AWS S3). +- `qqq-middleware-javalin`: Middleware http server. Procivdes REST API, and/or backing for a web frotnend. +- `qqq-middleware-picocli`: Middleware (actually, a front-end, innint?) Command Line interface. + +## License +QQQ - Low-code Application Framework for Engineers. \ +Copyright (C) 2022. Kingsrook, LLC \ +651 N Broad St Ste 205 # 6917 | Middletown DE 19709 | United States \ +contact@kingsrook.com | https://github.com/Kingsrook/ + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as +published by the Free Software Foundation, either version 3 of the +License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . diff --git a/qqq-backend-core/checkstyle.xml b/checkstyle.xml similarity index 100% rename from qqq-backend-core/checkstyle.xml rename to checkstyle.xml diff --git a/pom.xml b/pom.xml new file mode 100644 index 00000000..0e78e1d0 --- /dev/null +++ b/pom.xml @@ -0,0 +1,263 @@ + + + + + 4.0.0 + + com.kingsrook.qqq + qqq-parent-project + ${revision} + pom + + + qqq-backend-core + qqq-backend-module-rdbms + qqq-backend-module-filesystem + qqq-middleware-picocli + qqq-middleware-javalin + qqq-sample-project + + + + 0.3.0-SNAPSHOT + + UTF-8 + UTF-8 + 17 + 17 + true + true + true + 0.80 + + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.1.2 + + + org.apache.logging.log4j + log4j-api + 2.17.1 + + + org.apache.logging.log4j + log4j-core + 2.17.1 + + + org.junit.jupiter + junit-jupiter-engine + 5.8.1 + test + + + org.assertj + assertj-core + 3.23.1 + test + + + + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + -Xlint:unchecked + + + + org.apache.maven.plugins + maven-surefire-plugin + 3.0.0-M5 + + + @{jaCoCoArgLine} + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.1.2 + + + com.puppycrawl.tools + checkstyle + 9.0 + + + + + validate + validate + + checkstyle.xml + + UTF-8 + true + false + true + warning + **/target/generated-sources/*.* + + + + check + + + + + + com.amashchenko.maven.plugin + gitflow-maven-plugin + 1.18.0 + + + main + dev + version- + + true + install + true + 1 + + + + org.jacoco + jacoco-maven-plugin + 0.8.8 + + + pre-unit-test + + prepare-agent + + + jaCoCoArgLine + + + + unit-test-check + + check + + + + ${coverage.haltOnFailure} + + + BUNDLE + + + INSTRUCTION + COVEREDRATIO + ${coverage.instructionCoveredRatioMinimum} + + + + + + + + post-unit-test + verify + + report + + + + + + exec-maven-plugin + org.codehaus.mojo + 3.0.0 + + + test-coverage-summary + verify + + exec + + + sh + + -c + + /dev/null 2>&1 +if [ "$?" == "0" ]; then + echo "Element\nInstructions Missed\nInstruction Coverage\nBranches Missed\nBranch Coverage\nComplexity Missed\nComplexity Hit\nLines Missed\nLines Hit\nMethods Missed\nMethods Hit\nClasses Missed\nClasses Hit\n" > /tmp/$$.headers + xpath -q -e '/html/body/table/tfoot/tr[1]/td/text()' target/site/jacoco/index.html > /tmp/$$.values + paste /tmp/$$.headers /tmp/$$.values | tail +2 | awk -v FS='\t' '{printf("%-20s %s\n",$1,$2)}' + rm /tmp/$$.headers /tmp/$$.values +else + echo "xpath is not installed. Jacoco coverage summary will not be produced here.."; +fi + ]]> + + + + + + + + + + + + github-qqq-maven-registry + GitHub QQQ Maven Registry + https://maven.pkg.github.com/Kingsrook/qqq-maven-registry + + + + + + github-qqq-maven-registry + GitHub QQQ Maven Registry + https://maven.pkg.github.com/Kingsrook/qqq-maven-registry + + + + diff --git a/qqq-backend-core/pom.xml b/qqq-backend-core/pom.xml index 1088fd68..268945bc 100644 --- a/qqq-backend-core/pom.xml +++ b/qqq-backend-core/pom.xml @@ -23,29 +23,17 @@ 4.0.0 - com.kingsrook.qqq qqq-backend-core - 0.3.0-SNAPSHOT - - scm:git:git@github.com:Kingsrook/qqq-backend-core.git - scm:git:git@github.com:Kingsrook/qqq-backend-core.git - HEAD - + + com.kingsrook.qqq + qqq-parent-project + ${revision} + - - - - UTF-8 - UTF-8 - 17 - 17 - true - true - true - 0.80 + @@ -53,11 +41,6 @@ - - com.auth0 - mvc-auth-commons - 1.9.2 - com.fasterxml.jackson.core jackson-databind @@ -79,49 +62,48 @@ 1.8 - org.assertj - assertj-core - 3.23.1 - test - - - + com.github.hervian safety-mirror 4.0.1 - org.dhatim fastexcel 0.12.15 - - + + com.auth0 + mvc-auth-commons + 1.9.2 + io.github.cdimascio java-dotenv 5.2.2 + + org.apache.maven.plugins maven-checkstyle-plugin - 3.1.2 org.apache.logging.log4j log4j-api - 2.17.1 org.apache.logging.log4j log4j-core - 2.17.1 org.junit.jupiter junit-jupiter-engine - 5.8.1 + test + + + org.assertj + assertj-core test @@ -129,176 +111,17 @@ - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - -Xlint:unchecked - - - - org.apache.maven.plugins - maven-surefire-plugin - 3.0.0-M5 - - - @{jaCoCoArgLine} - - - - org.apache.maven.plugins - maven-checkstyle-plugin - 3.1.2 - - - com.puppycrawl.tools - checkstyle - 9.0 - - - - - validate - validate - - checkstyle.xml - - UTF-8 - true - false - true - warning - **/target/generated-sources/*.* - - - - check - - - - - - com.amashchenko.maven.plugin - gitflow-maven-plugin - 1.18.0 - - - main - dev - version- - - true - install - true - 1 - - org.jacoco jacoco-maven-plugin - 0.8.8 com/kingsrook/qqq/backend/core/model/**/*.class com/kingsrook/qqq/backend/core/exceptions/**/*.class - - - pre-unit-test - - prepare-agent - - - jaCoCoArgLine - - - - unit-test-check - - check - - - - ${coverage.haltOnFailure} - - - BUNDLE - - - INSTRUCTION - COVEREDRATIO - ${coverage.instructionCoveredRatioMinimum} - - - - - - - - post-unit-test - verify - - report - - - - - - exec-maven-plugin - org.codehaus.mojo - 3.0.0 - - - test-coverage-summary - verify - - exec - - - sh - - -c - - /tmp/$$.headers -xpath -q -e '/html/body/table/tfoot/tr[1]/td/text()' target/site/jacoco/index.html > /tmp/$$.values -echo -echo "Jacoco coverage summary report:" -echo " See also target/site/jacoco/index.html" -echo " and https://www.jacoco.org/jacoco/trunk/doc/counters.html" -echo "------------------------------------------------------------" -paste /tmp/$$.headers /tmp/$$.values | tail +2 | awk -v FS='\t' '{printf("%-20s %s\n",$1,$2)}' -rm /tmp/$$.headers /tmp/$$.values - ]]> - - - - - - - - github-qqq-maven-registry - GitHub QQQ Maven Registry - https://maven.pkg.github.com/Kingsrook/qqq-maven-registry - - - - - - github-qqq-maven-registry - GitHub QQQ Maven Registry - https://maven.pkg.github.com/Kingsrook/qqq-maven-registry - - - diff --git a/qqq-backend-module-filesystem/.circleci/config.yml b/qqq-backend-module-filesystem/.circleci/config.yml deleted file mode 100644 index 87d7748d..00000000 --- a/qqq-backend-module-filesystem/.circleci/config.yml +++ /dev/null @@ -1,96 +0,0 @@ -## Deviations from qqq-java library standard circleci config: -## - To test AWS S3, uses localstsack executor, orb, and startup step -## - This docker image doesn't have java-17, so we install (and cache) jvm-17 -version: 2.1 - -executors: - java17: - docker: - - image: 'cimg/openjdk:17.0' - resource_class: small - -orbs: - slack: circleci/slack@4.10.1 - localstack: localstack/platform@1.0 - -commands: - install_java17: - steps: - - run: - name: Install Java 17 - command: | - sudo add-apt-repository -y ppa:openjdk-r/ppa - sudo apt install -y openjdk-17-jdk - sudo rm /etc/alternatives/java - sudo ln -s /usr/lib/jvm/java-17-openjdk-amd64/bin/java /etc/alternatives/java - run_maven: - parameters: - maven_subcommand: - default: test - type: string - steps: - - checkout - - restore_cache: - keys: - - v1-dependencies-{{ checksum "pom.xml" }} - - run: - name: Run Maven - command: | - mvn -s .circleci/mvn-settings.xml << parameters.maven_subcommand >> - - store_artifacts: - path: target/site/jacoco - - run: - name: Save test results - command: | - mkdir -p ~/test-results/junit/ - find . -type f -regex ".*/target/surefire-reports/.*xml" -exec cp {} ~/test-results/junit/ \; - when: always - - store_test_results: - path: ~/test-results - - save_cache: - paths: - - ~/.m2 - key: v1-dependencies-{{ checksum "pom.xml" }} - -jobs: - mvn_test: - executor: localstack/default - steps: - - localstack/startup - - install_java17 - - run_maven: - maven_subcommand: verify - - slack/notify: - event: fail - - mvn_deploy: - executor: localstack/default - steps: - - localstack/startup - - install_java17 - - run_maven: - maven_subcommand: deploy - - slack/notify: - event: always - -workflows: - test_only: - jobs: - - mvn_test: - context: [ qqq-maven-registry-credentials, kingsrook-slack ] - filters: - branches: - ignore: /dev/ - tags: - ignore: /(version|snapshot)-.*/ - - deploy: - jobs: - - mvn_deploy: - context: [ qqq-maven-registry-credentials, kingsrook-slack ] - filters: - branches: - only: /dev/ - tags: - only: /(version|snapshot)-.*/ - diff --git a/qqq-backend-module-filesystem/.circleci/mvn-settings.xml b/qqq-backend-module-filesystem/.circleci/mvn-settings.xml deleted file mode 100644 index b2a345f0..00000000 --- a/qqq-backend-module-filesystem/.circleci/mvn-settings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - github-qqq-maven-registry - ${env.QQQ_MAVEN_REGISTRY_USERNAME} - ${env.QQQ_MAVEN_REGISTRY_PASSWORD} - - - diff --git a/qqq-backend-module-filesystem/checkstyle.xml b/qqq-backend-module-filesystem/checkstyle.xml deleted file mode 100644 index f5e7412d..00000000 --- a/qqq-backend-module-filesystem/checkstyle.xml +++ /dev/null @@ -1,265 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/qqq-backend-module-filesystem/pom.xml b/qqq-backend-module-filesystem/pom.xml index aa463203..32cc274f 100644 --- a/qqq-backend-module-filesystem/pom.xml +++ b/qqq-backend-module-filesystem/pom.xml @@ -23,29 +23,17 @@ 4.0.0 - com.kingsrook.qqq qqq-backend-module-filesystem - 0.3.0-SNAPSHOT - - scm:git:git@github.com:Kingsrook/qqq-backend-module-rdbms.git - scm:git:git@github.com:Kingsrook/qqq-backend-module-rdbms.git - HEAD - + + com.kingsrook.qqq + qqq-parent-project + ${revision} + - - - UTF-8 - UTF-8 - 17 - 17 - true - true - true - 0.80 @@ -53,7 +41,7 @@ com.kingsrook.qqq qqq-backend-core - 0.2.0 + ${revision} @@ -73,197 +61,25 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.1.2 org.apache.logging.log4j log4j-api - 2.17.1 org.apache.logging.log4j log4j-core - 2.17.1 org.junit.jupiter junit-jupiter-engine - 5.8.1 test org.assertj assertj-core - 3.23.1 test - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - -Xlint:unchecked - - - - org.apache.maven.plugins - maven-surefire-plugin - 3.0.0-M5 - - @{jaCoCoArgLine} - - - - org.apache.maven.plugins - maven-checkstyle-plugin - 3.1.2 - - - com.puppycrawl.tools - checkstyle - 9.0 - - - - - validate - validate - - checkstyle.xml - - UTF-8 - true - false - true - warning - **/target/generated-sources/*.* - - - - check - - - - - - com.amashchenko.maven.plugin - gitflow-maven-plugin - 1.18.0 - - - main - dev - version- - - true - install - true - 1 - - - - org.jacoco - jacoco-maven-plugin - 0.8.8 - - - pre-unit-test - - prepare-agent - - - jaCoCoArgLine - - - - unit-test-check - - check - - - - ${coverage.haltOnFailure} - - - BUNDLE - - - INSTRUCTION - COVEREDRATIO - ${coverage.instructionCoveredRatioMinimum} - - - - - - - - post-unit-test - verify - - report - - - - - - exec-maven-plugin - org.codehaus.mojo - 3.0.0 - - - test-coverage-summary - verify - - exec - - - sh - - -c - - /tmp/$$.headers -xpath -q -e '/html/body/table/tfoot/tr[1]/td/text()' target/site/jacoco/index.html > /tmp/$$.values -echo -echo "Jacoco coverage summary report:" -echo " See also target/site/jacoco/index.html" -echo " and https://www.jacoco.org/jacoco/trunk/doc/counters.html" -echo "------------------------------------------------------------" -paste /tmp/$$.headers /tmp/$$.values | tail +2 | awk -v FS='\t' '{printf("%-20s %s\n",$1,$2)}' -rm /tmp/$$.headers /tmp/$$.values - ]]> - - - - - - - - - - - - github-qqq-maven-registry - GitHub QQQ Maven Registry - https://maven.pkg.github.com/Kingsrook/qqq-maven-registry - - - - - - github-qqq-maven-registry - GitHub QQQ Maven Registry - https://maven.pkg.github.com/Kingsrook/qqq-maven-registry - - - diff --git a/qqq-backend-module-rdbms/.circleci/config.yml b/qqq-backend-module-rdbms/.circleci/config.yml deleted file mode 100644 index 658f75d1..00000000 --- a/qqq-backend-module-rdbms/.circleci/config.yml +++ /dev/null @@ -1,79 +0,0 @@ -version: 2.1 - -executors: - java17: - docker: - - image: 'cimg/openjdk:17.0' - resource_class: small - -orbs: - slack: circleci/slack@4.10.1 - -commands: - run_maven: - parameters: - maven_subcommand: - default: test - type: string - steps: - - checkout - - restore_cache: - keys: - - v1-dependencies-{{ checksum "pom.xml" }} - - run: - name: Run Maven - command: | - mvn -s .circleci/mvn-settings.xml << parameters.maven_subcommand >> - - store_artifacts: - path: target/site/jacoco - - run: - name: Save test results - command: | - mkdir -p ~/test-results/junit/ - find . -type f -regex ".*/target/surefire-reports/.*xml" -exec cp {} ~/test-results/junit/ \; - when: always - - store_test_results: - path: ~/test-results - - save_cache: - paths: - - ~/.m2 - key: v1-dependencies-{{ checksum "pom.xml" }} - -jobs: - mvn_test: - executor: java17 - steps: - - run_maven: - maven_subcommand: verify - - slack/notify: - event: fail - - mvn_deploy: - executor: java17 - steps: - - run_maven: - maven_subcommand: deploy - - slack/notify: - event: always - -workflows: - test_only: - jobs: - - mvn_test: - context: [ qqq-maven-registry-credentials, kingsrook-slack ] - filters: - branches: - ignore: /dev/ - tags: - ignore: /(version|snapshot)-.*/ - - deploy: - jobs: - - mvn_deploy: - context: [ qqq-maven-registry-credentials, kingsrook-slack ] - filters: - branches: - only: /dev/ - tags: - only: /(version|snapshot)-.*/ - diff --git a/qqq-backend-module-rdbms/.circleci/mvn-settings.xml b/qqq-backend-module-rdbms/.circleci/mvn-settings.xml deleted file mode 100644 index b2a345f0..00000000 --- a/qqq-backend-module-rdbms/.circleci/mvn-settings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - github-qqq-maven-registry - ${env.QQQ_MAVEN_REGISTRY_USERNAME} - ${env.QQQ_MAVEN_REGISTRY_PASSWORD} - - - diff --git a/qqq-backend-module-rdbms/checkstyle.xml b/qqq-backend-module-rdbms/checkstyle.xml deleted file mode 100644 index f5e7412d..00000000 --- a/qqq-backend-module-rdbms/checkstyle.xml +++ /dev/null @@ -1,265 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/qqq-backend-module-rdbms/pom.xml b/qqq-backend-module-rdbms/pom.xml index 933a359d..817a1e1d 100644 --- a/qqq-backend-module-rdbms/pom.xml +++ b/qqq-backend-module-rdbms/pom.xml @@ -23,29 +23,17 @@ 4.0.0 - com.kingsrook.qqq qqq-backend-module-rdbms - 0.3.0-SNAPSHOT - - scm:git:git@github.com:Kingsrook/qqq-backend-module-rdbms.git - scm:git:git@github.com:Kingsrook/qqq-backend-module-rdbms.git - HEAD - + + com.kingsrook.qqq + qqq-parent-project + ${revision} + - - - UTF-8 - UTF-8 - 17 - 17 - true - true - true - 0.80 @@ -53,7 +41,7 @@ com.kingsrook.qqq qqq-backend-core - 0.2.0 + ${revision} @@ -74,197 +62,25 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.1.2 org.apache.logging.log4j log4j-api - 2.17.1 org.apache.logging.log4j log4j-core - 2.17.1 org.junit.jupiter junit-jupiter-engine - 5.8.1 test org.assertj assertj-core - 3.23.1 test - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - -Xlint:unchecked - - - - org.apache.maven.plugins - maven-surefire-plugin - 3.0.0-M5 - - @{jaCoCoArgLine} - - - - org.apache.maven.plugins - maven-checkstyle-plugin - 3.1.2 - - - com.puppycrawl.tools - checkstyle - 9.0 - - - - - validate - validate - - checkstyle.xml - - UTF-8 - true - false - true - warning - **/target/generated-sources/*.* - - - - check - - - - - - com.amashchenko.maven.plugin - gitflow-maven-plugin - 1.18.0 - - - main - dev - version- - - true - install - true - 1 - - - - org.jacoco - jacoco-maven-plugin - 0.8.8 - - - pre-unit-test - - prepare-agent - - - jaCoCoArgLine - - - - unit-test-check - - check - - - - ${coverage.haltOnFailure} - - - BUNDLE - - - INSTRUCTION - COVEREDRATIO - ${coverage.instructionCoveredRatioMinimum} - - - - - - - - post-unit-test - verify - - report - - - - - - exec-maven-plugin - org.codehaus.mojo - 3.0.0 - - - test-coverage-summary - verify - - exec - - - sh - - -c - - /tmp/$$.headers -xpath -q -e '/html/body/table/tfoot/tr[1]/td/text()' target/site/jacoco/index.html > /tmp/$$.values -echo -echo "Jacoco coverage summary report:" -echo " See also target/site/jacoco/index.html" -echo " and https://www.jacoco.org/jacoco/trunk/doc/counters.html" -echo "------------------------------------------------------------" -paste /tmp/$$.headers /tmp/$$.values | tail +2 | awk -v FS='\t' '{printf("%-20s %s\n",$1,$2)}' -rm /tmp/$$.headers /tmp/$$.values - ]]> - - - - - - - - - - - - github-qqq-maven-registry - GitHub QQQ Maven Registry - https://maven.pkg.github.com/Kingsrook/qqq-maven-registry - - - - - - github-qqq-maven-registry - GitHub QQQ Maven Registry - https://maven.pkg.github.com/Kingsrook/qqq-maven-registry - - - diff --git a/qqq-middleware-javalin/.circleci/config.yml b/qqq-middleware-javalin/.circleci/config.yml deleted file mode 100644 index 658f75d1..00000000 --- a/qqq-middleware-javalin/.circleci/config.yml +++ /dev/null @@ -1,79 +0,0 @@ -version: 2.1 - -executors: - java17: - docker: - - image: 'cimg/openjdk:17.0' - resource_class: small - -orbs: - slack: circleci/slack@4.10.1 - -commands: - run_maven: - parameters: - maven_subcommand: - default: test - type: string - steps: - - checkout - - restore_cache: - keys: - - v1-dependencies-{{ checksum "pom.xml" }} - - run: - name: Run Maven - command: | - mvn -s .circleci/mvn-settings.xml << parameters.maven_subcommand >> - - store_artifacts: - path: target/site/jacoco - - run: - name: Save test results - command: | - mkdir -p ~/test-results/junit/ - find . -type f -regex ".*/target/surefire-reports/.*xml" -exec cp {} ~/test-results/junit/ \; - when: always - - store_test_results: - path: ~/test-results - - save_cache: - paths: - - ~/.m2 - key: v1-dependencies-{{ checksum "pom.xml" }} - -jobs: - mvn_test: - executor: java17 - steps: - - run_maven: - maven_subcommand: verify - - slack/notify: - event: fail - - mvn_deploy: - executor: java17 - steps: - - run_maven: - maven_subcommand: deploy - - slack/notify: - event: always - -workflows: - test_only: - jobs: - - mvn_test: - context: [ qqq-maven-registry-credentials, kingsrook-slack ] - filters: - branches: - ignore: /dev/ - tags: - ignore: /(version|snapshot)-.*/ - - deploy: - jobs: - - mvn_deploy: - context: [ qqq-maven-registry-credentials, kingsrook-slack ] - filters: - branches: - only: /dev/ - tags: - only: /(version|snapshot)-.*/ - diff --git a/qqq-middleware-javalin/.circleci/mvn-settings.xml b/qqq-middleware-javalin/.circleci/mvn-settings.xml deleted file mode 100644 index b2a345f0..00000000 --- a/qqq-middleware-javalin/.circleci/mvn-settings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - github-qqq-maven-registry - ${env.QQQ_MAVEN_REGISTRY_USERNAME} - ${env.QQQ_MAVEN_REGISTRY_PASSWORD} - - - diff --git a/qqq-middleware-javalin/checkstyle.xml b/qqq-middleware-javalin/checkstyle.xml deleted file mode 100644 index f5e7412d..00000000 --- a/qqq-middleware-javalin/checkstyle.xml +++ /dev/null @@ -1,265 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/qqq-middleware-javalin/pom.xml b/qqq-middleware-javalin/pom.xml index 9c530b97..9de49afb 100644 --- a/qqq-middleware-javalin/pom.xml +++ b/qqq-middleware-javalin/pom.xml @@ -23,29 +23,17 @@ 4.0.0 - com.kingsrook.qqq qqq-middleware-javalin - 0.3.0-SNAPSHOT - - scm:git:git@github.com:Kingsrook/qqq-middleware-javalin.git - scm:git:git@github.com:Kingsrook/qqq-middleware-javalin.git - HEAD - + + com.kingsrook.qqq + qqq-parent-project + ${revision} + - - - UTF-8 - UTF-8 - 17 - 17 - true - true - true - 0.80 @@ -53,12 +41,12 @@ com.kingsrook.qqq qqq-backend-core - 0.2.0 + ${revision} com.kingsrook.qqq qqq-backend-module-rdbms - 0.2.0 + ${revision} test @@ -85,202 +73,30 @@ slf4j-simple 1.7.36 - - org.assertj - assertj-core - 3.23.1 - test - org.apache.maven.plugins maven-checkstyle-plugin - 3.1.2 org.apache.logging.log4j log4j-api - 2.17.2 org.apache.logging.log4j log4j-core - 2.17.2 org.junit.jupiter junit-jupiter-engine - 5.8.2 + test + + + org.assertj + assertj-core test - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - -Xlint:unchecked - - - - org.apache.maven.plugins - maven-surefire-plugin - 3.0.0-M5 - - @{jaCoCoArgLine} - - - - org.apache.maven.plugins - maven-checkstyle-plugin - 3.1.2 - - - com.puppycrawl.tools - checkstyle - 9.0 - - - - - validate - validate - - checkstyle.xml - - UTF-8 - true - false - true - warning - **/target/generated-sources/*.* - - - - check - - - - - - com.amashchenko.maven.plugin - gitflow-maven-plugin - 1.18.0 - - - main - dev - version- - - true - install - true - 1 - - - - org.jacoco - jacoco-maven-plugin - 0.8.8 - - - pre-unit-test - - prepare-agent - - - jaCoCoArgLine - - - - unit-test-check - - check - - - - ${coverage.haltOnFailure} - - - BUNDLE - - - INSTRUCTION - COVEREDRATIO - ${coverage.instructionCoveredRatioMinimum} - - - - - - - - post-unit-test - verify - - report - - - - - - exec-maven-plugin - org.codehaus.mojo - 3.0.0 - - - test-coverage-summary - verify - - exec - - - sh - - -c - - /tmp/$$.headers -xpath -q -e '/html/body/table/tfoot/tr[1]/td/text()' target/site/jacoco/index.html > /tmp/$$.values -echo -echo "Jacoco coverage summary report:" -echo " See also target/site/jacoco/index.html" -echo " and https://www.jacoco.org/jacoco/trunk/doc/counters.html" -echo "------------------------------------------------------------" -paste /tmp/$$.headers /tmp/$$.values | tail +2 | awk -v FS='\t' '{printf("%-20s %s\n",$1,$2)}' -rm /tmp/$$.headers /tmp/$$.values - ]]> - - - - - - - - - - - - github-qqq-maven-registry - GitHub QQQ Maven Registry - https://maven.pkg.github.com/Kingsrook/qqq-maven-registry - - - - - - github-qqq-maven-registry - GitHub QQQ Maven Registry - https://maven.pkg.github.com/Kingsrook/qqq-maven-registry - - - diff --git a/qqq-middleware-picocli/.circleci/config.yml b/qqq-middleware-picocli/.circleci/config.yml deleted file mode 100644 index 658f75d1..00000000 --- a/qqq-middleware-picocli/.circleci/config.yml +++ /dev/null @@ -1,79 +0,0 @@ -version: 2.1 - -executors: - java17: - docker: - - image: 'cimg/openjdk:17.0' - resource_class: small - -orbs: - slack: circleci/slack@4.10.1 - -commands: - run_maven: - parameters: - maven_subcommand: - default: test - type: string - steps: - - checkout - - restore_cache: - keys: - - v1-dependencies-{{ checksum "pom.xml" }} - - run: - name: Run Maven - command: | - mvn -s .circleci/mvn-settings.xml << parameters.maven_subcommand >> - - store_artifacts: - path: target/site/jacoco - - run: - name: Save test results - command: | - mkdir -p ~/test-results/junit/ - find . -type f -regex ".*/target/surefire-reports/.*xml" -exec cp {} ~/test-results/junit/ \; - when: always - - store_test_results: - path: ~/test-results - - save_cache: - paths: - - ~/.m2 - key: v1-dependencies-{{ checksum "pom.xml" }} - -jobs: - mvn_test: - executor: java17 - steps: - - run_maven: - maven_subcommand: verify - - slack/notify: - event: fail - - mvn_deploy: - executor: java17 - steps: - - run_maven: - maven_subcommand: deploy - - slack/notify: - event: always - -workflows: - test_only: - jobs: - - mvn_test: - context: [ qqq-maven-registry-credentials, kingsrook-slack ] - filters: - branches: - ignore: /dev/ - tags: - ignore: /(version|snapshot)-.*/ - - deploy: - jobs: - - mvn_deploy: - context: [ qqq-maven-registry-credentials, kingsrook-slack ] - filters: - branches: - only: /dev/ - tags: - only: /(version|snapshot)-.*/ - diff --git a/qqq-middleware-picocli/.circleci/mvn-settings.xml b/qqq-middleware-picocli/.circleci/mvn-settings.xml deleted file mode 100644 index b2a345f0..00000000 --- a/qqq-middleware-picocli/.circleci/mvn-settings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - github-qqq-maven-registry - ${env.QQQ_MAVEN_REGISTRY_USERNAME} - ${env.QQQ_MAVEN_REGISTRY_PASSWORD} - - - diff --git a/qqq-middleware-picocli/checkstyle.xml b/qqq-middleware-picocli/checkstyle.xml deleted file mode 100644 index f5e7412d..00000000 --- a/qqq-middleware-picocli/checkstyle.xml +++ /dev/null @@ -1,265 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/qqq-middleware-picocli/pom.xml b/qqq-middleware-picocli/pom.xml index 07414d4f..4eecb082 100644 --- a/qqq-middleware-picocli/pom.xml +++ b/qqq-middleware-picocli/pom.xml @@ -23,29 +23,17 @@ 4.0.0 - com.kingsrook.qqq qqq-middleware-picocli - 0.3.0-SNAPSHOT - - scm:git:git@github.com:Kingsrook/qqq-middleware-picocli.git - scm:git:git@github.com:Kingsrook/qqq-middleware-picocli.git - HEAD - + + com.kingsrook.qqq + qqq-parent-project + ${revision} + - - - UTF-8 - UTF-8 - 17 - 17 - true - true - true - 0.80 @@ -53,16 +41,15 @@ com.kingsrook.qqq qqq-backend-core - 0.2.0 + ${revision} com.kingsrook.qqq qqq-backend-module-rdbms - 0.2.0 + ${revision} test - info.picocli @@ -85,28 +72,23 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.1.2 org.apache.logging.log4j log4j-api - 2.17.1 org.apache.logging.log4j log4j-core - 2.17.1 org.junit.jupiter junit-jupiter-engine - 5.8.1 test org.assertj assertj-core - 3.23.1 test @@ -127,167 +109,7 @@ - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - -Xlint:unchecked - - - - org.apache.maven.plugins - maven-surefire-plugin - 3.0.0-M5 - - @{jaCoCoArgLine} - - - - org.apache.maven.plugins - maven-checkstyle-plugin - 3.1.2 - - - com.puppycrawl.tools - checkstyle - 9.0 - - - - - validate - validate - - checkstyle.xml - - UTF-8 - true - false - true - warning - **/target/generated-sources/*.* - - - - check - - - - - - com.amashchenko.maven.plugin - gitflow-maven-plugin - 1.18.0 - - - main - dev - version- - - true - install - true - 1 - - - - org.jacoco - jacoco-maven-plugin - 0.8.8 - - - pre-unit-test - - prepare-agent - - - jaCoCoArgLine - - - - unit-test-check - - check - - - - ${coverage.haltOnFailure} - - - BUNDLE - - - INSTRUCTION - COVEREDRATIO - ${coverage.instructionCoveredRatioMinimum} - - - - - - - - post-unit-test - verify - - report - - - - - - exec-maven-plugin - org.codehaus.mojo - 3.0.0 - - - test-coverage-summary - verify - - exec - - - sh - - -c - - /tmp/$$.headers -xpath -q -e '/html/body/table/tfoot/tr[1]/td/text()' target/site/jacoco/index.html > /tmp/$$.values -echo -echo "Jacoco coverage summary report:" -echo " See also target/site/jacoco/index.html" -echo " and https://www.jacoco.org/jacoco/trunk/doc/counters.html" -echo "------------------------------------------------------------" -paste /tmp/$$.headers /tmp/$$.values | tail +2 | awk -v FS='\t' '{printf("%-20s %s\n",$1,$2)}' -rm /tmp/$$.headers /tmp/$$.values - ]]> - - - - - - - - - github-qqq-maven-registry - GitHub QQQ Maven Registry - https://maven.pkg.github.com/Kingsrook/qqq-maven-registry - - - - - - github-qqq-maven-registry - GitHub QQQ Maven Registry - https://maven.pkg.github.com/Kingsrook/qqq-maven-registry - - - diff --git a/qqq-sample-project/.circleci/config.yml b/qqq-sample-project/.circleci/config.yml deleted file mode 100644 index a35d7951..00000000 --- a/qqq-sample-project/.circleci/config.yml +++ /dev/null @@ -1,66 +0,0 @@ -## Deviations from qqq-java library standard circleci config: -## - In this project, we just always run a test, never a deploy (at this time). -version: 2.1 - -executors: - java17: - docker: - - image: 'cimg/openjdk:17.0' - resource_class: small - -orbs: - slack: circleci/slack@4.10.1 - -commands: - run_maven: - parameters: - maven_subcommand: - default: test - type: string - steps: - - checkout - - restore_cache: - keys: - - v1-dependencies-{{ checksum "pom.xml" }} - - run: - name: Run Maven - command: | - mvn -s .circleci/mvn-settings.xml << parameters.maven_subcommand >> - - store_artifacts: - path: target/site/jacoco - - run: - name: Save test results - command: | - mkdir -p ~/test-results/junit/ - find . -type f -regex ".*/target/surefire-reports/.*xml" -exec cp {} ~/test-results/junit/ \; - when: always - - store_test_results: - path: ~/test-results - - save_cache: - paths: - - ~/.m2 - key: v1-dependencies-{{ checksum "pom.xml" }} - -jobs: - mvn_test: - executor: java17 - steps: - - run_maven: - maven_subcommand: verify - - slack/notify: - event: fail - - mvn_deploy: - executor: java17 - steps: - - run_maven: - maven_subcommand: deploy - - slack/notify: - event: always - -workflows: - test_only: - jobs: - - mvn_test: - context: [ qqq-maven-registry-credentials, kingsrook-slack ] - diff --git a/qqq-sample-project/.circleci/mvn-settings.xml b/qqq-sample-project/.circleci/mvn-settings.xml deleted file mode 100644 index b2a345f0..00000000 --- a/qqq-sample-project/.circleci/mvn-settings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - github-qqq-maven-registry - ${env.QQQ_MAVEN_REGISTRY_USERNAME} - ${env.QQQ_MAVEN_REGISTRY_PASSWORD} - - - diff --git a/qqq-sample-project/checkstyle.xml b/qqq-sample-project/checkstyle.xml deleted file mode 100644 index f5e7412d..00000000 --- a/qqq-sample-project/checkstyle.xml +++ /dev/null @@ -1,265 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/qqq-sample-project/pom.xml b/qqq-sample-project/pom.xml index 06ff5538..2808ec54 100644 --- a/qqq-sample-project/pom.xml +++ b/qqq-sample-project/pom.xml @@ -25,23 +25,17 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.kingsrook.qqq qqq-sample-project - 0.2.0-SNAPSHOT + + + com.kingsrook.qqq + qqq-parent-project + ${revision} + - - - UTF-8 - UTF-8 - 17 - 17 - true - true - true - 0.75 @@ -49,51 +43,53 @@ com.kingsrook.qqq qqq-backend-core - 0.2.0-20220726.214150-15 + ${revision} com.kingsrook.qqq qqq-backend-module-rdbms - 0.2.0-20220726.214633-12 + ${revision} com.kingsrook.qqq qqq-backend-module-filesystem - 0.2.0-20220726.215110-8 + ${revision} com.kingsrook.qqq qqq-middleware-javalin - 0.2.0-20220726.215233-6 + ${revision} com.kingsrook.qqq qqq-middleware-picocli - 0.2.0-20220726.215232-6 + ${revision} + org.apache.maven.plugins maven-checkstyle-plugin - 3.1.2 org.apache.logging.log4j log4j-api - 2.17.2 org.apache.logging.log4j log4j-core - 2.17.2 org.junit.jupiter junit-jupiter-engine - 5.8.2 + test + + + org.assertj + assertj-core test @@ -114,156 +110,7 @@ - - org.apache.maven.plugins - maven-resources-plugin - 3.2.0 - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - -Xlint:unchecked - - - - org.apache.maven.plugins - maven-surefire-plugin - 3.0.0-M5 - - @{jaCoCoArgLine} - - - - org.apache.maven.plugins - maven-checkstyle-plugin - 3.1.2 - - - com.puppycrawl.tools - checkstyle - 9.0 - - - - - validate - validate - - checkstyle.xml - - UTF-8 - true - false - true - warning - **/target/generated-sources/*.* - - - - check - - - - - - org.jacoco - jacoco-maven-plugin - 0.8.8 - - - pre-unit-test - - prepare-agent - - - jaCoCoArgLine - - - - unit-test-check - - check - - - - ${coverage.haltOnFailure} - - - BUNDLE - - - INSTRUCTION - COVEREDRATIO - ${coverage.instructionCoveredRatioMinimum} - - - - - - - - post-unit-test - verify - - report - - - - - - exec-maven-plugin - org.codehaus.mojo - 3.0.0 - - - test-coverage-summary - verify - - exec - - - sh - - -c - - /tmp/$$.headers -xpath -q -e '/html/body/table/tfoot/tr[1]/td/text()' target/site/jacoco/index.html > /tmp/$$.values -echo -echo "Jacoco coverage summary report:" -echo " See also target/site/jacoco/index.html" -echo " and https://www.jacoco.org/jacoco/trunk/doc/counters.html" -echo "------------------------------------------------------------" -paste /tmp/$$.headers /tmp/$$.values | tail +2 | awk -v FS='\t' '{printf("%-20s %s\n",$1,$2)}' -rm /tmp/$$.headers /tmp/$$.values - ]]> - - - - - - - - - github-qqq-maven-registry - GitHub QQQ Maven Registry - https://maven.pkg.github.com/Kingsrook/qqq-maven-registry - - - - - - github-qqq-maven-registry - GitHub QQQ Maven Registry - https://maven.pkg.github.com/Kingsrook/qqq-maven-registry - - -