Skip to content

Commit 71ecf23

Browse files
koentsjekoentsje
committed
HBX-3124: Create the 'gradle' folder containing the wrapper and the library on the fly
Signed-off-by: Koen Aers <[email protected]>
1 parent 33c9b73 commit 71ecf23

File tree

7 files changed

+177
-39
lines changed

7 files changed

+177
-39
lines changed

‎gradle/.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,6 @@
33

44
# Ignore Gradle build output directory
55
build
6+
7+
# Ignore the Gradle folder as this is constructed on the fly
8+
gradle

‎gradle/gradle/libs.versions.toml‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎gradle/pom.xml‎

Lines changed: 167 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,124 @@
4646

4747
<build>
4848
<plugins>
49+
<plugin>
50+
<artifactId>maven-resources-plugin</artifactId>
51+
<executions>
52+
<execution>
53+
<id>validate-copy-libs-versions-toml</id>
54+
<phase>validate</phase>
55+
<goals>
56+
<goal>copy-resources</goal>
57+
</goals>
58+
<configuration>
59+
<outputDirectory>gradle</outputDirectory>
60+
<resources>
61+
<resource>
62+
<directory>resources</directory>
63+
<filtering>true</filtering>
64+
<includes>
65+
<include>libs.versions.toml</include>
66+
</includes>
67+
</resource>
68+
</resources>
69+
</configuration>
70+
</execution>
71+
<execution>
72+
<id>pre-clean-copy-libs-versions-toml</id>
73+
<phase>pre-clean</phase>
74+
<goals>
75+
<goal>copy-resources</goal>
76+
</goals>
77+
<configuration>
78+
<outputDirectory>gradle</outputDirectory>
79+
<resources>
80+
<resource>
81+
<directory>resources</directory>
82+
<filtering>true</filtering>
83+
<includes>
84+
<include>libs.versions.toml</include>
85+
</includes>
86+
</resource>
87+
</resources>
88+
</configuration>
89+
</execution>
90+
<execution>
91+
<id>validate-copy-gradle-wrapper-jar</id>
92+
<phase>validate</phase>
93+
<goals>
94+
<goal>copy-resources</goal>
95+
</goals>
96+
<configuration>
97+
<outputDirectory>gradle/wrapper</outputDirectory>
98+
<resources>
99+
<resource>
100+
<directory>resources</directory>
101+
<includes>
102+
<include>gradle-wrapper.jar</include>
103+
</includes>
104+
</resource>
105+
</resources>
106+
</configuration>
107+
</execution>
108+
<execution>
109+
<id>pre-clean-copy-gradle-wrapper-jar</id>
110+
<phase>pre-clean</phase>
111+
<goals>
112+
<goal>copy-resources</goal>
113+
</goals>
114+
<configuration>
115+
<outputDirectory>gradle/wrapper</outputDirectory>
116+
<resources>
117+
<resource>
118+
<directory>resources</directory>
119+
<includes>
120+
<include>gradle-wrapper.jar</include>
121+
</includes>
122+
</resource>
123+
</resources>
124+
</configuration>
125+
</execution>
126+
<execution>
127+
<id>validate-copy-gradle-wrapper-properties</id>
128+
<phase>validate</phase>
129+
<goals>
130+
<goal>copy-resources</goal>
131+
</goals>
132+
<configuration>
133+
<outputDirectory>gradle/wrapper</outputDirectory>
134+
<resources>
135+
<resource>
136+
<directory>resources</directory>
137+
<filtering>true</filtering>
138+
<includes>
139+
<include>gradle-wrapper.properties</include>
140+
</includes>
141+
</resource>
142+
</resources>
143+
</configuration>
144+
</execution>
145+
<execution>
146+
<id>pre-clean-copy-gradle-wrapper-properties</id>
147+
<phase>pre-clean</phase>
148+
<goals>
149+
<goal>copy-resources</goal>
150+
</goals>
151+
<configuration>
152+
<outputDirectory>gradle/wrapper</outputDirectory>
153+
<resources>
154+
<resource>
155+
<directory>resources</directory>
156+
<filtering>true</filtering>
157+
<includes>
158+
<include>gradle-wrapper.properties</include>
159+
</includes>
160+
</resource>
161+
</resources>
162+
</configuration>
163+
</execution>
164+
</executions>
165+
</plugin>
166+
49167
<!-- Maven deploy is skipped on purpose as Gradle build will stage the artifact itself. -->
50168
<plugin>
51169
<groupId>org.apache.maven.plugins</groupId>
@@ -54,43 +172,62 @@
54172
<skip>true</skip>
55173
</configuration>
56174
</plugin>
57-
<!-- execute Gradle command -->
175+
<!-- execute Gradle command -->
176+
<plugin>
177+
<groupId>org.codehaus.mojo</groupId>
178+
<artifactId>exec-maven-plugin</artifactId>
179+
<executions>
180+
<execution>
181+
<id>gradle-package</id>
182+
<phase>prepare-package</phase>
183+
<configuration>
184+
<executable>${gradle.executable}</executable>
185+
<arguments>
186+
<argument>clean</argument>
187+
<argument>build</argument>
188+
<argument>-PprojectVersion=${project.version}</argument>
189+
<argument>-Ph2Version=${h2.version}</argument>
190+
<argument>-Dmaven.repo.local=${settings.localRepository}</argument>
191+
<argument>-PmavenRootDirectory=${rootProject.directory}</argument>
192+
</arguments>
193+
</configuration>
194+
<goals>
195+
<goal>exec</goal>
196+
</goals>
197+
</execution>
198+
<execution>
199+
<id>gradle-clean</id>
200+
<phase>clean</phase>
201+
<configuration>
202+
<executable>${gradle.executable}</executable>
203+
<arguments>
204+
<argument>clean</argument>
205+
<argument>-PprojectVersion=${project.version}</argument>
206+
<argument>-Ph2Version=${h2.version}</argument>
207+
</arguments>
208+
</configuration>
209+
<goals>
210+
<goal>exec</goal>
211+
</goals>
212+
</execution>
213+
</executions>
214+
</plugin>
58215
<plugin>
59-
<groupId>org.codehaus.mojo</groupId>
60-
<artifactId>exec-maven-plugin</artifactId>
216+
<artifactId>maven-clean-plugin</artifactId>
61217
<executions>
62218
<execution>
63-
<id>gradle-package</id>
64-
<phase>prepare-package</phase>
65-
<configuration>
66-
<executable>${gradle.executable}</executable>
67-
<arguments>
68-
<argument>clean</argument>
69-
<argument>build</argument>
70-
<argument>-PprojectVersion=${project.version}</argument>
71-
<argument>-Ph2Version=${h2.version}</argument>
72-
<argument>-Dmaven.repo.local=${settings.localRepository}</argument>
73-
<argument>-PmavenRootDirectory=${rootProject.directory}</argument>
74-
</arguments>
75-
</configuration>
219+
<id>delete-gradle-wrapper</id>
220+
<phase>clean</phase>
76221
<goals>
77-
<goal>exec</goal>
222+
<goal>clean</goal>
78223
</goals>
79-
</execution>
80-
<execution>
81-
<id>gradle-clean</id>
82-
<phase>clean</phase>
83224
<configuration>
84-
<executable>${gradle.executable}</executable>
85-
<arguments>
86-
<argument>clean</argument>
87-
<argument>-PprojectVersion=${project.version}</argument>
88-
<argument>-Ph2Version=${h2.version}</argument>
89-
</arguments>
225+
<filesets>
226+
<fileset>
227+
<directory>gradle</directory>
228+
</fileset>
229+
</filesets>
90230
</configuration>
91-
<goals>
92-
<goal>exec</goal>
93-
</goals>
94231
</execution>
95232
</executions>
96233
</plugin>

‎gradle/gradle/wrapper/gradle-wrapper.jar‎ renamed to ‎gradle/resources/gradle-wrapper.jar‎

File renamed without changes.

‎gradle/gradle/wrapper/gradle-wrapper.properties‎ renamed to ‎gradle/resources/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-${gradle.version}-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎gradle/resources/libs.versions.toml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[versions]
2+
junit-jupiter = "${junit-jupiter.version}"
3+
4+
[libraries]
5+
junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit-jupiter" }

‎pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@
9999
<properties>
100100

101101
<maven.version>3.9.11</maven.version>
102+
<gradle.version>8.14.3</gradle.version>
102103

103104
<ant.version>1.10.15</ant.version>
104105
<antlr.version>4.13.2</antlr.version>

0 commit comments

Comments
 (0)