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

Use 2023-09 simrel #2848

Merged
merged 4 commits into from
Sep 28, 2023
Merged

Use 2023-09 simrel #2848

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
fb421ab
Use 2023-09 simrel
akurtakov Sep 23, 2023
78134a0
Use Hamcrest 2.2 in JUnitClasspathContainerEntry
akurtakov Sep 27, 2023
97ec55c
Fix BasicP2RepositoryIntegrationTest with 2023-03
akurtakov Sep 27, 2023
abdbb10
Fix CustomProfileIntegrationTest with 2023-09
akurtakov Sep 27, 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 tycho-its/projects/api-tools/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<module>bundle2</module>
</modules>
<properties>
<target-platform>https://download.eclipse.org/releases/2023-06/</target-platform>
<target-platform>https://download.eclipse.org/releases/2023-09/</target-platform>
</properties>
<repositories>
<repository>
Expand Down
2 changes: 1 addition & 1 deletion tycho-its/projects/document-bundle-plugin/build-help-index/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<version>1.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<properties>
<target-platform>https://download.eclipse.org/releases/2023-03/</target-platform>
<target-platform>https://download.eclipse.org/releases/2023-09/</target-platform>
<tycho-version>4.0.0-SNAPSHOT</tycho-version>
</properties>
<repositories>
Expand Down
2 changes: 1 addition & 1 deletion tycho-its/projects/eeProfile.custom/build/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
</repository>
<repository>
<id>repo-with-test-runtime</id>
<url>${test-runtime-repo}</url>
<url>${target-platform}</url>
<layout>p2</layout>
</repository>
</repositories>
Expand Down
1 change: 1 addition & 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 @@ -212,6 +212,7 @@
<provided namespace='osgi.ee' name='JavaSE' version='1.8.0'/>
<provided namespace='osgi.ee' name='JavaSE/compact1' version='1.8.0'/>
<provided namespace='osgi.ee' name='JavaSE' version='11'/>
<provided namespace='osgi.ee' name='JavaSE' version='17'/>
</provides>
<touchpoint id='org.eclipse.equinox.p2.native' version='1.0.0'/>
</unit>
Expand Down
2 changes: 1 addition & 1 deletion tycho-its/projects/p2Repository/category.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- includes three bundles in different ways; note: the bundles do not require each other -->
<site>
<bundle id="com.sun.el" version="0.0.0"/>
<bundle id="com.sun.el.javax.el" version="0.0.0"/>
<iu id="org.apache.felix.gogo.runtime" version="0.0.0">
<category name="Test Category" />
</iu>
Expand Down
2 changes: 1 addition & 1 deletion tycho-its/projects/p2Repository/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<repository>
<id>test-data-repo</id>
<layout>p2</layout>
<url>${test-data-repo}</url>
<url>${target-platform}</url>
</repository>
</repositories>

Expand Down
5 changes: 2 additions & 3 deletions tycho-its/src/test/java/org/eclipse/tycho/test/eeProfile/CustomProfileIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2012 SAP AG and others.
* Copyright (c) 2012, 2023 SAP AG and others.
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
Expand Down Expand Up @@ -27,14 +27,13 @@ public class CustomProfileIntegrationTest extends AbstractTychoIntegrationTest {
@Test
public void testBuildWithCustomProfile() throws Exception {
// reactor with a test bundle importing javax.activation;version="1.1.0"
Verifier verifier = getVerifier("eeProfile.custom/build", false);
Verifier verifier = getVerifier("eeProfile.custom/build", true);

// repository where the custom EE is the only provider of
// javax.activation;version="1.1.0"
verifier.setSystemProperty("custom-profile-repo",
ResourceUtil.resolveTestResource("projects/eeProfile.custom/repository").toURI().toString());

verifier.setSystemProperty("test-runtime-repo", ResourceUtil.P2Repositories.ECLIPSE_LATEST.toString());
verifier.executeGoal("verify");
verifier.verifyErrorFreeLog();

Expand Down
7 changes: 3 additions & 4 deletions ...s/src/test/java/org/eclipse/tycho/test/p2Repository/BasicP2RepositoryIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2012, 2021 SAP AG and others.
* Copyright (c) 2012, 2023 SAP AG and others.
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
Expand Down Expand Up @@ -38,8 +38,7 @@ public class BasicP2RepositoryIntegrationTest extends AbstractTychoIntegrationTe

@BeforeClass
public static void executeBuild() throws Exception {
verifier = new BasicP2RepositoryIntegrationTest().getVerifier("/p2Repository", false);
verifier.addCliOption("-Dtest-data-repo=" + ResourceUtil.P2Repositories.ECLIPSE_LATEST.toString());
verifier = new BasicP2RepositoryIntegrationTest().getVerifier("/p2Repository", true);
verifier.executeGoal("verify");
verifier.verifyErrorFreeLog();
p2Repo = P2RepositoryTool.forEclipseRepositoryModule(new File(verifier.getBasedir()));
Expand All @@ -48,7 +47,7 @@ public static void executeBuild() throws Exception {
@Test
public void test381377BundleInclusion() {
// check that (separately!) included bundle is there
assertTrue(p2Repo.getBundleArtifact("com.sun.el", "2.2.0.v201303151357").isFile());
assertTrue(p2Repo.getBundleArtifact("com.sun.el.javax.el", "3.0.0").isFile());
}

@Test
Expand Down
4 changes: 2 additions & 2 deletions ...a-model/src/main/java/org/eclipse/tycho/model/classpath/JUnitClasspathContainerEntry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ public interface JUnitClasspathContainerEntry extends ClasspathContainerEntry {
static final JUnitBundle JUNIT4_PLUGIN = JUnitBundle.of("org.junit", "[4.13.0,5.0.0)",
"org.apache.servicemix.bundles", "org.apache.servicemix.bundles.junit");

static final JUnitBundle HAMCREST_CORE_PLUGIN = JUnitBundle.of("org.hamcrest.core", "[1.1.0,2.0.0)",
"org.apache.servicemix.bundles", "org.apache.servicemix.bundles.hamcrest");
static final JUnitBundle HAMCREST_CORE_PLUGIN = JUnitBundle.of("org.hamcrest", "[2.0.0,3.0.0)", "org.hamcrest",
laeubi marked this conversation as resolved.
Show resolved Hide resolved
"hamcrest");

static final JUnitBundle JUNIT_JUPITER_API_PLUGIN = JUnitBundle.of("junit-jupiter-api", "[5.0.0,6.0.0)",
"org.junit.jupiter", "junit-jupiter-api");
Expand Down
2 changes: 1 addition & 1 deletion tycho-testing-harness/src/main/java/org/eclipse/tycho/test/util/EnvironmentUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public class EnvironmentUtil {

private static final String MAVEN_HOME_INFO = "Maven home:";

public static final String ECLIPSE_LATEST = "https:////download.eclipse.org/releases/2022-12/";
public static final String ECLIPSE_LATEST = "https:////download.eclipse.org/releases/2023-09/";
Copy link
Member

Choose a reason for hiding this comment

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

do you know hy we have the four times / here? it seems to not harm but looks strange...

Copy link
Member Author

Choose a reason for hiding this comment

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

I would guess 2 // for the protocol and 2 more to escape them somewhere in the code.

Copy link
Member

Choose a reason for hiding this comment

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

This looks suspicious... if we need escaping it should not be done in the constant itself ...


private static final Properties props;

Expand Down
Loading