mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-06-07 09:46:02 +02:00
Clean up Maven build (#662)
* remove invalid tycho resolver config (not valid since many versions) * fix PMD plugin configuration (config attribute was renamed in 3.18) * remove duplicate versions already managed in pluginManagement section * fix indentation * move all not yet configured versions into pluginManagement of the parent module to avoid further duplication * consume the target platform as file, not as maven artifact (this simplifies building a single module A LOT) * remove invalid tycho-source-plugin configuration * disable tycho consumer POM generation (not needed here, and avoids a warning in each module) * remove prerequisites. that's for maven plugins only, and this POM already contains the better suited similar maven enforcer rule * enforce UTF-8 for javadoc generation (the build fails on Windows otherwise, trying to read some Japanese? characters with the Windows default encoding)
This commit is contained in:
Michael Keppler
GitHub
parent
37ff19400f
commit
d4102ca82f
44 changed files with 123 additions and 212 deletions
|
|
@ -30,7 +30,6 @@
|
|||
<plugin>
|
||||
<groupId>org.eclipse.tycho</groupId>
|
||||
<artifactId>tycho-source-plugin</artifactId>
|
||||
<version>${tycho-version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>plugin-source</id>
|
||||
|
|
@ -57,7 +56,6 @@
|
|||
<plugin>
|
||||
<groupId>org.eclipse.tycho.extras</groupId>
|
||||
<artifactId>tycho-eclipserun-plugin</artifactId>
|
||||
<version>${tycho-version}</version>
|
||||
<configuration>
|
||||
<applicationArgs>
|
||||
<arg>-application</arg>
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@
|
|||
<plugin>
|
||||
<groupId>org.eclipse.tycho</groupId>
|
||||
<artifactId>tycho-source-plugin</artifactId>
|
||||
<version>${tycho-version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>plugin-source</id>
|
||||
|
|
@ -57,7 +56,6 @@
|
|||
<plugin>
|
||||
<groupId>org.eclipse.tycho.extras</groupId>
|
||||
<artifactId>tycho-eclipserun-plugin</artifactId>
|
||||
<version>${tycho-version}</version>
|
||||
<configuration>
|
||||
<applicationArgs>
|
||||
<arg>-application</arg>
|
||||
|
|
|
|||
|
|
@ -24,13 +24,12 @@
|
|||
<artifactId>org.eclipse.cdt.meson.ui.tests</artifactId>
|
||||
<version>1.0.1-SNAPSHOT</version>
|
||||
<packaging>eclipse-test-plugin</packaging>
|
||||
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.eclipse.tycho</groupId>
|
||||
<artifactId>target-platform-configuration</artifactId>
|
||||
<version>${tycho-version}</version>
|
||||
<configuration>
|
||||
<dependency-resolution>
|
||||
<extraRequirements>
|
||||
|
|
|
|||
|
|
@ -27,7 +27,6 @@
|
|||
-->
|
||||
|
||||
<modules>
|
||||
<module>../../releng/org.eclipse.cdt.target</module>
|
||||
<module>../../jsoncdb</module>
|
||||
<module>..</module>
|
||||
</modules>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
|||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: %Bundle-Name
|
||||
Bundle-SymbolicName: org.eclipse.cdt.codan.core;singleton:=true
|
||||
Bundle-Version: 4.2.0.qualifier
|
||||
Bundle-Version: 4.2.100.qualifier
|
||||
Bundle-Activator: org.eclipse.cdt.codan.core.CodanCorePlugin
|
||||
Bundle-Vendor: %Bundle-Vendor
|
||||
Require-Bundle: org.eclipse.core.runtime,
|
||||
|
|
|
|||
|
|
@ -30,9 +30,7 @@
|
|||
<plugin>
|
||||
<groupId>org.eclipse.tycho</groupId>
|
||||
<artifactId>target-platform-configuration</artifactId>
|
||||
<version>${tycho-version}</version>
|
||||
<configuration>
|
||||
<resolver>p2</resolver>
|
||||
<pomDependencies>consider</pomDependencies>
|
||||
<environments>
|
||||
<environment>
|
||||
|
|
@ -46,7 +44,6 @@
|
|||
<plugin>
|
||||
<groupId>org.eclipse.tycho</groupId>
|
||||
<artifactId>tycho-source-plugin</artifactId>
|
||||
<version>${tycho-version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>plugin-source</id>
|
||||
|
|
|
|||
|
|
@ -30,9 +30,7 @@
|
|||
<plugin>
|
||||
<groupId>org.eclipse.tycho</groupId>
|
||||
<artifactId>target-platform-configuration</artifactId>
|
||||
<version>${tycho-version}</version>
|
||||
<configuration>
|
||||
<resolver>p2</resolver>
|
||||
<pomDependencies>consider</pomDependencies>
|
||||
<environments>
|
||||
<environment>
|
||||
|
|
@ -46,7 +44,6 @@
|
|||
<plugin>
|
||||
<groupId>org.eclipse.tycho</groupId>
|
||||
<artifactId>tycho-source-plugin</artifactId>
|
||||
<version>${tycho-version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>plugin-source</id>
|
||||
|
|
|
|||
|
|
@ -30,9 +30,7 @@
|
|||
<plugin>
|
||||
<groupId>org.eclipse.tycho</groupId>
|
||||
<artifactId>target-platform-configuration</artifactId>
|
||||
<version>${tycho-version}</version>
|
||||
<configuration>
|
||||
<resolver>p2</resolver>
|
||||
<pomDependencies>consider</pomDependencies>
|
||||
<environments>
|
||||
<environment>
|
||||
|
|
@ -46,7 +44,6 @@
|
|||
<plugin>
|
||||
<groupId>org.eclipse.tycho</groupId>
|
||||
<artifactId>tycho-source-plugin</artifactId>
|
||||
<version>${tycho-version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>plugin-source</id>
|
||||
|
|
|
|||
|
|
@ -30,9 +30,7 @@
|
|||
<plugin>
|
||||
<groupId>org.eclipse.tycho</groupId>
|
||||
<artifactId>target-platform-configuration</artifactId>
|
||||
<version>${tycho-version}</version>
|
||||
<configuration>
|
||||
<resolver>p2</resolver>
|
||||
<pomDependencies>consider</pomDependencies>
|
||||
<environments>
|
||||
<environment>
|
||||
|
|
|
|||
|
|
@ -30,9 +30,7 @@
|
|||
<plugin>
|
||||
<groupId>org.eclipse.tycho</groupId>
|
||||
<artifactId>target-platform-configuration</artifactId>
|
||||
<version>${tycho-version}</version>
|
||||
<configuration>
|
||||
<resolver>p2</resolver>
|
||||
<pomDependencies>consider</pomDependencies>
|
||||
<environments>
|
||||
<environment>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
|||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: %pluginName
|
||||
Bundle-SymbolicName: org.eclipse.cdt.core.native;singleton:=true
|
||||
Bundle-Version: 6.3.200.qualifier
|
||||
Bundle-Version: 6.3.300.qualifier
|
||||
Bundle-Activator: org.eclipse.cdt.internal.core.natives.CNativePlugin
|
||||
Bundle-Vendor: %providerName
|
||||
Bundle-Localization: plugin
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<version>6.3.200-SNAPSHOT</version>
|
||||
<version>6.3.300-SNAPSHOT</version>
|
||||
<artifactId>org.eclipse.cdt.core.native</artifactId>
|
||||
<packaging>eclipse-plugin</packaging>
|
||||
|
||||
|
|
|
|||
|
|
@ -48,7 +48,6 @@
|
|||
<plugin>
|
||||
<groupId>org.eclipse.tycho</groupId>
|
||||
<artifactId>tycho-surefire-plugin</artifactId>
|
||||
<version>${tycho-version}</version>
|
||||
<configuration>
|
||||
<useUIHarness>false</useUIHarness>
|
||||
<!-- Core tests actually use eclipse.ui classes, see CProjectHelper -->
|
||||
|
|
|
|||
|
|
@ -30,9 +30,7 @@
|
|||
<plugin>
|
||||
<groupId>org.eclipse.tycho</groupId>
|
||||
<artifactId>target-platform-configuration</artifactId>
|
||||
<version>${tycho-version}</version>
|
||||
<configuration>
|
||||
<resolver>p2</resolver>
|
||||
<pomDependencies>consider</pomDependencies>
|
||||
<environments>
|
||||
<environment>
|
||||
|
|
@ -46,7 +44,6 @@
|
|||
<plugin>
|
||||
<groupId>org.eclipse.tycho</groupId>
|
||||
<artifactId>tycho-source-plugin</artifactId>
|
||||
<version>${tycho-version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>plugin-source</id>
|
||||
|
|
|
|||
|
|
@ -30,9 +30,7 @@
|
|||
<plugin>
|
||||
<groupId>org.eclipse.tycho</groupId>
|
||||
<artifactId>target-platform-configuration</artifactId>
|
||||
<version>${tycho-version}</version>
|
||||
<configuration>
|
||||
<resolver>p2</resolver>
|
||||
<pomDependencies>consider</pomDependencies>
|
||||
<environments>
|
||||
<environment>
|
||||
|
|
|
|||
|
|
@ -70,7 +70,6 @@
|
|||
<plugin>
|
||||
<groupId>org.eclipse.tycho</groupId>
|
||||
<artifactId>tycho-surefire-plugin</artifactId>
|
||||
<version>${tycho-version}</version>
|
||||
<configuration>
|
||||
<useUIHarness>true</useUIHarness>
|
||||
<useUIThread>true</useUIThread>
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@
|
|||
<plugin>
|
||||
<groupId>org.eclipse.tycho</groupId>
|
||||
<artifactId>tycho-source-plugin</artifactId>
|
||||
<version>${tycho-version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>plugin-source</id>
|
||||
|
|
@ -57,7 +56,6 @@
|
|||
<plugin>
|
||||
<groupId>org.eclipse.tycho.extras</groupId>
|
||||
<artifactId>tycho-eclipserun-plugin</artifactId>
|
||||
<version>${tycho-version}</version>
|
||||
<configuration>
|
||||
<applicationArgs>
|
||||
<arg>-application</arg>
|
||||
|
|
|
|||
|
|
@ -36,7 +36,6 @@
|
|||
<plugin>
|
||||
<groupId>org.eclipse.tycho</groupId>
|
||||
<artifactId>tycho-p2-director-plugin</artifactId>
|
||||
<version>${tycho-version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>materialize-products</id>
|
||||
|
|
@ -65,9 +64,7 @@
|
|||
<plugin>
|
||||
<groupId>org.eclipse.tycho</groupId>
|
||||
<artifactId>target-platform-configuration</artifactId>
|
||||
<version>${tycho-version}</version>
|
||||
<configuration>
|
||||
<resolver>p2</resolver>
|
||||
<pomDependencies>consider</pomDependencies>
|
||||
<environments>
|
||||
<environment>
|
||||
|
|
@ -109,7 +106,6 @@
|
|||
<plugin>
|
||||
<groupId>org.eclipse.tycho</groupId>
|
||||
<artifactId>tycho-p2-director-plugin</artifactId>
|
||||
<version>${tycho-version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>materialize-products</id>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
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
|
||||
-->
|
||||
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
|
||||
|
|
@ -29,7 +29,6 @@
|
|||
<plugin>
|
||||
<groupId>org.eclipse.tycho</groupId>
|
||||
<artifactId>tycho-surefire-plugin</artifactId>
|
||||
<version>${tycho-version}</version>
|
||||
<configuration>
|
||||
<useUIHarness>true</useUIHarness>
|
||||
<useUIThread>false</useUIThread>
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@
|
|||
<plugin>
|
||||
<groupId>org.eclipse.tycho</groupId>
|
||||
<artifactId>tycho-source-plugin</artifactId>
|
||||
<version>${tycho-version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>plugin-source</id>
|
||||
|
|
@ -58,7 +57,6 @@
|
|||
<plugin>
|
||||
<groupId>org.eclipse.tycho.extras</groupId>
|
||||
<artifactId>tycho-eclipserun-plugin</artifactId>
|
||||
<version>${tycho-version}</version>
|
||||
<configuration>
|
||||
<applicationArgs>
|
||||
<arg>-application</arg>
|
||||
|
|
@ -101,7 +99,6 @@
|
|||
<plugin>
|
||||
<groupId>org.eclipse.tycho.extras</groupId>
|
||||
<artifactId>tycho-document-bundle-plugin</artifactId>
|
||||
<version>${tycho-version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>eclipse-javadoc</id>
|
||||
|
|
@ -112,7 +109,7 @@
|
|||
<configuration>
|
||||
<outputDirectory>${project.basedir}/reference/api
|
||||
</outputDirectory>
|
||||
<javadocOptions>
|
||||
<javadocOptions combine.children="append">
|
||||
<excludes>
|
||||
<exclude>org.eclipse.cdt.internal.*</exclude>
|
||||
</excludes>
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@
|
|||
<plugin>
|
||||
<groupId>org.eclipse.tycho</groupId>
|
||||
<artifactId>tycho-source-plugin</artifactId>
|
||||
<version>${tycho-version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>plugin-source</id>
|
||||
|
|
@ -43,7 +42,7 @@
|
|||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
|
||||
<profiles>
|
||||
<profile>
|
||||
<id>build-doc</id>
|
||||
|
|
@ -57,7 +56,6 @@
|
|||
<plugin>
|
||||
<groupId>org.eclipse.tycho.extras</groupId>
|
||||
<artifactId>tycho-eclipserun-plugin</artifactId>
|
||||
<version>${tycho-version}</version>
|
||||
<configuration>
|
||||
<applicationArgs>
|
||||
<arg>-application</arg>
|
||||
|
|
|
|||
|
|
@ -63,7 +63,6 @@
|
|||
<plugin>
|
||||
<groupId>org.eclipse.tycho</groupId>
|
||||
<artifactId>tycho-surefire-plugin</artifactId>
|
||||
<version>${tycho-version}</version>
|
||||
<configuration>
|
||||
<useUIHarness>false</useUIHarness>
|
||||
<argLine>${tycho.testArgLine} ${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -Dcdt.tests.dsf.gdb.path=${dsf.gdb.tests.gdbPath} -Ddsf.gdb.tests.timeout.multiplier=${dsf.gdb.tests.timeout.multiplier} -Dcdt.tests.dsf.gdb.versions=${cdt.tests.dsf.gdb.versions}</argLine>
|
||||
|
|
|
|||
|
|
@ -27,7 +27,6 @@
|
|||
-->
|
||||
|
||||
<modules>
|
||||
<module>../../releng/org.eclipse.cdt.target</module>
|
||||
<module>..</module>
|
||||
</modules>
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -63,7 +63,6 @@
|
|||
<plugin>
|
||||
<groupId>org.eclipse.tycho</groupId>
|
||||
<artifactId>tycho-surefire-plugin</artifactId>
|
||||
<version>${tycho-version}</version>
|
||||
<configuration>
|
||||
<useUIHarness>false</useUIHarness>
|
||||
<argLine>${tycho.testArgLine} ${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -Dcdt.tests.dsf.gdb.path=${dsf.gdb.tests.gdbPath} -Ddsf.gdb.tests.timeout.multiplier=${dsf.gdb.tests.timeout.multiplier} -Dcdt.tests.dsf.gdb.versions=${cdt.tests.dsf.gdb.versions}</argLine>
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@
|
|||
<plugin>
|
||||
<groupId>org.eclipse.tycho</groupId>
|
||||
<artifactId>tycho-source-plugin</artifactId>
|
||||
<version>${tycho-version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>plugin-source</id>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
|||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: %pluginName
|
||||
Bundle-SymbolicName: org.eclipse.launchbar.core;singleton:=true
|
||||
Bundle-Version: 2.5.100.qualifier
|
||||
Bundle-Version: 2.5.200.qualifier
|
||||
Bundle-Activator: org.eclipse.launchbar.core.internal.Activator
|
||||
Bundle-Vendor: %providerName
|
||||
Require-Bundle: org.eclipse.core.runtime,
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
|||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: %pluginName
|
||||
Bundle-SymbolicName: org.eclipse.launchbar.ui.controls;singleton:=true
|
||||
Bundle-Version: 1.2.300.qualifier
|
||||
Bundle-Version: 1.2.400.qualifier
|
||||
Bundle-Activator: org.eclipse.launchbar.ui.controls.internal.Activator
|
||||
Bundle-Vendor: %providerName
|
||||
Require-Bundle: org.eclipse.osgi.services;bundle-version="3.5.0",
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
|||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: %pluginName
|
||||
Bundle-SymbolicName: org.eclipse.launchbar.ui;singleton:=true
|
||||
Bundle-Version: 2.5.200.qualifier
|
||||
Bundle-Version: 2.5.300.qualifier
|
||||
Bundle-Activator: org.eclipse.launchbar.ui.internal.Activator
|
||||
Bundle-Vendor: %providerName
|
||||
Require-Bundle: org.eclipse.core.runtime,
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
|||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: %pluginName
|
||||
Bundle-SymbolicName: org.eclipse.cdt.debug.ui.memory.transport;singleton:=true
|
||||
Bundle-Version: 2.3.200.qualifier
|
||||
Bundle-Version: 2.3.300.qualifier
|
||||
Bundle-Localization: plugin
|
||||
Bundle-Vendor: %providerName
|
||||
Require-Bundle: org.eclipse.cdt.debug.core.memory;bundle-version="0.1.0",
|
||||
|
|
|
|||
185
pom.xml
185
pom.xml
|
|
@ -14,10 +14,6 @@
|
|||
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<prerequisites>
|
||||
<maven>${required-maven-version}</maven>
|
||||
</prerequisites>
|
||||
|
||||
<groupId>org.eclipse.cdt</groupId>
|
||||
<artifactId>cdt-parent</artifactId>
|
||||
<version>11.5.0-SNAPSHOT</version>
|
||||
|
|
@ -82,13 +78,13 @@
|
|||
<license>
|
||||
<name>Eclipse Public License 2.0</name>
|
||||
<comments>
|
||||
|
||||
|
||||
|
||||
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
|
||||
</comments>
|
||||
</license>
|
||||
|
|
@ -138,7 +134,7 @@
|
|||
<module>core/org.eclipse.cdt.core.macosx</module>
|
||||
<module>core/org.eclipse.cdt.core</module>
|
||||
<module>core/org.eclipse.cdt.ui</module>
|
||||
|
||||
|
||||
<module>cross/org.eclipse.cdt.build.crossgcc</module>
|
||||
<module>cross/org.eclipse.cdt.build.crossgcc-feature</module>
|
||||
<module>cross/org.eclipse.cdt.launch.remote</module>
|
||||
|
|
@ -161,7 +157,7 @@
|
|||
|
||||
<module>doc/org.eclipse.cdt.doc.user</module>
|
||||
<module>doc/org.eclipse.cdt.doc.isv</module>
|
||||
|
||||
|
||||
<module>dsf/org.eclipse.cdt.dsf</module>
|
||||
<module>dsf/org.eclipse.cdt.dsf.ui</module>
|
||||
<module>dsf/org.eclipse.cdt.examples.dsf</module>
|
||||
|
|
@ -284,7 +280,6 @@
|
|||
<module>releng/org.eclipse.cdt-feature</module>
|
||||
<module>releng/org.eclipse.cdt.sdk</module>
|
||||
<module>releng/org.eclipse.cdt.sdk-feature</module>
|
||||
<module>releng/org.eclipse.cdt.target</module>
|
||||
<module>releng/org.eclipse.cdt.repo</module>
|
||||
|
||||
<module>build/org.eclipse.cdt.managedbuilder.core.tests</module>
|
||||
|
|
@ -382,12 +377,7 @@
|
|||
<version>${tycho-version}</version>
|
||||
<configuration>
|
||||
<target>
|
||||
<artifact>
|
||||
<groupId>org.eclipse.cdt</groupId>
|
||||
<artifactId>org.eclipse.cdt.target</artifactId>
|
||||
<classifier>${target-platform}</classifier>
|
||||
<version>1.0.0</version>
|
||||
</artifact>
|
||||
<file>${maven.multiModuleProjectDirectory}/releng/org.eclipse.cdt.target/cdt.target</file>
|
||||
</target>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
|
@ -679,7 +669,6 @@
|
|||
<artifactId>target-platform-configuration</artifactId>
|
||||
<version>${tycho-version}</version>
|
||||
<configuration>
|
||||
<resolver>p2</resolver>
|
||||
<pomDependencies>consider</pomDependencies>
|
||||
<environments>
|
||||
<environment>
|
||||
|
|
@ -727,9 +716,6 @@
|
|||
<plugin>
|
||||
<groupId>org.eclipse.tycho</groupId>
|
||||
<artifactId>tycho-source-plugin</artifactId>
|
||||
<configuration>
|
||||
<encoding>UTF-8</encoding>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>attach-source</id>
|
||||
|
|
@ -877,6 +863,13 @@
|
|||
<version>${tycho-version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<executions>
|
||||
<execution>
|
||||
<!-- disable default consumer pom. not needed here, and it shows a warning for each module -->
|
||||
<id>default-update-consumer-pom</id>
|
||||
<phase>none</phase>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.eclipse.tycho</groupId>
|
||||
|
|
@ -965,7 +958,7 @@
|
|||
<artifactId>maven-pmd-plugin</artifactId>
|
||||
<version>3.20.0</version>
|
||||
<configuration>
|
||||
<sourceEncoding>utf-8</sourceEncoding>
|
||||
<inputEncoding>utf-8</inputEncoding>
|
||||
<minimumTokens>100</minimumTokens>
|
||||
<targetJdk>11</targetJdk>
|
||||
<format>xml</format>
|
||||
|
|
@ -980,70 +973,94 @@
|
|||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.eclipse.tycho.extras</groupId>
|
||||
<artifactId>tycho-eclipserun-plugin</artifactId>
|
||||
<version>${tycho-version}</version>
|
||||
<configuration>
|
||||
<applicationArgs>
|
||||
<arg>-application</arg>
|
||||
<arg>org.eclipse.ant.core.antRunner</arg>
|
||||
<arg>-buildfile</arg>
|
||||
<arg>customBuildCallbacks.xml</arg>
|
||||
<arg>build.index</arg>
|
||||
</applicationArgs>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<artifactId>org.apache.ant</artifactId>
|
||||
<type>eclipse-plugin</type>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<artifactId>org.eclipse.help.base</artifactId>
|
||||
<type>eclipse-plugin</type>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<artifactId>org.eclipse.ant.core</artifactId>
|
||||
<type>eclipse-plugin</type>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<!-- This needs to be explicitely set now, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=395281 -->
|
||||
<repositories>
|
||||
<repository>
|
||||
<id>platform</id>
|
||||
<layout>p2</layout>
|
||||
<url>${help-docs-eclipserun-repo}</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
<goal>eclipse-run</goal>
|
||||
</goals>
|
||||
<phase>compile</phase>
|
||||
<configuration>
|
||||
<executionEnvironment>JavaSE-17</executionEnvironment>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.eclipse.tycho</groupId>
|
||||
<artifactId>tycho-gpg-plugin</artifactId>
|
||||
<version>${tycho-version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>pgpsigner</id>
|
||||
<goals>
|
||||
<goal>sign-p2-artifacts</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<keyname>4F23165B6AC51B15</keyname>
|
||||
<skipIfJarsigned>false</skipIfJarsigned>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<groupId>org.eclipse.tycho.extras</groupId>
|
||||
<artifactId>tycho-eclipserun-plugin</artifactId>
|
||||
<version>${tycho-version}</version>
|
||||
<configuration>
|
||||
<applicationArgs>
|
||||
<arg>-application</arg>
|
||||
<arg>org.eclipse.ant.core.antRunner</arg>
|
||||
<arg>-buildfile</arg>
|
||||
<arg>customBuildCallbacks.xml</arg>
|
||||
<arg>build.index</arg>
|
||||
</applicationArgs>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<artifactId>org.apache.ant</artifactId>
|
||||
<type>eclipse-plugin</type>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<artifactId>org.eclipse.help.base</artifactId>
|
||||
<type>eclipse-plugin</type>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<artifactId>org.eclipse.ant.core</artifactId>
|
||||
<type>eclipse-plugin</type>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<!-- This needs to be explicitely set now, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=395281 -->
|
||||
<repositories>
|
||||
<repository>
|
||||
<id>platform</id>
|
||||
<layout>p2</layout>
|
||||
<url>${help-docs-eclipserun-repo}</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
<goal>eclipse-run</goal>
|
||||
</goals>
|
||||
<phase>compile</phase>
|
||||
<configuration>
|
||||
<executionEnvironment>JavaSE-17</executionEnvironment>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.eclipse.tycho</groupId>
|
||||
<artifactId>tycho-gpg-plugin</artifactId>
|
||||
<version>${tycho-version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>pgpsigner</id>
|
||||
<goals>
|
||||
<goal>sign-p2-artifacts</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<keyname>4F23165B6AC51B15</keyname>
|
||||
<skipIfJarsigned>false</skipIfJarsigned>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.eclipse.tycho.extras</groupId>
|
||||
<artifactId>tycho-document-bundle-plugin</artifactId>
|
||||
<version>${tycho-version}</version>
|
||||
<configuration>
|
||||
<javadocOptions>
|
||||
<encoding>UTF-8</encoding>
|
||||
</javadocOptions>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.eclipse.tycho</groupId>
|
||||
<artifactId>tycho-p2-director-plugin</artifactId>
|
||||
<version>${tycho-version}</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.eclipse.tycho</groupId>
|
||||
<artifactId>tycho-p2-repository-plugin</artifactId>
|
||||
<version>${tycho-version}</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
<artifactId>build-helper-maven-plugin</artifactId>
|
||||
<version>3.4.0</version>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</pluginManagement>
|
||||
</build>
|
||||
|
|
|
|||
|
|
@ -1,56 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!--
|
||||
Copyright (c) 2014, 2021 Contributors to the Eclipse Foundation
|
||||
|
||||
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
|
||||
-->
|
||||
<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/maven-v4_0_0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<parent>
|
||||
<groupId>org.eclipse.cdt</groupId>
|
||||
<artifactId>cdt-parent</artifactId>
|
||||
<version>11.5.0-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<groupId>org.eclipse.cdt</groupId>
|
||||
<artifactId>org.eclipse.cdt.target</artifactId>
|
||||
<version>1.0.0</version>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
<artifactId>build-helper-maven-plugin</artifactId>
|
||||
<version>3.4.0</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>attach-artifacts</id>
|
||||
<phase>package</phase>
|
||||
<goals>
|
||||
<goal>attach-artifact</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<artifacts>
|
||||
<artifact>
|
||||
<file>cdt.target</file>
|
||||
<type>target</type>
|
||||
<classifier>cdt</classifier>
|
||||
</artifact>
|
||||
</artifacts>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
||||
|
|
@ -30,7 +30,6 @@
|
|||
<plugin>
|
||||
<groupId>org.eclipse.tycho</groupId>
|
||||
<artifactId>tycho-source-plugin</artifactId>
|
||||
<version>${tycho-version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>plugin-source</id>
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@
|
|||
<plugin>
|
||||
<groupId>org.eclipse.tycho</groupId>
|
||||
<artifactId>tycho-source-plugin</artifactId>
|
||||
<version>${tycho-version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>plugin-source</id>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@
|
|||
<plugin>
|
||||
<groupId>org.eclipse.tycho</groupId>
|
||||
<artifactId>tycho-source-plugin</artifactId>
|
||||
<version>${tycho-version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>plugin-source</id>
|
||||
|
|
@ -47,7 +46,6 @@
|
|||
<plugin>
|
||||
<groupId>org.eclipse.tycho.extras</groupId>
|
||||
<artifactId>tycho-document-bundle-plugin</artifactId>
|
||||
<version>${tycho-version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>eclipse-javadoc</id>
|
||||
|
|
@ -58,7 +56,7 @@
|
|||
<configuration>
|
||||
<outputDirectory>${project.basedir}/html/reference/api
|
||||
</outputDirectory>
|
||||
<javadocOptions>
|
||||
<javadocOptions combine.children="append">
|
||||
<includes>
|
||||
<include>org.eclipse.cdt.remote.*</include>
|
||||
<include>org.eclipse.remote.*</include>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
|||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: %pluginName
|
||||
Bundle-SymbolicName: org.eclipse.remote.proxy.protocol.core;singleton:=true
|
||||
Bundle-Version: 2.1.0.qualifier
|
||||
Bundle-Version: 2.1.100.qualifier
|
||||
Bundle-Activator: org.eclipse.remote.internal.proxy.protocol.core.Activator
|
||||
Bundle-Vendor: %pluginProvider
|
||||
Bundle-ActivationPolicy: lazy
|
||||
|
|
|
|||
|
|
@ -13,13 +13,12 @@
|
|||
<artifactId>org.eclipse.remote.proxy.server.product</artifactId>
|
||||
<version>1.0.100</version>
|
||||
<packaging>eclipse-repository</packaging>
|
||||
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.eclipse.tycho</groupId>
|
||||
<artifactId>tycho-p2-repository-plugin</artifactId>
|
||||
<version>${tycho-version}</version>
|
||||
<configuration>
|
||||
<createArtifactRepository>false</createArtifactRepository>
|
||||
<includeAllDependencies>true</includeAllDependencies>
|
||||
|
|
@ -39,7 +38,6 @@
|
|||
<plugin>
|
||||
<groupId>org.eclipse.tycho</groupId>
|
||||
<artifactId>tycho-p2-director-plugin</artifactId>
|
||||
<version>${tycho-version}</version>
|
||||
<configuration>
|
||||
<formats>
|
||||
<win32>zip</win32>
|
||||
|
|
@ -81,7 +79,6 @@
|
|||
<plugin>
|
||||
<groupId>org.eclipse.tycho</groupId>
|
||||
<artifactId>tycho-p2-director-plugin</artifactId>
|
||||
<version>${tycho-version}</version>
|
||||
<configuration>
|
||||
<formats>
|
||||
<win32>zip</win32>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
|||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: %pluginName
|
||||
Bundle-SymbolicName: org.eclipse.tm.terminal.connector.ssh;singleton:=true
|
||||
Bundle-Version: 4.8.100.qualifier
|
||||
Bundle-Version: 4.8.200.qualifier
|
||||
Bundle-Activator: org.eclipse.tm.terminal.connector.ssh.activator.UIPlugin
|
||||
Bundle-Vendor: %providerName
|
||||
Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400",
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
|||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: %pluginName
|
||||
Bundle-SymbolicName: org.eclipse.tm.terminal.connector.telnet;singleton:=true
|
||||
Bundle-Version: 4.8.0.qualifier
|
||||
Bundle-Version: 4.8.100.qualifier
|
||||
Bundle-Activator: org.eclipse.tm.terminal.connector.telnet.activator.UIPlugin
|
||||
Bundle-Vendor: %providerName
|
||||
Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400",
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
|||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: %pluginName
|
||||
Bundle-SymbolicName: org.eclipse.tm.terminal.control; singleton:=true
|
||||
Bundle-Version: 5.5.100.qualifier
|
||||
Bundle-Version: 5.5.200.qualifier
|
||||
Bundle-Activator: org.eclipse.tm.internal.terminal.control.impl.TerminalPlugin
|
||||
Bundle-Vendor: %providerName
|
||||
Bundle-Localization: plugin
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
|||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: %pluginName
|
||||
Bundle-SymbolicName: org.eclipse.tm.terminal.view.core;singleton:=true
|
||||
Bundle-Version: 4.10.100.qualifier
|
||||
Bundle-Version: 4.10.200.qualifier
|
||||
Bundle-Activator: org.eclipse.tm.terminal.view.core.activator.CoreBundleActivator
|
||||
Bundle-Vendor: %providerName
|
||||
Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400",
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
|||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: %pluginName
|
||||
Bundle-SymbolicName: org.eclipse.tm.terminal.view.ui;singleton:=true
|
||||
Bundle-Version: 4.11.300.qualifier
|
||||
Bundle-Version: 4.11.400.qualifier
|
||||
Bundle-Activator: org.eclipse.tm.terminal.view.ui.activator.UIPlugin
|
||||
Bundle-Vendor: %providerName
|
||||
Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400",
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
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
|
||||
-->
|
||||
|
||||
|
|
@ -34,7 +34,6 @@
|
|||
<id>only-terminal</id>
|
||||
<modules>
|
||||
<module>repo</module>
|
||||
<module>../releng/org.eclipse.cdt.target</module>
|
||||
<module>../core/org.eclipse.cdt.core.linux</module>
|
||||
<module>../core/org.eclipse.cdt.core.linux.aarch64</module>
|
||||
<module>../core/org.eclipse.cdt.core.linux.ppc64le</module>
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ Automatic-Module-Name: org.eclipse.tools.templates.ui
|
|||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: %pluginName
|
||||
Bundle-SymbolicName: org.eclipse.tools.templates.ui;singleton:=true
|
||||
Bundle-Version: 2.0.0.qualifier
|
||||
Bundle-Version: 2.0.100.qualifier
|
||||
Bundle-Activator: org.eclipse.tools.templates.ui.internal.Activator
|
||||
Require-Bundle: org.eclipse.ui,
|
||||
org.eclipse.core.runtime,
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
|||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: %plugin.name
|
||||
Bundle-SymbolicName: org.eclipse.cdt.visualizer.core;singleton:=true
|
||||
Bundle-Version: 1.2.0.qualifier
|
||||
Bundle-Version: 1.2.100.qualifier
|
||||
Bundle-Activator: org.eclipse.cdt.visualizer.core.plugin.CDTVisualizerCorePlugin
|
||||
Bundle-Vendor: %provider.name
|
||||
Require-Bundle: org.eclipse.ui,
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue