diff options
author | Marc-Andre Laperle | 2017-02-06 21:22:23 +0000 |
---|---|---|
committer | Marc-André Laperle | 2017-02-14 03:19:56 +0000 |
commit | 0046099052a16c40359b840b6f465f301fed1dd2 (patch) | |
tree | 44e44d29d71b7d385c6e2626c27bbc4396c597d7 /xlc | |
parent | f78a7306b3cf7bf2d5d05fd07d592cedec25f63a (diff) | |
download | org.eclipse.cdt-0046099052a16c40359b840b6f465f301fed1dd2.tar.gz org.eclipse.cdt-0046099052a16c40359b840b6f465f301fed1dd2.tar.xz org.eclipse.cdt-0046099052a16c40359b840b6f465f301fed1dd2.zip |
releng: Make use of Tycho POM-less functionality
This removes a lot of pom.xml from the source tree. This is using the
"POM-less" Tycho functionality.
See
https://wiki.eclipse.org/Tycho/Release_Notes/0.24#POM-less_Tycho_builds
One advantage of this is that you do not need to update the version in
the pom.xml when you change it in the MANIFEST.MF because the pom.xml is
automatically generated. This also reduces a lot of the duplicated
information and pom.xml repetition.
- Maven 3.3 and up is required.
- Only eclipse-plugins and eclipse-features can be pom-less.
Repositories, target and others still have pom.xml.
- New parent poms are added because a parent is necessary directly one
level above the plug-in/feature that will have its pom generated
- Some test plug-ins had to be renamed .test -> .tests because it's
required so that it detects that it's a test plug-in
- Some suites were renamed so that they all use the same consistent name
"AutomatedIntegrationSuite"
- Profiles were added for the more common test configurations. They are
activated by the presence of simple .properties files that only serve to
activate the correct profile. The profiles:
- One for UI tests (UI present and start in UI thread)
- One for SWTBot tests (UI present and do not start in UI thread)
Other test plug-ins that are too different are kept intact and still
have
a pom.xml
- Fragments are kept intact since they all have different target
platform configurations
Change-Id: I9d73380eb766f547830c552daf08053a30b1845c
Signed-off-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Diffstat (limited to 'xlc')
14 files changed, 34 insertions, 226 deletions
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/pom.xml b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/pom.xml deleted file mode 100644 index ddcdfd24b1e..00000000000 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/pom.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" - xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.eclipse.cdt</groupId> - <artifactId>cdt-parent</artifactId> - <version>9.3.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - - <version>1.0.0-SNAPSHOT</version> - <artifactId>org.eclipse.cdt.core.lrparser.xlc.tests</artifactId> - <packaging>eclipse-test-plugin</packaging> - - <build> - <plugins> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-surefire-plugin</artifactId> - <version>${tycho-version}</version> - <configuration> - <useUIHarness>false</useUIHarness> - <argLine>${tycho.testArgLine} ${base.test.vmargs}</argLine> - <includes> - <include>**/XlcTestSuite.*</include> - </includes> - <testFailureIgnore>true</testFailureIgnore> - </configuration> - </plugin> - </plugins> - </build> -</project> diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/suite/XlcTestSuite.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/suite/AutomatedIntegrationSuite.java index 5c03a495158..7053ab9ad37 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/suite/XlcTestSuite.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/suite/AutomatedIntegrationSuite.java @@ -17,7 +17,7 @@ import junit.framework.TestSuite; import org.eclipse.cdt.core.parser.xlc.tests.XlcExtensionsTestSuite; import org.eclipse.cdt.core.parser.xlc.tests.base.XlcLRParserTestSuite; -public class XlcTestSuite extends TestSuite { +public class AutomatedIntegrationSuite extends TestSuite { public static Test suite() { return new TestSuite() {{ diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc/pom.xml b/xlc/org.eclipse.cdt.core.lrparser.xlc/pom.xml deleted file mode 100644 index c27daea26e2..00000000000 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc/pom.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" - xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.eclipse.cdt</groupId> - <artifactId>cdt-parent</artifactId> - <version>9.3.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - - <version>5.1.0-SNAPSHOT</version> - <artifactId>org.eclipse.cdt.core.lrparser.xlc</artifactId> - <packaging>eclipse-plugin</packaging> -</project> diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/pom.xml b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/pom.xml deleted file mode 100644 index 53c351cc0fa..00000000000 --- a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/pom.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" - xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.eclipse.cdt</groupId> - <artifactId>cdt-parent</artifactId> - <version>9.3.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - - <version>5.0.100-SNAPSHOT</version> - <artifactId>org.eclipse.cdt.errorparsers.xlc.tests</artifactId> - <packaging>eclipse-test-plugin</packaging> - - <build> - <plugins> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-surefire-plugin</artifactId> - <version>${tycho-version}</version> - <configuration> - <useUIHarness>false</useUIHarness> - <argLine>${tycho.testArgLine} ${base.test.vmargs}</argLine> - <includes> - <include>**/AllXlcErrorParserTests.*</include> - </includes> - <testFailureIgnore>true</testFailureIgnore> - </configuration> - </plugin> - </plugins> - </build> -</project> diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/AllXlcErrorParserTests.java b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/AutomatedIntegrationSuite.java index 819b663f28f..bbc9c756876 100644 --- a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/AllXlcErrorParserTests.java +++ b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/AutomatedIntegrationSuite.java @@ -13,9 +13,9 @@ package org.eclipse.cdt.errorparsers.xlc.tests; import junit.framework.Test; import junit.framework.TestSuite; -public class AllXlcErrorParserTests { +public class AutomatedIntegrationSuite { public static void main(String[] args) { - junit.textui.TestRunner.run(AllXlcErrorParserTests.suite()); + junit.textui.TestRunner.run(AutomatedIntegrationSuite.suite()); } public static Test suite() { diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc/pom.xml b/xlc/org.eclipse.cdt.errorparsers.xlc/pom.xml deleted file mode 100644 index 8989b5d853e..00000000000 --- a/xlc/org.eclipse.cdt.errorparsers.xlc/pom.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" - xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.eclipse.cdt</groupId> - <artifactId>cdt-parent</artifactId> - <version>9.3.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - - <version>5.0.100-SNAPSHOT</version> - <artifactId>org.eclipse.cdt.errorparsers.xlc</artifactId> - <packaging>eclipse-plugin</packaging> -</project> diff --git a/xlc/org.eclipse.cdt.make.xlc.core/pom.xml b/xlc/org.eclipse.cdt.make.xlc.core/pom.xml deleted file mode 100644 index 1796c7cddad..00000000000 --- a/xlc/org.eclipse.cdt.make.xlc.core/pom.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" - xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.eclipse.cdt</groupId> - <artifactId>cdt-parent</artifactId> - <version>9.3.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - - <version>5.2.100-SNAPSHOT</version> - <artifactId>org.eclipse.cdt.make.xlc.core</artifactId> - <packaging>eclipse-plugin</packaging> -</project> diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlc.core/pom.xml b/xlc/org.eclipse.cdt.managedbuilder.xlc.core/pom.xml deleted file mode 100644 index dd26a822205..00000000000 --- a/xlc/org.eclipse.cdt.managedbuilder.xlc.core/pom.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" - xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.eclipse.cdt</groupId> - <artifactId>cdt-parent</artifactId> - <version>9.3.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - - <version>5.0.1-SNAPSHOT</version> - <artifactId>org.eclipse.cdt.managedbuilder.xlc.core</artifactId> - <packaging>eclipse-plugin</packaging> -</project> diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/pom.xml b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/pom.xml deleted file mode 100644 index 0a8c1bacbd4..00000000000 --- a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/pom.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" - xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.eclipse.cdt</groupId> - <artifactId>cdt-parent</artifactId> - <version>9.3.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - - <version>6.4.0-SNAPSHOT</version> - <artifactId>org.eclipse.cdt.managedbuilder.xlc.ui</artifactId> - <packaging>eclipse-plugin</packaging> -</project> diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/pom.xml b/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/pom.xml deleted file mode 100644 index 3740e2ca523..00000000000 --- a/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/pom.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" - xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.eclipse.cdt</groupId> - <artifactId>cdt-parent</artifactId> - <version>9.3.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - - <version>1.1.0-SNAPSHOT</version> - <artifactId>org.eclipse.cdt.managedbuilder.xlupc.ui</artifactId> - <packaging>eclipse-plugin</packaging> -</project> diff --git a/xlc/org.eclipse.cdt.xlc.feature/pom.xml b/xlc/org.eclipse.cdt.xlc.feature/pom.xml deleted file mode 100644 index 7cb416bc057..00000000000 --- a/xlc/org.eclipse.cdt.xlc.feature/pom.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" - xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.eclipse.cdt</groupId> - <artifactId>cdt-parent</artifactId> - <version>9.3.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - - <version>9.3.0-SNAPSHOT</version> - <artifactId>org.eclipse.cdt.xlc.feature</artifactId> - <packaging>eclipse-feature</packaging> -</project> diff --git a/xlc/org.eclipse.cdt.xlc.sdk-feature/feature-no-source.properties b/xlc/org.eclipse.cdt.xlc.sdk-feature/feature-no-source.properties new file mode 100644 index 00000000000..8c2b2f70c57 --- /dev/null +++ b/xlc/org.eclipse.cdt.xlc.sdk-feature/feature-no-source.properties @@ -0,0 +1 @@ +# This file tells the Maven build to not generate sources for this feature diff --git a/xlc/org.eclipse.cdt.xlc.sdk-feature/pom.xml b/xlc/org.eclipse.cdt.xlc.sdk-feature/pom.xml deleted file mode 100644 index 85a64f2450b..00000000000 --- a/xlc/org.eclipse.cdt.xlc.sdk-feature/pom.xml +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" - xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.eclipse.cdt</groupId> - <artifactId>cdt-parent</artifactId> - <version>9.3.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - - <groupId>org.eclipse.cdt.features</groupId> - <version>9.3.0-SNAPSHOT</version> - <artifactId>org.eclipse.cdt.xlc.sdk</artifactId> - <packaging>eclipse-feature</packaging> - - <build> - <plugins> - <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-source-feature-plugin</artifactId> - <version>${tycho-extras-version}</version> - <executions> - <execution> - <id>source-feature</id> - <phase>none</phase> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> diff --git a/xlc/pom.xml b/xlc/pom.xml new file mode 100644 index 00000000000..ec5b5c4e9b4 --- /dev/null +++ b/xlc/pom.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.eclipse.cdt</groupId> + <artifactId>cdt-parent</artifactId> + <version>9.3.0-SNAPSHOT</version> + </parent> + + <artifactId>org.eclipse.cdt.xlc-parent</artifactId> + <packaging>pom</packaging> + + <modules> + <module>org.eclipse.cdt.core.lrparser.xlc</module> + <module>org.eclipse.cdt.errorparsers.xlc</module> + <module>org.eclipse.cdt.make.xlc.core</module> + <module>org.eclipse.cdt.managedbuilder.xlc.core</module> + <module>org.eclipse.cdt.managedbuilder.xlc.ui</module> + <module>org.eclipse.cdt.managedbuilder.xlupc.ui</module> + <module>org.eclipse.cdt.xlc.feature</module> + <module>org.eclipse.cdt.xlc.sdk-feature</module> + <module>org.eclipse.cdt.errorparsers.xlc.tests</module> +<!-- + <module>org.eclipse.cdt.core.lrparser.xlc.tests</module> +--> + </modules> +</project> |