Skip to content

Commit

Permalink
Merge branch 'master' into XWIKI-22540
Browse files Browse the repository at this point in the history
  • Loading branch information
@Sereza7
Sereza7 authored Nov 27, 2024
2 parents fd1505e + 06cd830 commit b50e558
Show file tree
Hide file tree
Showing 1,407 changed files with 22,006 additions and 9,466 deletions.
20 changes: 20 additions & 0 deletions .github/renovate.json5
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,26 @@
{
"matchPackagePrefixes": ["org.xwiki.commons:", "org.xwiki.rendering:", "org.xwiki.platform:", "org.xwiki.enterprise:"],
"enabled": false
},

// Automatically assign npm packages to @manuelleduc
{
"matchDatasources": ["npm"],
"assignees": ["manuelleduc"]
},

// Automatically assign webjars packages to @mflorea
{
"matchDatasources": ["maven"],
"matchPackageNames": ["org.webjars*"],
"assignees": ["mflorea"]
},

// Automatically assign other Maven dependencies to @tmortagne
{
"matchDatasources": ["maven"],
"matchPackageNames": ["!org.webjars*"],
"assignees": ["tmortagne"]
}
]
}
19 changes: 18 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,26 @@ Read our [Release Notes](https://www.xwiki.org/xwiki/bin/view/ReleaseNotes/).
* [Development Flow](https://dev.xwiki.org/xwiki/bin/view/Community/DevelopmentPractices#HGeneralDevelopmentFlow) to see the full list of tools we use to build the XWiki software.
* [![Revved up by Develocity](https://img.shields.io/badge/Revved%20up%20by-Develocity-06A0CE?logo=Gradle&labelColor=02303A)](https://ge.xwiki.org/scans)

## Project Statistics

![XWiki Platform Activity](https://repobeats.axiom.co/api/embed/7d0980aec51d3e1b8622875db877a3eaacabe169.svg "XWiki Platform Activity")

Note that we're [using an issue tracker](https://jira.xwiki.org/browse/XWIKI) other than GitHub Issues (hence the empty left column in the stats).

See the [Project Health page](https://dev.xwiki.org/xwiki/bin/view/Community/ProjectHealth) for more statistics about the XWiki project.

## Community

We're always looking for contributors!

You should read our [Get Involved Guide](https://dev.xwiki.org/xwiki/bin/view/Community/Contributing) or get in touch:
* [Blog](https://www.xwiki.org/xwiki/bin/view/Blog/)
* [Forum](https://dev.xwiki.org/xwiki/bin/view/Community/Discuss)
* [Chat](https://dev.xwiki.org/xwiki/bin/view/Community/Chat)

You can follow the XWiki news in [our blog](https://www.xwiki.org/xwiki/bin/view/Blog/).

Thank you to all contributors:

<a href="https://github.com/xwiki/xwiki-platform/graphs/contributors">
<img src="https://contrib.rocks/image?repo=xwiki/xwiki-platform&max=5000" />
</a>
94 changes: 29 additions & 65 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.xwiki.commons</groupId>
<artifactId>xwiki-commons-pom</artifactId>
<version>16.9.0-SNAPSHOT</version>
<version>17.0.0-SNAPSHOT</version>
<!-- Note: Do NOT set the <relativePath> tag here as this can cause issues. For example imagine you're using
Jenkins and you have the following directory structure:
workspace/xwiki-commons
Expand All @@ -41,7 +41,7 @@
<artifactId>xwiki-platform</artifactId>
<name>XWiki Platform - Parent POM</name>
<packaging>pom</packaging>
<version>16.9.0-SNAPSHOT</version>
<version>17.0.0-SNAPSHOT</version>
<description>XWiki Platform - Parent POM</description>
<properties>
<!-- Versions of XWiki dependencies used in Platform modules -->
Expand All @@ -50,37 +50,41 @@
<platform.version>${commons.version}</platform.version>

<!-- Dependencies versions -->
<batik.version>1.17</batik.version>
<batik.version>1.18</batik.version>
<restlet.version>2.3.12</restlet.version>
<tika.version>2.9.2</tika.version>
<pdfbox.version>2.0.31</pdfbox.version>
<keypress.version>2.1.5</keypress.version>
<jetty.server.version>12.0.12</jetty.server.version>
<jetty.server.version>12.0.15</jetty.server.version>
<jetty.client.version>10.0.24</jetty.client.version>
<jetty.version>${jetty.client.version}</jetty.version>
<!-- Force using the version of slf4j from Jetty dependencies instead of the one set by XWiki. The version used
by jetty is referenced in its mod files. When upgrading Jetty, check the version of SF4J used and set the
by jetty is referenced in its mod files. When upgrading Jetty, check the version of SLF4J used and set the
version here. -->
<jetty.server.slf4j.version>2.0.13</jetty.server.slf4j.version>
<netty.version>4.1.113.Final</netty.version>
<jetty.server.slf4j.version>2.0.16</jetty.server.slf4j.version>
<!-- Force using the version of apache-el from Jetty dependencies instead of the one set by XWiki. The version used
by jetty is referenced in its mod files. When upgrading Jetty, check the version of apache-el used and set the
version here. -->
<jetty.server.apache-el.version>9.0.96</jetty.server.apache-el.version>
<netty.version>4.1.115.Final</netty.version>
<hibernate.version>5.6.15.Final</hibernate.version>
<dockerJava.version>3.4.0</dockerJava.version>
<cvssCalculator.version>1.4.3</cvssCalculator.version>
<solr.major.version>9</solr.major.version>
<solr.version>9.4.1</solr.version>
<lucene.version>9.8.0</lucene.version>
<jersey.version>2.42</jersey.version>
<jersey.version>2.45</jersey.version>
<hk2.version>2.6.1</hk2.version>
<zookeeper.version>3.9.2</zookeeper.version>
<zookeeper.version>3.9.3</zookeeper.version>

<!-- Versions of other software we need in our functional tests -->
<testcontainers.version>1.20.2</testcontainers.version>
<testcontainers.version>1.20.4</testcontainers.version>
<!-- The LO version must point to the latest version from "Still" branch (LTS). When upgrading the version make
sure the new version is available from https://download.documentfoundation.org/libreoffice/stable/
Note: We don't need to exact version (e.g. 7.2.7.2) since the LTS is made available using a max of 2 dots
(e.g. 7.2.7).
-->
<libreoffice.version>24.2.6</libreoffice.version>
<libreoffice.version>24.2.7</libreoffice.version>

<!-- By default check that unit tests don't output anything to the console -->
<xwiki.surefire.captureconsole.skip>false</xwiki.surefire.captureconsole.skip>
Expand Down Expand Up @@ -108,13 +112,13 @@
<!-- Versions of JDBC connectors we want to use in our distribution, in our tests and when using build tools -->
<hsqldb.groupId>org.hsqldb</hsqldb.groupId>
<hsqldb.artifactId>hsqldb</hsqldb.artifactId>
<hsqldb.version>2.7.3</hsqldb.version>
<hsqldb.version>2.7.4</hsqldb.version>
<mysql.groupId>com.mysql</mysql.groupId>
<mysql.artifactId>mysql-connector-j</mysql.artifactId>
<mysql.version>9.0.0</mysql.version>
<mysql.version>9.1.0</mysql.version>
<mariadb.groupId>org.mariadb.jdbc</mariadb.groupId>
<mariadb.artifactId>mariadb-java-client</mariadb.artifactId>
<mariadb.version>3.4.1</mariadb.version>
<mariadb.version>3.5.1</mariadb.version>
<derby.groupId>org.apache.derby</derby.groupId>
<derby.artifactId>derby</derby.artifactId>
<derby.version>10.14.2.0</derby.version>
Expand All @@ -123,7 +127,7 @@
<pgsql.version>42.7.4</pgsql.version>
<oracle.groupId>com.oracle.database.jdbc</oracle.groupId>
<oracle.artifactId>ojdbc11</oracle.artifactId>
<oracle.version>21.11.0.0</oracle.version>
<oracle.version>21.16.0.0</oracle.version>

<!-- Versions of Node related tools -->
<node.version>v20.12.0</node.version>
Expand Down Expand Up @@ -182,7 +186,7 @@
<dependency>
<groupId>org.liquibase</groupId>
<artifactId>liquibase-core</artifactId>
<version>4.29.2</version>
<version>4.30.0</version>
<exclusions>
<!-- Not the right id -->
<exclusion>
Expand Down Expand Up @@ -374,46 +378,6 @@
<artifactId>tika-parser-image-module</artifactId>
<version>${tika.version}</version>
</dependency>

<!-- Rome 1.x is used only in the feed api module -->
<dependency>
<groupId>rome</groupId>
<artifactId>rome</artifactId>
<version>1.0</version>
<exclusions>
<!-- Exclude JDOM since Rome depends on jdom:jdom and we want to use org.jdom:jdom -->
<exclusion>
<groupId>jdom</groupId>
<artifactId>jdom</artifactId>
</exclusion>
<!-- We want to choose the SLF4J binding only when XWiki is packaged. -->
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>rome</groupId>
<artifactId>rome-fetcher</artifactId>
<version>1.0</version>
<!-- Exclude JDOM since Rome depends on jdom:jdom and we want to use org.jdom:jdom -->
<exclusions>
<exclusion>
<groupId>jdom</groupId>
<artifactId>jdom</artifactId>
</exclusion>
<!-- We want to choose the SLF4J binding only when XWiki is packaged. -->
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.rometools</groupId>
<artifactId>rome</artifactId>
Expand Down Expand Up @@ -621,7 +585,7 @@
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
<version>2.3.2</version>
<version>2.4.0</version>
</dependency>

<dependency>
Expand All @@ -632,7 +596,7 @@
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>1.18.1</version>
<version>1.18.2</version>
</dependency>

<!-- PDF -->
Expand Down Expand Up @@ -697,7 +661,7 @@
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>xmlgraphics-commons</artifactId>
<version>2.9</version>
<version>2.10</version>
<exclusions>
<!-- We want to choose the SLF4J binding only when XWiki is packaged. -->
<exclusion>
Expand Down Expand Up @@ -740,7 +704,7 @@
<dependency>
<groupId>com.github.jnr</groupId>
<artifactId>jnr-ffi</artifactId>
<version>2.2.16</version>
<version>2.2.17</version>
</dependency>
<dependency>
<groupId>com.github.jnr</groupId>
Expand All @@ -750,7 +714,7 @@
<dependency>
<groupId>com.github.jnr</groupId>
<artifactId>jnr-posix</artifactId>
<version>3.1.19</version>
<version>3.1.20</version>
</dependency>
<dependency>
<groupId>com.github.jnr</groupId>
Expand All @@ -762,7 +726,7 @@
<dependency>
<groupId>io.sf.carte</groupId>
<artifactId>css4j</artifactId>
<version>4.4</version>
<version>5.0</version>
</dependency>
<dependency>
<groupId>io.sf.carte</groupId>
Expand All @@ -774,7 +738,7 @@
<groupId>io.sf.carte</groupId>
<artifactId>css4j-dom4j</artifactId>
<!-- Note: has a different release cycle than CSS4J "core" -->
<version>4.2</version>
<version>5.0</version>
</dependency>

<!-- Carte XML DTD -->
Expand Down Expand Up @@ -1024,12 +988,12 @@
<dependency>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite-core</artifactId>
<version>1.37.0</version>
<version>1.38.0</version>
</dependency>
<dependency>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite-linq4j</artifactId>
<version>1.37.0</version>
<version>1.38.0</version>
</dependency>
<dependency>
<groupId>org.apache.calcite.avatica</groupId>
Expand Down
Loading

0 comments on commit b50e558

Please sign in to comment.