Skip to content

Commit

Permalink
JNG-5932 Fixing generator workflow regression
Browse files Browse the repository at this point in the history
  • Loading branch information
@robertcsakany
robertcsakany committed Sep 23, 2024
1 parent d261fbe commit ab621a5
Show file tree
Hide file tree
Showing 8 changed files with 379 additions and 222 deletions.
58 changes: 34 additions & 24 deletions judo-jsl-fullstack-karaf-project-template-application/src/main/resources/app/pom.xml.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,37 +24,27 @@
<groupId>hu.blackbelt.judo.meta</groupId>
<artifactId>judo-psm-generator-maven-plugin</artifactId>
<version>${judo-meta-psm-version}</version>
<configuration>
<psm>mvn:${project.groupId}:{{ lowerCase model.name }}{{ projectPostfix }}-model:${project.version}!model/${model-name}-psm.model</psm>
<destination>${basedir}/src/main/java</destination>
<uris>
<uri>mvn:hu.blackbelt.judo.generator:judo-psm-generator-sdk-core-common:${judo-psm-generator-sdk-core-version}</uri>
<uri>mvn:hu.blackbelt.judo.generator:judo-psm-generator-sdk-core-empty-custom-operation-osgi:${judo-psm-generator-sdk-core-version}</uri>
</uris>
<type>psm-sdk-core</type>
<templateParameters>
<apiPrefix>${project.groupId}.{{ lowerCase model.name }}.api</apiPrefix>
<operationPrefix>${project.groupId}.{{ lowerCase model.name }}.operation</operationPrefix>
<osgiPrefix>${project.groupId}.{{ lowerCase model.name }}.osgi</osgiPrefix>
<emptyCustomOperationOsgiPrefix>${project.groupId}.{{ lowerCase model.name }}.custom</emptyCustomOperationOsgiPrefix>
</templateParameters>
</configuration>
<executions>
<execution>
<id>reset-psm-app-checksums</id>
<phase>process-sources</phase>
<goals>
<goal>resetChecksum</goal>
</goals>
</execution>

<execution>
<id>execute-psm-app-generation</id>
<phase>generate-sources</phase>
<goals>
<goal>generate</goal>
</goals>
<configuration>
<psm>mvn:${project.groupId}:{{ lowerCase model.name }}{{ projectPostfix }}-model:${project.version}!model/${model-name}-psm.model</psm>
<destination>${basedir}/src/main/java</destination>
<uris>
<uri>mvn:hu.blackbelt.judo.generator:judo-psm-generator-sdk-core-common:${judo-psm-generator-sdk-core-version}</uri>
<uri>mvn:hu.blackbelt.judo.generator:judo-psm-generator-sdk-core-empty-custom-operation-osgi:${judo-psm-generator-sdk-core-version}</uri>
</uris>
<type>psm-sdk-core</type>
<templateParameters>
<apiPrefix>${project.groupId}.{{ lowerCase model.name }}.api</apiPrefix>
<operationPrefix>${project.groupId}.{{ lowerCase model.name }}.operation</operationPrefix>
<osgiPrefix>${project.groupId}.{{ lowerCase model.name }}.osgi</osgiPrefix>
<emptyCustomOperationOsgiPrefix>${project.groupId}.{{ lowerCase model.name }}.custom</emptyCustomOperationOsgiPrefix>
</templateParameters>
<validateChecksum>${validateChecksum}</validateChecksum>
</configuration>
</execution>
Expand All @@ -65,14 +55,34 @@
<goals>
<goal>synchronizeGitignore</goal>
</goals>
<configuration>
<psm>mvn:${project.groupId}:{{ lowerCase model.name }}{{ projectPostfix }}-model:${project.version}!model/${model-name}-psm.model</psm>
<destination>${basedir}/src/main/java</destination>
</configuration>
</execution>

<execution>
<id>reset-psm-app-checksums</id>
<phase>process-sources</phase>
<goals>
<goal>resetChecksum</goal>
</goals>
<configuration>
<psm>mvn:${project.groupId}:{{ lowerCase model.name }}{{ projectPostfix }}-model:${project.version}!model/${model-name}-psm.model</psm>
<destination>${basedir}/src/main/java</destination>
</configuration>
</execution>

<execution>
<id>generate-psm-app-checksum</id>
<phase>package</phase>
<phase>compile</phase>
<goals>
<goal>checksum</goal>
</goals>
<configuration>
<psm>mvn:${project.groupId}:{{ lowerCase model.name }}{{ projectPostfix }}-model:${project.version}!model/${model-name}-psm.model</psm>
<destination>${basedir}/src/main/java</destination>
</configuration>
</execution>

</executions>
Expand Down
52 changes: 31 additions & 21 deletions ...jsl-fullstack-karaf-project-template-application/src/main/resources/e2e/actor/pom.xml.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,23 +40,6 @@
<groupId>hu.blackbelt.judo.meta</groupId>
<artifactId>judo-ui-generator-maven-plugin</artifactId>
<version>${judo-meta-ui-version}</version>
<configuration>
<uris>
<uri>mvn:hu.blackbelt.judo.generator:judo-ui-playwright-e2e-template:${judo-ui-e2e-template-version}</uri>
</uris>
<type>playwright-e2e</type>
<scanPackages>
hu.blackbelt.judo.generator.commons,
hu.blackbelt.judo.ui.generator.react,
hu.blackbelt.judo.ui.generator.typescript.rest.commons,
hu.blackbelt.judo.ui.generator.playwright
</scanPackages>
<applications>
${actor-name}
</applications>
<ui>${ui-model}</ui>
<destination>${generation-target}</destination>
</configuration>
<executions>
<execution>
<id>execute-ui-e2e-template-generation</id>
Expand All @@ -65,35 +48,62 @@
<goal>generate</goal>
</goals>
<configuration>
<uris>
<uri>mvn:hu.blackbelt.judo.generator:judo-ui-playwright-e2e-template:${judo-ui-e2e-template-version}</uri>
</uris>
<type>playwright-e2e</type>
<scanPackages>
hu.blackbelt.judo.generator.commons,
hu.blackbelt.judo.ui.generator.react,
hu.blackbelt.judo.ui.generator.typescript.rest.commons,
hu.blackbelt.judo.ui.generator.playwright
</scanPackages>
<applications>
${actor-name}
</applications>
<ui>${ui-model}</ui>
<destination>${generation-target}</destination>
<validateChecksum>${validateChecksum}</validateChecksum>
</configuration>
</execution>

<execution>
<id>synchronize-execute-ui-e2e-template-gitignore</id>
<id>synchronize-ui-e2e-template-gitignore</id>
<phase>process-sources</phase>
<goals>
<goal>synchronizeGitignore</goal>
</goals>
<configuration>
<ui>${ui-model}</ui>
<destination>${generation-target}</destination>
</configuration>
</execution>

<execution>
<id>reset-execute-ui-e2e-template-checksums</id>
<id>reset-ui-e2e-template-checksums</id>
<phase>process-sources</phase>
<goals>
<goal>resetChecksum</goal>
</goals>
<configuration>
<ui>${ui-model}</ui>
<destination>${generation-target}</destination>
</configuration>
</execution>

<execution>
<id>generate-execute-ui-e2e-template-checksum</id>
<id>generate-ui-e2e-template-checksum</id>
<phase>package</phase>
<goals>
<goal>checksum</goal>
</goals>
<configuration>
<ui>${ui-model}</ui>
<destination>${generation-target}</destination>
</configuration>
</execution>
</executions>

</executions>
<dependencies>
<dependency>
<groupId>hu.blackbelt.judo.meta</groupId>
Expand Down
Loading

0 comments on commit ab621a5

Please sign in to comment.