diff --git a/p2-maven-plugin/pom.xml b/p2-maven-plugin/pom.xml index 87ccc8e0eb..d84ff3b525 100644 --- a/p2-maven-plugin/pom.xml +++ b/p2-maven-plugin/pom.xml @@ -42,17 +42,17 @@ org.eclipse.platform org.eclipse.equinox.p2.director - 2.6.400 + 2.6.500 org.eclipse.platform org.eclipse.equinox.p2.engine - 2.10.200 + 2.10.300 org.eclipse.platform org.eclipse.equinox.p2.metadata - 2.9.100 + 2.9.200 org.eclipse.platform @@ -75,7 +75,7 @@ org.eclipse.platform org.eclipse.equinox.preferences - 3.11.100 + 3.11.200 org.apache.maven @@ -101,7 +101,7 @@ org.eclipse.platform org.eclipse.equinox.p2.updatesite - 1.3.400 + 1.3.500 @@ -138,12 +138,12 @@ org.eclipse.platform org.eclipse.equinox.p2.garbagecollector - 1.3.300 + 1.3.400 org.eclipse.platform org.eclipse.equinox.p2.director.app - 1.3.400 + 1.3.500 org.eclipse.platform diff --git a/pom.xml b/pom.xml index 4d97e59d0c..9a1438da1c 100644 --- a/pom.xml +++ b/pom.xml @@ -68,10 +68,10 @@ 3.9.6 3.5.2 - 3.21.0 + 3.22.0 3.39.0 1.79 - 7.0.0 + 7.1.0 5.11.3 1.11.3 @@ -300,12 +300,12 @@ org.eclipse.platform org.eclipse.equinox.p2.repository - 2.9.100 + 2.9.200 org.eclipse.platform org.eclipse.equinox.p2.publisher.eclipse - 1.6.200 + 1.6.300 org.eclipse.platform diff --git a/sisu-osgi/sisu-osgi-connect/pom.xml b/sisu-osgi/sisu-osgi-connect/pom.xml index 7d024f3502..be09fc8a08 100644 --- a/sisu-osgi/sisu-osgi-connect/pom.xml +++ b/sisu-osgi/sisu-osgi-connect/pom.xml @@ -28,7 +28,7 @@ org.eclipse.platform org.eclipse.equinox.registry - 3.12.100 + 3.12.200 org.eclipse.sisu diff --git a/src/site/markdown/PackagingTypes.md b/src/site/markdown/PackagingTypes.md index 13576639bc..5265bf0cdd 100644 --- a/src/site/markdown/PackagingTypes.md +++ b/src/site/markdown/PackagingTypes.md @@ -2,12 +2,12 @@ Tycho defines the following custom Maven packaging types targeted for Eclipse Plug-in development. -* `eclipse-plugin` corresponds to [Eclipse Plug-in and Plug-in Fragment projects](https://wiki.eclipse.org/PDE/User_Guide#Plug-in). +* `eclipse-plugin` corresponds to [Eclipse Plug-in and Plug-in Fragment projects](https://github.com/eclipse-pde/eclipse.pde/blob/master/docs/User_Guide.md#Plug-in). * `eclipse-test-plugin` is similar to `eclipse-plugin` but only contains Plugin Tests to be executed inside an OSGi runtime. There is a noticable difference between `eclipse-plugin` and `eclipse-test-plugin` with respect to the goal executed during `integration-test`. The former uses `tycho-surefire-plugin:integration-test` while the latter uses `tycho-surefire-plugin:test`. -* `eclipse-feature` corresponds to [Eclipse Feature projects](https://wiki.eclipse.org/PDE/User_Guide#Feature) -* `eclipse-repository` corresponds to projects containing a `category.xml` file, the support of [Eclipse Update Site projects](https://wiki.eclipse.org/PDE/User_Guide#Update_Site) has been removed in latest Tycho versions -* `eclipse-target-definition` corresponds to [Eclipse Target Platform](https://wiki.eclipse.org/PDE/User_Guide#Target_Platform) -* `p2-installable-unit` corresponds to [Installable Units](https://wiki.eclipse.org/Installable_Units) +* `eclipse-feature` corresponds to [Eclipse Feature projects](https://github.com/eclipse-pde/eclipse.pde/blob/master/docs/User_Guide.md#Feature) +* `eclipse-repository` corresponds to projects containing a `category.xml` file, the support of [Eclipse Update Site projects]https://github.com/eclipse-pde/eclipse.pde/blob/master/docs/User_Guide.md#Update-Site) has been removed in latest Tycho versions +* `eclipse-target-definition` corresponds to [Eclipse Target Platform](https://github.com/eclipse-pde/eclipse.pde/blob/master/docs/User_Guide.md#Target_Platform) +* `p2-installable-unit` corresponds to [Installable Units](https://github.com/eclipse-equinox/p2/blob/master/docs/Installable_Units.md) The lifecycle bindings (i.e. which Maven plugins are executed in which Maven phase by default) are defined by `tycho-maven-plugin` in a [Maven extension](https://maven.apache.org/guides/mini/guide-using-extensions.html) therefore it needs to be loaded accordingly: diff --git a/tycho-api/pom.xml b/tycho-api/pom.xml index f8293eb956..e822cd0e4a 100644 --- a/tycho-api/pom.xml +++ b/tycho-api/pom.xml @@ -28,7 +28,7 @@ org.eclipse.platform org.eclipse.equinox.p2.metadata - 2.9.100 + 2.9.200 org.eclipse.platform diff --git a/tycho-apitools-plugin/pom.xml b/tycho-apitools-plugin/pom.xml index 22fee37544..c1c8420b3d 100644 --- a/tycho-apitools-plugin/pom.xml +++ b/tycho-apitools-plugin/pom.xml @@ -50,7 +50,7 @@ org.eclipse.pde org.eclipse.pde.core - 3.19.0 + 3.20.0 jar @@ -71,7 +71,7 @@ org.eclipse.jdt org.eclipse.jdt.launching - 3.23.0 + 3.23.100 diff --git a/tycho-build/pom.xml b/tycho-build/pom.xml index 65e613539f..bc4f991706 100644 --- a/tycho-build/pom.xml +++ b/tycho-build/pom.xml @@ -68,20 +68,20 @@ org.eclipse.platform org.eclipse.equinox.p2.director - 2.6.400 + 2.6.500 org.eclipse.platform org.eclipse.equinox.p2.engine - 2.10.200 + 2.10.300 org.eclipse.platform org.eclipse.equinox.p2.metadata - 2.9.100 + 2.9.200 org.eclipse.platform diff --git a/tycho-core/pom.xml b/tycho-core/pom.xml index 465c93fa2e..277875568b 100644 --- a/tycho-core/pom.xml +++ b/tycho-core/pom.xml @@ -322,7 +322,7 @@ org.eclipse.pde org.eclipse.pde.core - 3.19.0 + 3.20.0 test diff --git a/tycho-eclipse-plugin/pom.xml b/tycho-eclipse-plugin/pom.xml index b6094502ff..dc17b1b7a7 100644 --- a/tycho-eclipse-plugin/pom.xml +++ b/tycho-eclipse-plugin/pom.xml @@ -39,7 +39,7 @@ org.eclipse.pde org.eclipse.pde.core - 3.19.0 + 3.20.0 jar diff --git a/tycho-extras/tycho-document-bundle-plugin/pom.xml b/tycho-extras/tycho-document-bundle-plugin/pom.xml index b27429626c..ea124dc923 100644 --- a/tycho-extras/tycho-document-bundle-plugin/pom.xml +++ b/tycho-extras/tycho-document-bundle-plugin/pom.xml @@ -59,12 +59,12 @@ org.eclipse.platform org.eclipse.help.base - 4.4.500 + 4.4.600 org.eclipse.pde org.eclipse.pde.core - 3.19.0 + 3.20.0 diff --git a/tycho-sbom/pom.xml b/tycho-sbom/pom.xml index 6b50bfa611..495c9318bf 100644 --- a/tycho-sbom/pom.xml +++ b/tycho-sbom/pom.xml @@ -34,7 +34,7 @@ org.cyclonedx cyclonedx-maven-plugin - 2.9.0 + 2.9.1 diff --git a/tycho-versions-plugin/src/main/java/org/eclipse/tycho/versions/pom/PomUtil.java b/tycho-versions-plugin/src/main/java/org/eclipse/tycho/versions/pom/PomUtil.java index fda4d927ad..7d99264a14 100644 --- a/tycho-versions-plugin/src/main/java/org/eclipse/tycho/versions/pom/PomUtil.java +++ b/tycho-versions-plugin/src/main/java/org/eclipse/tycho/versions/pom/PomUtil.java @@ -48,8 +48,8 @@ public static String expandProperties(String str, List properties) { String unexpandedProperty = m.group(); String propertyName = m.group(1); m.appendReplacement(resolvedVersionBuilder, - properties.stream().filter(p -> p.getName().equals(propertyName)).map(p -> p.getValue()) - .findFirst().orElse(unexpandedProperty)); + Matcher.quoteReplacement(properties.stream().filter(p -> p.getName().equals(propertyName)) + .map(p -> p.getValue()).findFirst().orElse(unexpandedProperty))); } m.appendTail(resolvedVersionBuilder); return resolvedVersionBuilder.toString(); diff --git a/tycho-versions-plugin/src/test/java/org/eclipse/tycho/versions/pom/tests/PomUtilTest.java b/tycho-versions-plugin/src/test/java/org/eclipse/tycho/versions/pom/tests/PomUtilTest.java new file mode 100644 index 0000000000..412182d47d --- /dev/null +++ b/tycho-versions-plugin/src/test/java/org/eclipse/tycho/versions/pom/tests/PomUtilTest.java @@ -0,0 +1,42 @@ +/******************************************************************************* + * Copyright (c) 2024 SAP SE 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 + * + * Contributors: + * SAP SE - initial API and implementation + *******************************************************************************/ +package org.eclipse.tycho.versions.pom.tests; + +import static org.junit.Assert.assertEquals; + +import java.io.ByteArrayInputStream; +import java.nio.charset.StandardCharsets; + +import org.eclipse.tycho.versions.pom.PomFile; +import org.eclipse.tycho.versions.pom.PomUtil; +import org.junit.Test; + +public class PomUtilTest { + + @Test + public void expandProperties() throws Exception { + String pom = """ + + + fooValue + barValue + + + """; + PomFile pomFile = PomFile.read(new ByteArrayInputStream(pom.getBytes(StandardCharsets.UTF_8)), true); + + String expanded = PomUtil.expandProperties("${foo}-${bar}-${notFound}", pomFile.getProperties()); + + assertEquals("fooValue-barValue-${notFound}", expanded); + } +} diff --git a/tycho-wrap-plugin/pom.xml b/tycho-wrap-plugin/pom.xml index 5d6bdf0830..9cb8263a17 100644 --- a/tycho-wrap-plugin/pom.xml +++ b/tycho-wrap-plugin/pom.xml @@ -34,7 +34,7 @@ biz.aQute.bnd biz.aQute.bnd.maven - 7.0.0 + 7.1.0