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

Pr 2897 #2903

Merged
merged 4 commits into from
Oct 25, 2023
Merged

Pr 2897 #2903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1be1009
Bump bnd.version from 6.4.0 to 7.0.0
dependabot[bot] Oct 8, 2023
3bc5a37
Adjust to BNDlib7 changes
laeubi Oct 9, 2023
1008c1c
Fix LocalRepositoryCrosstalkTest
laeubi Oct 22, 2023
3b97fa5
Fix CustomProfileIntegrationTest
laeubi Oct 22, 2023
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 pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<surefire-version>3.2.1</surefire-version>
<equinoxVersion>3.18.500</equinoxVersion>
<ecjVersion>3.35.0</ecjVersion>
<bnd.version>6.4.0</bnd.version>
<bnd.version>7.0.0</bnd.version>
<!-- these are referenced from src/main/resources/META-INF/plexus/components.xml -->
<resources-plugin.version>2.4.3</resources-plugin.version>
<install-plugin.version>2.3.1</install-plugin.version>
Expand Down
5 changes: 3 additions & 2 deletions tycho-core/src/test/java/org/eclipse/m2e/pde/target/tests/OSGiMetadataGenerationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ public void testNonOSGiArtifact_missingArtifactGenerate_defaultInstructions() th
assertEquals("Bundle derived from maven artifact com.google.errorprone:error_prone_annotations:2.18.0",
attributes.getValue(Constants.BUNDLE_NAME));
assertEqualManifestHeaders(Constants.IMPORT_PACKAGE, attributes,
"javax.lang.model.element;resolution:=optional");
"javax.lang.model.element;resolution:=\"optional\", java.lang.annotation;resolution:=\"optional\", java.lang;resolution:=\"optional\"");
assertEqualManifestHeaders(Constants.EXPORT_PACKAGE, attributes,
"com.google.errorprone.annotations;version=\"2.18.0\";uses:=\"javax.lang.model.element\"",
"com.google.errorprone.annotations.concurrent;version=\"2.18.0\"");
Expand Down Expand Up @@ -223,7 +223,8 @@ public void testNonOSGiArtifact_missingArtifactGenerate_customInstructions() thr
attributes.getValue(Constants.BUNDLE_SYMBOLICNAME));
assertEquals("Bundle in Test from artifact com.google.errorprone:error_prone_annotations:2.18.0:",
attributes.getValue(Constants.BUNDLE_NAME));
assertEqualManifestHeaders(Constants.IMPORT_PACKAGE, attributes, "javax.lang.model.element");
assertEqualManifestHeaders(Constants.IMPORT_PACKAGE, attributes,
"java.lang.annotation, javax.lang.model.element, java.lang");
assertEqualManifestHeaders(Constants.EXPORT_PACKAGE, attributes,
"com.google.errorprone.annotations;version=\"2.18.0\";uses:=\"javax.lang.model.element\"",
"com.google.errorprone.annotations.concurrent;version=\"2.18.0\"");
Expand Down
2 changes: 1 addition & 1 deletion ...itoryCrosstalk/bundle01/src/TYCHO0367localRepositoryCrosstalk/bundle01/Eclipse34Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public void test()
Bundle equinox = getBundle( "org.eclipse.osgi");

assertEquals( 3, equinox.getVersion().getMajor() );
assertEquals( 12, equinox.getVersion().getMinor() );
assertEquals( 13, equinox.getVersion().getMinor() );
}

public Bundle getBundle( String id )
Expand Down
8 changes: 8 additions & 0 deletions tycho-its/projects/eeProfile.custom/repository/content.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,14 @@
<unit id='a.jre.customprofile' version='1.6.0' singleton='false'>
<provides size='200'>
<provided namespace='org.eclipse.equinox.p2.iu' name='a.jre.customprofile' version='1.6.0'/>
<provided namespace='java.package' name='java.lang' version='0.0.0'/>
<provided namespace='java.package' name='java.lang.annotation' version='0.0.0'/>
<provided namespace='java.package' name='java.lang.invoke' version='0.0.0'/>
<provided namespace='java.package' name='java.lang.reflect' version='0.0.0'/>
<provided namespace='java.package' name='java.util' version='0.0.0'/>
<provided namespace='java.package' name='java.util.concurrent' version='0.0.0'/>
<provided namespace='java.package' name='java.util.concurrent.atomic' version='0.0.0'/>

<provided namespace='java.package' name='javax.accessibility' version='0.0.0'/>
<provided namespace='java.package' name='javax.activation' version='0.0.0'/>
<provided namespace='java.package' name='javax.activation' version='1.1.1'/>
Expand Down
7 changes: 4 additions & 3 deletions ...rg/eclipse/tycho/test/TYCHO0367localRepositoryCrosstalk/LocalRepositoryCrosstalkTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,16 @@
public class LocalRepositoryCrosstalkTest extends AbstractTychoIntegrationTest {
@Test
public void test() throws Exception {
// run e352 test first
// run bundle 2 test first with latest eclipse
Verifier v01 = getVerifier("/TYCHO0367localRepositoryCrosstalk/bundle02", false);
v01.addCliOption("-Dp2.repo=" + P2Repositories.ECLIPSE_LATEST.toString());
v01.executeGoal("install");
v01.verifyErrorFreeLog();

// now run e342 test, it should not "see" e352 artifacts in local repo
// now run bundle1 test, it should not "see" artifacts in local repo from newer
// update site
Verifier v02 = getVerifier("/TYCHO0367localRepositoryCrosstalk/bundle01", false);
v02.addCliOption("-Dp2.repo=" + P2Repositories.ECLIPSE_OXYGEN.toString());
v02.addCliOption("-Dp2.repo=https:////download.eclipse.org/releases/photon/");
v02.executeGoal("install");
v02.verifyErrorFreeLog();
}
Expand Down
Loading