Skip to content
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

Jump to bottom

Remove empty hamcrest-core 2.x from 'JUnit 4/5' classpath container #1612

Merged
merged 2 commits into from
Sep 11, 2024
Merged

Remove empty hamcrest-core 2.x from 'JUnit 4/5' classpath container #1612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a687598
Version bump for 4.34 stream
HannesWell Sep 5, 2024
802584c
Remove empty hamcrest-core 2.x from 'JUnit 4/5' classpath container
HannesWell Aug 25, 2024
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
2 changes: 1 addition & 1 deletion org.eclipse.jdt.junit.core/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Automatic-Module-Name: org.eclipse.jdt.junit.core
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jdt.junit.core;singleton:=true
Bundle-Version: 3.13.300.qualifier
Bundle-Version: 3.13.400.qualifier
Bundle-Activator: org.eclipse.jdt.internal.junit.JUnitCorePlugin
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %providerName
Expand Down
10 changes: 0 additions & 10 deletions ...eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/buildpath/BuildPathSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,9 +304,6 @@ public boolean accept(File dir, String name) {
public static final JUnitPluginDescription JUNIT4_PLUGIN= new JUnitPluginDescription(
"org.junit", new VersionRange("[4.13.0,5.0.0)"), null, "org.junit_4.*.jar", "org.junit.source", "source-bundle/", JUnitPreferencesConstants.JUNIT4_JAVADOC); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$

private static final JUnitPluginDescription HAMCREST_CORE_PLUGIN= new JUnitPluginDescription(
"org.hamcrest.core", new VersionRange("[2.2.0,3.1.0)"), null, "org.hamcrest.core_2.*.jar", "org.hamcrest.core.source", "source-bundle/", JUnitPreferencesConstants.HAMCREST_CORE_JAVADOC); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$

private static final JUnitPluginDescription HAMCREST_PLUGIN= new JUnitPluginDescription(
"org.hamcrest", new VersionRange("[2.2.0,3.1.0)"), null, "org.hamcrest_2.*.jar", "org.hamcrest.source", "source-bundle/", JUnitPreferencesConstants.HAMCREST_JAVADOC); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$

Expand Down Expand Up @@ -421,13 +418,6 @@ public static IClasspathEntry getJUnit4as3LibraryEntry() {
return JUNIT4_AS_3_PLUGIN.getLibraryEntry();
}

/**
* @return the org.hamcrest.core library, or <code>null</code> if not available
*/
public static IClasspathEntry getHamcrestCoreLibraryEntry() {
return HAMCREST_CORE_PLUGIN.getLibraryEntry();
}

/**
* @return the org.hamcrest library, or <code>null</code> if not available
*/
Expand Down
2 changes: 0 additions & 2 deletions ...dt.junit.core/src/org/eclipse/jdt/internal/junit/buildpath/JUnitContainerInitializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@ private static JUnitContainer getNewContainer(IPath containerPath, IClasspathAtt
case JUNIT4:
entriesList.add(BuildPathSupport.getJUnit4LibraryEntry());
entriesList.add(BuildPathSupport.getHamcrestLibraryEntry());
entriesList.add(BuildPathSupport.getHamcrestCoreLibraryEntry());
break;
case JUNIT5:
boolean vintage = isVintage(attributes);
Expand All @@ -145,7 +144,6 @@ private static JUnitContainer getNewContainer(IPath containerPath, IClasspathAtt
entriesList.add(BuildPathSupport.getJUnit4LibraryEntry());
}
entriesList.add(BuildPathSupport.getHamcrestLibraryEntry());
entriesList.add(BuildPathSupport.getHamcrestCoreLibraryEntry());
// errors will be reported above
entriesList.removeIf(e -> e == null);
break;
Expand Down
Loading