Skip to content

Commit

Permalink
draft: repackage vaadin-maven-plugin (#4954)
Browse files Browse the repository at this point in the history
* repackage vaadin-maven plugin

* reuse flow.version in gradle-plugin

* remove the change for the hilla-dev-mode, as it will be covered by #4968

---------

Co-authored-by: Manolo Carrasco <[email protected]>
  • Loading branch information
ZheSun88 and manolo authored Feb 1, 2024
1 parent c8f0c99 commit c8cd498
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion scripts/generator/generate.js
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ writer.writeReleaseNotes(versions, releaseNotesTemplateFileName, releaseNotesRes
writer.writeReleaseNotes(versions, releaseNotesMaintenanceTemplateFileName, releaseNotesMaintenanceResultFileName);
writer.writeReleaseNotes(versions, releaseNotesPrereleaseTemplateFileName, releaseNotesPrereleaseResultFileName);

writer.writeProperty(versions, "flow", mavenPluginTemplatePomFileName, mavenPluginResultPomFileName);
writer.writeProperty(versions, "hilla", mavenPluginTemplatePomFileName, mavenPluginResultPomFileName);
writer.writeProperty(versions, "flow", gradlePluginTemplatePomFileName, gradlePluginResultPomFileName);
writer.writeProperty(versions, "flow", gradlePortalPluginTemplatePomFileName, gradlePortalPluginResultPomFileName);
writer.writeProperty(versions, "flow", platformJavadocTemplatePomFileName, platformJavadocResultPomFileName);
Expand Down
24 changes: 12 additions & 12 deletions scripts/generator/templates/template-vaadin-maven-plugin-pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>flow-maven-plugin</artifactId>
<version>${flow.version}</version>
<groupId>com.vaadin.hilla</groupId>
<artifactId>hilla-maven-plugin</artifactId>
<version>${hilla.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
Expand Down Expand Up @@ -115,24 +115,24 @@
<configuration>
<artifactItems>
<artifactItem>
<groupId>com.vaadin</groupId>
<artifactId>flow-maven-plugin</artifactId>
<version>${flow.version}</version>
<groupId>com.vaadin.hilla</groupId>
<artifactId>hilla-maven-plugin</artifactId>
<version>${hilla.version}</version>
<classifier>sources</classifier>
<includes>**/*.java</includes>
<outputDirectory>src/main/java</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>com.vaadin</groupId>
<artifactId>flow-maven-plugin</artifactId>
<version>${flow.version}</version>
<groupId>com.vaadin.hilla</groupId>
<artifactId>hilla-maven-plugin</artifactId>
<version>${hilla.version}</version>
<excludes>**/*.class,META-INF/**</excludes>
<outputDirectory>src/main/resources</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>com.vaadin</groupId>
<artifactId>flow-maven-plugin</artifactId>
<version>${flow.version}</version>
<groupId>com.vaadin.hilla</groupId>
<artifactId>hilla-maven-plugin</artifactId>
<version>${hilla.version}</version>
<includes>**/lifecycle-mapping-metadata.xml</includes>
<outputDirectory>src/main/resources</outputDirectory>
</artifactItem>
Expand Down

0 comments on commit c8cd498

Please sign in to comment.