Skip to content

use 6.2.0.317 #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
zspitzer wants to merge 6 commits into from
Closed

use 6.2.0.317 #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7d3d366
use 6.2.0.317
zspitzer Feb 8, 2025
d0992ff
use java 21
zspitzer Feb 8, 2025
c53939f
Update testStableReleaseBundles.cfc
zspitzer Feb 8, 2025
d207d0e
disable sentry, log all to console for debugging
zspitzer Feb 10, 2025
6a36270
LDEV-5323 add check for correct application scope
zspitzer Feb 10, 2025
4cd4018
LDEV-5320 avoid session error
zspitzer Feb 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ jobs:
name: Java build
runs-on: ubuntu-latest
env:
luceeVersion: 6.0.4.10
luceeVersion: 6.2.0.317-SNAPSHOT
#luceeVersionQuery: 6.0.3/all/jar
steps:
- uses: actions/checkout@v4
- name: Set up JDK 11
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
java-version: '11'
java-version: '21'
distribution: 'adopt'
- name: Cache Maven packages
if: always()
Expand Down
4 changes: 4 additions & 0 deletions apps/updateserver/rest/ExtensionProvider.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
*/
component {

if (getApplicationSettings().name != "lucee-provider")
systemOutput("Extension REST Provider has wrong Application Scope: ["
& getApplicationSettings().name & "], should be [lucee-provider]", true);

variables.metaReader = application.extMetaReader;
variables.cdnURL = application.extensionsCdnUrl;

Expand Down
5 changes: 5 additions & 0 deletions apps/updateserver/rest/UpdateProvider.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
*/
component {

if (getApplicationSettings().name != "lucee-provider")
systemOutput("Update REST Provider has wrong Application Scope: ["
& getApplicationSettings().name & "], should be [lucee-provider]", true);


variables.bundleDownloadService = application.bundleDownloadService;
variables.s3Root = application.coreS3Root;
variables.cdnUrl = application.coreCdnUrl;
Expand Down
2 changes: 1 addition & 1 deletion apps/updateserver/services/legacy/Jira.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
component {

variables.prefix="a2";
variables.maxInactiveInterval=getPageContext().getRequest().getSession(true).getMaxInactiveInterval();
variables.maxInactiveInterval=getPageContext().getRequest().getSession(true).getMaxInactiveInterval()?: 3600;
/*static {
static.prefix="a2";
static.maxInactiveInterval=getPageContext().getRequest().getSession(true).getMaxInactiveInterval();
Expand Down
59 changes: 29 additions & 30 deletions devops/.CFconfig-download.json5
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,29 +132,29 @@
"layout": "classic"
},
"update-provider": {
"appenderArguments": "environment:%7Benv%2ESENTRY%5FENV%7D;dist:;extras:;dsn:%7Benv%2ESENTRY%5FDSN%7D;debug:true;tags",
//"appenderArguments": "environment:%7Benv%2ESENTRY%5FENV%7D;dist:;extras:;dsn:%7Benv%2ESENTRY%5FDSN%7D;debug:true;tags",
"level": "error",
"appenderClass": "org.lucee.extension.sentry.log.log4j.SentryAppenderLog4j2",
"appenderBundleName": "sentry.extension",
"appenderBundleVersion": "5.5.2.15",
"layoutClass": "lucee.commons.io.log.log4j2.layout.ClassicLayout",
//"appenderClass": "org.lucee.extension.sentry.log.log4j.SentryAppenderLog4j2",
//"appenderBundleName": "sentry.extension",
//"appenderBundleVersion": "5.5.2.15",
//"layoutClass": "lucee.commons.io.log.log4j2.layout.ClassicLayout",
"layoutArguments": ""
},
"exception": {
"appenderArguments": "environment:%7Benv%2ESENTRY%5FENV%7D;dist:;extras:;dsn:%7Benv%2ESENTRY%5FDSN%7D;debug:true;tags",
//"appenderArguments": "environment:%7Benv%2ESENTRY%5FENV%7D;dist:;extras:;dsn:%7Benv%2ESENTRY%5FDSN%7D;debug:true;tags",
"level": "error",
"appenderClass": "org.lucee.extension.sentry.log.log4j.SentryAppenderLog4j2",
"appenderBundleName": "sentry.extension",
"appenderBundleVersion": "5.5.2.15",
//"appenderClass": "org.lucee.extension.sentry.log.log4j.SentryAppenderLog4j2",
/"appenderBundleName": "sentry.extension",
//"appenderBundleVersion": "5.5.2.15",
"layoutClass": "lucee.commons.io.log.log4j2.layout.ClassicLayout",
"layoutArguments": ""
},
"application": {
"appenderArguments": "environment:%7Benv%2ESENTRY%5FENV%7D;dist:;extras:;dsn:%7Benv%2ESENTRY%5FDSN%7D;debug:true;tags",
//"appenderArguments": "environment:%7Benv%2ESENTRY%5FENV%7D;dist:;extras:;dsn:%7Benv%2ESENTRY%5FDSN%7D;debug:true;tags",
"level": "info",
"appenderClass": "org.lucee.extension.sentry.log.log4j.SentryAppenderLog4j2",
"appenderBundleName": "sentry.extension",
"appenderBundleVersion": "5.5.2.15",
//"appenderClass": "org.lucee.extension.sentry.log.log4j.SentryAppenderLog4j2",
//"appenderBundleName": "sentry.extension",
//"appenderBundleVersion": "5.5.2.15",
"layoutClass": "lucee.commons.io.log.log4j2.layout.ClassicLayout",
"layoutArguments": ""
},
Expand Down Expand Up @@ -280,33 +280,32 @@
"salt": "BC6F6636-DBE0-42CF-AFB9548BA094304C",
"extensions": [
{
"id": "17AB52DE-B300-A94B-E058BD978511E39E",
"name": "S3 Resource Extension",
"version": "2.0.1.25"
"id": "17AB52DE-B300-A94B-E058BD978511E39E"
,"name": "S3 Resource Extension"
//,"version": "2.0.1.25"
},
{
"id": "B737ABC4-D43F-4D91-8E8E973E37C40D1B",
"name": "Image extension",
"version": "2.0.0.26"
"id": "B737ABC4-D43F-4D91-8E8E973E37C40D1B"
,"name": "Image extension"
//,"version": "2.0.0.26"
},
{
"id": "37C61C0A-5D7E-4256-8572639BE0CF5838",
"name": "ESAPI extension",
"version": "2.2.4.15"
"id": "37C61C0A-5D7E-4256-8572639BE0CF5838"
"name": "ESAPI extension"
//,"version": "2.2.4.15"
},
{
"id": "8D7FB0DF-08BB-1589-FE3975678F07DB17",
"name": "Compress Tags",
"version": "1.0.0.15"
"id": "8D7FB0DF-08BB-1589-FE3975678F07DB17"
,"name": "Compress Tags"
//,"version": "1.0.0.15"
} /*
{
"id": "CED6227E-0F49-6367-A68D21AACA6B07E8",
"version": "1.0.0.5",
"name": "Lucee Administrator"
"id": "CED6227E-0F49-6367-A68D21AACA6B07E8"
, "name": "Lucee Administrator"
} */
],
"errorGeneralTemplate": "/lucee/templates/error/error-public.cfm",
"errorMissingTemplate": "/lucee/templates/error/error-public.cfm",
"errorGeneralTemplate": "/lucee/templates/error/error.cfm",
"errorMissingTemplate": "/lucee/templates/error/error.cfm",
"errorStatusCode": "true",
"inspectTemplate": "never",
"typeChecking": "true",
Expand Down
48 changes: 22 additions & 26 deletions devops/.CFconfig-update.json5
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,29 +132,29 @@
"layout": "classic"
},
"update-provider": {
"appenderArguments": "environment:%7Benv%2ESENTRY%5FENV%7D;dist:;extras:;dsn:%7Benv%2ESENTRY%5FDSN%7D;debug:true;tags",
// "appenderArguments": "environment:%7Benv%2ESENTRY%5FENV%7D;dist:;extras:;dsn:%7Benv%2ESENTRY%5FDSN%7D;debug:true;tags",
"level": "error",
"appenderClass": "org.lucee.extension.sentry.log.log4j.SentryAppenderLog4j2",
"appenderBundleName": "sentry.extension",
"appenderBundleVersion": "5.5.2.15",
//"appenderClass": "org.lucee.extension.sentry.log.log4j.SentryAppenderLog4j2",
//"appenderBundleName": "sentry.extension",
//"appenderBundleVersion": "5.5.2.15",
"layoutClass": "lucee.commons.io.log.log4j2.layout.ClassicLayout",
"layoutArguments": ""
},
"exception": {
"appenderArguments": "environment:%7Benv%2ESENTRY%5FENV%7D;dist:;extras:;dsn:%7Benv%2ESENTRY%5FDSN%7D;debug:true;tags",
//"appenderArguments": "environment:%7Benv%2ESENTRY%5FENV%7D;dist:;extras:;dsn:%7Benv%2ESENTRY%5FDSN%7D;debug:true;tags",
"level": "error",
"appenderClass": "org.lucee.extension.sentry.log.log4j.SentryAppenderLog4j2",
"appenderBundleName": "sentry.extension",
"appenderBundleVersion": "5.5.2.15",
//"appenderClass": "org.lucee.extension.sentry.log.log4j.SentryAppenderLog4j2",
//"appenderBundleName": "sentry.extension",
//"appenderBundleVersion": "5.5.2.15",
"layoutClass": "lucee.commons.io.log.log4j2.layout.ClassicLayout",
"layoutArguments": ""
},
"application": {
"appenderArguments": "environment:%7Benv%2ESENTRY%5FENV%7D;dist:;extras:;dsn:%7Benv%2ESENTRY%5FDSN%7D;debug:true;tags",
//"appenderArguments": "environment:%7Benv%2ESENTRY%5FENV%7D;dist:;extras:;dsn:%7Benv%2ESENTRY%5FDSN%7D;debug:true;tags",
"level": "info",
"appenderClass": "org.lucee.extension.sentry.log.log4j.SentryAppenderLog4j2",
"appenderBundleName": "sentry.extension",
"appenderBundleVersion": "5.5.2.15",
//"appenderClass": "org.lucee.extension.sentry.log.log4j.SentryAppenderLog4j2",
//"appenderBundleName": "sentry.extension",
//"appenderBundleVersion": "5.5.2.15",
"layoutClass": "lucee.commons.io.log.log4j2.layout.ClassicLayout",
"layoutArguments": ""
},
Expand Down Expand Up @@ -201,11 +201,11 @@
"layout": "classic"
},
"rest": {
"appenderArguments": "environment:%7Benv%2ESENTRY%5FENV%7D;dist:;extras:;dsn:%7Benv%2ESENTRY%5FDSN%7D;debug:true;tags",
//"appenderArguments": "environment:%7Benv%2ESENTRY%5FENV%7D;dist:;extras:;dsn:%7Benv%2ESENTRY%5FDSN%7D;debug:true;tags",
"level": "error",
"appenderClass": "org.lucee.extension.sentry.log.log4j.SentryAppenderLog4j2",
"appenderBundleName": "sentry.extension",
"appenderBundleVersion": "5.5.2.15",
//"appenderClass": "org.lucee.extension.sentry.log.log4j.SentryAppenderLog4j2",
//"appenderBundleName": "sentry.extension",
//"appenderBundleVersion": "5.5.2.15",
"layoutClass": "lucee.commons.io.log.log4j2.layout.ClassicLayout",
"layoutArguments": ""
},
Expand Down Expand Up @@ -284,23 +284,19 @@
"extensions": [
{
"id": "17AB52DE-B300-A94B-E058BD978511E39E",
"name": "S3 Resource Extension",
"version": "2.0.1.25"
"name": "S3 Resource Extension"
},
{
"id": "B737ABC4-D43F-4D91-8E8E973E37C40D1B",
"name": "Image extension",
"version": "2.0.0.26"
"name": "Image extension"
},
{
"id": "37C61C0A-5D7E-4256-8572639BE0CF5838",
"name": "ESAPI extension",
"version": "2.2.4.15"
"name": "ESAPI extension"
},
{
"id": "8D7FB0DF-08BB-1589-FE3975678F07DB17",
"name": "Compress Tags",
"version": "1.0.0.15"
"name": "Compress Tags"
} /*
{
"id": "CED6227E-0F49-6367-A68D21AACA6B07E8",
Expand All @@ -318,8 +314,8 @@
],
"list": "false"
},
"errorGeneralTemplate": "/lucee/templates/error/error-public.cfm",
"errorMissingTemplate": "/lucee/templates/error/error-public.cfm",
"errorGeneralTemplate": "/lucee/templates/error/error.cfm",
"errorMissingTemplate": "/lucee/templates/error/error.cfm",
"errorStatusCode": "true",
"inspectTemplate": "never",
"typeChecking": "true",
Expand Down
6 changes: 5 additions & 1 deletion devops/Dockerfile.base
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
FROM lucee/lucee:6.0.3.1-tomcat9.0-jdk11-temurin-jammy
# FROM lucee/lucee:6.0.3.1-tomcat9.0-jdk11-temurin-jammy
# FROM lucee/lucee:6.1.1.118-nginx-tomcat9.0-jdk11-temurin-jammy
FROM lucee/lucee:6.2.0.317-SNAPSHOT-nginx-tomcat10.1-jre21-temurin-jammy
ADD https://repo1.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/0.20.0/jmx_prometheus_javaagent-0.20.0.jar /opt/lucee/bin/prometheus-java-agent.jar
ENV JAVA_OPTS="-javaagent:/opt/lucee/bin/prometheus-java-agent.jar=9090:/opt/lucee/conf/prometheus/config.yml"
ENV LUCEE_ADMIN_ENABLED=false
ENV LUCEE_LOGGING_FORCE_LEVEL=info
ENV LUCEE_LOGGING_FORCE_APPENDER=console
RUN mkdir -p /opt/lucee/server/lucee-server/deploy && \
mkdir -p /opt/lucee/server/lucee-server/context && \
wget -nv https://ext.lucee.org/sentry-extension-5.5.2.15.lex -O /opt/lucee/server/lucee-server/deploy/sentry-extension.lex
Expand Down
2 changes: 1 addition & 1 deletion tests/testStableReleaseBundles.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase" labels="data-provider-inte
http url="https://update.lucee.org/rest/update/provider/download/#bundleSpec#/" result="local.res" throwOnError=true;
} catch ( e ) {
systemOutput( "https://update.lucee.org/rest/update/provider/download/#bundleSpec#/ threw [" & e.message & "]", true );
return missing;
return bundle;
}
}
return "";
Expand Down
Loading