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

refactor: simplify hilla-bom #2160

Merged
merged 8 commits into from
Mar 6, 2024
Merged

refactor: simplify hilla-bom #2160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6bb6c0c
chore: simplify hilla-bom
ZheSun88 Mar 1, 2024
6bd5090
add missing groupid
ZheSun88 Mar 1, 2024
60a869a
Merge branch 'main' into simplify-hilla-bom
ZheSun88 Mar 1, 2024
edb4ca2
Merge branch 'main' into simplify-hilla-bom
platosha Mar 5, 2024
7251387
Merge branch 'main' into simplify-hilla-bom
taefi Mar 5, 2024
936307b
Merge branch 'main' into simplify-hilla-bom
ZheSun88 Mar 6, 2024
795e533
chore: add formatter-plugin to hilla bom
ZheSun88 Mar 6, 2024
d5d03b1
add flow-bom to gradle test as flow dependency has been removed from …
ZheSun88 Mar 6, 2024
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
137 changes: 21 additions & 116 deletions packages/java/hilla-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,98 +4,24 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>com.vaadin</groupId>
<artifactId>hilla-project</artifactId>
<version>24.4-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>

<groupId>com.vaadin</groupId>
<artifactId>hilla-bom</artifactId>
<packaging>pom</packaging>
<name>Hilla Platform (Bill of Materials)</name>
<description>Hilla Platform (Bill of Materials)</description>
<version>24.4-SNAPSHOT</version>
<url>https://hilla.dev</url>

<properties>
<formatter.basedir>${project.parent.basedir}</formatter.basedir>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-testbench-bom</artifactId>
<version>${testbench.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- Flow -->
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>flow</artifactId>
<version>${flow.version}</version>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>flow-server</artifactId>
<version>${flow.version}</version>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-dev-server</artifactId>
<version>${flow.version}</version>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>flow-lit-template</artifactId>
<version>${flow.version}</version>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>flow-polymer-template</artifactId>
<version>${flow.version}</version>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>flow-push</artifactId>
<version>${flow.version}</version>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>flow-data</artifactId>
<version>${flow.version}</version>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>flow-dnd</artifactId>
<version>${flow.version}</version>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>flow-server-production-mode</artifactId>
<version>${flow.version}</version>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-spring</artifactId>
<version>${flow.version}</version>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>flow-webpush</artifactId>
<version>${flow.version}</version>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>flow-html-components</artifactId>
<version>${flow.version}</version>
<artifactId>hilla</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>com.vaadin</groupId>
<artifactId>hilla</artifactId>
<artifactId>hilla-engine-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand All @@ -113,45 +39,24 @@
<artifactId>hilla-engine-runtime</artifactId>
<version>${project.version}</version>
</dependency>

<!-- SLF4J -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jcl</artifactId>
<version>${slf4j.version}</version>
</dependency>
<!-- JNA -->
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
<version>${jna.version}</version>
</dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna-platform</artifactId>
<version>${jna.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

<build>
<plugins>
<plugin>
<groupId>net.revelc.code.formatter</groupId>
<artifactId>formatter-maven-plugin</artifactId>
<version>2.23.0</version>
<configuration>
<configFile>https://raw.githubusercontent.com/vaadin/hilla/main/.config/VaadinJavaConventions.xml</configFile>
<!-- Provide a dummy JS config file to avoid errors -->
<configJsFile>https://raw.githubusercontent.com/vaadin/hilla/main/.config/VaadinJavaConventions.xml</configJsFile>
<lineEnding>LF</lineEnding>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
</plugins>
</build>

</project>
3 changes: 2 additions & 1 deletion packages/java/tests/gradle/single-module-tests/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ dependencies {

dependencyManagement {
imports {
mavenBom "com.vaadin:hilla-bom:$hillaVersion"
mavenBom "com.vaadin:hilla-bom:$hillaVersion"
mavenBom "com.vaadin:flow-bom:$flowVersion"
}
}
1 change: 1 addition & 0 deletions packages/java/tests/gradle/single-module-tests/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
org.gradle.daemon=false
hillaVersion=24.4-SNAPSHOT
flowVersion=24.4-SNAPSHOT
3 changes: 2 additions & 1 deletion packages/java/tests/gradle/single-module/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ dependencies {

dependencyManagement {
imports {
mavenBom "com.vaadin:hilla-bom:$hillaVersion"
mavenBom "com.vaadin:hilla-bom:$hillaVersion"
mavenBom "com.vaadin:flow-bom:$flowVersion"
}
}
1 change: 1 addition & 0 deletions packages/java/tests/gradle/single-module/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
org.gradle.daemon=false
hillaVersion=24.4-SNAPSHOT
flowVersion=24.4-SNAPSHOT
Loading