You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2023/10/15 16:13:40 UTC
[maven-surefire] branch master updated (176937dea -> 0a5dba8a3)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
from 176937dea Simplify temp dir creation
new 5a0943805 [SUREFIRE-2202] NullPointerException if super class meets specific condition
new 0a5dba8a3 [SUREFIRE-2188] Upgrade to Parent 40
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
maven-surefire-common/pom.xml | 4 ++++
maven-surefire-report-plugin/pom.xml | 4 ++++
pom.xml | 4 ++--
.../java/org/apache/maven/surefire/testng/utils/MethodSelector.java | 4 +++-
4 files changed, 13 insertions(+), 3 deletions(-)
[maven-surefire] 02/02: [SUREFIRE-2188] Upgrade to Parent 40
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit 0a5dba8a3678aca1682a518e79f39502ef3935ea
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun Oct 15 18:13:27 2023 +0200
[SUREFIRE-2188] Upgrade to Parent 40
---
maven-surefire-common/pom.xml | 4 ++++
maven-surefire-report-plugin/pom.xml | 4 ++++
pom.xml | 4 ++--
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/maven-surefire-common/pom.xml b/maven-surefire-common/pom.xml
index 6f32ec897..4aac26387 100644
--- a/maven-surefire-common/pom.xml
+++ b/maven-surefire-common/pom.xml
@@ -71,6 +71,10 @@
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-java</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-xml</artifactId>
+ </dependency>
<dependency>
<groupId>org.fusesource.jansi</groupId>
<artifactId>jansi</artifactId>
diff --git a/maven-surefire-report-plugin/pom.xml b/maven-surefire-report-plugin/pom.xml
index dc11a91b1..9d8276781 100644
--- a/maven-surefire-report-plugin/pom.xml
+++ b/maven-surefire-report-plugin/pom.xml
@@ -94,6 +94,10 @@
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-xml</artifactId>
+ </dependency>
<dependency>
<groupId>org.fusesource.jansi</groupId>
<artifactId>jansi</artifactId>
diff --git a/pom.xml b/pom.xml
index c4c8ae4c5..dcd35dbd5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
~ "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.
+ ~ under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>39</version>
+ <version>40</version>
</parent>
<groupId>org.apache.maven.surefire</groupId>
[maven-surefire] 01/02: [SUREFIRE-2202] NullPointerException if super class meets specific condition
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit 5a0943805f7ef3da691bd4f39660346bfc7283d6
Author: Javier A. Ortiz Bultron <ja...@gmail.com>
AuthorDate: Fri Oct 13 09:59:38 2023 -0500
[SUREFIRE-2202] NullPointerException if super class meets specific condition
This closes #673
---
.../java/org/apache/maven/surefire/testng/utils/MethodSelector.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/MethodSelector.java b/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/MethodSelector.java
index 42bb4fae0..b5930ad4e 100644
--- a/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/MethodSelector.java
+++ b/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/MethodSelector.java
@@ -61,7 +61,9 @@ public class MethodSelector implements IMethodSelector {
boolean hasTestResolver = resolver != null && !resolver.isEmpty();
if (hasTestResolver) {
boolean run = false;
- for (Class<?> clazz = test.getRealClass(); !run && clazz != Object.class; clazz = clazz.getSuperclass()) {
+ for (Class<?> clazz = test.getRealClass();
+ !run && clazz != null && clazz != Object.class;
+ clazz = clazz.getSuperclass()) {
run = resolver.shouldRun(clazz, test.getMethodName());
}
return run;