Bump to Tomcat 10

Signed-off-by: Daniel Mikusa <[email protected]>
paketo-buildpacks · Jul 26, 2024 · bbc2ad5 · bbc2ad5
1 parent c51d0e4
commit bbc2ad5
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/java/war/README.md b/java/war/README.md
@@ -5,7 +5,7 @@ See [prerequisites](https://paketo.io/docs/howto/java/#prerequisites) of this sa
 ## Building
 
 ```bash
-pack build applications/war --env BP_JVM_VERSION=17
+pack build applications/war --env BP_JVM_VERSION=17 --env BP_TOMCAT_VERSION=10
 ```
 
 ## Running

diff --git a/java/war/pom.xml b/java/war/pom.xml
@@ -51,4 +51,20 @@
 		</dependency>
 	</dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                  <image>
+                    <env>
+                      <BP_TOMCAT_VERSION>10</BP_TOMCAT_VERSION>
+                    </env>
+                  </image>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
diff --git a/java/war/smoke_test/war_test.go b/java/war/smoke_test/war_test.go
@@ -3,12 +3,13 @@ package war_test
 import (
 	"flag"
 	"fmt"
-	"github.com/paketo-buildpacks/samples/tests"
 	"os"
 	"path/filepath"
 	"testing"
 	"time"
 
+	"github.com/paketo-buildpacks/samples/tests"
+
 	"github.com/paketo-buildpacks/occam"
 	"github.com/sclevine/spec"
 	"github.com/sclevine/spec/report"
@@ -96,6 +97,7 @@ func testWARWithBuilder(builder string) func(*testing.T, spec.G, spec.S) {
 					image, logs, err = pack.Build.
 						WithPullPolicy("never").
 						WithBuilder(builder).
+						WithEnv(map[string]string{"BP_TOMCAT_VERSION": "10"}).
 						Execute(name, source)
 					Expect(err).ToNot(HaveOccurred(), logs.String)