From 85a0c464107e67b5a244c637f22ceae3b27424c8 Mon Sep 17 00:00:00 2001 From: Andre White Date: Wed, 20 Sep 2023 16:54:15 -0600 Subject: [PATCH 01/10] :art: Trunk Format --- .trunk/trunk.yaml | 4 + .../src/main/docker/Dockerfile.jvm | 2 + .../src/main/docker/Dockerfile.legacy-jar | 2 + .../src/main/docker/Dockerfile.native | 2 + .../src/main/docker/Dockerfile.native-micro | 2 + .../src/main/docker/Dockerfile.jvm | 2 +- .../src/main/docker/Dockerfile.legacy-jar | 2 + .../src/main/docker/Dockerfile.native | 2 + .../src/main/docker/Dockerfile.native-micro | 2 + pom.xml | 1324 ----------------- .../Drow_Scimitar_of_the_Weapon_Master.html | 32 +- swagger.yaml | 14 +- todos.yaml | 26 +- 13 files changed, 41 insertions(+), 1375 deletions(-) delete mode 100644 pom.xml diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index 1be6c29b..f05c901d 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -29,6 +29,10 @@ lint: - shellcheck@0.9.0 - shfmt@3.6.0 - yamllint@1.32.0 + ignore: + - linters: [ALL] + paths: + - incubating/** runtimes: enabled: - go@1.21.0 diff --git a/incubating/amqp-quickstart-producer/src/main/docker/Dockerfile.jvm b/incubating/amqp-quickstart-producer/src/main/docker/Dockerfile.jvm index 952d1a75..d4aa7600 100644 --- a/incubating/amqp-quickstart-producer/src/main/docker/Dockerfile.jvm +++ b/incubating/amqp-quickstart-producer/src/main/docker/Dockerfile.jvm @@ -1,3 +1,5 @@ +# trunk-ignore-all(trivy/DS026) +# trunk-ignore-all(checkov/CKV_DOCKER_2) #### # This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode # diff --git a/incubating/amqp-quickstart-producer/src/main/docker/Dockerfile.legacy-jar b/incubating/amqp-quickstart-producer/src/main/docker/Dockerfile.legacy-jar index cc8e5b51..d6d6dcdf 100644 --- a/incubating/amqp-quickstart-producer/src/main/docker/Dockerfile.legacy-jar +++ b/incubating/amqp-quickstart-producer/src/main/docker/Dockerfile.legacy-jar @@ -1,3 +1,5 @@ +# trunk-ignore-all(trivy/DS026) +# trunk-ignore-all(checkov/CKV_DOCKER_2) #### # This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode # diff --git a/incubating/amqp-quickstart-producer/src/main/docker/Dockerfile.native b/incubating/amqp-quickstart-producer/src/main/docker/Dockerfile.native index 2a7836cb..263adb5d 100644 --- a/incubating/amqp-quickstart-producer/src/main/docker/Dockerfile.native +++ b/incubating/amqp-quickstart-producer/src/main/docker/Dockerfile.native @@ -1,3 +1,5 @@ +# trunk-ignore-all(trivy/DS026) +# trunk-ignore-all(checkov/CKV_DOCKER_2) #### # This Dockerfile is used in order to build a container that runs the Quarkus application in native (no JVM) mode. # diff --git a/incubating/amqp-quickstart-producer/src/main/docker/Dockerfile.native-micro b/incubating/amqp-quickstart-producer/src/main/docker/Dockerfile.native-micro index 0f55bd8b..80f1dd81 100644 --- a/incubating/amqp-quickstart-producer/src/main/docker/Dockerfile.native-micro +++ b/incubating/amqp-quickstart-producer/src/main/docker/Dockerfile.native-micro @@ -1,3 +1,5 @@ +# trunk-ignore-all(trivy/DS026) +# trunk-ignore-all(checkov/CKV_DOCKER_2) #### # This Dockerfile is used in order to build a container that runs the Quarkus application in native (no JVM) mode. # It uses a micro base image, tuned for Quarkus native executables. diff --git a/incubating/poc-scala-quarkus/src/main/docker/Dockerfile.jvm b/incubating/poc-scala-quarkus/src/main/docker/Dockerfile.jvm index 74ddda65..c658a868 100644 --- a/incubating/poc-scala-quarkus/src/main/docker/Dockerfile.jvm +++ b/incubating/poc-scala-quarkus/src/main/docker/Dockerfile.jvm @@ -1,5 +1,5 @@ +# trunk-ignore-all(trivy/DS026) # trunk-ignore-all(checkov/CKV_DOCKER_2) - #### # This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode # diff --git a/incubating/poc-scala-quarkus/src/main/docker/Dockerfile.legacy-jar b/incubating/poc-scala-quarkus/src/main/docker/Dockerfile.legacy-jar index 70233e49..8575ccef 100644 --- a/incubating/poc-scala-quarkus/src/main/docker/Dockerfile.legacy-jar +++ b/incubating/poc-scala-quarkus/src/main/docker/Dockerfile.legacy-jar @@ -1,3 +1,5 @@ +# trunk-ignore-all(trivy/DS026) +# trunk-ignore-all(checkov/CKV_DOCKER_2) #### # This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode # diff --git a/incubating/poc-scala-quarkus/src/main/docker/Dockerfile.native b/incubating/poc-scala-quarkus/src/main/docker/Dockerfile.native index 6f894572..327824f4 100644 --- a/incubating/poc-scala-quarkus/src/main/docker/Dockerfile.native +++ b/incubating/poc-scala-quarkus/src/main/docker/Dockerfile.native @@ -1,3 +1,5 @@ +# trunk-ignore-all(trivy/DS026) +# trunk-ignore-all(checkov/CKV_DOCKER_2) #### # This Dockerfile is used in order to build a container that runs the Quarkus application in native (no JVM) mode. # diff --git a/incubating/poc-scala-quarkus/src/main/docker/Dockerfile.native-micro b/incubating/poc-scala-quarkus/src/main/docker/Dockerfile.native-micro index 9a4058bb..1910f0ce 100644 --- a/incubating/poc-scala-quarkus/src/main/docker/Dockerfile.native-micro +++ b/incubating/poc-scala-quarkus/src/main/docker/Dockerfile.native-micro @@ -1,3 +1,5 @@ +# trunk-ignore-all(trivy/DS026) +# trunk-ignore-all(checkov/CKV_DOCKER_2) #### # This Dockerfile is used in order to build a container that runs the Quarkus application in native (no JVM) mode. # It uses a micro base image, tuned for Quarkus native executables. diff --git a/pom.xml b/pom.xml deleted file mode 100644 index d967f9f7..00000000 --- a/pom.xml +++ /dev/null @@ -1,1324 +0,0 @@ - - - - - 4.0.0 - ddo-calc - ddo-calc-parent - 0.1.0-alpha - pom - DDO Calculations - DDO Calculator for damage, planning and analysis (Super POM + Aggregator) - - subprojects/common/ddo-core - - - - src/specs/scala - src/specs/resources - src/test/specs - - 2.0.0 - 0.3.4 - - UTF-8 - UTF-8 - 1.8 - [1.8,) - ${jvm.version} - ${jvm.version} - UTF-8 - ${project.inceptionYear} - - 3.0.0-rc1 - - 3.3.3 - - 1.11.1 - 1.8.0 - - 1.8.0 - - - 1.1.0 - 1.4.11 - - - 2.32.0 - - 2.12 - 2.13.6 - 2.13.12 - ${scala.base} - 3.9.4 - ${scala.version} - 1.3.0 - 0.3.2 - 0.7.6 - - 1.9.10 - apache_v2 - 7.4.8 - ${project.build.outputDirectory}/${project.groupId}.properties - - 1.1 - - 4.13.2 - 0.5.5 - 2.0.2-beta - 1.0.0 - 2.1.1 - target/concordion - 3.0.0 - 1.0.5 - false - - 1.5.0.RELEASE - - - 3.1.0 - - 2.8.2 - - - - scoverage - reuseReports - ${project.basedir}/../target/jacoco.exec - scala - 3.4.0.905 - - 3.6 - 2.9 - github - - - 3.5.0 - - - src/specs/scala - src/specs/resources - src/test/specs - - - - - - io.vertx - vertx-web-scala_${scala.base} - 3.5.0 - - - io.vertx - vertx-auth-mongo-scala_${scala.base} - 3.5.0 - - - - - lt.velykis.maven.skins - reflow-maven-skin - 1.1.1 - - - lt.velykis.maven.skins - reflow-velocity-tools - 1.1.1 - - - - io.swagger - swagger-codegen - ${swagger.version} - - - io.swagger - swagger-codegen-maven-plugin - ${swagger.version} - - - - - com.typesafe.slick - slick_${scala.base} - ${slick.version} - - - com.typesafe.slick - slick-codegen_${scala.base} - ${slick.version} - - - - com.sksamuel.avro4s - avro4s-core_2.11 - ${avro.scala.version} - - - org.apache.avro - avro - ${avro.version} - - - - - com.revolutionanalytics.deployr - jRBroker - ${jrbroker.version} - - - io.onetapbeyond - fluent-r - ${fluentr.version} - - - - org.jetbrains.kotlin - kotlin-stdlib - ${kotlin.version} - - - - org.scala-lang - scala-library - ${scala.version} - - - org.scalactic - scalactic_${scala.base} - ${scalatest.version} - - - - com.beachape - enumeratum_${scala.base} - 1.5.10 - - - - com.typesafe.scala-logging - scala-logging_${scala.tools.version} - ${scala.logging.version} - - - ch.qos.logback - logback-classic - ${logback.version} - - - - com.typesafe - config - 1.4.1 - - - com.github.kxbmap - configs_${scala.base} - 0.4.4 - - - - com.wix - accord-core_${scala.tools.version} - ${accord.version} - - - - net.ruippeixotog - scala-scraper_${scala.tools.version} - ${scalascraper.version} - - - - org.scala-saddle - saddle-core_2.11 - 1.3.4 - - - - org.scalatra.scalate - scalate-core_${scala.base} - ${scalatra.version} - - - org.scalatra.scalate - scalate-test_${scala.base} - ${scalatra.version} - - - de.neuland-bfi - jade4j - 1.3.2 - - - - commons-codec - commons-codec - 1.15 - - - org.springframework.data - spring-data-commons-core - ${spring.boot.version} - true - - - - - org.springframework.boot - spring-boot-starter-parent - ${spring.boot.version} - pom - import - true - - - - - org.eclipse.xtend - org.eclipse.xtend.lib - ${xtend.version} - test - - - org.mockito - mockito-all - ${mockito.version} - test - - - - org.concordion - concordion - ${concordion.version} - test - - - org.concordion - concordion-embed-extension - 1.1.2 - test - - - - org.concordion - concordion-collapse-output-extension - 1.0.0 - test - - - org.scalatest - scalatest_${scala.tools.version} - ${scalatest.version} - test - - - org.evosuite - evosuite-standalone-runtime - ${evosuiteVersion} - test - - - - org.jnario - org.jnario.lib - ${jnario.version} - test - - - com.wix - accord-scalatest_${scala.tools.version} - ${accord.version} - test - - - junit - junit - ${junit.version} - test - - - org.testng - testng - 7.7.1 - test - - - com.github.bmsantos - cola-tests - ${cola.version} - test - - - - - - - - - com.versioneye - versioneye-maven-plugin - 3.11.1 - - - - - com.github.ekryd.sortpom - sortpom-maven-plugin - 2.4.0 - - custom_1 - ${project.build.sourceEncoding} - false - true - scope - - - - - sort - - verify - - - - - - org.apache.maven.plugins - maven-deploy-plugin - ${maven-deploy-plugin.version} - - true - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.5.1 - - nexus - http://localhost:8081/nexus/ - false - - - - default-deploy - - deploy - - deploy - - - - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.8.1 - - - org.scoverage - scoverage-maven-plugin - ${scoverage.plugin.version} - - ${scala.version} - true - true - - - - - instrument - - check - - package - - - - - org.apache.maven.plugins - maven-surefire-report-plugin - 2.19.1 - - - org.codehaus.mojo - sonar-maven-plugin - ${sonar.plugin.version} - - - - sonar - - verify - - - - - - org.codehaus.mojo - versions-maven-plugin - 2.15.0 - - - - org.apache.maven.plugins - maven-enforcer-plugin - 1.4.1 - - - pre-release - - enforce - - - - - No Snapshots Allowed! - false - - - ${jvm.version} - - - true - - - - - - - com.mycila - license-maven-plugin - 2.11 - -
com/mycila/maven/plugin/license/templates/APACHE-2.txt
- - Andre White - adarro@gmail.com - - - src/main/scala/**/*.scala - src/test/scala/**/*.scala - src/main/java/**/*.java - src/test/java/**/*.java - **/*.xml - **/*.kt - **/*.r - - - **/test* - target/** - **/AndroidManifest.xml - **/README - src/test/resources/** - src/main/resources/** - - true - true - - JAVADOC_STYLE - HAML_STYLE - JAVADOC_STYLE - - - - - - check - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 3.4.0 - - - pl.project13.maven - git-commit-id-plugin - 4.9.10 - - - - ${project.basedir}/.git - - - git - - - dd.MM.yyyy '@' HH:mm:ss z - - - - ${user.timezone} - - - false - - - - - - true - - - ${project.build.outputDirectory}/git.properties - - - properties - - - true - - - - false - - - - true - - - - true - - - - false - - - - false - - - - - - - - - - - - - - - - false - - - - 7 - - - - flat - - - - - - - false - - - false - - 7 - - - -dirty - - - * - - - false - - - - - - revision - - - - - - - - - external.atlassian.jgitflow - jgitflow-maven-plugin - 1.0-m5.1 - - - master - development - feature- - release- - hotfix- - v- - - - - - - - com.github.bmsantos - cola-maven-plugin - ${cola.version} - - - **/*Test.class - - - - - compile-cola-tests - - compile - - process-test-classes - - - - - - org.apache.maven.plugins - maven-failsafe-plugin - 2.22.2 - - - integration-test - - integration-test - - - - verify - - verify - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.3 - - - - org.jetbrains.kotlin - kotlin-maven-plugin - ${kotlin.version} - - - compile - - compile - - compile - - - test-compile - - test-compile - - test-compile - - - - - - - - net.alchim31.maven - scala-maven-plugin - 3.2.2 - true - - scatatest:test surefire:test - - - - scala-compile - - compile - - - - -dependencyfile - -deprecation - -feature - -Ywarn-unused - -Xlint - -Xcheckinit - -Yrangepos - - JavaThenScala - - - - scala-test-compile - - testCompile - - - - -dependencyfile - -deprecation - -feature - -Ywarn-unused - -Xlint - -Xcheckinit - -Yrangepos - - - **/*.java - **/*.scala - - - - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9 - - 64m - 2g - ${project.build.directory} - true - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.19 - - - - org.scalatest - scalatest-maven-plugin - 2.2.0 - - ${project.build.directory}/surefire-reports - . - WDF TestSuite.txt - - target/concordion - - - - - org.pegdown - pegdown - 1.6.0 - - - - - scala-test - - test - - - Test - ${skip.tests} - - - - scala-test-spec - - test - - - Spec - ${skip.tests} - - - - scala-integration-test - - test - - integration-test - - IT - ${skip.tests} - - - - - - org.evosuite.plugins - evosuite-maven-plugin - ${evosuiteVersion} - - - - prepare - - process-test-classes - - - - - - - org.eclipse.xtend - xtend-maven-plugin - ${xtend.version} - - - - compile - testCompile - xtend-install-debug-info - - - ${project.build.directory}/xtend-gen/main - ${project.build.directory}/xtend-gen/test - - - - - - - org.jnario - jnario-maven-plugin - ${jnario.version} - - - - testCompile - xtend-test-install-debug-info - - - - - - - - de.smartics.maven.plugin - alias-maven-plugin - ${version.alias-maven-plugin} - - - alias - - alias - - - ${project.url}/alias-report.html - - - - - - - lt.velykis.maven.skins - reflow-maven-skin - 1.1.1 - - - lt.velykis.maven.skins - reflow-velocity-tools - 1.1.1 - - - org.apache.maven.plugins - maven-site-plugin - ${site.plugin.version} - - true - - - - lt.velykis.maven.skins - reflow-maven-skin - 1.1.1 - - - lt.velykis.maven.skins - reflow-velocity-tools - 1.1.1 - - - - org.apache.velocity - velocity-engine-core - 2.3 - - - org.apache.maven.skins - maven-fluido-skin - 1.5 - - - org.apache.maven.doxia - doxia-module-markdown - 1.7 - - - - - com.github.github - site-maven-plugin - 0.12 - - Creating site for ${project.version} - - - - - site - - site-deploy - - github - - Building site for my project - - ${project.version} - true - - - - - - - - - - - - - - - com.versioneye - versioneye-maven-plugin - - 58c90554d01cb20045124875 - - - - org.codehaus.mojo - versions-maven-plugin - - scalascraper.version,scala.base,scala.version,scala.tools.versionscala.minor.version,scala.binary.full.version,scalatest.version - - - - org.apache.maven.plugins - maven-dependency-plugin - - true - - - - uninstall - - purge-local-repository - - true - - ${project.groupId}:${project.artifactId} - true - - - - uninstall-dep - - purge-local-repository - - true - - false - false - - - - - - - com.github.github - site-maven-plugin - - - com.github.ekryd.sortpom - sortpom-maven-plugin - - - - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.9 - false - - - org.apache.maven.plugins - maven-pmd-plugin - 3.6 - true - - true - utf-8 - 100 - ${jvm.version} - - **/*Bean.java - **/generated/*.java - - - target/generated-sources/stubs - - - - - maven-dependency-plugin - 2.10 - - - org.scoverage - scoverage-maven-plugin - ${scoverage.plugin.version} - - - org.apache.maven.plugins - maven-jxr-plugin - 2.3 - - - aggregate - - aggregate - - false - - - - - org.apache.maven.plugins - maven-surefire-report-plugin - RELEASE - - - org.codehaus.mojo - versions-maven-plugin - 2.15.0 - - - - dependency-updates-report - plugin-updates-report - property-updates-report - - - - - - org.codehaus.mojo - taglist-maven-plugin - 3.0.0 - - - - http://github.com/adarro/ddo-calc/ - 2015 - - - awhite - Andre White - adarro@gmail.com - https://adarro.github.io - - owner - - - - - scm:git:git://github.com/github.com/adarro/ddo-calc.git - scm:git:git@github.com:adarro/ddo-calc.git - https://github.com/adarro/ddo-calc - - - GitHub Issues - https://github.com/adarro/ddo-calc/issues - - - - - SpringIO - Spring.IO releases - http://repo.spring.io/libs-release-remote - - - sonatype-releases - https://oss.sonatype.org/content/repositories/releases - - - central - http://repo1.maven.org/maven2/ - - - - - - true - - - false - - smartics-public - https://www.smartics.eu/nexus/content//groups/public-group - - - sonatype-releases - http://oss.sonatype.org/content/repositories/releases - - - central - http://repo1.maven.org/maven2 - - - - - - ddo.website - Adarro's Nexus - http://localhost/DdoObjects/ - - - - \ No newline at end of file diff --git a/subprojects/common/ddo-web/src/test/resources/Drow_Scimitar_of_the_Weapon_Master.html b/subprojects/common/ddo-web/src/test/resources/Drow_Scimitar_of_the_Weapon_Master.html index 9a47f59e..1cf63436 100644 --- a/subprojects/common/ddo-web/src/test/resources/Drow_Scimitar_of_the_Weapon_Master.html +++ b/subprojects/common/ddo-web/src/test/resources/Drow_Scimitar_of_the_Weapon_Master.html @@ -1029,21 +1029,7 @@

margin-top: 10px; margin-bottom: 5px; " - > - - - + >