You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2024/01/30 04:01:21 UTC
(openmeetings) branch master updated: [OPENMEETINGS-2780] rat-plugin, license-plugin, spring and mysql
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 2758df8c4 [OPENMEETINGS-2780] rat-plugin, license-plugin, spring and mysql
2758df8c4 is described below
commit 2758df8c440a125bfb914e4989eb7fd0c8fde91f
Author: Maxim Solodovnik <so...@apache.org>
AuthorDate: Tue Jan 30 11:01:12 2024 +0700
[OPENMEETINGS-2780] rat-plugin, license-plugin, spring and mysql
---
pom.xml | 41 ++++++-----------------------------------
1 file changed, 6 insertions(+), 35 deletions(-)
diff --git a/pom.xml b/pom.xml
index faedc119a..66ac4013f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,14 +58,14 @@
<version.maven-antrun-plugin>3.1.0</version.maven-antrun-plugin>
<version.maven-resources-plugin>3.3.1</version.maven-resources-plugin>
<version.maven-gpg-plugin>3.1.0</version.maven-gpg-plugin>
- <version.apache-rat-plugin>0.15</version.apache-rat-plugin>
+ <version.apache-rat-plugin>0.16.1</version.apache-rat-plugin>
<version.checksum-maven-plugin>1.11</version.checksum-maven-plugin>
<maven-bundle-plugin.version>5.1.9</maven-bundle-plugin.version>
<maven-checkstyle-plugin.version>3.3.1</maven-checkstyle-plugin.version>
<exec-maven-plugin.version>3.1.1</exec-maven-plugin.version>
<minify-maven-plugin.version>1.7.6</minify-maven-plugin.version>
- <license-maven-plugin.version>2.3.0</license-maven-plugin.version>
+ <license-maven-plugin.version>2.4.0</license-maven-plugin.version>
<reflow-maven-skin.version>2.3.4</reflow-maven-skin.version>
<reflow-theme>cerulean</reflow-theme>
<replacer.version>1.5.3</replacer.version>
@@ -87,7 +87,7 @@
<wicket-jquery-ui.version>10.0.0-M1</wicket-jquery-ui.version>
<wicketstuff.version>10.0.0-M2</wicketstuff.version>
<wicket-bootstrap.version>7.0.1</wicket-bootstrap.version>
- <spring.version>6.1.2</spring.version>
+ <spring.version>6.1.3</spring.version>
<tomcat.version>10.1.18</tomcat.version>
<jetty.version>11.0.19</jetty.version>
<ical4j.version>4.0.0-rc3</ical4j.version>
@@ -117,7 +117,7 @@
<commons-net.version>3.10.0</commons-net.version>
<dom4j.version>2.1.4</dom4j.version>
<postgresql.version>42.7.1</postgresql.version>
- <mysql.version>8.2.0</mysql.version>
+ <mysql.version>8.3.0</mysql.version>
<mssql.version>12.4.2.jre11</mssql.version>
<ojdbc.version>19.21.0.0</ojdbc.version>
<xstream.version>1.4.20</xstream.version>
@@ -1390,8 +1390,7 @@
<artifactId>apache-rat-plugin</artifactId>
<configuration>
<addDefaultLicenseMatchers>true</addDefaultLicenseMatchers>
- <!-- Non-deprecated config -->
- <!--licenses>
+ <licenses>
<license>
<family>OM_MIT</family>
<any>
@@ -1415,35 +1414,7 @@
<id>OM_CC_BY_4</id>
<name>CC BY 4.0</name>
</family>
- </families-->
- <!-- Deprecated config -->
- <licenses>
- <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
- <licenseFamilyCategory>MIT</licenseFamilyCategory>
- <licenseFamilyName>MIT</licenseFamilyName>
- <notes></notes>
- <patterns>
- <pattern>Licensed MIT</pattern>
- <pattern>licensed under the MIT and GPL</pattern>
- </patterns>
- </license>
- <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
- <licenseFamilyCategory>Creative Commons Attribution</licenseFamilyCategory>
- <licenseFamilyName>CC BY</licenseFamilyName>
- <notes></notes>
- <patterns>
- <pattern>creativecommons.org/licenses/by/4.0</pattern>
- </patterns>
- </license>
- </licenses>
- <licenseFamilies>
- <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily">
- <familyName>MIT</familyName>
- </licenseFamily>
- <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily">
- <familyName>CC BY</familyName>
- </licenseFamily>
- </licenseFamilies>
+ </families>
<excludes>
<exclude>**/*.mp3</exclude>
<exclude>**/localhost.jks</exclude>