Skip to content

Commit 7695e21

Browse files
Merge pull request #344 from vorburger:fix-302
PiperOrigin-RevId: 795166397
2 parents 1945fad + 852ebd8 commit 7695e21

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

dev/pom.xml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,18 @@
107107
<build>
108108
<resources>
109109
<resource>
110-
<directory>browser</directory>
111-
<!-- This will place the contents of the 'browser' folder into 'BOOT-INF/classes/browser/'
112-
in the JAR -->
113-
<targetPath>browser</targetPath>
110+
<!-- This will correctly place the contents of the 'browser' folder into 'browser/' at the
111+
root of the normal JAR, and in 'BOOT-INF/classes/browser/' in the Spring Boot repackaged
112+
executable JAR.
113+
114+
We use <directory>. and <include>browser/** instead of <directory>browser with <targetPath>browser
115+
because that does not work and used to cause https://github.com/google/adk-java/issues/302.
116+
117+
An alternative would be to simply use src/main/resources/browser instead of doing this. -->
118+
<directory>.</directory>
119+
<includes>
120+
<include>browser/**</include>
121+
</includes>
114122
</resource>
115123
</resources>
116124
<pluginManagement>

0 commit comments

Comments
 (0)