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 e5b21fd17 [OPENMEETINGS-2770] apache-parent, logback, swagger; code clean-up e5b21fd17 is described below commit e5b21fd177a119fe5e977c0c6249f4984200c2b4 Author: Maxim Solodovnik <solomax...@gmail.com> AuthorDate: Fri Jun 16 12:51:47 2023 +0700 [OPENMEETINGS-2770] apache-parent, logback, swagger; code clean-up --- .../src/site/xdoc/BuildInstructions.xml | 8 +- .../src/main/webapp/WEB-INF/classes/hazelcast.xml | 2 +- pom.xml | 113 +++++---------------- 3 files changed, 32 insertions(+), 91 deletions(-) diff --git a/openmeetings-server/src/site/xdoc/BuildInstructions.xml b/openmeetings-server/src/site/xdoc/BuildInstructions.xml index 78c3ae7db..c02c972e0 100644 --- a/openmeetings-server/src/site/xdoc/BuildInstructions.xml +++ b/openmeetings-server/src/site/xdoc/BuildInstructions.xml @@ -53,9 +53,9 @@ <source>mvn org.sonatype.ossindex.maven:ossindex-maven-plugin:audit -f pom.xml</source> </section> <section name="Check for updates"> - <source>mvn versions:display-dependency-updates</source> - <source>mvn versions:display-plugin-updates</source> - <source>mvn versions:display-property-updates</source> + <source>mvn versions:display-dependency-updates -DincludeParent</source> + <source>mvn versions:display-plugin-updates -DincludeParent</source> + <source>mvn versions:display-property-updates -DincludeParent</source> </section> <section name="Check dependencies"> <source>mvn org.apache.maven.plugins:maven-dependency-plugin:analyze-only</source> @@ -84,7 +84,7 @@ cd openmeetings-webapp tail -f -n 1000 target/openmeetings.log ]]> </source> - + <p>In case you would like to develop Openmeetings you need to run <i>"unpacked"</i> build: </p> <source> <![CDATA[ diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/hazelcast.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/hazelcast.xml index 54606f721..39fe9a65b 100644 --- a/openmeetings-web/src/main/webapp/WEB-INF/classes/hazelcast.xml +++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/hazelcast.xml @@ -21,7 +21,7 @@ <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.hazelcast.com/schema/config" - xsi:schemaLocation="http://www.hazelcast.com/schema/config http://www.hazelcast.com/schema/config/hazelcast-config-5.2.xsd" + xsi:schemaLocation="http://www.hazelcast.com/schema/config http://www.hazelcast.com/schema/config/hazelcast-config-5.3.xsd" > <map name="ONLINE_USERS_KEY"> <near-cache> diff --git a/pom.xml b/pom.xml index bc39dc170..937cf5102 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache</groupId> <artifactId>apache</artifactId> - <version>29</version> + <version>30</version> </parent> <groupId>org.apache.openmeetings</groupId> <artifactId>openmeetings-parent</artifactId> @@ -40,43 +40,48 @@ <db>h2</db> <autoModuleName>apache.openmeetings.parent</autoModuleName> <jdk.version>17</jdk.version> + <minimalMavenBuildVersion>3.8.7</minimalMavenBuildVersion> + <minimalJavaBuildVersion>${jdk.version}</minimalJavaBuildVersion> + <!-- plugin versions --> - <maven-javadoc-plugin.version>3.5.0</maven-javadoc-plugin.version> - <maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version> - <maven-site-plugin.version>4.0.0-M5</maven-site-plugin.version> + <version.maven-javadoc-plugin>3.5.0</version.maven-javadoc-plugin> + <version.maven-surefire>3.1.2</version.maven-surefire> + <version.maven-site-plugin>4.0.0-M5</version.maven-site-plugin> + <version.maven-enforcer-plugin>3.3.0</version.maven-enforcer-plugin> + <version.maven-source-plugin>3.3.0</version.maven-source-plugin> + <version.maven-compiler-plugin>3.11.0</version.maven-compiler-plugin> + <version.maven-project-info-reports-plugin>3.4.5</version.maven-project-info-reports-plugin> + <version.maven-jar-plugin>3.3.0</version.maven-jar-plugin> + <version.maven-assembly-plugin>3.6.0</version.maven-assembly-plugin> + <version.maven-dependency-plugin>3.6.0</version.maven-dependency-plugin> + <version.maven-war-plugin>3.4.0</version.maven-war-plugin> + <version.maven-clean-plugin>3.2.0</version.maven-clean-plugin> + <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.checksum-maven-plugin>1.11</version.checksum-maven-plugin> + + <maven-bundle-plugin.version>5.1.8</maven-bundle-plugin.version> + <maven-checkstyle-plugin.version>3.3.0</maven-checkstyle-plugin.version> <exec-maven-plugin.version>3.1.0</exec-maven-plugin.version> <minify-maven-plugin.version>1.7.6</minify-maven-plugin.version> - <maven-enforcer-plugin.version>3.3.0</maven-enforcer-plugin.version> - <maven-source-plugin.version>3.3.0</maven-source-plugin.version> - <checksum-maven-plugin.version>1.11</checksum-maven-plugin.version> - <maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version> <license-maven-plugin.version>2.0.0</license-maven-plugin.version> <reflow-maven-skin.version>2.3.3</reflow-maven-skin.version> <reflow-theme>cerulean</reflow-theme> - <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version> - <maven-project-info-reports-plugin.version>3.4.5</maven-project-info-reports-plugin.version> - <maven-jar-plugin.version>3.3.0</maven-jar-plugin.version> - <maven-assembly-plugin.version>3.6.0</maven-assembly-plugin.version> - <maven-dependency-plugin.version>3.6.0</maven-dependency-plugin.version> - <maven-bundle-plugin.version>5.1.8</maven-bundle-plugin.version> - <maven-war-plugin.version>3.3.2</maven-war-plugin.version> - <maven-clean-plugin.version>3.2.0</maven-clean-plugin.version> - <maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version> - <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version> <replacer.version>1.5.3</replacer.version> <xml-maven-plugin.version>1.0.2</xml-maven-plugin.version> <saxon.version>8.7</saxon.version> <buildnumber-maven-plugin.version>3.0.0</buildnumber-maven-plugin.version> - <apache-rat-plugin.version>0.15</apache-rat-plugin.version> <keytool-maven-plugin.version>1.7</keytool-maven-plugin.version> <maven-jarsigner-plugin.version>3.0.0</maven-jarsigner-plugin.version> <sonar-maven-plugin.version>3.9.1.2184</sonar-maven-plugin.version> <jacoco-maven-plugin.versoin>0.8.10</jacoco-maven-plugin.versoin> <forbiddenapis.version>3.5.1</forbiddenapis.version> - <maven-checkstyle-plugin.version>3.3.0</maven-checkstyle-plugin.version> <frontend-maven-plugin.version>1.12.1</frontend-maven-plugin.version> <swagger-plugin.version>2.1.6</swagger-plugin.version> <plexus-utils.version>3.5.1</plexus-utils.version> + <!-- dependency versions --> <junit.version>5.9.3</junit.version> <wicket.version>9.14.0</wicket.version> @@ -117,7 +122,7 @@ <caldav4j.version>1.0.5</caldav4j.version> <tika-parsers.version>2.8.0</tika-parsers.version> <slf4j.version>2.0.7</slf4j.version> - <logback.version>1.4.7</logback.version> + <logback.version>1.4.8</logback.version> <jetty.version>9.4.51.v20230217</jetty.version> <license.excludedScopes>test</license.excludedScopes> <bcprov-jdk15on.version>1.70</bcprov-jdk15on.version> @@ -131,7 +136,7 @@ <javax.servlet-api.version>3.1.0</javax.servlet-api.version> <jquery-ui-touch-punch.version>0.2.3-2</jquery-ui-touch-punch.version> <apacheds-test-framework.version>2.0.0.AM26</apacheds-test-framework.version> - <swagger.version>2.2.11</swagger.version> + <swagger.version>2.2.12</swagger.version> <bytebuddy.version>1.14.5</bytebuddy.version> <annotation-api.version>1.3.2</annotation-api.version> <jsr305.version>3.0.2</jsr305.version> @@ -396,12 +401,6 @@ </mailingList> </mailingLists> <repositories> - <repository> - <id>apache-snapshots</id> - <url>https://repository.apache.org/content/groups/snapshots</url> - <releases><enabled>false</enabled></releases> - <snapshots><enabled>true</enabled></snapshots> - </repository> <repository> <id>sonatype-snapshots</id> <name>Sonatype Snapshots Repository</name> @@ -410,14 +409,6 @@ <snapshots><enabled>true</enabled></snapshots> </repository> </repositories> - <pluginRepositories> - <pluginRepository> - <id>apache-snapshots</id> - <url>https://repository.apache.org/content/groups/snapshots</url> - <releases><enabled>false</enabled></releases> - <snapshots><enabled>true</enabled></snapshots> - </pluginRepository> - </pluginRepositories> <dependencyManagement> <dependencies> <dependency> @@ -1170,7 +1161,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>${maven-javadoc-plugin.version}</version> <configuration> <doclint>none</doclint> <additionalOptions>-html5</additionalOptions> @@ -1186,7 +1176,6 @@ <inherited>true</inherited> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>${maven-compiler-plugin.version}</version> <configuration> <source>${jdk.version}</source> <target>${jdk.version}</target> @@ -1198,7 +1187,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>${maven-jar-plugin.version}</version> <configuration> <archive> <manifest> @@ -1259,20 +1247,9 @@ </dependency> </dependencies> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <version>${maven-assembly-plugin.version}</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>${maven-dependency-plugin.version}</version> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> - <version>${maven-site-plugin.version}</version> <dependencies> <dependency> <groupId>io.github.devacfr.maven.skins</groupId> @@ -1284,7 +1261,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>${maven-surefire-plugin.version}</version> <configuration> <forkCount>1</forkCount> <reuseForks>true</reuseForks> @@ -1299,31 +1275,15 @@ <argLine>@{argLine} --add-modules java.se --add-exports java.base/jdk.internal.ref=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.management/sun.management=ALL-UNNAMED --add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens=java.base/sun.security.util=ALL-UNNAMED --add-opens=java.base/sun.security.x509=A [...] </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-report-plugin</artifactId> - <version>${maven-surefire-plugin.version}</version> - </plugin> <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> <version>${maven-bundle-plugin.version}</version> <extensions>true</extensions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <version>${maven-antrun-plugin.version}</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <version>${maven-war-plugin.version}</version> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> - <version>${maven-resources-plugin.version}</version> <configuration> <nonFilteredFileExtensions> <nonFilteredFileExtension>pdf</nonFilteredFileExtension> @@ -1361,15 +1321,9 @@ <artifactId>buildnumber-maven-plugin</artifactId> <version>${buildnumber-maven-plugin.version}</version> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-clean-plugin</artifactId> - <version>${maven-clean-plugin.version}</version> - </plugin> <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> - <version>${apache-rat-plugin.version}</version> <configuration> <addDefaultLicenseMatchers>true</addDefaultLicenseMatchers> <licenses> @@ -1478,7 +1432,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> - <version>${maven-enforcer-plugin.version}</version> <executions> <execution> <id>enforce-versions</id> @@ -1632,15 +1585,9 @@ <verbose>false</verbose> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-gpg-plugin</artifactId> - <version>${maven-gpg-plugin.version}</version> - </plugin> <plugin> <groupId>net.nicoulaj.maven.plugins</groupId> <artifactId>checksum-maven-plugin</artifactId> - <version>${checksum-maven-plugin.version}</version> <configuration> <shasumSummary>true</shasumSummary> <algorithms> @@ -1648,11 +1595,6 @@ </algorithms> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <version>${maven-source-plugin.version}</version> - </plugin> <plugin> <groupId>io.openapitools.swagger</groupId> <artifactId>swagger-maven-plugin</artifactId> @@ -1666,7 +1608,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-project-info-reports-plugin</artifactId> - <version>${maven-project-info-reports-plugin.version}</version> <configuration> <skip>${om.quick.build}</skip> <dependencyLocationsEnabled>false</dependencyLocationsEnabled>