Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: group platform modules in a profile, remove gradle module activation rule (CP: 24.0) #4301

Merged
merged 1 commit into from
Jun 29, 2023
Merged

chore: group platform modules in a profile, remove gradle module activation rule (CP: 24.0) #4301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions hilla-dev/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
<description>Hilla Platform Development Dependencies</description>
<version>${hilla.version}</version>
<url>https://hilla.dev</url>
<properties>
<skipNexusStagingDeployMojo>false</skipNexusStagingDeployMojo>
</properties>
<distributionManagement>
<repository>
<id>vaadin-prereleases</id>
Expand Down
5 changes: 5 additions & 0 deletions hilla-react/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@
<description>Hilla Platform for React-based Applications</description>
<version>${hilla.version}</version>
<url>https://hilla.dev</url>

<properties>
<skipNexusStagingDeployMojo>false</skipNexusStagingDeployMojo>
</properties>

<distributionManagement>
<repository>
<id>vaadin-prereleases</id>
Expand Down
4 changes: 4 additions & 0 deletions hilla-spring-boot-starter/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
<description>Spring Boot Starter for Hilla applications.</description>
<version>${hilla.version}</version>

<properties>
<skipNexusStagingDeployMojo>false</skipNexusStagingDeployMojo>
</properties>

<repositories>
<!-- The order of definitions matters. Explicitly defining central here to make sure it has the highest priority. -->

Expand Down
3 changes: 3 additions & 0 deletions hilla/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
<description>Hilla Platform</description>
<version>${hilla.version}</version>
<url>https://hilla.dev</url>
<properties>
<skipNexusStagingDeployMojo>false</skipNexusStagingDeployMojo>
</properties>
<distributionManagement>
<repository>
<id>vaadin-prereleases</id>
Expand Down
51 changes: 32 additions & 19 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,22 +31,6 @@
</repository>
</distributionManagement>

<modules>
<module>vaadin-internal</module>
<module>vaadin</module>
<module>vaadin-spring-bom</module>
<module>vaadin-bom</module>
<module>vaadin-core-internal</module>
<module>vaadin-core</module>
<module>vaadin-dev</module>
<module>vaadin-maven-plugin</module>
<module>vaadin-testbench</module>
<module>vaadin-testbench-junit5</module>
<module>vaadin-spring-boot-starter</module>
<module>vaadin-platform-javadoc</module>
<module>vaadin-dev-bundle</module>
</modules>

<profiles>
<profile>
<id>sbom</id>
Expand All @@ -56,9 +40,6 @@
</profile>
<profile>
<id>gradle</id>
<activation>
<jdk>(,18)</jdk>
</activation>
<modules>
<module>vaadin-gradle-plugin</module>
<module>vaadin-gradle-plugin/pom-portal.xml</module>
Expand All @@ -83,6 +64,38 @@
<module>hilla-spring-boot-starter</module>
<module>hilla-maven-plugin</module>
</modules>
<!-- This prevents deploying all com.vaadin modules, but we need to set it to true in
all hilla modules -->
<properties>
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
</properties>
</profile>
<!-- separate platform modules for active by default it must be after hilla modules -->
<profile>
<id>platform</id>
<activation>
<property>
<name>!skipPlatform</name>
</property>
</activation>
<modules>
<module>vaadin-internal</module>
<module>vaadin</module>
<module>vaadin-spring-bom</module>
<module>vaadin-bom</module>
<module>vaadin-core-internal</module>
<module>vaadin-core</module>
<module>vaadin-dev</module>
<module>vaadin-maven-plugin</module>
<module>vaadin-testbench</module>
<module>vaadin-testbench-junit5</module>
<module>vaadin-spring-boot-starter</module>
<module>vaadin-platform-javadoc</module>
<module>vaadin-dev-bundle</module>
</modules>
<properties>
<skipNexusStagingDeployMojo>false</skipNexusStagingDeployMojo>
</properties>
</profile>
<!-- Needed so as we can skip this module on releasing and still nexus stating works -->
<profile>
Expand Down
2 changes: 1 addition & 1 deletion scripts/generator/templates/template-hilla-bom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<url>https://hilla.dev</url>

<properties>
{{javadeps}}
<skipNexusStagingDeployMojo>false</skipNexusStagingDeployMojo>
</properties>

<distributionManagement>
Expand Down
1 change: 1 addition & 0 deletions scripts/generator/templates/template-hilla-maven-plugin-pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.version>3.8.6</maven.version>
<skipNexusStagingDeployMojo>false</skipNexusStagingDeployMojo>
</properties>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion scripts/generator/templates/template-servlet-containers-tests-pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<failOnMissingWebXml>false</failOnMissingWebXml>
<maven.deploy.skip>true</maven.deploy.skip>
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
<!-- this version is needed for app.bndrun file -->
{{javadeps}}
</properties>
Expand Down
2 changes: 1 addition & 1 deletion vaadin-platform-hybrid-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<failOnMissingWebXml>false</failOnMissingWebXml>
<maven.deploy.skip>true</maven.deploy.skip>
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
</properties>
<dependencyManagement>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion vaadin-platform-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<failOnMissingWebXml>false</failOnMissingWebXml>
<maven.deploy.skip>true</maven.deploy.skip>
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
<osgi.bundle.version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</osgi.bundle.version>
</properties>
<dependencyManagement>
Expand Down
Loading