Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
43df3dc
[prepare-major] update to major version 7.0-SNAPSHOT
msladek Jan 1, 2026
492aa74
[prepare-major] update to major version 7.0-SNAPSHOT
msladek Jan 1, 2026
1f39542
[prepare-major] update to major version 7.0-SNAPSHOT
msladek Jan 1, 2026
1a4d33a
[prepare-major] update to major version 7.0-SNAPSHOT
msladek Jan 1, 2026
c3a3021
[prepare-major] update to major version 7.0-SNAPSHOT
msladek Jan 1, 2026
35badde
[prepare-major] update to major version 7.0-SNAPSHOT
msladek Jan 1, 2026
12ff142
[prepare-major] update to major version 7.0-SNAPSHOT
msladek Jan 1, 2026
d5ec747
[prepare-major] update to major version 7.0-SNAPSHOT
msladek Jan 1, 2026
4172d20
[prepare-major] update to major version 7.0-SNAPSHOT
msladek Jan 1, 2026
546e42f
[prepare-major] update to major version 7.0-SNAPSHOT
msladek Jan 1, 2026
2827092
[prepare-major] update to major version 7.0-SNAPSHOT
msladek Jan 1, 2026
5c23c95
[prepare-major] update to major version 7.0-SNAPSHOT
msladek Jan 1, 2026
6c924ff
[prepare-major] update to major version 7.0-SNAPSHOT
msladek Jan 1, 2026
72a3b6d
[prepare-major] update to major version 7.0-SNAPSHOT
msladek Jan 1, 2026
b5c2635
[prepare-major] update to major version 7.0-SNAPSHOT
msladek Jan 1, 2026
a61c96f
[prepare-major] update to major version 7.0-SNAPSHOT
msladek Jan 1, 2026
7419afb
[prepare-major] update to major version 7.0-SNAPSHOT
msladek Jan 1, 2026
f1fef1e
fix PaymentService
msladek Jan 1, 2026
57bb596
[prepare-major] update to major version 7.0-SNAPSHOT
msladek Jan 1, 2026
3259cd5
add wiki-manager
msladek Jan 1, 2026
0b5dd4a
add javax.ws.rs
msladek Jan 1, 2026
749d23b
Merge remote-tracking branch 'origin/dev' into major-7
msladek Jan 10, 2026
6f02a82
merge celements-search-lucene into celements-search
msladek Jan 10, 2026
fc9d6d3
Merge branch 'dev' into major-7
msladek Jan 11, 2026
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
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ local.properties
*.war
*.nar
*.ear
*.zip
*.tar.gz
*.rar

Expand Down
6 changes: 3 additions & 3 deletions celements-calendar-gdata/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@
<parent>
<groupId>com.celements</groupId>
<artifactId>celements</artifactId>
<version>6.0-SNAPSHOT</version>
<version>7.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>celements-calendar-gdata</artifactId>
<version>6.0-SNAPSHOT</version>
<version>7.0-SNAPSHOT</version>
<description>Celements Calendar</description>
<repositories>
<repository>
Expand All @@ -42,7 +42,7 @@
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-calendar</artifactId>
<version>6.0-SNAPSHOT</version>
<version>7.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.google.gdata</groupId>
Expand Down
8 changes: 4 additions & 4 deletions celements-captcha/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,23 +26,23 @@
<parent>
<groupId>com.celements</groupId>
<artifactId>celements</artifactId>
<version>6.0</version>
<version>7.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>celements-captcha</artifactId>
<version>6.1-SNAPSHOT</version>
<version>7.0-SNAPSHOT</version>
<description>Celements captcha implementations</description>
<dependencies>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-model</artifactId>
<version>6.0</version>
<version>7.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-core</artifactId>
<version>6.0</version>
<version>7.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
12 changes: 6 additions & 6 deletions celements-cleverreach/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,35 +24,35 @@
<parent>
<groupId>com.celements</groupId>
<artifactId>celements</artifactId>
<version>6.3</version>
<version>7.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>celements-cleverreach</artifactId>
<version>6.2-SNAPSHOT</version>
<version>7.0-SNAPSHOT</version>
<description>Celements connector to Clever Reach API</description>
<dependencies>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-model</artifactId>
<version>6.4</version>
<version>7.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-core</artifactId>
<version>6.13</version>
<version>7.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-css</artifactId>
<version>6.0</version>
<version>7.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-mailsender</artifactId>
<version>6.0</version>
<version>7.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
8 changes: 4 additions & 4 deletions celements-contact/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,23 +26,23 @@
<parent>
<groupId>com.celements</groupId>
<artifactId>celements</artifactId>
<version>6.0</version>
<version>7.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>celements-contact</artifactId>
<version>6.1-SNAPSHOT</version>
<version>7.0-SNAPSHOT</version>
<description>Celements Core</description>
<dependencies>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-model</artifactId>
<version>6.0</version>
<version>7.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-core</artifactId>
<version>6.0</version>
<version>7.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
8 changes: 4 additions & 4 deletions celements-css/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,23 @@
<parent>
<groupId>com.celements</groupId>
<artifactId>celements</artifactId>
<version>6.0</version>
<version>7.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>celements-css</artifactId>
<version>6.1-SNAPSHOT</version>
<version>7.0-SNAPSHOT</version>
<description>Webtools for css handling like inliner, minifier</description>
<dependencies>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-model</artifactId>
<version>6.0</version>
<version>7.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-core</artifactId>
<version>6.0</version>
<version>7.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
10 changes: 5 additions & 5 deletions celements-layout/component/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,29 @@
<parent>
<groupId>com.celements</groupId>
<artifactId>celements</artifactId>
<version>6.6</version>
<version>7.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>celements-layout</artifactId>
<version>6.5-SNAPSHOT</version>
<version>7.0-SNAPSHOT</version>
<description>Celements Layout</description>
<dependencies>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-core</artifactId>
<version>6.14</version>
<version>7.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-model</artifactId>
<version>6.6</version>
<version>7.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-spring-security</artifactId>
<version>6.0</version>
<version>7.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
6 changes: 3 additions & 3 deletions celements-layout/web-module/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,18 @@
<parent>
<groupId>com.celements</groupId>
<artifactId>celementsweb</artifactId>
<version>6.2</version>
<version>7.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>celements-layout-web</artifactId>
<version>6.5-SNAPSHOT</version>
<version>7.0-SNAPSHOT</version>
<packaging>war</packaging>
<name>Celements Layout Web</name>
<dependencies>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-layout</artifactId>
<version>6.4</version>
<version>7.0-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
Expand Down
4 changes: 2 additions & 2 deletions celements-mailsender/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<parent>
<groupId>com.celements</groupId>
<artifactId>celements</artifactId>
<version>6.2</version>
<version>7.0-SNAPSHOT</version>
</parent>
<artifactId>celements-mailsender</artifactId>
<version>6.1-SNAPSHOT</version>
<version>7.0-SNAPSHOT</version>
<name>Celements Mail Sender</name>
<repositories>
<repository>
Expand Down
8 changes: 4 additions & 4 deletions celements-payment/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,23 +26,23 @@
<parent>
<groupId>com.celements</groupId>
<artifactId>celements</artifactId>
<version>6.0</version>
<version>7.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>payment</artifactId>
<version>6.1-SNAPSHOT</version>
<version>7.0-SNAPSHOT</version>
<description>Celements Payment</description>
<dependencies>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-model</artifactId>
<version>6.0</version>
<version>7.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-core</artifactId>
<version>6.0</version>
<version>7.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@
import java.util.List;
import java.util.Map;

import org.hibernate.HibernateException;
import org.hibernate.Session;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xwiki.component.annotation.Component;
Expand All @@ -36,7 +34,7 @@
import com.celements.model.context.ModelContext;
import com.celements.payment.exception.PaymentException;
import com.celements.payment.raw.PaymentRawObject;
import com.celements.web.plugin.api.CelementsWebPluginApi;
import com.celements.web.plugin.CelementsWebPlugin;
import com.google.common.base.Functions;
import com.google.common.collect.Lists;
import com.xpn.xwiki.XWikiContext;
Expand Down Expand Up @@ -69,9 +67,9 @@ public void executePaymentAction(Map<String, String[]> data) {
XWikiDocument actionXdoc = getXWikiContext().getWiki().getDocument(callbackDocRef,
getXWikiContext());
Document actionDoc = actionXdoc.newDocument(getXWikiContext());
CelementsWebPluginApi celementsweb = (CelementsWebPluginApi) getXWikiContext().getWiki().getPluginApi(
"celementsweb", getXWikiContext());
celementsweb.getPlugin().executeAction(actionDoc, data, actionXdoc, getXWikiContext());
CelementsWebPlugin celementsweb = (CelementsWebPlugin) getXWikiContext().getWiki()
.getPlugin("celementsweb", getXWikiContext());
celementsweb.executeAction(actionDoc, data, actionXdoc, getXWikiContext());
} else {
LOGGER.warn("Failed to execute payment action because Payment.CallbackActions"
+ " does not exist in [" + getXWikiContext().getDatabase() + "].");
Expand All @@ -84,13 +82,9 @@ public void executePaymentAction(Map<String, String[]> data) {
@Override
public void storePaymentObject(final PaymentRawObject paymentObj) throws PaymentException {
try {
getHibStore().executeWrite(context.getXWikiContext(), true, new HibernateCallback<Void>() {

@Override
public Void doInHibernate(Session session) throws HibernateException {
session.saveOrUpdate(paymentObj);
return null;
}
getHibStore().executeWrite(context.getXWikiContext(), true, (HibernateCallback<Void>) session -> {
session.saveOrUpdate(paymentObj);
return null;
});
LOGGER.info("storePaymentObject: '{}'", paymentObj);
} catch (XWikiException xwe) {
Expand Down
6 changes: 3 additions & 3 deletions celements-rights/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@
<parent>
<groupId>com.celements</groupId>
<artifactId>celements</artifactId>
<version>6.0</version>
<version>7.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>celements-rights</artifactId>
<version>6.1-SNAPSHOT</version>
<version>7.0-SNAPSHOT</version>
<description>Celements Rights</description>
<dependencies>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-model</artifactId>
<version>6.0</version>
<version>7.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
6 changes: 3 additions & 3 deletions celements-scheduler/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,16 @@
<parent>
<groupId>com.celements</groupId>
<artifactId>celements</artifactId>
<version>6.6</version>
<version>7.0-SNAPSHOT</version>
</parent>
<artifactId>celements-scheduler</artifactId>
<version>6.3-SNAPSHOT</version>
<version>7.0-SNAPSHOT</version>
<name>Celements Scheduler</name>
<dependencies>
<dependency>
<groupId>com.celements</groupId>
<artifactId>celements-model</artifactId>
<version>6.7</version>
<version>7.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
Loading