diff --git a/cmd/helper/main.go b/cmd/helper/main.go index 3fcba84..307e2f4 100644 --- a/cmd/helper/main.go +++ b/cmd/helper/main.go @@ -22,7 +22,7 @@ import ( "github.com/paketo-buildpacks/libpak/bard" "github.com/paketo-buildpacks/libpak/sherpa" - "github.com/paketo-buildpacks/apache-tomcat/helper" + "github.com/paketo-buildpacks/apache-tomcat/v7/helper" ) func main() { diff --git a/cmd/main/main.go b/cmd/main/main.go index d14ac0e..d362a1f 100644 --- a/cmd/main/main.go +++ b/cmd/main/main.go @@ -22,7 +22,7 @@ import ( "github.com/paketo-buildpacks/libpak" "github.com/paketo-buildpacks/libpak/bard" - "github.com/paketo-buildpacks/apache-tomcat/tomcat" + "github.com/paketo-buildpacks/apache-tomcat/v7/tomcat" ) func main() { diff --git a/go.mod b/go.mod index 1f57555..9f08433 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ -module github.com/paketo-buildpacks/apache-tomcat +module github.com/paketo-buildpacks/apache-tomcat/v7 -go 1.15 +go 1.17 require ( github.com/buildpacks/libcnb v1.25.5 @@ -10,3 +10,26 @@ require ( github.com/paketo-buildpacks/libpak v1.58.0 github.com/sclevine/spec v1.4.0 ) + +require ( + github.com/BurntSushi/toml v1.0.0 // indirect + github.com/Masterminds/semver/v3 v3.1.1 // indirect + github.com/creack/pty v1.1.17 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/imdario/mergo v0.3.12 // indirect + github.com/magiconair/properties v1.8.5 // indirect + github.com/mattn/go-colorable v0.1.2 // indirect + github.com/mattn/go-isatty v0.0.8 // indirect + github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect + github.com/pavel-v-chernykh/keystore-go/v4 v4.3.0 // indirect + github.com/pelletier/go-toml v1.9.4 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/stretchr/objx v0.1.1 // indirect + github.com/stretchr/testify v1.7.0 // indirect + github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect + golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985 // indirect + golang.org/x/sys v0.0.0-20220207234003-57398862261d // indirect + golang.org/x/text v0.3.6 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect +) diff --git a/go.sum b/go.sum index e428e8c..0dc21c3 100644 --- a/go.sum +++ b/go.sum @@ -28,7 +28,6 @@ github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/heroku/color v0.0.6 h1:UTFFMrmMLFcL3OweqP1lAdp8i1y/9oHqkeHjQ/b/Ny0= @@ -132,7 +131,6 @@ golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyj golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= diff --git a/helper/access_logging_support_test.go b/helper/access_logging_support_test.go index 5761b5c..bfba003 100644 --- a/helper/access_logging_support_test.go +++ b/helper/access_logging_support_test.go @@ -23,7 +23,7 @@ import ( . "github.com/onsi/gomega" "github.com/sclevine/spec" - "github.com/paketo-buildpacks/apache-tomcat/helper" + "github.com/paketo-buildpacks/apache-tomcat/v7/helper" ) func testAccessLoggingSupport(t *testing.T, context spec.G, it spec.S) { diff --git a/scripts/build.sh b/scripts/build.sh index cb0c018..e84bbde 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -2,8 +2,8 @@ set -euo pipefail -GOOS="linux" go build -ldflags='-s -w' -o bin/helper github.com/paketo-buildpacks/apache-tomcat/cmd/helper -GOOS="linux" go build -ldflags='-s -w' -o bin/main github.com/paketo-buildpacks/apache-tomcat/cmd/main +GOOS="linux" go build -ldflags='-s -w' -o bin/helper github.com/paketo-buildpacks/apache-tomcat/v7/cmd/helper +GOOS="linux" go build -ldflags='-s -w' -o bin/main github.com/paketo-buildpacks/apache-tomcat/v7/cmd/main if [ "${STRIP:-false}" != "false" ]; then strip bin/helper bin/main diff --git a/tomcat/base_test.go b/tomcat/base_test.go index d0a51ac..1eae065 100644 --- a/tomcat/base_test.go +++ b/tomcat/base_test.go @@ -28,7 +28,7 @@ import ( "github.com/paketo-buildpacks/libpak" "github.com/sclevine/spec" - "github.com/paketo-buildpacks/apache-tomcat/tomcat" + "github.com/paketo-buildpacks/apache-tomcat/v7/tomcat" ) func testBase(t *testing.T, context spec.G, it spec.S) { diff --git a/tomcat/build_test.go b/tomcat/build_test.go index 4de75d5..4848db0 100644 --- a/tomcat/build_test.go +++ b/tomcat/build_test.go @@ -29,7 +29,7 @@ import ( "github.com/paketo-buildpacks/libpak" "github.com/sclevine/spec" - "github.com/paketo-buildpacks/apache-tomcat/tomcat" + "github.com/paketo-buildpacks/apache-tomcat/v7/tomcat" ) func testBuild(t *testing.T, context spec.G, it spec.S) { diff --git a/tomcat/detect_test.go b/tomcat/detect_test.go index 134eb0b..e00a7c3 100644 --- a/tomcat/detect_test.go +++ b/tomcat/detect_test.go @@ -26,7 +26,7 @@ import ( . "github.com/onsi/gomega" "github.com/sclevine/spec" - "github.com/paketo-buildpacks/apache-tomcat/tomcat" + "github.com/paketo-buildpacks/apache-tomcat/v7/tomcat" ) func testDetect(t *testing.T, context spec.G, it spec.S) { diff --git a/tomcat/home_test.go b/tomcat/home_test.go index e71297a..3c733b5 100644 --- a/tomcat/home_test.go +++ b/tomcat/home_test.go @@ -27,7 +27,7 @@ import ( "github.com/paketo-buildpacks/libpak" "github.com/sclevine/spec" - "github.com/paketo-buildpacks/apache-tomcat/tomcat" + "github.com/paketo-buildpacks/apache-tomcat/v7/tomcat" ) func testHome(t *testing.T, context spec.G, it spec.S) {