This is an automated email from the ASF dual-hosted git repository.
robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
The following commit(s) were added to refs/heads/master by this push:
new 1047004c Update build deps
1047004c is described below
commit 1047004c185a495de2a2e5b0848b18704545207d
Author: Robert Lazarski <[email protected]>
AuthorDate: Sat Oct 5 10:50:23 2024 -1000
Update build deps
---
apidocs/pom.xml | 53 ++++++++++++++++++++++++++---------
apidocs/src/main/assembly/apidocs.xml | 32 ---------------------
modules/rampart-integration/pom.xml | 4 +--
pom.xml | 42 +++++++++++++--------------
4 files changed, 62 insertions(+), 69 deletions(-)
diff --git a/apidocs/pom.xml b/apidocs/pom.xml
index 8a7a60c9..050394dc 100644
--- a/apidocs/pom.xml
+++ b/apidocs/pom.xml
@@ -26,8 +26,14 @@
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>apidocs</artifactId>
- <name>Javadoc</name>
<packaging>pom</packaging>
+ <name>Javadoc</name>
+ <scm>
+
<connection>scm:git:https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git</connection>
+
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git</developerConnection>
+
<url>https://gitbox.apache.org/repos/asf?p=axis-axis2-java-rampart.git;a=summary</url>
+ <tag>HEAD</tag>
+ </scm>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -47,6 +53,27 @@
</dependencies>
<build>
<plugins>
+ <!-- https://issues.apache.org/jira/browse/MJAVADOC-469 -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create-javadoc-compat-out-dir</id>
+ <phase>pre-site</phase>
+ <goals>
+ <goal>regex-property</goal>
+ </goals>
+ <configuration>
+ <name>javadoc-compat-out-dir</name>
+ <value>${project.build.directory}</value>
+ <regex>\\</regex>
+ <replacement>\\\\</replacement>
+ <failIfNoMatch>false</failIfNoMatch>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
@@ -90,28 +117,26 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-assembly-plugin</artifactId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
<executions>
<execution>
- <phase>package</phase>
+ <id>default-site</id>
+ <phase>site</phase>
<goals>
- <goal>single</goal>
+ <goal>site</goal>
</goals>
<configuration>
- <descriptors>
-
<descriptor>src/main/assembly/apidocs.xml</descriptor>
- </descriptors>
- <appendAssemblyId>false</appendAssemblyId>
+ <skip>true</skip>
</configuration>
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
diff --git a/apidocs/src/main/assembly/apidocs.xml
b/apidocs/src/main/assembly/apidocs.xml
deleted file mode 100644
index 4c4b6f1b..00000000
--- a/apidocs/src/main/assembly/apidocs.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-<assembly>
- <id>javadoc</id>
- <includeBaseDirectory>false</includeBaseDirectory>
- <formats>
- <format>zip</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>${project.build.directory}/apidocs</directory>
- <outputDirectory>.</outputDirectory>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/modules/rampart-integration/pom.xml
b/modules/rampart-integration/pom.xml
index 80296bcc..ba9773cf 100644
--- a/modules/rampart-integration/pom.xml
+++ b/modules/rampart-integration/pom.xml
@@ -155,7 +155,7 @@
<id>create-test-resources</id>
<phase>process-test-resources</phase>
<configuration>
- <tasks>
+ <target>
<property name="addressing.mar"
value="addressing-${axis2.version}.mar" />
<mkdir dir="target/temp-ramp" />
@@ -369,7 +369,7 @@
<jar
jarfile="target/test-resources/rahas_service_repo_5/services/SecureService.aar"
basedir="target/temp-rahas" />
<!--RahasAttributeTest END-->
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
diff --git a/pom.xml b/pom.xml
index 53b26fac..9b5275b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -166,33 +166,33 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>3.0.0-M8</version>
+ <version>3.5.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>3.3.0</version>
+ <version>3.6.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
- <version>2.0.0</version>
+ <version>4.0.1</version>
<dependencies>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy-all</artifactId>
- <version>3.0.14</version>
+ <version>4.0.23</version>
<type>pom</type>
</dependency>
</dependencies>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
- <version>3.0.1</version>
+ <version>3.8.0</version>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
+ <version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.apache.axis2</groupId>
@@ -201,7 +201,7 @@
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
- <version>3.4</version>
+ <version>3.20.0</version>
<configuration>
<!-- Required by maven-scm-publish-plugin -->
<skipDeploy>true</skipDeploy>
@@ -209,23 +209,23 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>3.6.0</version>
+ <version>3.7.1</version>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.5.0</version>
+ <version>3.10.1</version>
</plugin>
<plugin>
<groupId>com.github.veithen.alta</groupId>
<artifactId>alta-maven-plugin</artifactId>
- <version>0.8.0</version>
+ <version>0.8.1</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>3.3.0</version>
+ <version>3.5.0</version>
<executions>
<execution>
<phase>validate</phase>
@@ -345,7 +345,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.11.0</version>
+ <version>3.12.0</version>
<configuration>
<source>11</source>
<target>11</target>
@@ -354,7 +354,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
- <version>1.23</version>
+ <version>1.24</version>
<executions>
<execution>
<id>check</id>
@@ -405,7 +405,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-publish-plugin</artifactId>
- <version>3.2.1</version>
+ <version>3.3.0</version>
</plugin>
</plugins>
</build>
@@ -414,7 +414,7 @@
<plugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>3.4.5</version>
+ <version>3.7.0</version>
<reportSets>
<reportSet>
<reports>
@@ -601,27 +601,27 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jul</artifactId>
- <version>2.23.1</version>
+ <version>2.24.1</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
- <version>2.23.1</version>
+ <version>2.24.1</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
- <version>2.23.1</version>
+ <version>2.24.1</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
- <version>2.23.1</version>
+ <version>2.24.1</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jcl</artifactId>
- <version>2.23.1</version>
+ <version>2.24.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
