diff --git a/tycho-its/projects/product.pluginBased.mavenArtefacts/.mvn/extensions.xml b/tycho-its/projects/product.pluginBased.mavenArtefacts/.mvn/extensions.xml new file mode 100644 index 0000000000..877053636d --- /dev/null +++ b/tycho-its/projects/product.pluginBased.mavenArtefacts/.mvn/extensions.xml @@ -0,0 +1,8 @@ + + + + org.eclipse.tycho + tycho-build + ${tycho-version} + + \ No newline at end of file diff --git a/tycho-its/projects/product.pluginBased.mavenArtefacts/pom.xml b/tycho-its/projects/product.pluginBased.mavenArtefacts/pom.xml new file mode 100644 index 0000000000..84d101f36e --- /dev/null +++ b/tycho-its/projects/product.pluginBased.mavenArtefacts/pom.xml @@ -0,0 +1,78 @@ + + + + 4.0.0 + tycho-its-project.issue1052 + tycho-its-project.issue1052.parent + 1.0.0-SNAPSHOT + pom + + + UTF-8 + + + + + + + org.eclipse.tycho + tycho-p2-director-plugin + ${tycho-version} + + + + + + + org.eclipse.tycho + tycho-maven-plugin + ${tycho-version} + true + + + + org.eclipse.tycho + tycho-packaging-plugin + ${tycho-version} + + + false + + + + + + org.eclipse.tycho + target-platform-configuration + ${tycho-version} + + + + win32 + win32 + x86_64 + + + + + + tycho-its-project.issue1052 + tycho-its-project.issue1052.target + ${project.version} + + + + + + + + + + tycho-its-project.issue1052.target + tycho-its-project.issue1052.jaxrs.product + + \ No newline at end of file diff --git a/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.jaxrs.product/.project b/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.jaxrs.product/.project new file mode 100644 index 0000000000..1695f9d263 --- /dev/null +++ b/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.jaxrs.product/.project @@ -0,0 +1,28 @@ + + + tycho-its-project.issue1052.jaxrs.product + + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + + + + 1656398149664 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + + diff --git a/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.jaxrs.product/.settings/org.eclipse.core.resources.prefs b/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.jaxrs.product/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000000..99f26c0203 --- /dev/null +++ b/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.jaxrs.product/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.jaxrs.product/tycho-its-project.issue1052.jaxrs.product b/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.jaxrs.product/tycho-its-project.issue1052.jaxrs.product new file mode 100644 index 0000000000..8c8740a130 --- /dev/null +++ b/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.jaxrs.product/tycho-its-project.issue1052.jaxrs.product @@ -0,0 +1,31 @@ + + + + + + + + + + + + -Declipse.ignoreApp=true -Dosgi.noShutdown=true -Dorg.osgi.service.http.port=8282 + + -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts + + + + + + + + + + + + + + + + + diff --git a/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.target/.project b/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.target/.project new file mode 100644 index 0000000000..1aac4a8776 --- /dev/null +++ b/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.target/.project @@ -0,0 +1,11 @@ + + + tycho-its-project.issue1052.target + + + + + + + + diff --git a/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.target/.settings/org.eclipse.core.resources.prefs b/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.target/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000000..99f26c0203 --- /dev/null +++ b/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.target/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.target/tycho-its-project.issue1052.target.target b/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.target/tycho-its-project.issue1052.target.target new file mode 100644 index 0000000000..e254e55f02 --- /dev/null +++ b/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.target/tycho-its-project.issue1052.target.target @@ -0,0 +1,21 @@ + + + + + + + + + + + + + org.osgi + org.osgi.service.jaxrs + 1.0.1 + jar + + + + + \ No newline at end of file diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/product/PluginBasedProductTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/product/PluginBasedProductTest.java new file mode 100644 index 0000000000..6bd22658d8 --- /dev/null +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/product/PluginBasedProductTest.java @@ -0,0 +1,26 @@ +/******************************************************************************* + * Copyright (c) 2022 Dirk Fauth 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 + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + *******************************************************************************/ +package org.eclipse.tycho.test.product; + +import java.util.Arrays; + +import org.apache.maven.it.Verifier; +import org.eclipse.tycho.test.AbstractTychoIntegrationTest; +import org.junit.Test; + +public class PluginBasedProductTest extends AbstractTychoIntegrationTest { + + @Test + public void testMavenDepedencyInTarget() throws Exception { + Verifier verifier = getVerifier("product.pluginBased.mavenArtefacts", false); + verifier.executeGoals(Arrays.asList("clean", "verify")); + verifier.verifyErrorFreeLog(); + } +}