Skip to content

Remove code corresponding to Maven 2.x and JDK 7 #199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
slawekjaranowski wants to merge 1 commit into from
Closed

Remove code corresponding to Maven 2.x and JDK 7 #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 2 additions & 14 deletions ...suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,20 +53,8 @@ public void testitMNG294()
verifier.deleteDirectory( "target" );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "user-settings.xml" );
if ( matchesVersionRange( "[2.1.0-M2,)" ) )
{
// dedicated CLI option only available since MNG-3914
verifier.addCliOption( "--global-settings" );
verifier.addCliOption( "global-settings.xml" );
}
else
{
verifier.setSystemProperty( "org.apache.maven.global-settings", "global-settings.xml" );
}
if ( matchesVersionRange( "(3.2.5,)" ) )
{
verifier.getSystemProperties().put( "maven.multiModuleProjectDirectory", testDir.getAbsolutePath() );
}
verifier.addCliOption( "--global-settings" );
verifier.addCliOption( "global-settings.xml" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Expand Down
2 changes: 0 additions & 2 deletions ...-suite/src/test/java/org/apache/maven/it/MavenITmng6972AllowAccessToGraphPackageTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,11 @@ public void testit()
verifier.deleteArtifact( "mng-6972-allow-access-to-graph-package", "using-module", "1.0", "jar" );

verifier = newVerifier( new File( testDir.getAbsolutePath(), "build-plugin" ).getAbsolutePath() );
verifier.getSystemProperties().put( "maven.multiModuleProjectDirectory", testDir.getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();

verifier = newVerifier( new File( testDir.getAbsolutePath(), "using-module" ).getAbsolutePath() );
verifier.getSystemProperties().put( "maven.multiModuleProjectDirectory", testDir.getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Expand Down
22 changes: 4 additions & 18 deletions ...t/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,33 +568,19 @@ protected Verifier newVerifier( String basedir, String settings, boolean debug )

String path = settingsFile.getAbsolutePath();

// dedicated CLI option only available since MNG-3914
if ( matchesVersionRange( "[2.1.0,)" ) )
verifier.addCliOption( "--global-settings" );
if ( path.indexOf( ' ' ) < 0 )
{
verifier.addCliOption( "--global-settings" );
if ( path.indexOf( ' ' ) < 0 )
{
verifier.addCliOption( path );
}
else
{
verifier.addCliOption( '"' + path + '"' );
}
verifier.addCliOption( path );
}
else
{
verifier.getSystemProperties().put( "org.apache.maven.global-settings", path );
verifier.addCliOption( '"' + path + '"' );
}
Copy link
Copy Markdown
Member

@michael-o michael-o Sep 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we still need to quote ourselves? Feels weird, no?

Copy link
Copy Markdown
Member Author

@slawekjaranowski slawekjaranowski Sep 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wouldn't like touch it until Verifier 2.0

Copy link
Copy Markdown
Contributor

@gnodet gnodet Sep 15, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, note that the upgrade to verifier 2.0 will break quotes arguments. Also note that I plan to merge #176 soon and it includes an upgrade to verifier 2.0-SNAPSHOT. Unless we really do want to postpone until it's released, but the snapshots are available on public apache repos, so that's not a dealbreaker, especially as ITs are never released.

Copy link
Copy Markdown
Member Author

@slawekjaranowski slawekjaranowski Sep 15, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have many changes in Verifier 2.0.0, many deprecated methods, etc
My proposition is to release Verifier 2.0.0-M1 as is now - I can do it in next weekend.

In next step after #176 we can clean of using deprecated methods we can release next milestone with next part of resolved issues and so on, until to final 2.0.0

As always I like step by step and if it possible split bigger changes.

What do you think?

Copy link
Copy Markdown
Contributor

@gnodet gnodet Sep 15, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds like a plan to me !

}

try
{
// Java7 TLS protocol
if ( VersionRange.createFromVersionSpec( "(,1.8.0)" ).containsVersion( getJavaVersion() ) )
{
verifier.addCliOption( "-Dhttps.protocols=TLSv1.2" );
}

// auto set source+target to lowest reasonable java version
// Java9 requires at least 1.6
if ( VersionRange.createFromVersionSpec( "[9,12)" ).containsVersion( getJavaVersion() ) )
Expand Down
3 changes: 0 additions & 3 deletions run-its.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@
# How I run the ITs from a clean slate. Though I do this with a primed Nexus instance. JvZ.
# build maven core using -PversionlessMavenDist

# For Jdk 7 use with -Dhttps.protocols=TLSv1.2
# mvn clean install -Prun-its,embedded -Dmaven.repo.local=`pwd`/repo -Dhttps.protocols=TLSv1.2

mvn clean install -Prun-its,embedded -Dmaven.repo.local=`pwd`/repo

# If behind a proxy try this
Expand Down