Skip to content

Commit

Permalink
Merge branch 'main' into engine-multiple-wars
Browse files Browse the repository at this point in the history
  • Loading branch information
dmikusa authored Dec 14, 2023
2 parents 1d9a6ed + 9726892 commit 22fa80d
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 30 deletions.
42 changes: 21 additions & 21 deletions buildpack.toml
Original file line number Diff line number Diff line change
Expand Up @@ -81,32 +81,32 @@ api = "0.7"
name = "BP_TOMCAT_VERSION"

[[metadata.dependencies]]
cpes = ["cpe:2.3:a:apache:tomcat:8.5.96:*:*:*:*:*:*:*"]
cpes = ["cpe:2.3:a:apache:tomcat:8.5.97:*:*:*:*:*:*:*"]
id = "tomcat"
name = "Apache Tomcat"
purl = "pkg:generic/[email protected].96"
sha256 = "0307cfb85e58a2ff3d033d464bdc01f03fd5452618b17baf64368b1e6b02e886"
source = "https://archive.apache.org/dist/tomcat/tomcat-8/v8.5.96/src/apache-tomcat-8.5.96-src.tar.gz"
source-sha256 = "6e436bfa5cdb87d2f67924f170498a78e238511638ad63745bb85e934b0b8d98"
purl = "pkg:generic/[email protected].97"
sha256 = "d7ab8493b1deec6514c37e51183f933147a6db5b0798b3f28b3e34c2a63ebf9a"
source = "https://archive.apache.org/dist/tomcat/tomcat-8/v8.5.97/src/apache-tomcat-8.5.97-src.tar.gz"
source-sha256 = "59e1680188e5a2c1f4a9de5a2dd533b6211925a4a1ba4f8eee120d89a7d2b85f"
stacks = ["*"]
uri = "https://archive.apache.org/dist/tomcat/tomcat-8/v8.5.96/bin/apache-tomcat-8.5.96.tar.gz"
version = "8.5.96"
uri = "https://archive.apache.org/dist/tomcat/tomcat-8/v8.5.97/bin/apache-tomcat-8.5.97.tar.gz"
version = "8.5.97"

[[metadata.dependencies.licenses]]
type = "Apache-2.0"
uri = "https://www.apache.org/licenses/"

[[metadata.dependencies]]
cpes = ["cpe:2.3:a:apache:tomcat:9.0.83:*:*:*:*:*:*:*"]
cpes = ["cpe:2.3:a:apache:tomcat:9.0.84:*:*:*:*:*:*:*"]
id = "tomcat"
name = "Apache Tomcat"
purl = "pkg:generic/[email protected].83"
sha256 = "76092dae89dc1f3ae6dd11404d64852761a401f18cd373c93b5ff7ef2ce4f90a"
source = "https://archive.apache.org/dist/tomcat/tomcat-9/v9.0.83/src/apache-tomcat-9.0.83-src.tar.gz"
source-sha256 = "16e4c8ce39148ab1f7ea5491828dd6d88ab86c263dfac0e756ebc2ef8e13d023"
purl = "pkg:generic/[email protected].84"
sha256 = "e616951e2e4350bd2dadd65e606b21e5be97e28ce27a0d102060545622ab7ae0"
source = "https://archive.apache.org/dist/tomcat/tomcat-9/v9.0.84/src/apache-tomcat-9.0.84-src.tar.gz"
source-sha256 = "55f9e4eeb3913bf7d289b4663b74495050f2bda217854dfd352619c7354a30b7"
stacks = ["*"]
uri = "https://archive.apache.org/dist/tomcat/tomcat-9/v9.0.83/bin/apache-tomcat-9.0.83.tar.gz"
version = "9.0.83"
uri = "https://archive.apache.org/dist/tomcat/tomcat-9/v9.0.84/bin/apache-tomcat-9.0.84.tar.gz"
version = "9.0.84"

[[metadata.dependencies.licenses]]
type = "Apache-2.0"
Expand All @@ -129,16 +129,16 @@ api = "0.7"
uri = "https://www.apache.org/licenses/"

[[metadata.dependencies]]
cpes = ["cpe:2.3:a:apache:tomcat:10.1.16:*:*:*:*:*:*:*"]
cpes = ["cpe:2.3:a:apache:tomcat:10.1.17:*:*:*:*:*:*:*"]
id = "tomcat"
name = "Apache Tomcat"
purl = "pkg:generic/[email protected].16"
sha256 = "432b0b98a377450f13b9a47b82ea7df78ed0bcf2ee4b759182b4c7fdc1fe5841"
source = "https://archive.apache.org/dist/tomcat/tomcat-10/v10.1.16/src/apache-tomcat-10.1.16-src.tar.gz"
source-sha256 = "e676c0b964d5c27e02c668839940ce6510bebf6797a2d012652990de47a32967"
purl = "pkg:generic/[email protected].17"
sha256 = "ba89ba45c13c54511bb4201758e93fe902970abd163b42f5714668828f13d991"
source = "https://archive.apache.org/dist/tomcat/tomcat-10/v10.1.17/src/apache-tomcat-10.1.17-src.tar.gz"
source-sha256 = "7d42f41a64c49aff4e61e43beba73b66a54931608be1aed6807950f0ee2bbab6"
stacks = ["*"]
uri = "https://archive.apache.org/dist/tomcat/tomcat-10/v10.1.16/bin/apache-tomcat-10.1.16.tar.gz"
version = "10.1.16"
uri = "https://archive.apache.org/dist/tomcat/tomcat-10/v10.1.17/bin/apache-tomcat-10.1.17.tar.gz"
version = "10.1.17"

[[metadata.dependencies.licenses]]
type = "Apache-2.0"
Expand Down
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ require (
github.com/stretchr/objx v0.5.1 // indirect
github.com/stretchr/testify v1.8.4 // indirect
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
golang.org/x/crypto v0.15.0 // indirect
golang.org/x/net v0.18.0 // indirect
golang.org/x/sys v0.14.0 // indirect
golang.org/x/crypto v0.16.0 // indirect
golang.org/x/net v0.19.0 // indirect
golang.org/x/sys v0.15.0 // indirect
golang.org/x/text v0.14.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
software.sslmate.com/src/go-pkcs12 v0.4.0 // indirect
Expand Down
12 changes: 6 additions & 6 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,15 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofmx9yWTog9BfvIu0q41lo=
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos=
golang.org/x/crypto v0.15.0 h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA=
golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g=
golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg=
golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ=
golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY=
golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
golang.org/x/tools v0.14.0 h1:jvNa2pY0M4r62jkRQ6RwEZZyPcymeL9XZMLBbV7U2nc=
Expand Down

0 comments on commit 22fa80d

Please sign in to comment.