This is an automated email from the ASF dual-hosted git repository. ahuber pushed a commit to branch v3 in repository https://gitbox.apache.org/repos/asf/causeway.git
commit c8e13d03a99cb22ed528bb2bec2f17b8486d9b9a Merge: 12a22e4a9c f3a583add6 Author: andi-huber <[email protected]> AuthorDate: Mon Apr 1 13:44:45 2024 +0200 merge from 'master' pom.xml | 18 - tooling/adoc/antora.yml | 23 - tooling/adoc/modules/ROOT/nav.adoc | 4 - tooling/adoc/modules/ROOT/pages/about.adoc | 11 - .../adoc/modules/ROOT/partials/component-nav.adoc | 3 - tooling/adoc/modules/ROOT/partials/module-nav.adoc | 2 - tooling/c4modeling/README.adoc | 49 -- tooling/c4modeling/pom.xml | 60 --- .../java/org/apache/causeway/tooling/c4/C4.java | 140 ------ .../apache/causeway/tooling/c4/test/C4Test.java | 141 ------ .../tooling/c4/test/baeldung-example-v1.puml | 41 -- .../tooling/c4/test/baeldung-example-v2.puml | 41 -- tooling/cli/README.adoc | 9 - tooling/cli/adoc/antora.yml | 19 - tooling/cli/adoc/modules/tooling-cli/examples.sh | 22 - .../tooling-cli/examples/causeway-tooling.yml | 91 ---- tooling/cli/adoc/modules/tooling-cli/nav.adoc | 4 - .../cli/adoc/modules/tooling-cli/pages/about.adoc | 295 ----------- .../modules/tooling-cli/partials/module-nav.adoc | 4 - tooling/cli/pom.xml | 130 ----- .../java/org/apache/causeway/tooling/cli/Cli.java | 146 ------ .../causeway/tooling/cli/CliCommandAbstract.java | 64 --- .../org/apache/causeway/tooling/cli/CliConfig.java | 147 ------ .../cli/adocfix/OrphanedIncludeStatementFixer.java | 129 ----- .../tooling/cli/projdoc/ProjectDocModel.java | 537 --------------------- .../tooling/cli/projdoc/ProjectDocWriter.java | 173 ------- tooling/cli/src/main/resources/log4j2.xml | 26 - .../ProjectDocModel_sanitizeDescription_Test.java | 51 -- .../causeway/tooling/cli/test/CliConfigTest.java | 70 --- .../test/adocfix/IncludeStatementFixerTest.java | 70 --- .../tooling/cli/test/adocfix/ProjectSampler.java | 51 -- .../causeway/tooling/cli/test/causeway-tooling.yml | 89 ---- tooling/java2adoc/pom.xml | 69 --- .../causeway/tooling/j2adoc/J2AdocContext.java | 280 ----------- .../apache/causeway/tooling/j2adoc/J2AdocUnit.java | 194 -------- .../tooling/j2adoc/convert/HtmlToAsciiDoc.java | 219 --------- .../tooling/j2adoc/convert/J2AdocConverter.java | 63 --- .../j2adoc/convert/J2AdocConverterAbstract.java | 170 ------- .../j2adoc/convert/J2AdocConverterDefault.java | 264 ---------- .../tooling/j2adoc/format/MemberFormatter.java | 51 -- .../causeway/tooling/j2adoc/format/Snippets.java | 127 ----- .../tooling/j2adoc/format/UnitFormatter.java | 40 -- .../j2adoc/format/UnitFormatterAbstract.java | 221 --------- .../j2adoc/format/UnitFormatterCompact.java | 80 --- .../format/UnitFormatterWithSourceAndCallouts.java | 85 ---- .../format/UnitFormatterWithSourceAndSections.java | 225 --------- .../j2adoc/util/AsciiDocIncludeTagFilter.java | 86 ---- .../tooling/j2adoc/util/ResourceCoordinates.java | 123 ----- .../tooling/j2adoc/convert/HtmlToAsciiDocTest.java | 59 --- .../j2adoc/format/UnitFormatterAbstractTest.java | 45 -- .../j2adoc/test/ExampleReferenceFinder.java | 102 ---- .../j2adoc/test/ExampleReferenceRewriter.java | 104 ---- .../causeway/tooling/j2adoc/test/J2AdocTest.java | 142 ------ .../tooling/j2adoc/test/ProjectSampler.java | 51 -- tooling/javamodel/pom.xml | 133 ----- .../tooling/javamodel/AnalyzerConfigFactory.java | 92 ---- .../javamodel/ast/AnnotationDeclarations.java | 56 --- .../ast/AnnotationMemberDeclarations.java | 45 -- .../tooling/javamodel/ast/AnyTypeDeclaration.java | 229 --------- .../javamodel/ast/CallableDeclarations.java | 61 --- .../ast/ClassOrInterfaceDeclarations.java | 79 --- .../tooling/javamodel/ast/CodeClasses.java | 75 --- .../tooling/javamodel/ast/CompilationUnits.java | 107 ---- .../javamodel/ast/ConstructorDeclarations.java | 83 ---- .../javamodel/ast/EnumConstantDeclarations.java | 34 -- .../tooling/javamodel/ast/EnumDeclarations.java | 87 ---- .../tooling/javamodel/ast/FieldDeclarations.java | 97 ---- .../tooling/javamodel/ast/ImportDeclarations.java | 92 ---- .../causeway/tooling/javamodel/ast/Javadocs.java | 114 ----- .../tooling/javamodel/ast/MemberInfos.java | 50 -- .../tooling/javamodel/ast/MethodDeclarations.java | 84 ---- .../tooling/javamodel/ast/PackageDeclarations.java | 41 -- .../tooling/javamodel/ast/TypeDeclarations.java | 59 --- .../tooling/javamodel/test/AnalyzerTest.java | 115 ----- .../tooling/javamodel/test/ProjectSamples.java | 72 --- tooling/metaprog/pom.xml | 85 ---- .../compiler/JavaSourceCompilingClassLoader.java | 147 ------ .../demoshowcases/value/ValueShowCase.java | 433 ----------------- .../demoshowcases/value/ValueTypeGenTemplate.java | 377 --------------- .../graphql/GraphQLToJavaSourceConverter.java | 258 ---------- .../src/main/resources/$Templates-common.adoc | 66 --- .../resources/$Templates-common~primitive.adoc | 59 --- .../src/main/resources/$Templates-description.adoc | 26 - .../$Templates-description~primitive.adoc | 27 -- .../metaprog/src/main/resources/$Templates.java | 84 ---- .../src/main/resources/$Templates.layout.xml | 60 --- .../src/main/resources/$Templates~primitive.java | 82 ---- .../src/main/resources/holder/$TemplateHolder.java | 42 -- .../main/resources/holder/$TemplateHolder2.java | 75 --- .../holder/$TemplateHolder2~primitive.java | 74 --- .../holder/$TemplateHolder_actionReturning.java | 40 -- .../$TemplateHolder_actionReturningArray.java | 52 -- ...plateHolder_actionReturningArray~primitive.java | 50 -- .../$TemplateHolder_actionReturningCollection.java | 51 -- ...Holder_actionReturningCollection~primitive.java | 49 -- .../$TemplateHolder_actionReturning~primitive.java | 38 -- .../holder/$TemplateHolder_mixinProperty.java | 42 -- .../$TemplateHolder_mixinProperty~primitive.java | 40 -- ...plateHolder_updateReadOnlyOptionalProperty.java | 60 --- ..._updateReadOnlyOptionalPropertyWithChoices.java | 73 --- .../$TemplateHolder_updateReadOnlyProperty.java | 55 --- ...teHolder_updateReadOnlyPropertyWithChoices.java | 70 --- ...pdateReadOnlyPropertyWithChoices~primitive.java | 68 --- ...ateHolder_updateReadOnlyProperty~primitive.java | 53 -- .../holder/$TemplateHolder~primitive.java | 34 -- .../resources/jdo/$TemplateJdo-description.adoc | 18 - .../jdo/$TemplateJdo-description~primitive.adoc | 13 - .../src/main/resources/jdo/$TemplateJdo.java | 85 ---- .../main/resources/jdo/$TemplateJdoEntities.java | 42 -- .../jdo/$TemplateJdoEntities~primitive.java | 40 -- .../src/main/resources/jdo/$TemplateJdo~lob.java | 86 ---- .../main/resources/jdo/$TemplateJdo~primitive.java | 67 --- .../resources/jpa/$TemplateJpa-description.adoc | 18 - .../jpa/$TemplateJpa-description~primitive.adoc | 13 - .../src/main/resources/jpa/$TemplateJpa.java | 97 ---- .../main/resources/jpa/$TemplateJpaEntities.java | 42 -- .../jpa/$TemplateJpaEntities~primitive.java | 40 -- .../src/main/resources/jpa/$TemplateJpa~lob.java | 101 ---- .../main/resources/jpa/$TemplateJpa~primitive.java | 79 --- .../resources/persistence/$TemplateEntity.java | 44 -- .../persistence/$TemplateEntity.layout.xml | 59 --- .../persistence/$TemplateEntity~primitive.java | 42 -- .../$TemplateEntity~primitive.layout.xml | 58 --- .../resources/persistence/$TemplateSeeding.java | 39 -- .../persistence/$TemplateSeeding~primitive.java | 37 -- .../main/resources/samples/$TemplateSamples.java | 39 -- .../samples/$TemplateSamples~primitive.java | 37 -- .../main/resources/vm/$TemplateVm-description.adoc | 17 - .../vm/$TemplateVm-description~primitive.adoc | 12 - .../src/main/resources/vm/$TemplateVm.java | 86 ---- .../src/main/resources/vm/$TemplateVm.layout.xml | 59 --- .../main/resources/vm/$TemplateVm~primitive.java | 69 --- .../resources/vm/$TemplateVm~primitive.layout.xml | 58 --- .../value/ValueTypeGenTemplateTest.java | 193 -------- .../tooling/metaprog/graphql/GraphQLTest.graphqls | 28 -- .../tooling/metaprog/graphql/GraphQLTest.java | 95 ---- .../src/test/resources/junit-platform.properties | 37 -- .../metaprog/src/test/resources/log4j2-test.xml | 56 --- tooling/pom.xml | 301 ------------ tooling/projectmodel/pom.xml | 66 --- .../tooling/projectmodel/ArtifactCoordinates.java | 82 ---- .../projectmodel/ArtifactShortNameFactory.java | 28 -- .../causeway/tooling/projectmodel/Dependency.java | 58 --- .../causeway/tooling/projectmodel/ProjectNode.java | 92 ---- .../tooling/projectmodel/ProjectNodeFactory.java | 35 -- .../projectmodel/ProjectNodeFactory_gradle.java | 92 ---- .../projectmodel/ProjectNodeFactory_maven.java | 172 ------- .../tooling/projectmodel/ProjectVisitor.java | 27 -- .../projectmodel/gradle/GradleBuildArtifact.java | 45 -- .../projectmodel/gradle/GradleDependencies.java | 33 -- .../gradle/GradleDependenciesFactory.java | 55 --- .../gradle/GradleDependenciesWriter.java | 74 --- .../projectmodel/gradle/GradleSettings.java | 34 -- .../projectmodel/gradle/GradleSettingsFactory.java | 76 --- .../projectmodel/gradle/GradleSettingsWriter.java | 69 --- .../projectmodel/gradle/WriterAbstract.java | 39 -- .../projectmodel/maven/MavenModelFactory.java | 100 ---- .../projectmodel/maven/SimpleModelResolver.java | 206 -------- .../projectmodel/sync/GradleDeficiency.java | 28 -- .../projectmodel/sync/SyncerMavenToGradle.java | 23 - tooling/projectmodel/src/main/resources/log4j2.xml | 26 - .../projectmodel/test/GradleDependenciesTest.java | 47 -- .../projectmodel/test/GradleSettingsTest.java | 134 ----- .../test/ProjectModelTestAbstract.java | 35 -- .../tooling/projectmodel/test/ProjectTreeTest.java | 95 ---- 165 files changed, 13813 deletions(-) diff --cc pom.xml index fbd6ecea07,f430d7cede..4589e115f4 --- a/pom.xml +++ b/pom.xml @@@ -123,12 -123,8 +123,11 @@@ </activation> <modules> <module>antora</module> - <module>incubator</module> + + <!-- incubator, without kroviz --> + <module>incubator/extensions/core/commandreplay</module> + <module>regressiontests</module> - <module>tooling</module> </modules> </profile> @@@ -147,25 -143,6 +146,23 @@@ </modules> </profile> + <profile> + <id>module-all-except-kroviz</id> + <activation> + <property> + <name>module-all-except-kroviz</name> + </property> + </activation> + <modules> + <module>antora</module> + + <!-- incubator, without kroviz --> + <module>incubator/extensions/core/commandreplay</module> + + <module>regressiontests</module> - <module>tooling</module> + </modules> + </profile> + <!-- NON-ESSENTIAL MODULES --> <profile> @@@ -242,30 -218,181 +239,15 @@@ </profile> <profile> - <id>causeway-app-starter-surefire</id> - <activation> - <property> - <name>!skip.causeway-app-starter-surefire</name> - </property> - </activation> - - <properties> - <!-- uses maven-surefire-plugin.version, which is declared by spring-boot-starter-parent --> - <skipTests>false</skipTests> - <skipUTs>${skipTests}</skipUTs> - <skipITs>${skipTests}</skipITs> - <skipBDDs>${skipTests}</skipBDDs> - <surefire-plugin.argLine></surefire-plugin.argLine> - </properties> - - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>${maven-surefire-plugin.version}</version> - <executions> - <execution> - <id>default-test</id> - <phase>test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <skipTests>${skipUTs}</skipTests> - <includes> - <include>**/*Test*.java</include> - </includes> - <excludes> - <exclude>**/*Testing.java</exclude> - <exclude>**/*IntegTest*.java</exclude> - <exclude>**/*Abstract*.java</exclude> - </excludes> - <useFile>true</useFile> - <printSummary>true</printSummary> - <reportsDirectory>${project.build.directory}/surefire-unittest-reports</reportsDirectory> - <forkCount>1</forkCount> - <reuseForks>true</reuseForks> - <argLine>${surefire-plugin.argLine}</argLine> - </configuration> - </execution> - <execution> - <id>integ-test</id> - <phase>integration-test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <skipTests>${skipITs}</skipTests> - <includes> - <include>**/*IntegTest*.java</include> - </includes> - <excludes> - <exclude>**/*Abstract*.java</exclude> - </excludes> - <useFile>true</useFile> - <printSummary>true</printSummary> - <reportsDirectory>${project.build.directory}/surefire-integtest-reports</reportsDirectory> - <forkCount>1</forkCount> - <reuseForks>true</reuseForks> - <argLine>${surefire-plugin.argLine}</argLine> - </configuration> - </execution> - <execution> - <id>bdd-specs</id> - <phase>integration-test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <skipTests>${skipBDDs}</skipTests> - <includes> - <include>**/*Spec*.java</include> - </includes> - <excludes> - <exclude>**/*Test.java</exclude> - <exclude>**/*Testing.java</exclude> - <exclude>**/*IntegTest*.java</exclude> - <exclude>**/*Abstract*.java</exclude> - </excludes> - <useFile>true</useFile> - <printSummary>true</printSummary> - <reportsDirectory>${project.build.directory}/surefire-bddspecs-reports</reportsDirectory> - <forkCount>1</forkCount> - <reuseForks>true</reuseForks> - <argLine>${surefire-plugin.argLine}</argLine> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-report-plugin</artifactId> - <version>${maven-surefire-report-plugin.version}</version> - <configuration> - <showSuccess>false</showSuccess> - </configuration> - <executions> - <execution> - <id>test</id> - <phase>test</phase> - </execution> - <execution> - <id>integration-test</id> - <phase>integration-test</phase> - </execution> - <execution> - <id>bdd-specs</id> - <phase>integration-test</phase> - </execution> - </executions> - </plugin> - </plugins> - </pluginManagement> - </build> - </profile> - - <profile> - <id>causeway-app-starter-docker</id> - <activation> - <property> - <name>!skip.causeway-app-starter-docker</name> - </property> - </activation> - <properties> - <jib-maven-plugin.version>3.4.1</jib-maven-plugin.version> - </properties> - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>com.google.cloud.tools</groupId> - <artifactId>jib-maven-plugin</artifactId> - <version>${jib-maven-plugin.version}</version> - </plugin> - </plugins> - </pluginManagement> - </build> - </profile> - - <!-- running: mvn spring-boot:run --> - <profile> - <id>causeway-app-starter-boot</id> + <id>module-regressiontests</id> <activation> <property> - <name>!skip.causeway-app-starter-boot</name> + <name>module-regressiontests</name> </property> </activation> - <properties> - </properties> - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-maven-plugin</artifactId> - <version>${spring-boot.version}</version> - <executions> - <execution> - <goals> - <goal>repackage</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </pluginManagement> - </build> + <modules> - <!-- prerequisites ... --> - <module>tooling</module> - + <module>regressiontests</module> - </modules> - </profile> - - <profile> - <id>module-tooling</id> - <activation> - <property> - <name>module-tooling</name> - </property> - </activation> - <modules> - <module>tooling</module> + </modules> </profile> <profile>
