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 96fd223d8 [OPENMEETINGS-2757] wicket, wicketstuff, the way tomcat is downloaded 96fd223d8 is described below commit 96fd223d8d3cff5c588bdb3df176e8d55567557e Author: Maxim Solodovnik <solomax...@gmail.com> AuthorDate: Tue Apr 18 23:07:17 2023 +0700 [OPENMEETINGS-2757] wicket, wicketstuff, the way tomcat is downloaded --- openmeetings-server/pom.xml | 51 +++++++++++++++++---------------------------- pom.xml | 4 ++-- 2 files changed, 21 insertions(+), 34 deletions(-) diff --git a/openmeetings-server/pom.xml b/openmeetings-server/pom.xml index 0145565a1..4fb9172c4 100644 --- a/openmeetings-server/pom.xml +++ b/openmeetings-server/pom.xml @@ -114,37 +114,6 @@ <logback.console><![CDATA[<appender-ref ref="CONSOLE" />]]></logback.console> </properties> </profile> - <profile> - <id>prepare-web-server</id> - <activation> - <file> - <missing>web-server/apache-tomcat-9.0.74.tar.gz</missing> <!-- TODO should be in-sync with global property --> - </file> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>wagon-maven-plugin</artifactId> - <executions> - <execution> - <id>download-web-server</id> - <phase>process-resources</phase> - <goals> - <goal>download-single</goal> - </goals> - <configuration> - <url>https://archive.apache.org/dist/tomcat/tomcat-9/v${tomcat.version}/bin</url> - <fromFile>apache-tomcat-${tomcat.version}.tar.gz</fromFile> - <toDir>${server-file.dir}</toDir> - <skip>${server.dwnd.skip}</skip> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> </profiles> <build> <plugins> @@ -265,6 +234,24 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <executions> + <execution> + <id>get-tomcat</id> + <phase>process-resources</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <outputDirectory>${server-file.dir}</outputDirectory> + <artifactItems> + <artifactItem> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat</artifactId> + <version>${tomcat.version}</version> + <type>tar.gz</type> + </artifactItem> + </artifactItems> + </configuration> + </execution> <execution> <id>unpack-css-js-site</id> <phase>pre-site</phase> @@ -373,7 +360,7 @@ </goals> <configuration> <target> - <untar src="${server-file.dir}/apache-tomcat-${tomcat.version}.tar.gz" dest="${project.build.directory}" + <untar src="${server-file.dir}/tomcat-${tomcat.version}.tar.gz" dest="${project.build.directory}" compression="gzip" overwrite="true"/> </target> <skip>${om.quick.build}</skip> diff --git a/pom.xml b/pom.xml index c2d5987ea..2cf45bbeb 100644 --- a/pom.xml +++ b/pom.xml @@ -79,9 +79,9 @@ <plexus-utils.version>3.5.1</plexus-utils.version> <!-- dependency versions --> <junit.version>5.9.2</junit.version> - <wicket.version>9.12.0</wicket.version> + <wicket.version>9.13.0</wicket.version> <wicket-jquery-ui.version>9.12.0</wicket-jquery-ui.version> - <wicketstuff.version>9.12.0</wicketstuff.version> + <wicketstuff.version>9.13.0</wicketstuff.version> <wicket-bootstrap.version>6.0.2</wicket-bootstrap.version> <font-awesome.version>6.4.0</font-awesome.version> <spring.version>5.3.27</spring.version>