Commit Graph

183 Commits

Author SHA1 Message Date
dependabot[bot]
2f879b24fb Bump maven.version from 4.0.0-rc-4 to 4.0.0-rc-5 (#1477)
Bump maven.version from 4.0.0-rc-4 to 4.0.0-rc-5
Bumps `maven.version` from 4.0.0-rc-4 to 4.0.0-rc-5.
Updates `org.apache.maven:maven-plugin-api` from 4.0.0-rc-4 to 4.0.0-rc-5
Updates `org.apache.maven:maven-model` from 4.0.0-rc-4 to 4.0.0-rc-5
Updates `org.apache.maven:maven-core` from 4.0.0-rc-4 to 4.0.0-rc-5
Updates `org.apache.maven:maven-resolver-provider` from 4.0.0-rc-4 to 4.0.0-rc-5
Updates `org.apache.maven:maven-embedder` from 4.0.0-rc-4 to 4.0.0-rc-5
Updates `org.apache.maven:maven-cli` from 4.0.0-rc-4 to 4.0.0-rc-5
Updates `org.apache.maven:maven-api-di` from 4.0.0-rc-4 to 4.0.0-rc-5
Updates `org.apache.maven:maven-jline` from 4.0.0-rc-4 to 4.0.0-rc-5
Updates `org.apache.maven:maven-logging` from 4.0.0-rc-4 to 4.0.0-rc-5
Updates `org.apache.maven:apache-maven` from 4.0.0-rc-4 to 4.0.0-rc-5
- [Release notes](https://github.com/apache/maven/releases)
- [Commits](https://github.com/apache/maven/compare/maven-4.0.0-rc-4...maven-4.0.0-rc-5)

---
updated-dependencies:
- dependency-name: org.apache.maven:maven-plugin-api
  dependency-version: 4.0.0-rc-5
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.maven:maven-model
  dependency-version: 4.0.0-rc-5
  dependency-type: direct:development
  update-type: version-update:semver-patch
- dependency-name: org.apache.maven:maven-core
  dependency-version: 4.0.0-rc-5
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.maven:maven-resolver-provider
  dependency-version: 4.0.0-rc-5
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.maven:maven-embedder
  dependency-version: 4.0.0-rc-5
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.maven:maven-cli
  dependency-version: 4.0.0-rc-5
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.maven:maven-api-di
  dependency-version: 4.0.0-rc-5
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.maven:maven-jline
  dependency-version: 4.0.0-rc-5
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.maven:maven-logging
  dependency-version: 4.0.0-rc-5
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.maven:apache-maven
  dependency-version: 4.0.0-rc-5
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Replace junit-platform-maven-plugin with maven-exec-plugin

The junit-platform-maven-plugin is no longer maintained and causes issues
with Maven 4.0.0-rc-5 due to stricter request validation.

This commit refactors the JUnitPlatformTest to use maven-exec-plugin instead:
- Removed JUnitPlatformTest and junit-platform test project
- Extended ExecOutputTest with a new cleanTestInheritIO() test method
- Added new execution to exec-output/pom.xml using exec:java goal with inheritIo=true
- Created HelloWorld.java class for testing inheritIO functionality

The refactoring maintains the same test coverage while using a more
maintainable plugin.

Related to #1477 and sormuras/junit-platform-maven-plugin#117

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Sylwester Lachiewicz <slachiewicz@apache.org>
Co-authored-by: Guillaume Nodet <gnodet@gmail.com>
2025-11-25 09:17:58 +01:00
Tamas Cservenak
d3c15a75b0 Fix test framework side effects (java props) (#1359)
Some checks are pending
Early Access / Default build (without GraalVM) (push) Waiting to run
Early Access / Build with GraalVM on ${{ matrix.os }} (macos-13) (push) Waiting to run
Early Access / Build with GraalVM on ${{ matrix.os }} (macos-latest) (push) Waiting to run
Early Access / Build with GraalVM on ${{ matrix.os }} (ubuntu-latest) (push) Waiting to run
Early Access / Build with GraalVM on ${{ matrix.os }} (windows-latest) (push) Waiting to run
Early Access / Site build (push) Waiting to run
The JvmTestClient pushed things to system properties and then did not clean up them. This went invisible, as long as user did not have user-wide extensions like smart-builder that suddenly was not filtered out anymore from tested mvnd daemon and caused havoc.

Changes:
* def client helper method emits "prev state" for properties it altered
* JvmTestClient uses this map to restore properties
* MavenConfIgnore ITs modified to still ignore takari smart builder as well...

Fixes #1357
2025-06-18 21:31:58 +02:00
Tamas Cservenak
b4de1b1a23 Disable ConcurrentDownloadsTest for now (#1293)
As due Mimir, it does not download anymore and assertion
fails. With Mimir primed caches, everything is got from
cache.
2025-03-13 15:10:01 +01:00
Guillaume Nodet
9e32662401 Refactor input stream support (fixes #1257) (#1268) 2025-02-17 23:12:16 +01:00
Tamas Cservenak
d4d4f23d7d Fixes (#1253)
Seems MSC fork does not allow pushes from users who have commit rights on forked maven-mvnd, so am incorporating @ascheman changes here as well.

This PR is:
* fixes from PR https://github.com/apache/maven-mvnd/pull/1252
* plus fix SO isse (self injected cache)
* plus migrated whole daemon to Maven DI (from javax.inject) except those that override Sisu components
* ported latest Maven changes
2025-02-08 20:55:53 +01:00
Jermaine Hua
7b309de9ab Support core extension more configuration (#1216)
Fixes #1163

Signed-off-by: crazyhzm <crazyhzm@apache.org>
2024-12-17 13:50:43 +01:00
Guillaume Nodet
31c765e0d4 Use Maven 4 model 2024-11-08 19:24:50 +01:00
Guillaume Nodet
72b7365e21 Upgrade to Maven 4.0.0-beta-5 (#1187) 2024-11-07 19:11:26 +01:00
Tamas Cservenak
11a6ed3528 mvnd IT: increase connectTimeout for ITs (#1171)
Experiment PR to figure out why MacOS GH runners keep failing with transport related (SSL handshake abort, HTTP timeouts) errors. As we know linux and windows boxes are in Azure, while macos boxes are somewhere else, and we get regularly real strange errors like "SSL handshake errors", "HTTP timeout error (against Central?)", so suspicion is on JDK transport (in HTTP/2 mode).

Experiments:
* force apache transport (HTTP/1.1) - ✔️ 
* force JDK transport into HTTP/1.1 - 🟥 
* use big timeout for connectTimeout - ✔️ 

Conclusion: for ITs we will for now increase the default (10sec) `connectTimeout` Resolver configuration, as it seems too low.
2024-10-17 14:07:05 +02:00
Guillaume Nodet
a032544164 Improve log and leverage the new infrastructure in Maven (#1164) 2024-10-15 18:15:15 +02:00
Tamas Cservenak
27258c0e54 Maven Daemon CLIng (#1158)
Co-authored-by: Guillaume Nodet <gnodet@gmail.com>
2024-10-15 13:05:56 +02:00
Guillaume Nodet
9644e46617 Fix maven.multiModuleProjectDirectory (fixes #1031) (#1057) 2024-07-16 17:17:04 +02:00
Tamas Cservenak
952a67450b mixup in case of DISPLAY messages type (#1038)
ProjectEvent message mixup fixed.

Fixes #1036
2024-06-20 09:01:29 +02:00
Tamas Cservenak
6de743152c Default value must be manually handled (#953)
Default must be manually handled, i missed this.

Fixes #912
2024-05-22 16:33:29 +02:00
Guillaume Nodet
42b230c10c Upgrade to Maven 4.0.0-beta-1 (#974) 2024-05-03 21:10:04 +02:00
Tamas Cservenak
1fc7a988b9 Align mvnd m39 with Maven 3.9.x re config interpolation (#933)
Port Maven 3.9.7 config and new properties (session.root/top)
into Daemon m39.

The IT got this property as it triggers exception (failure)
if mvn39 could not "discover" top directory.

Fixes #910
2024-04-19 16:25:49 +02:00
dependabot[bot]
ea62ae3514 Bump org.apache.activemq:apache-activemq
Bumps org.apache.activemq:apache-activemq from 5.16.0 to 5.16.6.

---
updated-dependencies:
- dependency-name: org.apache.activemq:apache-activemq
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-03-17 16:36:38 +01:00
Karl Heinz Marbaise
accb99e910 Removed superfluous public for tests (#882) 2023-10-16 14:45:20 +02:00
Guillaume Nodet
f8adf1b770 Switch to slf4j simple logger (fixes #835) (#868) 2023-07-10 15:16:32 +02:00
Guillaume Nodet
838b720342 Bump to maven-parent 40, maven 3.9.3 and 4.0.0-alpha-7 and maven-resolver 1.9.13 (#858) 2023-07-03 16:27:23 +02:00
Clay Johnson
0e07a384c4 Add configuration to send build scans to https://ge.apache.org (#810)
* Add configuration to send build scans to https://ge.apache.org

* Add `.mvn` directories to IT tests projects that lack one

Some of the integration tests to do not have `.mvn` directories and
search up the project structure until they find the `.mvn` directory
of the root project.

This change adds `.mvn` directories with empty `maven.config` files so
that the sample projects in VCS will be as close as possible to those
executed during integration testing
2023-06-11 20:30:10 +02:00
Guillaume Nodet
b00e7978a8 Fix broken detection of mvnd home on alpine linux (fixes #849) (#848)
* Fix for musl dynamic loader
* Add caching for mvnd.home and java.home
* Add IT for alpine linux
2023-05-18 07:37:14 +02:00
Petr Široký
b0b7115344 Make the default (non-native) build work again (#808)
* Make the default (non-native) build work again

 * the renamed test is supposed to use the native binary, but it was
   being picked up by surefire, because of its name. For non-native builds
   (e.g. without -Pnative) the test would fail as the native
   binary does not exist

* Add GitHub job for for default (non-native) build
2023-03-12 23:07:51 +01:00
Guillaume Nodet
d771375870 Move back mvn script into the mvn/bin folder to avoid conflicts, fixes #787 (#803) 2023-03-10 12:59:04 +01:00
Guillaume Nodet
65da451ecd Switch back to takari smart builder (#805) 2023-03-10 08:48:08 +01:00
Guillaume Nodet
d6b8cb1173 Turn off transfer messages when running tests when possible (#790) 2023-02-14 17:06:54 +01:00
Guillaume Nodet
3f563e829d Disable build consumer on tests using invoker to workaround MINVOKER-319 2023-01-28 02:08:53 +01:00
Guillaume Nodet
86d4e9b365 Upgrade to surefire 3.0.0-M8 2023-01-28 00:08:08 +01:00
Guillaume Nodet
faa59800d0 Fix test for changed version message 2023-01-24 20:00:40 +01:00
Guillaume Nodet
4f90d558b2 Attempt at moving mvn as first class citizen in mvnd distribution, #392 (#769) 2023-01-24 10:50:40 +01:00
Stefan Oehme
74df4b6b53 Fix core export provider (#764)
* Fix core export provider

Since https://github.com/apache/maven/pull/616, the default
CoreExportProvider no longer uses the provided CoreExports,
but instead tries (and fails) to discover them itself.

This change fixes that by providing our own custom instance
of CoreExportProvider. This allows core extension to contribute
exported artifacts and exported packages again, like it used to
do before the Maven 4.x upgrade.

* Add integration tests for API-providing extensions
2023-01-17 11:18:22 +01:00
Guillaume Nodet
89841adbcb Upgrade to maven parent 39 and reformat accordingly 2022-12-16 11:38:47 +01:00
Tamas Cservenak
92cbc7d6cf Update Maven to 4.0.0-alpha-3 and Maven Resolver to 1.9.2 (#742)
https://issues.apache.org/jira/browse/MNG-7586

* Remove CliMavenPluginManager which has the changed needed in alpha-3
* Align slf4j api with maven
* Make sure the invoker being called from IT reuses the settings from the invoker running the IT
* Fix IT when mrm is disabled
* Fix InvalidingPluginRealmCache

Co-authored-by: Guillaume Nodet <gnodet@gmail.com>
2022-12-15 19:26:58 +01:00
Guillaume Nodet
2a8d18d119 Display plugin's goal prefix and version instead of artifactId (#748)
* Display plugin's goal prefix and version instead of artifactId
* Default to groupId:artifactId if goalPrefix is not present
2022-12-13 23:58:58 +01:00
Guillaume Nodet
82efe456c9 Update ITs to recent maven plugins (#744)
* Switch ITs to surefire 3.0.0-M7
* Upgrade other plugins in ITs
* Upgrade quarkus and jandex
2022-11-23 14:49:28 +01:00
Guillaume Nodet
a14a1eb80f Reformat 2022-11-22 15:44:53 +01:00
Guillaume Nodet
895381b43f Switch to maven 4.0.0-alpha-2 (#718) 2022-11-19 16:56:26 +01:00
Guillaume Nodet
31612a129e Upgrade to groovy 4 to allow building on recent JDK (#735) 2022-11-19 00:18:28 +01:00
Guillaume Nodet
aacd3eb4cc Handle the multimodule project directory as early as possible in the client (fixes #694) (#697) 2022-10-03 22:46:09 +02:00
Guillaume Nodet
449e815973 Missing argument for option -D, fixes #662 (#679)
Co-authored-by: 核桃 <hetao@2dfire.com>
2022-08-30 09:14:12 +02:00
Guillaume Nodet
ff7bbbe458 Move BuildProperties to the client (#630) 2022-05-02 13:13:07 +02:00
Stephan Schroevers
0288988d63 Replace github.com/mvndaemon/mvnd references (#622)
As the repository is now hosted under `github.com/apache/maven-mvnd`.
2022-04-28 09:43:19 +02:00
Guillaume Nodet
73f4d50bcb Remove default values for heap options (#610)
* Set default max heap size to null

Let the JVM decide the max heap size instead of using hardcoded defaults
to match the behaviour of vanilla Maven.

* Add ITs for verifying max heap behaviour

- By default no max heap should be set
- If configured via jvm.config then max heap should be set but not mvnd.maxHeapSize
- If configured via mvnd.maxHeapSize then max heap should be set

* Remove defaults memory options

* Add missing test project

* Fix too small heap size

* Fix tests

Co-authored-by: Ashhar Hasan <hashhar_dev@outlook.com>
2022-04-26 13:22:37 +02:00
Guillaume Nodet
dbe2feaf0c Fix missing space 2022-04-26 13:22:06 +02:00
Guillaume Nodet
4755734708 Avoid caching parent with a version containing a property, fixes #594 (#602) 2022-03-03 13:22:27 +01:00
Guillaume Nodet
b5a8ebfb47 Reformat 2022-01-21 09:36:49 +01:00
Guillaume Nodet
62d580b930 Daemon reuse ignores differences in .mvn/jvm.config, fixes #576 (#580) 2022-01-13 10:01:33 +01:00
Guillaume Nodet
4c99b52e03 Make sure the maven.home and maven.conf properties are correctly set when the JVM is started, fixes #553 2022-01-11 08:12:18 +01:00
Guillaume Nodet
b3a55333a8 Fix NoSuchFileException when using the compile phase, fixes #564 2022-01-07 11:46:54 +01:00
Guillaume Nodet
4bb5c5d5b5 Fix resident extensions (#531) 2021-12-14 18:20:34 +01:00