501 Commits

Author SHA1 Message Date
8ef2a0347c Merged in SCALE-156-update-session-timeout-web-inf (pull request #199)
SCALE-156: Update web.xml in WEB-INF

* SCALE-156: Update web.xml in WEB-INF

* Import os

* Fix env

* Fix env
2025-06-16 09:16:53 +00:00
3778c6195a Merged in forked-contributions-target (pull request #198)
Merge forked contributions branch

* Merged in fixingShutdownError (pull request #197)

Fixing Shutdown Exit Error

* Initial commit of fixing error code returned when shutting down
 * Updated entrypoint to use new exec_app_wait
 * Added new file wait-for-shutdown.sh
 * Updated dockerfile to add new wait-for-shutdown.sh

* Renamed wait-for-shutdown to wait-for-catalina-shutdown
Added comments/documentation
Improved detection of catalina process
Removed logging from entrypoint

* Updated ref to shared-components

* Added readme about issue

* Updates to issue readme

* Updated submodule url

* Updated submodule repo ref

* Updated ref to submodule

* Merge remote-tracking branch 'bitbucketeficode/master' into fixingShutdownError

* Removed duplicate imports in entrypoint.py

* Cleaned up branch/pr


Approved-by: Eugene Ivantsov
* Fix internal proxies test
2025-05-05 09:15:19 +00:00
8c2ead7e14 Merged in update-session-timeout-web-xml (pull request #193)
Make it possible to adjust tomcat session timeout in web.xml

* Make it possible to adjust tomcat session timeout in web.xml

* Add imports
2025-04-19 20:47:02 +00:00
3f75253ed4 Merged in add-opensearch-properties (pull request #192)
Add opensearch properties

* Add opensearch props

* Update

* Fix tests

* Fix template

* Fix test

* Fix test

* Fix test

* Test additional props

* Test additional props

* Add search platform env var


Approved-by: Minh Tran
2025-03-06 07:06:33 +00:00
aea178a8ab Merged in confluence-10-remove-jdk-17 (pull request #191)
Stop building jdk17 for 10.0.x

* Stop building jdk17 for 10.0.x


Approved-by: Minh Tran
Approved-by: Adam Brokes
2025-02-25 22:56:36 +00:00
8081da23c8 Merged in access-log-pattern (pull request #190)
Make access log pattern configurable

* Make access log pattern configurable

* Fix test

* Fix test

* Fix test

* Fix test


Approved-by: Yifei Zhang
Approved-by: Adam Brokes
2025-02-17 19:37:25 +00:00
e91985ac7b Merged in remove-eol-versions (pull request #189)
Remove EOL versions

* Remove EOL versions

* Start building from 8.4


Approved-by: Minh Tran
2025-02-10 06:37:24 +00:00
73da601c5d Merged in support-additional-connectors (pull request #188)
Support additional connector

* Additional connector in server.xml

* Lowercase env var

* Add unit tests


Approved-by: Yifei Zhang
Approved-by: Richard Atkins
Approved-by: Adam Brokes
2025-02-04 06:22:21 +00:00
0c6149ddd9 Merged in make-stuckthreaddetectionvalve-configurable (pull request #187)
Make StuckThreadDetectionValve threshold configurable

* Make StuckThreadDetectionValve threshold configurable


Approved-by: Adam Brokes
2024-11-26 21:35:38 +00:00
c611313a66 Merged in SCALE-142-additional-cfg-xml-properties (pull request #186)
Add additional properties to cfg.xml template

* Add additional properties to cfg.xml template

* Fix typo


Approved-by: Yifei Zhang
2024-10-21 05:39:36 +00:00
7bd34eb96c Merged in SCALE-140-add-cluster-interface-cfg (pull request #185)
SCALE-140: Add ATL_CLUSTER_INTERFACE env var

* SCALE-140: Add ATL_CLUSTER_INTERFACE env var

* Fix typo


Approved-by: Adam Brokes
2024-10-17 03:01:18 +00:00
7e0f8155e4 Merged in jdk-21 (pull request #183)
Build JDK21 tags

* Build jdk21 based images

* Build jdk21 based images

* Fix pipelines


Approved-by: Dylan Rathbone
2024-10-04 04:35:33 +00:00
c1134ff838 Merged in troubleshoot-9-1-failure (pull request #182)
Upgdare Postgres to 14

* Send logs to stdout

* Upgrade database


Approved-by: Jun Jeong
Approved-by: Dylan Rathbone
2024-10-04 00:26:01 +00:00
ee86ff7c22 Merged in optional-sid (pull request #181)
Add optional server id to confluence.cfg.xml

* Add optional server id to confluence.cfg.xml


Approved-by: Adam Brokes
2024-10-01 00:33:33 +00:00
a243e8eed0 Merged in DCCLIP-1068-add-security-flag (pull request #179)
DCCLIP-1068: Introduce a security property for Confluence 9.1 and later.

* DCCLIP-1068: Introduce a security property for Confluence 9.1 and later.

* DCCLIP-1068: fix syntax error

* DCCLIP-1068: option to override ATL_SECURE_PROPERTIES

* DCCLIP-1068: fix syntax error

* DCCLIP-1068: remove env var export.


Approved-by: Eugene Ivantsov
Approved-by: Byron Conroy
Approved-by: Dylan Rathbone
2024-09-06 03:35:24 +00:00
bf8c9935f3 Merged in no-ticket-fix-jdbc-url (pull request #180)
Remove extra space in jdbc url

* Remove extra space


Approved-by: Minh Tran
Approved-by: Byron Conroy
2024-09-06 03:20:19 +00:00
38b24ecbcc Merged in SCALE-137-jdbc-url-ampersand (pull request #178)
SCALE-137: Replace '&' with `&`

* SCALE-137: replace '&' with '&'

* Fix unit tests

* Fix unit tests

* Check if jdbc url container excaped ampersand before replacing


Approved-by: Yifei Zhang
2024-08-19 05:10:29 +00:00
0bab37a331 Merged in use-latest-confluence-func-tests (pull request #177)
Use the latest Confluence for func tests

* Use the latest Confluence for func tests


Approved-by: Yifei Zhang
2024-08-07 01:46:56 +00:00
f06258364b Merged in CLIP-1907-update-skuk-threshold (pull request #176)
Update snyk threshold for ubi tags

* Update snyk threshold for ubi tags


Approved-by: Yifei Zhang
2024-07-31 01:27:07 +00:00
fc4a43042c Merged in CLIP-1909-pin-base-image-tag-to-ubuntu-noble (pull request #175)
CLIP-1909: Pinned base image tag to Ubuntu noble.

* CLIP-1909: Pinned base image tag to Ubuntu noble.


Approved-by: Eugene Ivantsov
2024-07-30 07:50:38 +00:00
be37c311a8 Merged in fix-context-path (pull request #174)
Fix context path in cfg.xml

* Fix context path in cfg.xml


Approved-by: Yifei Zhang
2024-07-30 00:14:22 +00:00
4739fca3c6 Merged in CLIP-1906-fix-volume-declaration (pull request #173)
CLIP-1906: Fix volume comment in the Dockerfile

* CLIP-1906: Fix volume comment in the Dockerfile

* Fix netcat package name


Approved-by: Yifei Zhang
2024-07-23 23:41:51 +00:00
2601be3f18 Merged in exclude-9-0-0 (pull request #172)
Temporarily exclude 9.0.0

* Skip 9.0.0

* Use 8.9.4 for branches and PR builds

* Update snyk ignore

* Override test version

* Update .snyk


Approved-by: Adam Brokes
2024-07-22 22:03:01 +00:00
9881a41894 Merged in remove-eap-steps (pull request #171)
Remove redundant new-eap-block

* Remove redunand new-eap-block

* Fix typo


Approved-by: Yifei Zhang
2024-07-15 05:49:35 +00:00
f857e05752 Merged in fix-new-releases-pipeline (pull request #170)
Fix jobs total in new-releases pipeline

* Fix jobs total


Approved-by: Yifei Zhang
2024-07-10 01:12:15 +00:00
0cb254b967 Merged in CLIP-1892-retry-docker-login-fix (pull request #169)
Fix a typo

* Fix a typo
2024-07-03 08:21:15 +00:00
00a4abf8b0 Merged in CLIP-1892-retry-docker-login (pull request #168)
Retry docker login, use smaller size

* Retry docker login, use smaller size
2024-07-03 08:10:13 +00:00
d952128976 Merged in CLIP-1891-optimize-new-releases-pipeline (pull request #167)
CLIP-1891: run one step per one flavor in new-releases pipelines

* CLIP-1891: run one step per one flavor

* CLIP-1891: run one step per one flavor


Approved-by: Adam Brokes
2024-06-25 03:52:01 +00:00
8d215905e9 Merged in CLIP-1885-confluence-multi-platform-tags (pull request #166)
CLIP-1885: Update Confluence pipelines to produce multi platform tags

* Update Confluence pipelines to produce multi platform tags


Approved-by: Adam Brokes
2024-06-12 04:59:51 +00:00
72373826d6 Merged in fix-readme (pull request #165)
Update link to git repo

* Update link to git repo


Approved-by: Minh Tran
2024-06-12 03:06:42 +00:00
fa7f3f1a20 Merged in CLIP-1880-stop-building-jdk11-eap (pull request #164)
CLIP-1880: Stop building JDK11 EAP tags

* CLIP-1880: Stop building JDK11 EAP tags


Approved-by: Jun Jeong
Approved-by: Minh Tran
2024-05-21 00:34:40 +00:00
d5e389ccd6 Merged in CLIP-1872-integrate-sha256-check (pull request #163)
CLIP-1872: Verify sha256 checksum after downloading tar.gz.

* CLIP-1872: Verify sha256 checksum after downloading tar.gz.

* CLIP-1872: Ignored cd in hadolint.


Approved-by: Eugene Ivantsov
2024-05-02 04:55:11 +00:00
8dce9d328c Merged in remote-valve-config (pull request #162)
Properly configure remoteIpValve

* Fix typos

* Fix more typos

* Fix unit tests

* Fix docker compose wait

* Rename remoteipvalve tests

* Fix docker compose yaml

* Add missing quotes

* Remove sleep

* Fix formatting

* More formatting


Approved-by: Yifei Zhang
2024-05-02 02:33:19 +00:00
6dc79d92c6 Merged in ubi-vulns (pull request #161)
Update glibs vulns to ignore

* Update glibs vulns to ignore


Approved-by: Adam Brokes
2024-04-29 23:51:30 +00:00
6aa3e14851 Merged in ignore-glibc-vuln (pull request #160)
Extend period to ignore glibc CVE

* Extend period to ignore glibc CVE

* Update ignore glibc rules


Approved-by: Minh Tran
Approved-by: Adam Brokes
2024-04-26 00:24:05 +00:00
de45f08dbd Merged in CLIP-1868-ignore-glibc-cves (pull request #159)
Temporarily ignore glibc cves

* Temporarily ignore glibc cves


Approved-by: Minh Tran
2024-04-21 21:12:33 +00:00
a309f75347 Merged in CLIP-1866-fix-multiple-default-releases (pull request #158)
CLIP-1866: Add plain version tag to only one variant of jdk

Approved-by: Eugene Ivantsov
2024-04-16 06:35:32 +00:00
51df6a8c88 CLIP-1866: Add plain version tag to only one variant of jdk. 2024-04-15 16:21:56 +10:00
182b0fda4f Merged in CLIP-1859-improve-readme (pull request #157)
CLIP-1859: Moved doc reference to a standalone section.

* CLIP-1859: Moved doc reference to a standalone section.


Approved-by: Eugene Ivantsov
2024-03-26 03:47:40 +00:00
6d48710b4a Merged in CLIP-1859-move-readme-to-helm-charts (pull request #156)
CLIP-1859: Migrate README to Helm chart docs

* CLIP-1859: Migrated README to Helm chart docs.

* CLIP-1859: Made -server repo deprecation message and reference to full readme to top.


Approved-by: Eugene Ivantsov
Approved-by: Minh Tran
Approved-by: Adam Brokes
2024-03-25 23:10:18 +00:00
bb83399875 Merged in CLIP-1853-server-eol (pull request #153)
Add server repo eol warning

* Add server repo eol warning


Approved-by: Yifei Zhang
Approved-by: Minh Tran
2024-03-14 05:15:05 +00:00
2d98fc4ea8 Merged in fix-ubi-func-tests (pull request #154)
Fix functional ubi tests

Approved-by: Yifei Zhang
2024-03-14 05:14:06 +00:00
4ba7a502bb Fix functional ubi tests 2024-03-14 15:53:27 +11:00
86697420f4 Merged in ubi-tags (pull request #152)
DCCLIP-874: Build and push UBI tags for Confluence

* Support UBI tags


Approved-by: Yifei Zhang
Approved-by: Minh Tran
2024-03-13 04:08:20 +00:00
de71ecbd95 Merged in keep-bundling-jdk11-with-8 (pull request #151)
Push jdk11 tags for 8.x Confluence

* Push jdk11 tags for 8.x Confluence

* Update README


Approved-by: Minh Tran
Approved-by: Adam Brokes
2024-02-16 00:12:36 +00:00
642cc3bb95 Merged in CLIP-1778-skip-server-repo (pull request #150)
Stop updating server repo

* Stop updating server repo

* Fix tags

* Fix missing param


Approved-by: Yifei Zhang
Approved-by: Minh Tran
Approved-by: Adam Brokes
2024-02-12 01:14:18 +00:00
ddfc0a93e0 Merged in CLIP-1847-support-jdk-17 (pull request #149)
Stop bundling Java 11 with Confluence 8.x

* Stop bundling Java 11 with Confluence 8.x

* Update the latest 7.x lts


Approved-by: Yifei Zhang
Approved-by: Minh Tran
2024-01-23 03:25:13 +00:00
f175a34c01 Merged in DCCLIP-789-review-install-dir-permissions (pull request #148)
DCCLIP-789: Make some directories writable to root group

* Make some directories writable for root group


Approved-by: Minh Tran
2024-01-18 02:30:57 +00:00
e6d24ab68f Merged in fix-installer-dir-permissions (pull request #147)
Change install dir permissions

* Change install dir permissions

* Update chown syntax

* Root own install dir

* Change permissions

* Confluence user and root group own install dir

* Fix tests

* Fix tests

* Remove redundant chown


Approved-by: Minh Tran
Approved-by: Adam Brokes
2024-01-17 19:50:27 +00:00
3b62a5a1a1 Merged in CLIP-1554-remove-default-preferred-test-query (pull request #146)
CLIP-1554: Remove default hibernate.c3p0.preferredTestQuery

* Make preferredTestQuery optional

* Make preferredTestQuery optional


Approved-by: Yifei Zhang
Approved-by: Minh Tran
Approved-by: Adam Brokes
2023-12-11 23:36:46 +00:00