Skip to content

Commit

Permalink
#29222 include in 23.01.22 LTS
Browse files Browse the repository at this point in the history
  • Loading branch information
erickgonzalez committed Aug 16, 2024
1 parent cd4c2bd commit 304ca90
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 37 deletions.
2 changes: 1 addition & 1 deletion dotCMS/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ dependencies {

felixsystem group: 'com.dotcms.samlbundle', name: 'com.dotcms.samlbundle', version: '24.02.29'

felixsystem group: 'com.dotcms.core.plugins', name: 'com.dotcms.telemetry', version: '24.05.29'
felixsystem group: 'com.dotcms.core.plugins', name: 'com.dotcms.telemetry', version: '24.08.08'

//// starter config

Expand Down
76 changes: 40 additions & 36 deletions dotCMS/src/main/resources/osgi/system/osgi-extra.conf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ com.dotcms.rest.api.v1.authentication,
com.dotmarketing.business.jgroups,
com.dotcms.rest.api.v1.personas,
com.dotmarketing.portlets.contentlet.business.web,
com.liferay.util.servlet,
com.liferay.util.servlet;version=0.1.0,
com.dotmarketing.sitesearch.model,
com.dotmarketing.cms.content.submit,
com.dotmarketing.util.json,
Expand All @@ -18,14 +18,15 @@ com.dotcms.mock.response,
com.dotmarketing.portlets.linkchecker.ajax,
org.apache.velocity.tools.generic,
com.dotmarketing.business.portal,
com.dotcms.rendering.velocity.viewtools;version=0.1.0,
com.dotcms.rendering.velocity.viewtools.util,
com.dotcms.rendering.velocity.viewtools.bean,
com.dotmarketing.portal.struts,
org.apache.velocity.runtime.resource.util;version=0.1.0,
com.dotcms.rest.api.v1.index,
com.dotcms.publisher.endpoint.business,
com.dotmarketing.cms.content.submit.util,
com.dotcms.contenttype.model.type,
com.dotcms.contenttype.model.type;version=0.1.0,
com.dotcms.rest.api.v1.sites.ruleengine.rules.conditions,
org.apache.velocity.runtime.resource,
com.dotcms.uuid.shorty,
Expand Down Expand Up @@ -69,17 +70,17 @@ com.dotmarketing.portlets.cmsmaintenance.util,
com.dotmarketing.portlets.containers.ajax,
com.dotcms.rest.api.v1.languages,
com.dotmarketing.portlets.workflows.struts,
com.dotcms.rest.annotation,
com.dotcms.rest.annotation;version=0.1.0,
com.dotcms.spring.web,
com.dotmarketing.portlets.rules,
com.dotcms.job.system.event.delegate,
com.dotcms.content.elasticsearch.util,
com.dotmarketing.comparators,
com.dotmarketing.portlets.templates.design.util,
com.dotmarketing.portlets.templates.design.util;version=0.1.0,
com.dotcms.rest.api.v1.system.role,
com.dotcms.rest.validation,
com.dotmarketing.portlets.templates.struts,
com.dotmarketing.portlets.usermanager.action,
com.dotmarketing.portlets.usermanager.action;version=0.1.0,
com.liferay.util.cal,
com.dotcms.filters.interceptor.dotcms,
com.dotcms.rest.api.v1.system,
Expand All @@ -90,8 +91,8 @@ com.liferay.util.format,
com.dotcms.cache.transport,
com.dotmarketing.portlets.links.action,
org.apache.velocity.texen,
org.elasticsearch.common.unit,
com.dotcms.content.elasticsearch.business,
org.elasticsearch.common.unit;version=0.1.0,
com.dotcms.content.elasticsearch.business;version=0.1.0,
com.dotcms.system.event.local.business;version=0.1.0,
com.dotcms.rendering.velocity.viewtools,
com.dotmarketing.startup,
Expand Down Expand Up @@ -139,7 +140,7 @@ com.dotmarketing.cms.myaccount.action,
com.dotmarketing.servlets.image,
com.dotmarketing.plugin.business,
com.dotmarketing.portlets.workflows.ajax,
com.dotmarketing.portlets.templates.design.bean,
com.dotmarketing.portlets.templates.design.bean;version=0.1.0,
com.dotcms.enterprise.achecker,
com.dotmarketing.portlets.workflows.action,
com.dotcms.rest.elasticsearch,
Expand Down Expand Up @@ -202,7 +203,7 @@ com.dotcms.enterprise.de.qaware.heimdall.d,
org.apache.tomcat.util.buf,
com.dotmarketing.util.diff.helper,
com.dotmarketing.portlets.workflowmessages.factories,
com.liferay.util,
com.liferay.util;version=0.1.0,
com.dotcms.publisher.ajax,
com.dotmarketing.cms.createaccount.struts,
com.dotmarketing.portlets.dashboard.business,
Expand Down Expand Up @@ -247,7 +248,7 @@ com.dotmarketing.portlets.osgi.AJAX,
com.dotcms.contenttype.model.component,
com.dotcms.api.tree,
com.dotcms.test,
com.dotcms.cluster.bean,
com.dotcms.cluster.bean;version=0.1.0,
com.liferay.util.servlet.fileupload,
org.apache.velocity.runtime;version=0.1.0,
org.apache.velocity.runtime.log;version=0.1.0,
Expand All @@ -271,7 +272,7 @@ com.dotcms.languagevariable.business,
com.dotcms.publisher.business,
com.dotmarketing.portlets.templates.action,
com.dotmarketing.logConsole.model,
com.dotcms.cluster.business,
com.dotcms.cluster.business;version=0.1.0,
com.dotcms.publisher.receiver.handler,
com.dotmarketing.portlets.rules.util,
com.dotmarketing.servlets.ajax,
Expand Down Expand Up @@ -311,10 +312,10 @@ com.dotmarketing.cache,
com.dotmarketing.portlets.links.struts,
com.dotcms.rest.servlet,
com.dotmarketing.portlets.cmsmaintenance.struts,
com.dotmarketing.common.db,
com.dotmarketing.common.db;version=0.1.0,
com.dotmarketing.portlets.user.struts,
com.dotcms.enterprise.cluster,
com.dotcms.util,
com.dotcms.util;version=0.1.0,
com.dotmarketing.business.skeleton,
com.liferay.portal.events,
com.dotcms.rendering.velocity.util,
Expand Down Expand Up @@ -350,7 +351,7 @@ com.dotmarketing.portlets.links.model,
com.dotcms.vanityurl.business,
com.dotmarketing.portlets.dashboard.model,
org.apache.velocity.context;version=0.1.0,
com.dotcms.rest.api.v1,
com.dotcms.rest.api.v1;version=0.1.0,
com.dotmarketing.quartz,
net.sourceforge.squirrel_sql.plugins.mssql.prefs,
org.apache.velocity.exception;version=0.1.0,
Expand All @@ -359,8 +360,8 @@ com.liferay.portal.upgrade,
com.dotcms.auth.providers.jwt.services,
com.dotcms.publisher.endpoint.bean.factory,
com.dotmarketing.business.util,
com.dotcms.rest,
com.dotmarketing.portlets.templates.model,
com.dotcms.rest;version=0.1.0,
com.dotmarketing.portlets.templates.model;version=0.1.0,
com.dotmarketing.cms.forgotpassword.action,
net.sourceforge.squirrel_sql.plugins.mysql.tokenizer,
com.dotmarketing.portlets.containers.factories,
Expand All @@ -378,7 +379,7 @@ com.dotmarketing.portlets.form.business,
com.dotcms.xmlsitemap,
com.dotmarketing.portlets.form.action,
com.dotmarketing.portlets.contentlet.util,
com.liferay.portal.model,
com.liferay.portal.model;version=0.1.0,
com.dotmarketing.portlets.htmlpageviews.factories,
com.dotmarketing.portlets.contentlet.business.exporter,
com.dotmarketing.util.diff.html.modification,
Expand All @@ -394,16 +395,16 @@ com.dotmarketing.portlets.browser.ajax,
com.dotmarketing.portlets.hostadmin.action,
com.dotcms.publisher.environment.bean,
org.apache.velocity.runtime.resource.loader;version=0.1.0,
com.dotmarketing.portlets.containers.business,
com.dotmarketing.portlets.containers.business;version=0.1.0,
com.liferay.portal.util,
com.dotcms.rest.validation.constraints,
com.dotcms.publisher.assets.bean,
com.dotmarketing.portlets.linkchecker.bean,
com.dotcms.enterprise.achecker.validation,
org.apache.velocity.texen.util,
com.dotcms.concurrent,
com.dotcms.concurrent.lock,
com.dotcms.http,
com.dotcms.concurrent;version=0.1.0,
com.dotcms.concurrent.lock;version=0.1.0,
com.dotcms.http;version=0.1.0,
com.dotcms.visitor.domain,
com.dotmarketing.portlets.linkchecker.util,
com.dotmarketing.portlets.workflowmessages.struts,
Expand All @@ -428,12 +429,12 @@ com.dotcms.spring.portlet,
com.dotmarketing.beans.transform,
com.dotcms.enterprise.cas,
com.dotmarketing.portlets.personas.model,
com.dotmarketing.portlets.templates.business,
com.dotmarketing.portlets.templates.business;version=0.1.0,
org.apache.velocity.tools.view.servlet,
com.dotmarketing.business.cache.provider.h22,
com.dotmarketing.listeners,
com.dotcms.workflow.helper,
com.dotmarketing.db,
com.dotmarketing.db;version=0.1.0,
com.dotmarketing.webdav,
com.dotcms.rest.api.v1.browsertree,
com.dotcms.enterprise.achecker.utility,
Expand Down Expand Up @@ -470,7 +471,7 @@ com.dotmarketing.util.diff,
com.dotcms.enterprise.publishing.remote.bundler.a,
com.dotmarketing.portlets.templates.factories,
com.dotmarketing.portlets.folders.transform,
com.dotmarketing.portlets.languagesmanager.business,
com.dotmarketing.portlets.languagesmanager.business;version=0.1.0,
com.dotmarketing.filters.compression,
com.dotcms.rest.api.v1.site,
com.dotmarketing.portlets.report.struts,
Expand Down Expand Up @@ -530,7 +531,7 @@ com.dotmarketing.business.cache.provider,
com.dotcms.cli.security,
com.dotmarketing.cms.login.struts,
com.dotcms.cluster,
com.dotmarketing.portlets.languagesmanager.model,
com.dotmarketing.portlets.languagesmanager.model;version=0.1.0,
com.dotmarketing.portlets.usermanager.struts,
com.dotcms.auth.providers.jwt.factories,
com.dotmarketing.portlets.report.businessrule,
Expand Down Expand Up @@ -563,7 +564,7 @@ com.dotcms.enterprise.license.a.a.c,
com.dotcms.rest.api.v1.page,
org.apache.velocity.anakia,
com.dotcms.enterprise.license.a.a.d,
com.dotmarketing.portlets.contentlet.business,
com.dotmarketing.portlets.contentlet.business;version=0.1.0,
com.dotcms.rest.api.v1.notification,
com.dotmarketing.portlets.calendar.viewtools,
com.dotmarketing.portlets.hostvariable.bussiness,
Expand All @@ -577,15 +578,17 @@ com.dotmarketing.portlets.report.action,
com.dotmarketing.common.reindex,
com.dotmarketing.business.cache.provider.timedcache,
com.dotmarketing.portlets.calendar.model,
com.fasterxml.jackson.annotation,
com.fasterxml.jackson.core,
com.fasterxml.jackson.databind,
com.fasterxml.jackson.databind.json,
com.fasterxml.jackson.jaxrs.json.annotation,
io.swagger.v3.oas.annotations,
io.swagger.v3.oas.annotations.media,
io.swagger.v3.oas.annotations.responses,
org.postgresql.util,

com.fasterxml.jackson.annotation;version=0.1.0,
com.fasterxml.jackson.core;version=0.1.0,
com.fasterxml.jackson.databind;version=0.1.0,
com.fasterxml.jackson.databind.json;version=0.1.0,
com.fasterxml.jackson.jaxrs.json.annotation;version=0.1.0,
io.swagger.v3.oas.annotations;version=0.1.0,
io.swagger.v3.oas.annotations.media;version=0.1.0,
io.swagger.v3.oas.annotations.responses;version=0.1.0,
org.postgresql.util;version=0.1.0,

org.osgi.framework,
org.osgi.framework.wiring,
org.osgi.service.packageadmin,
Expand Down Expand Up @@ -657,13 +660,14 @@ javax.xml.xpath;version=0.1.0,
net.spy.memcached;version=0.1.0,
net.spy.memcached.internal;version=0.1.0,
net.spy.memcached.transcoders;version=0.1.0,
org.apache.logging.log4j;
org.apache.commons.codec;version=0.1.0,
org.apache.commons.codec.binary;version=0.1.0,
org.apache.commons.codec.digest;version=0.1.0,
org.apache.commons.io;version=0.1.0,
org.apache.commons.io.input;version=0.1.0,
org.apache.commons.lang;version=0.1.0,
org.apache.commons.lang.math;0.1.0,
org.apache.commons.lang.math;version=0.1.0,
org.apache.http;version=0.1.0,
org.apache.http.auth;version=0.1.0,
org.apache.http.client;version=0.1.0,
Expand Down
1 change: 1 addition & 0 deletions hotfix_tracking.md
Original file line number Diff line number Diff line change
Expand Up @@ -290,3 +290,4 @@ This maintenance release includes the following code fixes:
221. https://github.com/dotCMS/core/issues/28838 : Category Child Permissions Not Loading #28838
222. https://github.com/dotCMS/core/issues/29079 : fileAsset Required Error while importing FileAsset through CSV #29079
223. https://github.com/dotCMS/core/issues/29209 : Wrong url when exporting file asset #29209
224. https://github.com/dotCMS/core/issues/29222 : Telemetry: not getting data after last release of the plugin #29222

0 comments on commit 304ca90

Please sign in to comment.