Skip to content
This repository was archived by the owner on Mar 3, 2026. It is now read-only.

Commit 6b3b3e8

Browse files
jknackjknack
committed
update maven assemblies (stork, zip, etc.) to support the new frontend module fix jooby-project#883 
1 parent 155237f commit 6b3b3e8

3 files changed

Lines changed: 78 additions & 60 deletions

File tree

‎modules/jooby-dist/src/main/resources/assemblies/jooby.flexible.zip.xml‎

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,6 @@
1515
</formats>
1616

1717
<fileSets>
18-
<fileSet>
19-
<directory>${project.basedir}</directory>
20-
<outputDirectory></outputDirectory>
21-
<includes>
22-
<include>*.js</include>
23-
</includes>
24-
</fileSet>
25-
26-
<fileSet>
27-
<directory>${project.basedir}${file.separator}src</directory>
28-
<outputDirectory>src</outputDirectory>
29-
<includes>
30-
<include>*.js</include>
31-
</includes>
32-
</fileSet>
33-
3418
<fileSet>
3519
<directory>${project.build.directory}</directory>
3620
<outputDirectory></outputDirectory>
@@ -62,27 +46,49 @@
6246
</includes>
6347
</fileSet>
6448

49+
<!-- compiled assets -->
6550
<fileSet>
6651
<directory>
67-
${project.basedir}${file.separator}public
52+
${project.build.directory}${file.separator}__public_
6853
</directory>
6954
<outputDirectory>public</outputDirectory>
7055
<includes>
7156
<include>**/*</include>
7257
</includes>
7358
</fileSet>
7459

75-
<!-- compiled assets -->
60+
<!-- compiled assets public/dist -->
7661
<fileSet>
7762
<directory>
78-
${project.build.directory}${file.separator}__public_
63+
${project.basedir}${file.separator}public${file.separator}dist
64+
</directory>
65+
<outputDirectory>public${file.separator}dist</outputDirectory>
66+
<includes>
67+
<include>**/*</include>
68+
</includes>
69+
</fileSet>
70+
71+
<fileSet>
72+
<directory>
73+
${project.basedir}${file.separator}public
7974
</directory>
8075
<outputDirectory>public</outputDirectory>
8176
<includes>
8277
<include>**/*</include>
8378
</includes>
8479
</fileSet>
8580

81+
<!-- dist -->
82+
<fileSet>
83+
<directory>
84+
${project.basedir}${file.separator}dist
85+
</directory>
86+
<outputDirectory>dist</outputDirectory>
87+
<includes>
88+
<include>**/*</include>
89+
</includes>
90+
</fileSet>
91+
8692
<fileSet>
8793
<directory>
8894
${project.basedir}${file.separator}cmd
@@ -95,4 +101,4 @@
95101

96102
</fileSets>
97103

98-
</assembly>
104+
</assembly>

‎modules/jooby-dist/src/main/resources/assemblies/jooby.stork.xml‎

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,6 @@
1111
</formats>
1212

1313
<fileSets>
14-
<fileSet>
15-
<directory>${project.basedir}</directory>
16-
<outputDirectory></outputDirectory>
17-
<includes>
18-
<include>*.js</include>
19-
</includes>
20-
</fileSet>
21-
22-
<fileSet>
23-
<directory>${project.basedir}${file.separator}src</directory>
24-
<outputDirectory>src</outputDirectory>
25-
<includes>
26-
<include>*.js</include>
27-
</includes>
28-
</fileSet>
29-
3014
<fileSet>
3115
<directory>${project.basedir}${file.separator}src${file.separator}etc${file.separator}bin</directory>
3216
<filtered>true</filtered>
@@ -76,27 +60,49 @@
7660
</includes>
7761
</fileSet>
7862

63+
<!-- compiled assets -->
7964
<fileSet>
8065
<directory>
81-
${project.basedir}${file.separator}public
66+
${project.build.directory}${file.separator}__public_
8267
</directory>
8368
<outputDirectory>public</outputDirectory>
8469
<includes>
8570
<include>**/*</include>
8671
</includes>
8772
</fileSet>
8873

89-
<!-- compiled assets -->
74+
<!-- compiled assets public/dist -->
9075
<fileSet>
9176
<directory>
92-
${project.build.directory}${file.separator}__public_
77+
${project.basedir}${file.separator}public${file.separator}dist
78+
</directory>
79+
<outputDirectory>public${file.separator}dist</outputDirectory>
80+
<includes>
81+
<include>**/*</include>
82+
</includes>
83+
</fileSet>
84+
85+
<fileSet>
86+
<directory>
87+
${project.basedir}${file.separator}public
9388
</directory>
9489
<outputDirectory>public</outputDirectory>
9590
<includes>
9691
<include>**/*</include>
9792
</includes>
9893
</fileSet>
9994

95+
<!-- dist -->
96+
<fileSet>
97+
<directory>
98+
${project.basedir}${file.separator}dist
99+
</directory>
100+
<outputDirectory>dist</outputDirectory>
101+
<includes>
102+
<include>**/*</include>
103+
</includes>
104+
</fileSet>
105+
100106
</fileSets>
101107

102108
<dependencySets>
@@ -106,4 +112,4 @@
106112
</dependencySet>
107113
</dependencySets>
108114

109-
</assembly>
115+
</assembly>

‎modules/jooby-dist/src/main/resources/assemblies/jooby.zip.xml‎

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,6 @@
1111
</formats>
1212

1313
<fileSets>
14-
<fileSet>
15-
<directory>${project.basedir}</directory>
16-
<outputDirectory></outputDirectory>
17-
<includes>
18-
<include>*.js</include>
19-
</includes>
20-
</fileSet>
21-
22-
<fileSet>
23-
<directory>${project.basedir}${file.separator}src</directory>
24-
<outputDirectory>src</outputDirectory>
25-
<includes>
26-
<include>*.js</include>
27-
</includes>
28-
</fileSet>
29-
3014
<fileSet>
3115
<directory>${project.build.directory}</directory>
3216
<outputDirectory></outputDirectory>
@@ -68,27 +52,49 @@
6852
</includes>
6953
</fileSet>
7054

55+
<!-- compiled assets -->
7156
<fileSet>
7257
<directory>
73-
${project.basedir}${file.separator}public
58+
${project.build.directory}${file.separator}__public_
7459
</directory>
7560
<outputDirectory>public</outputDirectory>
7661
<includes>
7762
<include>**/*</include>
7863
</includes>
7964
</fileSet>
8065

81-
<!-- compiled assets -->
66+
<!-- compiled assets public/dist -->
8267
<fileSet>
8368
<directory>
84-
${project.build.directory}${file.separator}__public_
69+
${project.basedir}${file.separator}public${file.separator}dist
70+
</directory>
71+
<outputDirectory>public${file.separator}dist</outputDirectory>
72+
<includes>
73+
<include>**/*</include>
74+
</includes>
75+
</fileSet>
76+
77+
<fileSet>
78+
<directory>
79+
${project.basedir}${file.separator}public
8580
</directory>
8681
<outputDirectory>public</outputDirectory>
8782
<includes>
8883
<include>**/*</include>
8984
</includes>
9085
</fileSet>
9186

87+
<!-- dist -->
88+
<fileSet>
89+
<directory>
90+
${project.basedir}${file.separator}dist
91+
</directory>
92+
<outputDirectory>dist</outputDirectory>
93+
<includes>
94+
<include>**/*</include>
95+
</includes>
96+
</fileSet>
97+
9298
</fileSets>
9399

94-
</assembly>
100+
</assembly>

0 commit comments

Comments
 (0)