Skip to content

Adjust Maven groupId to match the actual deployment - part 2 #1957

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

Merged
merged 2 commits into from
Mar 27, 2025
Merged

Adjust Maven groupId to match the actual deployment - part 2 #1957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e9d57f
Adjust Maven groupId to match the actual deployment - part 2
HannesWell Jan 19, 2025
3e4a36d
Version bump(s) for 4.36 stream
HannesWell Mar 27, 2025
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
3 changes: 1 addition & 2 deletions binaries/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,11 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>eclipse.platform.swt</groupId>
<groupId>org.eclipse.platform</groupId>
<artifactId>eclipse.platform.swt</artifactId>
<version>4.36.0-SNAPSHOT</version>
</parent>

<groupId>org.eclipse.swt</groupId>
<artifactId>eclipse.platform.swt.binaries</artifactId>
<packaging>pom</packaging>

Expand Down
2 changes: 1 addition & 1 deletion bundles/org.eclipse.swt.tools.base/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.swt.tools.base;singleton:=true
Bundle-Version: 3.107.600.qualifier
Bundle-Version: 3.107.700.qualifier
Bundle-ManifestVersion: 2
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Expand Down
1 change: 0 additions & 1 deletion bundles/org.eclipse.swt.tools.base/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,4 @@ bin.includes = about.html,\
.
src.includes = about.html

pom.model.groupId = org.eclipse.swt
tycho.pomless.parent = ../../local-build/local-build-parent
1 change: 0 additions & 1 deletion bundles/org.eclipse.swt.tools.spies/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,4 @@ output.. = bin/
source.. = src/
src.includes = about.html

pom.model.groupId = org.eclipse.swt
tycho.pomless.parent = ../../local-build/local-build-parent
1 change: 0 additions & 1 deletion bundles/org.eclipse.swt.tools/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,4 @@ source.. = src/,\
src.includes = about.html
bin.excludes = META-INF/p2.inf

pom.model.groupId = org.eclipse.swt
tycho.pomless.parent = ../../local-build/local-build-parent
3 changes: 1 addition & 2 deletions bundles/org.eclipse.swt/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,11 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.eclipse.platform</groupId>
<artifactId>eclipse.platform.swt</artifactId>
<groupId>eclipse.platform.swt</groupId>
<version>4.36.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.swt</artifactId>
<version>3.130.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
Expand Down
2 changes: 1 addition & 1 deletion examples/org.eclipse.swt.examples.browser.demos/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin.SWTBrowserDemos.name
Bundle-SymbolicName: org.eclipse.swt.examples.browser.demos; singleton:=true
Bundle-Version: 3.108.500.qualifier
Bundle-Version: 3.108.600.qualifier
Bundle-Activator: org.eclipse.swt.examples.browser.demos.BrowserDemoPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Expand Down
1 change: 0 additions & 1 deletion examples/org.eclipse.swt.examples.browser.demos/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,4 @@ bin.includes = doc-html/,\
META-INF/
src.includes=about.html

pom.model.groupId = org.eclipse.swt
tycho.pomless.parent = ../../local-build/local-build-parent
2 changes: 1 addition & 1 deletion examples/org.eclipse.swt.examples.launcher/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin.SWTLauncherExample.name
Bundle-SymbolicName: org.eclipse.swt.examples.launcher; singleton:=true
Bundle-Version: 3.108.400.qualifier
Bundle-Version: 3.108.500.qualifier
Bundle-Activator: org.eclipse.swt.examples.launcher.LauncherPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Expand Down
1 change: 0 additions & 1 deletion examples/org.eclipse.swt.examples.launcher/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,4 @@ src.includes = about.html
source.. = src/
output.. = bin/

pom.model.groupId = org.eclipse.swt
tycho.pomless.parent = ../../local-build/local-build-parent
2 changes: 1 addition & 1 deletion examples/org.eclipse.swt.examples.ole.win32/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin.SWTOLEExample.name
Bundle-SymbolicName: org.eclipse.swt.examples.ole.win32; singleton:=true
Bundle-Version: 3.109.200.qualifier
Bundle-Version: 3.109.300.qualifier
Bundle-Activator: org.eclipse.swt.examples.ole.win32.OlePlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Expand Down
5 changes: 2 additions & 3 deletions examples/org.eclipse.swt.examples.ole.win32/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.eclipse.platform</groupId>
<artifactId>eclipse.platform.swt</artifactId>
<groupId>eclipse.platform.swt</groupId>
<version>4.36.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.swt.examples.ole.win32</artifactId>
<version>3.109.200-SNAPSHOT</version>
<version>3.109.300-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>

<build>
Expand Down
2 changes: 1 addition & 1 deletion examples/org.eclipse.swt.examples.views/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin.SWTPaintExample.name
Bundle-SymbolicName: org.eclipse.swt.examples.views;singleton:=true
Bundle-Version: 3.108.500.qualifier
Bundle-Version: 3.108.600.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime,
Expand Down
1 change: 0 additions & 1 deletion examples/org.eclipse.swt.examples.views/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,4 @@ src.includes = about.html
source.. = src/
output.. = bin/

pom.model.groupId = org.eclipse.swt
tycho.pomless.parent = ../../local-build/local-build-parent
1 change: 0 additions & 1 deletion examples/org.eclipse.swt.examples/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,4 @@ src.includes = about.html,\
source.. = src/
output.. = bin/

pom.model.groupId = org.eclipse.swt
tycho.pomless.parent = ../../local-build/local-build-parent
2 changes: 1 addition & 1 deletion local-build/local-build-parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.eclipse.platform</groupId>
<artifactId>eclipse.platform.swt</artifactId>
<groupId>eclipse.platform.swt</groupId>
<version>4.36.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
Expand Down
3 changes: 1 addition & 2 deletions local-build/org.eclipse.swt.fragments.localbuild/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,11 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.eclipse.platform</groupId>
<artifactId>eclipse.platform.swt</artifactId>
<groupId>eclipse.platform.swt</groupId>
<version>4.36.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.swt.fragments.localbuild</artifactId>
<version>3.105.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
Expand Down
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 @@ -22,7 +22,7 @@
<relativePath>../eclipse-platform-parent</relativePath>
</parent>

<groupId>eclipse.platform.swt</groupId>
<groupId>org.eclipse.platform</groupId>
<artifactId>eclipse.platform.swt</artifactId>
<packaging>pom</packaging>

Expand Down
1 change: 0 additions & 1 deletion tests/org.eclipse.swt.tests.cocoa/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ bin.includes = .,\
# Both use the same not-shareable resources and therefore cannot run in parallel.
additional.bundles = org.eclipse.swt.tests

pom.model.groupId = org.eclipse.swt
tycho.pomless.parent = ../../local-build/local-build-parent
pom.model.packaging = eclipse-test-plugin
pom.model.property.code.ignoredWarnings = ${tests.ignoredWarnings}
Expand Down
1 change: 0 additions & 1 deletion tests/org.eclipse.swt.tests.gtk/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ bin.includes = .,\
# Both use the same not-shareable resources and therefore cannot run in parallel.
additional.bundles = org.eclipse.swt.tests

pom.model.groupId = org.eclipse.swt
tycho.pomless.parent = ../../local-build/local-build-parent
pom.model.packaging = eclipse-test-plugin
pom.model.property.code.ignoredWarnings = ${tests.ignoredWarnings}
Expand Down
1 change: 0 additions & 1 deletion tests/org.eclipse.swt.tests.win32/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ bin.includes = .,\
# Both use the same not-shareable resources and therefore cannot run in parallel.
additional.bundles = org.eclipse.swt.tests

pom.model.groupId = org.eclipse.swt
tycho.pomless.parent = ../../local-build/local-build-parent
pom.model.packaging = eclipse-test-plugin
pom.model.property.code.ignoredWarnings = ${tests.ignoredWarnings}
Expand Down
3 changes: 1 addition & 2 deletions tests/org.eclipse.swt.tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,11 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.eclipse.platform</groupId>
<artifactId>eclipse.platform.swt.localbuild</artifactId>
<groupId>eclipse.platform.swt</groupId>
<version>4.36.0-SNAPSHOT</version>
<relativePath>../../local-build/local-build-parent/</relativePath>
</parent>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.swt.tests</artifactId>
<version>3.107.800-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
Expand Down
Loading