Skip to content

[MNG-7909] Upgrade to Resolver 2.0.0-alpha-1#1282

Merged
cstamas merged 17 commits intoapache:masterfrom
cstamas:MNG-7909
Nov 7, 2023
Merged

[MNG-7909] Upgrade to Resolver 2.0.0-alpha-1#1282
cstamas merged 17 commits intoapache:masterfrom
cstamas:MNG-7909

Conversation

@cstamas
Copy link
Copy Markdown
Member

@cstamas cstamas commented Oct 14, 2023

Upgrade to Resolver 2.0.0.

Changes:

  • many UT code used new DefaultRepositorySystem() ctor that is gone (was present due SL only), replaced with mocks
  • dropped MavenResolverModule Guice module (as AetherGuice module is gone as well)
  • updated Resolver version to 2.0.0-alpha-1
  • added jdk transport (that prevails apache on Java 11)
  • rename of "native" into "apache", deprecate "native" name
  • introduce "jdk" transport

https://issues.apache.org/jira/browse/MNG-7909

This is WIP, but just to see does it work.

UTs were using nasty "def ctor" that creates EMPTY/unusable
system, and that ctor is gone (was there due SL). Replaced
by mocks, as RepositorySystem is not really needed in these
tests.

---

https://issues.apache.org/jira/browse/MNG-7909
@cstamas cstamas self-assigned this Oct 14, 2023
@cstamas
Copy link
Copy Markdown
Member Author

cstamas commented Oct 15, 2023

One IT fails, recorded as https://issues.apache.org/jira/browse/MRESOLVER-412

@cstamas
Copy link
Copy Markdown
Member Author

cstamas commented Oct 18, 2023

Seems some more ITs failed, looking...
The read poms one is recorded (and is not resolver related) https://issues.apache.org/jira/browse/MRESOLVER-412
Rest needs to be looked at.

@cstamas cstamas marked this pull request as ready for review November 6, 2023 21:33
@cstamas cstamas changed the title [MNG-7909] Upgrade to Resolver 2.0.0 [MNG-7909] Upgrade to Resolver 2.0.0-alpha-1 Nov 6, 2023
@cstamas cstamas requested a review from gnodet November 6, 2023 21:41
@cstamas
Copy link
Copy Markdown
Member Author

cstamas commented Nov 6, 2023

On Java 11 IT failures are:

Error:  Failures: 
Error:    MavenITmng4368TimestampAwareArtifactInstallerTest.testitJarPackaging:153->AbstractMavenIntegrationTestCase.assertFalse:363->AbstractMavenIntegrationTestCase.assertFalse:367 expected: <false> but was: <true>
Error:    MavenITmng5669ReadPomsOnce.testWithBuildConsumer:114->AbstractMavenIntegrationTestCase.assertTrue:359 Duplicate items: org.apache.maven:maven:3.2.5
org.apache.commons:commons-parent:52
org.codehaus.plexus:plexus:10 ==> expected: <true> but was: <false>
Error:    MavenITmng5669ReadPomsOnce.testWithoutBuildConsumer:78->AbstractMavenIntegrationTestCase.assertTrue:359 Duplicate items: org.apache.commons:commons-parent:52
org.apache:apache:15
org.apache.maven:maven-parent:25 ==> expected: <true> but was: <false>
Error:  Errors: 
Error:    MavenITmng5175WagonHttpTest.testmng5175_ReadTimeOutFromSettings:124 » Verification Text not found in log: Read timed out
   MavenITmng7470ResolverTransportTest.testResolverTransportDefault:106->performTest:97 » Verification Text not found in log: [DEBUG] Using transporter HttpTransporter
[INFO] 
Error:  Tests run: 904, Failures: 3, Errors: 2, Skipped: 34

Info:

  • we know about MavenITmng5669ReadPomsOnce, there is issue in model builder when using MT collector (and resolver 2.0.0 makes BF default that is MT)
  • MavenITmng5175WagonHttpTest is strange, is called "Wagon" but asserts that "apache" transport is used (is not, on Java11+ is jdk used)
  • the only questionable is MavenITmng4368TimestampAwareArtifactInstallerTest is not, is https://issues.apache.org/jira/browse/MRESOLVER-392 and LOL the original issue is this https://issues.apache.org/jira/browse/MNG-4368

@gnodet
Copy link
Copy Markdown
Contributor

gnodet commented Nov 6, 2023

  • we know about MavenITmng5669ReadPomsOnce, there is issue in model builder when using MT collector (and resolver 2.0.0 makes BF default that is MT)

Wasn't this one solved by #893 ?

@cstamas
Copy link
Copy Markdown
Member Author

cstamas commented Nov 6, 2023

Wasn't this one solved by #893 ?

WILL be solved when merged, yes 😄

@cstamas cstamas merged commit e6d1b4c into apache:master Nov 7, 2023
@cstamas cstamas deleted the MNG-7909 branch November 7, 2023 15:06
@gnodet gnodet added this to the 4.0.0-alpha-9 milestone Nov 8, 2023
@jira-importer
Copy link
Copy Markdown

Resolve #9005

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants