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 6416bc2 [OPENMEETINGS-1954] plugins are updated 6416bc2 is described below commit 6416bc20bb9343b40574b66cbde58f927d045638 Author: Maxim Solodovnik <solomax...@gmail.com> AuthorDate: Thu Dec 13 13:55:18 2018 +0700 [OPENMEETINGS-1954] plugins are updated --- openmeetings-server/pom.xml | 2 +- pom.xml | 45 +++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 42 insertions(+), 5 deletions(-) diff --git a/openmeetings-server/pom.xml b/openmeetings-server/pom.xml index 39735a9..3aa77e2 100644 --- a/openmeetings-server/pom.xml +++ b/openmeetings-server/pom.xml @@ -117,7 +117,7 @@ <id>prepare-web-server</id> <activation> <file> - <missing>web-server/apache-tomcat-9.0.13.tar.gz</missing> <!-- TODO should be in-sync with global property --> + <missing>web-server/apache-tomcat-9.0.14.tar.gz</missing> <!-- TODO should be in-sync with global property --> </file> </activation> <build> diff --git a/pom.xml b/pom.xml index 1f2ce94..b300b7d 100644 --- a/pom.xml +++ b/pom.xml @@ -52,7 +52,7 @@ <reflow-theme>cerulean</reflow-theme> <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version> <maven-project-info-reports-plugin.version>3.0.0</maven-project-info-reports-plugin.version> - <maven-jar-plugin.version>3.1.0</maven-jar-plugin.version> + <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version> <maven-assembly-plugin.version>3.1.0</maven-assembly-plugin.version> <maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version> <maven-bundle-plugin.version>4.1.0</maven-bundle-plugin.version> @@ -79,8 +79,8 @@ <red5-client.version>1.0.10-M9</red5-client.version> <spring.version>5.1.3.RELEASE</spring.version> <mina.version>2.0.19</mina.version> - <tomcat.version>9.0.13</tomcat.version> - <ical4j.version>3.0.2</ical4j.version> + <tomcat.version>9.0.14</tomcat.version> + <ical4j.version>3.0.3</ical4j.version> <cxf.version>3.2.7</cxf.version> <selenium.version>3.14.0</selenium.version> <simple-xml.version>2.7.1</simple-xml.version> @@ -750,6 +750,25 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.codehaus.groovy.maven</groupId> + <artifactId>gmaven-plugin</artifactId> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>execute</goal> + </goals> + <configuration> + <source> + def autoModuleName = "apache.${project.artifactId}".replace('-', '.') + project.properties['autoModuleName'] = autoModuleName; + println("Automatic-Module-Name will be '" + autoModuleName + "'") + </source> + </configuration> + </execution> + </executions> + </plugin> </plugins> <pluginManagement> <plugins> @@ -791,7 +810,7 @@ <Built-On>${maven.build.timestamp}</Built-On> <Git-Revision>${buildNumber}</Git-Revision> <Product-Version>${project.version}</Product-Version> - <Automatic-Module-Name>${project.artifactId}</Automatic-Module-Name> + <Automatic-Module-Name>${autoModuleName}</Automatic-Module-Name> </manifestEntries> </archive> </configuration> @@ -960,6 +979,11 @@ </bundledSignatures> </configuration> </plugin> + <plugin> + <groupId>org.codehaus.gmaven</groupId> + <artifactId>gmaven-plugin</artifactId> + <version>1.5</version> + </plugin> </plugins> </pluginManagement> </build> @@ -1443,6 +1467,19 @@ <ignore></ignore> </action> </pluginExecution> + <pluginExecution> + <pluginExecutionFilter> + <groupId>org.codehaus.groovy.maven</groupId> + <artifactId>gmaven-plugin</artifactId> + <versionRange>[1.0.0,)</versionRange> + <goals> + <goal>execute</goal> + </goals> + </pluginExecutionFilter> + <action> + <ignore></ignore> + </action> + </pluginExecution> </pluginExecutions> </lifecycleMappingMetadata> </configuration>