Skip to content

Commit 6d960d7

Browse files
nebhalenebhale
committed
Merge 76531562-container-certs to master
[Completes #76531562]
2 parents 5194155 + d902368 commit 6d960d7

252 files changed

Lines changed: 1170 additions & 262 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.idea/copyright/Apache_License__Version_2_0.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎README.md‎

Lines changed: 1 addition & 0 deletions

‎Rakefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Encoding: utf-8
22
# Cloud Foundry Java Buildpack
3-
# Copyright 2013-2015 the original author or authors.
3+
# Copyright 2013-2016 the original author or authors.
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
66
# you may not use this file except in compliance with the License.

‎bin/compile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env ruby
22
# Encoding: utf-8
33
# Cloud Foundry Java Buildpack
4-
# Copyright 2013-2015 the original author or authors.
4+
# Copyright 2013-2016 the original author or authors.
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.

‎bin/detect‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env ruby
22
# Encoding: utf-8
33
# Cloud Foundry Java Buildpack
4-
# Copyright 2013-2015 the original author or authors.
4+
# Copyright 2013-2016 the original author or authors.
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.

‎bin/release‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env ruby
22
# Encoding: utf-8
33
# Cloud Foundry Java Buildpack
4-
# Copyright 2013-2015 the original author or authors.
4+
# Copyright 2013-2016 the original author or authors.
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.

‎config/components.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ jres:
3636

3737
frameworks:
3838
- "JavaBuildpack::Framework::AppDynamicsAgent"
39+
- "JavaBuildpack::Framework::ContainerCertificateTrustStore"
3940
- "JavaBuildpack::Framework::Debug"
4041
# - "JavaBuildpack::Framework::DynaTraceAgent"
4142
# - "JavaBuildpack::Framework::IntroscopeAgent"

‎config/container_certificate_trust_store.yml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Cloud Foundry Java Buildpack
2+
# Copyright 2014-2015 the original author or authors.
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
16+
# Container certificate truststore configuration
17+
---
18+
enabled: false

‎docs/container-java_main.md‎

Lines changed: 3 additions & 2 deletions

‎docs/container-tomcat.md‎

Lines changed: 2 additions & 1 deletion

0 commit comments

Comments
 (0)