This is an automated email from the ASF dual-hosted git repository. solomax pushed a commit to branch dependencies-9.15 in repository https://gitbox.apache.org/repos/asf/wicket.git
commit c54dbb55286650cde0b025187e5783d04275f7f3 Author: Maxim Solodovnik <[email protected]> AuthorDate: Thu Aug 24 22:00:08 2023 +0700 Version names are aligned with parent.pom; dependencies and plugins are updated --- pom.xml | 81 ++++++++++++++++++++--------------------------------- wicket-core/pom.xml | 10 +++---- 2 files changed, 36 insertions(+), 55 deletions(-) diff --git a/pom.xml b/pom.xml index 2660302dce..b20b10b9f9 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache</groupId> <artifactId>apache</artifactId> - <version>23</version> + <version>30</version> </parent> <groupId>org.apache.wicket</groupId> <artifactId>wicket-parent</artifactId> @@ -135,21 +135,21 @@ <!-- Project Versions --> <asm.version>9.5</asm.version> - <aspectj.version>1.9.19</aspectj.version> + <aspectj.version>1.9.20</aspectj.version> <assertj-core.version>3.24.2</assertj-core.version> - <bouncycastle.version>1.74</bouncycastle.version> - <byte-buddy.version>1.14.4</byte-buddy.version> + <bouncycastle.version>1.76</bouncycastle.version> + <byte-buddy.version>1.14.6</byte-buddy.version> <cdi-unit.version>4.1.0</cdi-unit.version> <cglib.version>3.3.0</cglib.version> <commons-collections4.version>4.4</commons-collections4.version> <commons-fileupload.version>1.5</commons-fileupload.version> - <commons-io.version>2.12.0</commons-io.version> - <commons-lang3.version>3.12.0</commons-lang3.version> + <commons-io.version>2.13.0</commons-io.version> + <commons-lang3.version>3.13.0</commons-lang3.version> <guice.version>5.1.0</guice.version> <el-impl.version>2.2.1-b05</el-impl.version> <forbiddenapis.version>3.5.1</forbiddenapis.version> <jacoco.version>0.8.7</jacoco.version> - <jackson.version>2.14.3</jackson.version> + <jackson.version>2.15.2</jackson.version> <jakarta.annotation-api.version>1.3.5</jakarta.annotation-api.version> <jakarta.el.version>3.0.3</jakarta.el.version> <jakarta.el-api.version>3.0.3</jakarta.el-api.version> @@ -160,46 +160,46 @@ <javax.servlet-api.version>3.1.0</javax.servlet-api.version> <jdk-serializable-functional.version>1.9.0</jdk-serializable-functional.version> <jetty.version>9.4.51.v20230217</jetty.version> - <junit.version>5.9.3</junit.version> + <junit.version>5.10.0</junit.version> <jsr305.version>3.0.2</jsr305.version> <logback.version>1.2.7</logback.version> <hamcrest.version>2.2</hamcrest.version> - <hibernate-validator.version>6.2.0.Final</hibernate-validator.version> + <hibernate-validator.version>6.2.5.Final</hibernate-validator.version> <httpunit.version>1.7.3</httpunit.version> - <metrics.version>4.2.18</metrics.version> - <mockito.version>5.3.1</mockito.version> + <metrics.version>4.2.19</metrics.version> + <mockito.version>5.5.0</mockito.version> <objenesis.version>3.3</objenesis.version> - <openjson.version>1.0.12</openjson.version> + <openjson.version>1.0.13</openjson.version> <slf4j.version>2.0.7</slf4j.version> - <spring.version>5.3.27</spring.version> + <spring.version>5.3.29</spring.version> <wagon-ssh-external.version>3.4.3</wagon-ssh-external.version> <weld.version>3.1.9.Final</weld.version> <velocity-engine-core.version>2.3</velocity-engine-core.version> <!-- Maven plugins --> + <version.maven-clean-plugin>3.3.1</version.maven-clean-plugin> + <version.maven-war-plugin>3.4.0</version.maven-war-plugin> + <version.maven-compiler-plugin>3.11.0</version.maven-compiler-plugin> + <version.maven-deploy-plugin>3.1.1</version.maven-deploy-plugin> + <version.maven-source-plugin>3.3.0</version.maven-source-plugin> + <version.maven-gpg-plugin>3.1.0</version.maven-gpg-plugin> + <version.maven-install-plugin>3.1.1</version.maven-install-plugin> + <version.maven-jar-plugin>3.3.0</version.maven-jar-plugin> + <version.maven-javadoc-plugin>3.5.0</version.maven-javadoc-plugin> + <version.maven-project-info-reports-plugin>3.4.5</version.maven-project-info-reports-plugin> + <version.maven-release-plugin>3.0.1</version.maven-release-plugin> + <version.maven-remote-resources-plugin>3.1.0</version.maven-remote-resources-plugin> + <version.maven-resources-plugin>3.3.1</version.maven-resources-plugin> + <version.maven-site-plugin>4.0.0-M9</version.maven-site-plugin> + <version.maven-surefire>3.1.2</version.maven-surefire> <build-helper-maven-plugin.version>3.3.0</build-helper-maven-plugin.version> <japicmp-maven-plugin.version>0.17.2</japicmp-maven-plugin.version> <maven-archetype-plugin.version>3.2.1</maven-archetype-plugin.version> - <maven-bundle-plugin.version>5.1.8</maven-bundle-plugin.version> - <maven-clean-plugin.version>3.1.0</maven-clean-plugin.version> - <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version> - <maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version> + <maven-bundle-plugin.version>5.1.9</maven-bundle-plugin.version> <maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version> <maven-enforcer-plugin.version>3.3.0</maven-enforcer-plugin.version> - <maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version> - <maven-install-plugin.version>3.1.1</maven-install-plugin.version> - <maven-jar-plugin.version>3.3.0</maven-jar-plugin.version> - <maven-javadoc-plugin.version>3.5.0</maven-javadoc-plugin.version> - <maven-project-info-reports-plugin.version>3.4.2</maven-project-info-reports-plugin.version> - <maven-release-plugin.version>3.0.0</maven-release-plugin.version> - <maven-remote-resources-plugin.version>3.0.0</maven-remote-resources-plugin.version> - <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version> - <maven-site-plugin.version>4.0.0-M5</maven-site-plugin.version> - <maven-surefire-plugin.version>3.0.0</maven-surefire-plugin.version> - <maven-source-plugin.version>3.2.1</maven-source-plugin.version> <maven-toolchains-plugin.version>3.1.0</maven-toolchains-plugin.version> - <maven-war-plugin.version>3.3.2</maven-war-plugin.version> - <resources-optimizer-maven-plugin.version>2.4.1</resources-optimizer-maven-plugin.version> + <resources-optimizer-maven-plugin.version>2.6.1</resources-optimizer-maven-plugin.version> <osgi.dynamicimport.package /> <osgi.export.package>*</osgi.export.package> @@ -908,7 +908,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>${maven-compiler-plugin.version}</version> <inherited>true</inherited> <configuration> <release>${maven.compiler.source}</release> @@ -917,7 +916,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> - <version>${maven-deploy-plugin.version}</version> <configuration> <retryFailedDeploymentCount>10</retryFailedDeploymentCount> </configuration> @@ -1006,7 +1004,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-gpg-plugin</artifactId> - <version>${maven-gpg-plugin.version}</version> <executions> <execution> <id>sign-artifacts</id> @@ -1017,15 +1014,9 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-install-plugin</artifactId> - <version>${maven-install-plugin.version}</version> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>${maven-jar-plugin.version}</version> <configuration> <archive> <manifest> @@ -1038,7 +1029,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>${maven-javadoc-plugin.version}</version> <configuration> <minmemory>128m</minmemory> <maxmemory>256m</maxmemory> @@ -1064,7 +1054,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-release-plugin</artifactId> - <version>${maven-release-plugin.version}</version> <inherited>true</inherited> <configuration> <pushChanges>false</pushChanges> @@ -1074,7 +1063,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-remote-resources-plugin</artifactId> - <version>${maven-remote-resources-plugin.version}</version> <executions> <execution> <goals> @@ -1092,7 +1080,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> - <version>${maven-resources-plugin.version}</version> <configuration> <encoding>${project.build.sourceEncoding}</encoding> </configuration> @@ -1100,13 +1087,11 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> - <version>${maven-site-plugin.version}</version> </plugin> <plugin> <inherited>true</inherited> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> - <version>${maven-source-plugin.version}</version> <executions> <execution> <id>attach-sources</id> @@ -1120,7 +1105,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>${maven-surefire-plugin.version}</version> <configuration> <includes> <include>**/*Test.java</include> @@ -1134,7 +1118,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-report-plugin</artifactId> - <version>${maven-surefire-plugin.version}</version> + <version>${version.maven-surefire}</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -1158,7 +1142,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> - <version>${maven-war-plugin.version}</version> <configuration> <warName>${project.artifactId}</warName> </configuration> @@ -1594,7 +1577,6 @@ <inherited>true</inherited> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-project-info-reports-plugin</artifactId> - <version>${maven-project-info-reports-plugin.version}</version> <reportSets> <reportSet> <reports> @@ -1612,7 +1594,6 @@ <inherited>true</inherited> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>${maven-javadoc-plugin.version}</version> </plugin> </plugins> </reporting> diff --git a/wicket-core/pom.xml b/wicket-core/pom.xml index bfb2204150..00cd8e9f30 100644 --- a/wicket-core/pom.xml +++ b/wicket-core/pom.xml @@ -35,8 +35,8 @@ component model backed by POJO data beans that can easily be persisted using your favorite technology. </description> - <properties> - <osgi.export.package> + <properties> + <osgi.export.package> org.apache.wicket;-noimport:=true, org.apache.wicket.ajax;-noimport:=true, org.apache.wicket.ajax.attributes;-noimport:=true, @@ -142,9 +142,9 @@ org.apache.wicket.util.template;-noimport:=true, org.apache.wicket.util.tester;-noimport:=true, org.apache.wicket.validation;-noimport:=true, org.apache.wicket.validation.validator;-noimport:=true - </osgi.export.package> - <osgi.import.package>!java*,!kotlin*,!sun.nio.ch,!com.sun.crypto.provider,org.slf4j*;version="[1.7,3)",javax.servlet,javax.servlet.http,*</osgi.import.package> - </properties> + </osgi.export.package> + <osgi.import.package>!java*,!kotlin*,!sun.nio.ch,!com.sun.crypto.provider,org.slf4j*;version="[1.7,3)",javax.servlet,javax.servlet.http,*</osgi.import.package> + </properties> <dependencies> <dependency> <groupId>org.hamcrest</groupId>
