You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2022/01/14 21:07:55 UTC
[maven-surefire] branch jira-1972-2 created (now 653fea4)
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a change to branch jira-1972-2
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git.
at 653fea4 IntelliJ IDEA can recognize classifiers only if artifacts of project modules have another version
This branch includes the following new commits:
new 7c74ba6 [SUREFIRE-1972] Use current version of surefire-shared-utils
new 1fed3e5 ${surefire-shared-utils.version}
new 653fea4 IntelliJ IDEA can recognize classifiers only if artifacts of project modules have another version
The 3 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.
[maven-surefire] 03/03: IntelliJ IDEA can recognize classifiers only if artifacts of project modules have another version
Posted by ti...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch jira-1972-2
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit 653fea4862be9c969cfd00df85b2f2f9b5791884
Author: Tibor Digaňa <ti...@apache.org>
AuthorDate: Fri Jan 14 21:58:11 2022 +0100
IntelliJ IDEA can recognize classifiers only if artifacts of project modules have another version
---
pom.xml | 5 +++++
surefire-shared-utils/pom.xml | 33 ++++++++++++++++++++++++++++++++-
2 files changed, 37 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 0c3bb23..5ce71a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -689,6 +689,11 @@
<profiles>
<profile>
+ <!--
+ This is a workaround for IntelliJ IDEA, see https://youtrack.jetbrains.com/issue/IDEA-148573
+ IDEA is able to recognize external artifacts with classifiers. But IDEA expects modules and their artifacts
+ without classifier. If the version differs from project, the idea would understand it as external artifact.
+ -->
<id>ide-development</id>
<properties>
<surefire-shared-utils.version>3-SNAPSHOT</surefire-shared-utils.version>
diff --git a/surefire-shared-utils/pom.xml b/surefire-shared-utils/pom.xml
index a068e50..b3256c0 100644
--- a/surefire-shared-utils/pom.xml
+++ b/surefire-shared-utils/pom.xml
@@ -104,5 +104,36 @@
</plugin>
</plugins>
</build>
-
+ <profiles>
+ <profile>
+ <!--
+ This is a workaround for IntelliJ IDEA, see https://youtrack.jetbrains.com/issue/IDEA-148573
+ IDEA is able to recognize external artifacts with classifiers. But IDEA expects modules and their artifacts
+ without classifier. If the version differs from project, the idea would understand it as external artifact.
+ -->
+ <id>ide-development</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-install-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>install-devel-jar</id>
+ <phase>install</phase>
+ <goals>
+ <goal>install-file</goal>
+ </goals>
+ <configuration>
+ <artifactId>surefire-shared-utils</artifactId>
+ <version>3-SNAPSHOT</version>
+ <classifier>shaded</classifier>
+ <file>target/${project.build.finalName}-shaded.jar</file>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
[maven-surefire] 01/03: [SUREFIRE-1972] Use current version of surefire-shared-utils
Posted by ti...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch jira-1972-2
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit 7c74ba6b8bf9fb5f63d2468dae5164f4bc532575
Author: Tibor Digaňa <ti...@apache.org>
AuthorDate: Sat Jan 1 23:01:56 2022 +0100
[SUREFIRE-1972] Use current version of surefire-shared-utils
---
maven-surefire-common/pom.xml | 3 ++-
pom.xml | 2 +-
surefire-api/pom.xml | 3 ++-
surefire-extensions-api/pom.xml | 3 ++-
surefire-providers/common-java5/pom.xml | 3 ++-
surefire-report-parser/pom.xml | 3 ++-
surefire-shadefire/pom.xml | 2 +-
surefire-shared-utils/pom.xml | 6 +++++-
8 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/maven-surefire-common/pom.xml b/maven-surefire-common/pom.xml
index 805b247..1d3e2f7 100644
--- a/maven-surefire-common/pom.xml
+++ b/maven-surefire-common/pom.xml
@@ -74,7 +74,8 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-shared-utils</artifactId>
- <version>3.0.0-M4</version>
+ <version>${project.version}</version>
+ <classifier>shaded</classifier>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
diff --git a/pom.xml b/pom.xml
index 8210f62..25d5b4a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,6 +48,7 @@
</contributors>
<modules>
+ <module>surefire-shared-utils</module>
<module>surefire-logger-api</module>
<module>surefire-api</module>
<module>surefire-extensions-api</module>
@@ -62,7 +63,6 @@
<module>maven-failsafe-plugin</module>
<module>maven-surefire-report-plugin</module>
<module>surefire-its</module>
- <module>surefire-shared-utils</module>
</modules>
<scm>
diff --git a/surefire-api/pom.xml b/surefire-api/pom.xml
index 158c88a..5b653d0 100644
--- a/surefire-api/pom.xml
+++ b/surefire-api/pom.xml
@@ -40,7 +40,8 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-shared-utils</artifactId>
- <version>3.0.0-M4</version>
+ <version>${project.version}</version>
+ <classifier>shaded</classifier>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
diff --git a/surefire-extensions-api/pom.xml b/surefire-extensions-api/pom.xml
index ee08611..08ab343 100644
--- a/surefire-extensions-api/pom.xml
+++ b/surefire-extensions-api/pom.xml
@@ -45,7 +45,8 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-shared-utils</artifactId>
- <version>3.0.0-M4</version>
+ <version>${project.version}</version>
+ <classifier>shaded</classifier>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
diff --git a/surefire-providers/common-java5/pom.xml b/surefire-providers/common-java5/pom.xml
index f76659e..8d2f1df 100644
--- a/surefire-providers/common-java5/pom.xml
+++ b/surefire-providers/common-java5/pom.xml
@@ -35,7 +35,8 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-shared-utils</artifactId>
- <version>3.0.0-M4</version>
+ <version>${project.version}</version>
+ <classifier>shaded</classifier>
</dependency>
</dependencies>
diff --git a/surefire-report-parser/pom.xml b/surefire-report-parser/pom.xml
index b452bd7..146f7aa 100644
--- a/surefire-report-parser/pom.xml
+++ b/surefire-report-parser/pom.xml
@@ -41,7 +41,8 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-shared-utils</artifactId>
- <version>3.0.0-M4</version>
+ <version>${project.version}</version>
+ <classifier>shaded</classifier>
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
diff --git a/surefire-shadefire/pom.xml b/surefire-shadefire/pom.xml
index 164e35c..c7940fb 100644
--- a/surefire-shadefire/pom.xml
+++ b/surefire-shadefire/pom.xml
@@ -73,7 +73,7 @@
<configuration>
<artifactSet>
<includes>
- <include>org.apache.maven.surefire:surefire-shared-utils</include>
+ <include>org.apache.maven.surefire:surefire-shared-utils:jar:shaded</include>
<include>org.apache.maven.surefire:surefire-logger-api</include>
<include>org.apache.maven.surefire:surefire-api</include>
<include>org.apache.maven.surefire:surefire-extensions-spi</include>
diff --git a/surefire-shared-utils/pom.xml b/surefire-shared-utils/pom.xml
index c845f5c..a068e50 100644
--- a/surefire-shared-utils/pom.xml
+++ b/surefire-shared-utils/pom.xml
@@ -29,7 +29,9 @@
<artifactId>surefire-shared-utils</artifactId>
<name>Surefire Shared Utils</name>
- <description>Relocated Java packages of maven-shared-utils in Surefire</description>
+ <description>
+ Relocated Java packages of maven-shared-utils and several Apache Commons utilities in Surefire.
+ </description>
<licenses>
<license>
@@ -68,6 +70,8 @@
<goal>shade</goal>
</goals>
<configuration>
+ <shadedArtifactAttached>true</shadedArtifactAttached>
+ <shadedClassifierName>shaded</shadedClassifierName>
<artifactSet>
<includes>
<include>org.apache.maven.shared:maven-shared-utils</include>
[maven-surefire] 02/03: ${surefire-shared-utils.version}
Posted by ti...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch jira-1972-2
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit 1fed3e54b797213ba947d4afba6e7136497c0bd6
Author: Tibor Digaňa <ti...@apache.org>
AuthorDate: Fri Jan 14 21:47:15 2022 +0100
${surefire-shared-utils.version}
---
maven-surefire-common/pom.xml | 2 +-
pom.xml | 9 +++++++--
surefire-api/pom.xml | 2 +-
surefire-extensions-api/pom.xml | 2 +-
surefire-providers/common-java5/pom.xml | 2 +-
surefire-report-parser/pom.xml | 2 +-
6 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/maven-surefire-common/pom.xml b/maven-surefire-common/pom.xml
index 1d3e2f7..954d93e 100644
--- a/maven-surefire-common/pom.xml
+++ b/maven-surefire-common/pom.xml
@@ -74,7 +74,7 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-shared-utils</artifactId>
- <version>${project.version}</version>
+ <version>${surefire-shared-utils.version}</version>
<classifier>shaded</classifier>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index 25d5b4a..0c3bb23 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,6 +101,7 @@
<powermockVersion>2.0.5</powermockVersion>
<mavenPluginToolsVersion>3.6.2</mavenPluginToolsVersion>
<jacocoVersion>0.8.7</jacocoVersion>
+ <surefire-shared-utils.version>${project.version}</surefire-shared-utils.version>
<maven.surefire.scm.devConnection>scm:git:https://gitbox.apache.org/repos/asf/maven-surefire.git</maven.surefire.scm.devConnection>
<maven.site.path>surefire-archives/surefire-LATEST</maven.site.path>
<maven.compiler.testSource>1.${javaVersion}</maven.compiler.testSource>
@@ -687,7 +688,12 @@
</reporting>
<profiles>
-
+ <profile>
+ <id>ide-development</id>
+ <properties>
+ <surefire-shared-utils.version>3-SNAPSHOT</surefire-shared-utils.version>
+ </properties>
+ </profile>
<profile>
<id>jdk9+</id>
<activation>
@@ -697,7 +703,6 @@
<jvm9ArgsTests>--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.math=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.text=ALL-UNNAMED --add-opens java.base/java.util.regex=ALL-UNNAMED --add-opens java.base/java.nio.channels.spi=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED --add-opens java.base/java.util.concurrent=ALL-UNNAMED -- [...]
</properties>
</profile>
-
<profile>
<id>reporting</id>
<reporting>
diff --git a/surefire-api/pom.xml b/surefire-api/pom.xml
index 5b653d0..8446a5f 100644
--- a/surefire-api/pom.xml
+++ b/surefire-api/pom.xml
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-shared-utils</artifactId>
- <version>${project.version}</version>
+ <version>${surefire-shared-utils.version}</version>
<classifier>shaded</classifier>
</dependency>
<dependency>
diff --git a/surefire-extensions-api/pom.xml b/surefire-extensions-api/pom.xml
index 08ab343..5f6754f 100644
--- a/surefire-extensions-api/pom.xml
+++ b/surefire-extensions-api/pom.xml
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-shared-utils</artifactId>
- <version>${project.version}</version>
+ <version>${surefire-shared-utils.version}</version>
<classifier>shaded</classifier>
</dependency>
<dependency>
diff --git a/surefire-providers/common-java5/pom.xml b/surefire-providers/common-java5/pom.xml
index 8d2f1df..be06f97 100644
--- a/surefire-providers/common-java5/pom.xml
+++ b/surefire-providers/common-java5/pom.xml
@@ -35,7 +35,7 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-shared-utils</artifactId>
- <version>${project.version}</version>
+ <version>${surefire-shared-utils.version}</version>
<classifier>shaded</classifier>
</dependency>
</dependencies>
diff --git a/surefire-report-parser/pom.xml b/surefire-report-parser/pom.xml
index 146f7aa..9d6c4e3 100644
--- a/surefire-report-parser/pom.xml
+++ b/surefire-report-parser/pom.xml
@@ -41,7 +41,7 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-shared-utils</artifactId>
- <version>${project.version}</version>
+ <version>${surefire-shared-utils.version}</version>
<classifier>shaded</classifier>
</dependency>
<dependency>