diff --git a/.gitignore b/.gitignore index 284545ce528..d01a6898f10 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -target/ bin/ TMP/m2repo/ settings.xml @@ -9,4 +8,9 @@ workspace/ .metadata/ RemoteSystemsTempFiles/ /apiAnalyzer-workspace/ -eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/samples/*/doc-html \ No newline at end of file +eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/samples/*/doc-html + +# Maven/Tycho build artifats +target/ +.polyglot.* +pom.tycho diff --git a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/build.properties b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/build.properties index b3aff8f0eee..21b0e68a052 100644 --- a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/build.properties +++ b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/build.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2012 IBM Corporation and others. +# Copyright (c) 2000, 2025 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -13,3 +13,6 @@ custom=true bin.includes=*.properties,*.xml,*.html,*.png,*.css,META-INF/,concepts/, gettingStarted/, images/, reference/, tasks/, tips/, whatsNew/ bin.excludes=build.properties,build.xml,workspace,.m2 + +# Maven/Tycho pom model adjustments +pom.model.groupId = org.eclipse.jdt diff --git a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/pom.xml b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/pom.xml deleted file mode 100644 index 5ee141e0647..00000000000 --- a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/pom.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - 4.0.0 - - eclipse.platform.common - eclipse.platform.common - 4.36.0-SNAPSHOT - ../../ - - org.eclipse.jdt - org.eclipse.jdt.doc.user - 3.15.2600-SNAPSHOT - eclipse-plugin - diff --git a/eclipse.platform.common/bundles/org.eclipse.jdt.tips.user/build.properties b/eclipse.platform.common/bundles/org.eclipse.jdt.tips.user/build.properties index e9863e281ea..5303855b121 100644 --- a/eclipse.platform.common/bundles/org.eclipse.jdt.tips.user/build.properties +++ b/eclipse.platform.common/bundles/org.eclipse.jdt.tips.user/build.properties @@ -1,5 +1,18 @@ +############################################################################### +# Copyright (c) 2018, 2025 Remain Software and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# Remain Software - initial API and implementation +############################################################################### source.. = src/ output.. = bin/ bin.includes = META-INF/,\ .,\ plugin.xml + +# Maven/Tycho pom model adjustments +pom.model.groupId = org.eclipse.jdt diff --git a/eclipse.platform.common/bundles/org.eclipse.jdt.tips.user/pom.xml b/eclipse.platform.common/bundles/org.eclipse.jdt.tips.user/pom.xml deleted file mode 100644 index cc7574137d7..00000000000 --- a/eclipse.platform.common/bundles/org.eclipse.jdt.tips.user/pom.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - 4.0.0 - - eclipse.platform.common - eclipse.platform.common - 4.36.0-SNAPSHOT - ../../ - - org.eclipse.jdt - org.eclipse.tips.core - 0.3.100-SNAPSHOT - eclipse-plugin - diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.tips/build.properties b/eclipse.platform.common/bundles/org.eclipse.platform.doc.tips/build.properties index 6c480f39f1b..2330bd61a9e 100644 --- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.tips/build.properties +++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.tips/build.properties @@ -1,6 +1,19 @@ +############################################################################### +# Copyright (c) 2018, 2025 Vogella GmbH and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# Vogella GmbH - initial API and implementation +############################################################################### source.. = src/ output.. = bin/ bin.includes = META-INF/,\ .,\ plugin.xml,\ icons/ + +# Maven/Tycho pom model adjustments +pom.model.groupId = org.eclipse.platform diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.tips/pom.xml b/eclipse.platform.common/bundles/org.eclipse.platform.doc.tips/pom.xml deleted file mode 100644 index 6da90c18978..00000000000 --- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.tips/pom.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - 4.0.0 - - eclipse.platform.common - eclipse.platform.common - 4.36.0-SNAPSHOT - ../../ - - org.eclipse.platform - org.eclipse.platform.doc.tips - 0.3.100-SNAPSHOT - eclipse-plugin - diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/build.properties b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/build.properties index 6b81b794a6e..f2519fe7480 100644 --- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/build.properties +++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/build.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2012 IBM Corporation and others. +# Copyright (c) 2000, 2025 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -14,3 +14,6 @@ bin.includes = META-INF/,\ reference/, tasks/, tips/, whatsNew/ bin.excludes = build.properties + +# Maven/Tycho pom model adjustments +pom.model.groupId = org.eclipse.platform diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/pom.xml b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/pom.xml deleted file mode 100644 index 961cd1c794f..00000000000 --- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/pom.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - 4.0.0 - - eclipse.platform.common - eclipse.platform.common - 4.36.0-SNAPSHOT - ../../ - - org.eclipse.platform - org.eclipse.platform.doc.user - eclipse-plugin - diff --git a/eclipse.platform.releng/bundles/build.properties b/eclipse.platform.releng/bundles/build.properties new file mode 100644 index 00000000000..e580cf2e63c --- /dev/null +++ b/eclipse.platform.releng/bundles/build.properties @@ -0,0 +1,2 @@ +pom.model.artifactId = releng-bundles +pom.model.groupId = org.eclipse.platform diff --git a/eclipse.platform.releng/bundles/org.eclipse.ant.optional.junit/pom.xml b/eclipse.platform.releng/bundles/org.eclipse.ant.optional.junit/pom.xml deleted file mode 100644 index ce053609034..00000000000 --- a/eclipse.platform.releng/bundles/org.eclipse.ant.optional.junit/pom.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - 4.0.0 - - eclipse.platform.releng - eclipse.platform.releng - 4.36.0-SNAPSHOT - ../../ - - org.eclipse.platform - org.eclipse.ant.optional.junit - 3.3.400-SNAPSHOT - eclipse-plugin - diff --git a/eclipse.platform.releng/bundles/org.eclipse.rcp/build.properties b/eclipse.platform.releng/bundles/org.eclipse.rcp/build.properties index 849303c9a89..27be2a5ce10 100644 --- a/eclipse.platform.releng/bundles/org.eclipse.rcp/build.properties +++ b/eclipse.platform.releng/bundles/org.eclipse.rcp/build.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2016 IBM Corporation and others. +# Copyright (c) 2000, 2025 IBM Corporation and others. # # This program and the accompanying materials # are made available under the terms of the Eclipse Public License 2.0 @@ -19,3 +19,5 @@ bin.includes = about.html,\ plugin.properties,\ META-INF/ +# Maven/Tycho pom model adjustments +pom.model.property.tycho.buildqualifier.format = 'v${buildTimestamp}' diff --git a/eclipse.platform.releng/bundles/org.eclipse.rcp/pom.xml b/eclipse.platform.releng/bundles/org.eclipse.rcp/pom.xml deleted file mode 100644 index 820f5f324b7..00000000000 --- a/eclipse.platform.releng/bundles/org.eclipse.rcp/pom.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - 4.0.0 - - eclipse.platform.releng - eclipse.platform.releng - 4.36.0-SNAPSHOT - ../../ - - org.eclipse.platfrom - org.eclipse.rcp - eclipse-plugin - - - - org.eclipse.tycho - tycho-packaging-plugin - - 'v${buildTimestamp}' - - - - - diff --git a/eclipse.platform.releng/bundles/org.eclipse.releng.tests/build.properties b/eclipse.platform.releng/bundles/org.eclipse.releng.tests/build.properties index 98a88631f73..768b94d3bd7 100644 --- a/eclipse.platform.releng/bundles/org.eclipse.releng.tests/build.properties +++ b/eclipse.platform.releng/bundles/org.eclipse.releng.tests/build.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2011 IBM Corporation and others. +# Copyright (c) 2000, 2025 IBM Corporation and others. # # This program and the accompanying materials # are made available under the terms of the Eclipse Public License 2.0 @@ -23,3 +23,7 @@ bin.includes = compare.properties,\ . source.. = src/ output.. = bin/ + +# Maven/Tycho pom model adjustments +pom.model.property.testSuite = ${project.artifactId} +pom.model.property.skipTests = true diff --git a/eclipse.platform.releng/bundles/org.eclipse.releng.tests/pom.xml b/eclipse.platform.releng/bundles/org.eclipse.releng.tests/pom.xml deleted file mode 100644 index f84f1ffc6c3..00000000000 --- a/eclipse.platform.releng/bundles/org.eclipse.releng.tests/pom.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - 4.0.0 - - eclipse.platform.releng - eclipse.platform.releng - 4.36.0-SNAPSHOT - ../../ - - org.eclipse.platform - org.eclipse.releng.tests - 3.6.700-SNAPSHOT - eclipse-test-plugin - - ${project.artifactId} - true - - diff --git a/eclipse.platform.releng/bundles/org.eclipse.sdk.examples/build.properties b/eclipse.platform.releng/bundles/org.eclipse.sdk.examples/build.properties index 1e8f95dda4f..edf96aac7d0 100644 --- a/eclipse.platform.releng/bundles/org.eclipse.sdk.examples/build.properties +++ b/eclipse.platform.releng/bundles/org.eclipse.sdk.examples/build.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2010 IBM Corporation and others. +# Copyright (c) 2000, 2025 IBM Corporation and others. # # This program and the accompanying materials # are made available under the terms of the Eclipse Public License 2.0 @@ -25,3 +25,5 @@ bin.includes = about.html,\ # these files need to end up as root files in /eclipse/ src.includes=about.html +# Maven/Tycho pom model adjustments +pom.model.property.tycho.buildqualifier.format = 'v${buildTimestamp}' diff --git a/eclipse.platform.releng/bundles/org.eclipse.sdk.examples/pom.xml b/eclipse.platform.releng/bundles/org.eclipse.sdk.examples/pom.xml deleted file mode 100644 index 6dfdecc0f43..00000000000 --- a/eclipse.platform.releng/bundles/org.eclipse.sdk.examples/pom.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - 4.0.0 - - eclipse.platform.releng - eclipse.platform.releng - 4.36.0-SNAPSHOT - ../../ - - org.eclipse.platform - org.eclipse.sdk.examples - eclipse-plugin - - - - org.eclipse.tycho - tycho-packaging-plugin - - 'v${buildTimestamp}' - - - - - diff --git a/eclipse.platform.releng/bundles/org.eclipse.sdk.tests/build.properties b/eclipse.platform.releng/bundles/org.eclipse.sdk.tests/build.properties index 7dae64cfbd0..b18895fbfe5 100644 --- a/eclipse.platform.releng/bundles/org.eclipse.sdk.tests/build.properties +++ b/eclipse.platform.releng/bundles/org.eclipse.sdk.tests/build.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2005 IBM Corporation and others. +# Copyright (c) 2000, 2025 IBM Corporation and others. # # This program and the accompanying materials # are made available under the terms of the Eclipse Public License 2.0 @@ -18,3 +18,6 @@ bin.includes = about.html,\ eclipse32.png,\ plugin.properties,\ META-INF/ + +# Maven/Tycho pom model adjustments +pom.model.property.tycho.buildqualifier.format = 'v${buildTimestamp}' diff --git a/eclipse.platform.releng/bundles/org.eclipse.sdk.tests/pom.xml b/eclipse.platform.releng/bundles/org.eclipse.sdk.tests/pom.xml deleted file mode 100644 index e95cd95fd17..00000000000 --- a/eclipse.platform.releng/bundles/org.eclipse.sdk.tests/pom.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - 4.0.0 - - eclipse.platform.releng - eclipse.platform.releng - 4.36.0-SNAPSHOT - ../../ - - org.eclipse.platform - org.eclipse.sdk.tests - eclipse-plugin - - - - org.eclipse.tycho - tycho-packaging-plugin - - 'v${buildTimestamp}' - - - - - diff --git a/eclipse.platform.releng/bundles/org.eclipse.test.performance/pom.xml b/eclipse.platform.releng/bundles/org.eclipse.test.performance/pom.xml deleted file mode 100644 index f04cd5e0c0c..00000000000 --- a/eclipse.platform.releng/bundles/org.eclipse.test.performance/pom.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - 4.0.0 - - eclipse.platform.releng - eclipse.platform.releng - 4.36.0-SNAPSHOT - ../../ - - org.eclipse.platform - org.eclipse.test.performance - 3.21.100-SNAPSHOT - eclipse-plugin - diff --git a/eclipse.platform.releng/bundles/org.eclipse.test/META-INF/MANIFEST.MF b/eclipse.platform.releng/bundles/org.eclipse.test/META-INF/MANIFEST.MF index f2ab114d6cf..c77d2d68a4b 100644 --- a/eclipse.platform.releng/bundles/org.eclipse.test/META-INF/MANIFEST.MF +++ b/eclipse.platform.releng/bundles/org.eclipse.test/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.test; singleton:=true -Bundle-Version: 3.6.200.qualifier +Bundle-Version: 3.6.300.qualifier Eclipse-BundleShape: dir Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/eclipse.platform.releng/bundles/org.eclipse.test/build.properties b/eclipse.platform.releng/bundles/org.eclipse.test/build.properties index dbb2d165a0b..29cdac39ffd 100644 --- a/eclipse.platform.releng/bundles/org.eclipse.test/build.properties +++ b/eclipse.platform.releng/bundles/org.eclipse.test/build.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2017 IBM Corporation and others. +# Copyright (c) 2000, 2025 IBM Corporation and others. # # This program and the accompanying materials # are made available under the terms of the Eclipse Public License 2.0 @@ -19,3 +19,6 @@ bin.includes = .,\ about.html src.includes = about.html source.. = src/ + +# Maven/Tycho pom model adjustments +pom.model.property.defaultSigning-excludeInnerJars = true diff --git a/eclipse.platform.releng/bundles/org.eclipse.test/pom.xml b/eclipse.platform.releng/bundles/org.eclipse.test/pom.xml deleted file mode 100644 index 815e9ad2c46..00000000000 --- a/eclipse.platform.releng/bundles/org.eclipse.test/pom.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - 4.0.0 - - eclipse.platform.releng - eclipse.platform.releng - 4.36.0-SNAPSHOT - ../../ - - org.eclipse.platform - org.eclipse.test - 3.6.200-SNAPSHOT - eclipse-plugin - - true - - diff --git a/eclipse.platform.releng/features/build.properties b/eclipse.platform.releng/features/build.properties new file mode 100644 index 00000000000..bde893d9394 --- /dev/null +++ b/eclipse.platform.releng/features/build.properties @@ -0,0 +1 @@ +pom.model.artifactId = releng-features diff --git a/eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml b/eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml deleted file mode 100644 index 7190ff01092..00000000000 --- a/eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - 4.0.0 - - eclipse.platform.releng - eclipse.platform.releng - 4.36.0-SNAPSHOT - ../../ - - org.eclipse.help.feature - org.eclipse.help - org.eclipse.help.feature - 2.3.2200-SNAPSHOT - eclipse-feature - - - - org.eclipse.tycho - tycho-source-plugin - - - package - feature-source - - feature-source - - - - - - org.eclipse.tycho - tycho-p2-plugin - - - attach-p2-metadata - package - - p2-metadata - - - - - - - diff --git a/eclipse.platform.releng/features/org.eclipse.rcp/pom.xml b/eclipse.platform.releng/features/org.eclipse.rcp/pom.xml deleted file mode 100644 index 999aa06c27d..00000000000 --- a/eclipse.platform.releng/features/org.eclipse.rcp/pom.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - 4.0.0 - - eclipse.platform.releng - eclipse.platform.releng - 4.36.0-SNAPSHOT - ../../ - - org.eclipse.rcp.feature - org.eclipse.rcp - org.eclipse.rcp.feature - eclipse-feature - - - - org.eclipse.tycho - tycho-source-plugin - - - package - feature-source - - feature-source - - - - - - - - - - - org.eclipse.tycho - tycho-p2-plugin - - - attach-p2-metadata - package - - p2-metadata - - - - - - - diff --git a/eclipse.platform.releng/features/org.eclipse.sdk.examples-feature/pom.xml b/eclipse.platform.releng/features/org.eclipse.sdk.examples-feature/pom.xml deleted file mode 100644 index 4ed70779a83..00000000000 --- a/eclipse.platform.releng/features/org.eclipse.sdk.examples-feature/pom.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - 4.0.0 - - eclipse.platform.releng - eclipse.platform.releng - 4.36.0-SNAPSHOT - ../../ - - org.eclipse.sdk.feature - org.eclipse.sdk.examples - org.eclipse.sdk.examples.feature - eclipse-feature - - - - - org.eclipse.tycho - tycho-source-plugin - - - package - feature-source - - feature-source - - - - - - - - - - - - org.eclipse.tycho - tycho-p2-plugin - - - attach-p2-metadata - package - - p2-metadata - - - - - - - diff --git a/eclipse.platform.releng/features/org.eclipse.sdk.tests/pom.xml b/eclipse.platform.releng/features/org.eclipse.sdk.tests/pom.xml deleted file mode 100644 index 33b3859b463..00000000000 --- a/eclipse.platform.releng/features/org.eclipse.sdk.tests/pom.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - 4.0.0 - - eclipse.platform.releng - eclipse.platform.releng - 4.36.0-SNAPSHOT - ../../ - - org.eclipse.sdk.feature - org.eclipse.sdk.tests - org.eclipse.sdk.tests.feature - eclipse-feature - - diff --git a/eclipse.platform.releng/features/org.eclipse.sdk/pom.xml b/eclipse.platform.releng/features/org.eclipse.sdk/pom.xml deleted file mode 100644 index 76820b25c2a..00000000000 --- a/eclipse.platform.releng/features/org.eclipse.sdk/pom.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - 4.0.0 - - eclipse.platform.releng - eclipse.platform.releng - 4.36.0-SNAPSHOT - ../../ - - org.eclipse.sdk.feature - org.eclipse.sdk - org.eclipse.sdk.feature - eclipse-feature - diff --git a/eclipse.platform.releng/features/org.eclipse.test-feature/pom.xml b/eclipse.platform.releng/features/org.eclipse.test-feature/pom.xml deleted file mode 100644 index b9b6a3441b7..00000000000 --- a/eclipse.platform.releng/features/org.eclipse.test-feature/pom.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - 4.0.0 - - eclipse.platform.releng - eclipse.platform.releng - 4.36.0-SNAPSHOT - ../../ - - org.eclipse.test.feature - org.eclipse.test - org.eclipse.test.feature - 3.9.200-SNAPSHOT - eclipse-feature - diff --git a/eclipse.platform.releng/pom.xml b/eclipse.platform.releng/pom.xml index d509074013d..ab85d6b1679 100644 --- a/eclipse.platform.releng/pom.xml +++ b/eclipse.platform.releng/pom.xml @@ -47,25 +47,49 @@ + + generate-feature-source + + + feature.xml + + + + + + org.eclipse.tycho + tycho-source-plugin + + + feature-source + + feature-source + + package + + + + + org.eclipse.tycho + tycho-p2-plugin + + + attach-p2-metadata + + p2-metadata + + package + + + + + + - bundles/org.eclipse.ant.optional.junit - bundles/org.eclipse.rcp - bundles/org.eclipse.releng.tests - bundles/org.eclipse.sdk.examples - bundles/org.eclipse.sdk.tests - bundles/org.eclipse.test - bundles/org.eclipse.test.performance - bundles/org.eclipse.test.performance.win32 - - features/org.eclipse.help-feature - features/org.eclipse.platform-feature - features/org.eclipse.rcp - features/org.eclipse.sdk - features/org.eclipse.sdk.examples-feature - features/org.eclipse.sdk.tests - features/org.eclipse.test-feature + bundles + features