diff options
author | Alexander Kurtakov | 2018-05-30 11:10:54 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2018-05-30 11:11:08 +0000 |
commit | be993aad6aacf83e22132e03eb9ca41a577d240e (patch) | |
tree | 1b379a0a378e75a8d8b76cc494cbe1d508c8dfe6 /org.eclipse.equinox.p2.releng | |
parent | dd4d2725f12894cd21f4bbf80a185786dbff7e42 (diff) | |
download | rt.equinox.p2-be993aad6aacf83e22132e03eb9ca41a577d240e.tar.gz rt.equinox.p2-be993aad6aacf83e22132e03eb9ca41a577d240e.tar.xz rt.equinox.p2-be993aad6aacf83e22132e03eb9ca41a577d240e.zip |
Bug 535327 - Streamline maven poms hierachyI20180531-2125I20180531-2000I20180531-1245I20180531-0910
Needed so tycho-versions:set-versions works properly.
Not all modules handled properly but majority are which is good enough
for me now.
Change-Id: I62d65744ed65d083f3755aab86b925fa780092b5
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
Diffstat (limited to 'org.eclipse.equinox.p2.releng')
6 files changed, 11 insertions, 235 deletions
diff --git a/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-aggregator/.project b/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-aggregator/.project deleted file mode 100644 index 141b7adc7..000000000 --- a/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-aggregator/.project +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.equinox.p2-aggregator</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - </buildSpec> - <natures> - </natures> -</projectDescription> diff --git a/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-aggregator/pom.xml b/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-aggregator/pom.xml deleted file mode 100644 index 894e2b9fd..000000000 --- a/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-aggregator/pom.xml +++ /dev/null @@ -1,82 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright (c) 2012 Eclipse Foundation. - All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Distribution License v1.0 - which accompanies this distribution, and is available at - http://www.eclipse.org/org/documents/edl-v10.php - - Contributors: - Igor Fedorenko - initial implementation ---> -<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"> - <parent> - <artifactId>org.eclipse.equinox.p2-parent</artifactId> - <groupId>org.eclipse</groupId> - <version>4.8.0-SNAPSHOT</version> - <relativePath>../org.eclipse.equinox.p2-parent</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.eclipse</groupId> - <artifactId>org.eclipse.equinox.p2-aggregator</artifactId> - <version>4.8.0-SNAPSHOT</version> - <packaging>pom</packaging> - - <modules> - <module>../../bundles/ie.wombat.jbdiff</module> - <module>../../bundles/ie.wombat.jbdiff.test</module> - <module>../../bundles/org.eclipse.equinox.frameworkadmin</module> - <module>../../bundles/org.eclipse.equinox.frameworkadmin.equinox</module> - <module>../../bundles/org.eclipse.equinox.frameworkadmin.test</module> - <module>../../bundles/org.eclipse.equinox.p2.artifact.optimizers</module> - <module>../../bundles/org.eclipse.equinox.p2.artifact.processors</module> - <module>../../bundles/org.eclipse.equinox.p2.artifact.repository</module> - <module>../../bundles/org.eclipse.equinox.p2.console</module> - <module>../../bundles/org.eclipse.equinox.p2.core</module> - <module>../../features/org.eclipse.equinox.p2.core.feature</module> - <module>../../bundles/org.eclipse.equinox.p2.director</module> - <module>../../bundles/org.eclipse.equinox.p2.director.app</module> - <module>../../bundles/org.eclipse.equinox.p2.directorywatcher</module> - <module>../../bundles/org.eclipse.equinox.p2.discovery</module> - <module>../../bundles/org.eclipse.equinox.p2.discovery.compatibility</module> - <module>../../bundles/org.eclipse.equinox.p2.engine</module> - <module>../../bundles/org.eclipse.equinox.p2.extensionlocation</module> - <module>../../features/org.eclipse.equinox.p2.extras.feature</module> - <module>../../bundles/org.eclipse.equinox.p2.garbagecollector</module> - <module>../../bundles/org.eclipse.equinox.p2.installer</module> - <module>../../bundles/org.eclipse.equinox.p2.jarprocessor</module> - <module>../../bundles/org.eclipse.equinox.p2.metadata</module> - <module>../../bundles/org.eclipse.equinox.p2.metadata.repository</module> - <module>../../bundles/org.eclipse.equinox.p2.operations</module> - <module>../../bundles/org.eclipse.equinox.p2.publisher</module> - <module>../../bundles/org.eclipse.equinox.p2.reconciler.dropins</module> - <module>../../bundles/org.eclipse.equinox.p2.repository</module> - <module>../../bundles/org.eclipse.equinox.p2.repository.tools</module> - <module>../../bundles/org.eclipse.equinox.p2.sar</module> - <module>../../bundles/org.eclipse.equinox.p2.tests</module> -<!-- <module>../../bundles/org.eclipse.equinox.p2.tests.discovery</module>--> -<!-- <module>../../bundles/org.eclipse.equinox.p2.tests.ui</module>--> -<!-- <module>../../bundles/org.eclipse.equinox.p2.tests.verifier</module> --> -<!-- <module>../../bundles/org.eclipse.equinox.p2.testserver</module>--> - <module>../../bundles/org.eclipse.equinox.p2.touchpoint.eclipse</module> - <module>../../bundles/org.eclipse.equinox.p2.touchpoint.natives</module> - <module>../../bundles/org.eclipse.equinox.p2.transport.ecf</module> - <module>../../bundles/org.eclipse.equinox.p2.ui</module> - <module>../../bundles/org.eclipse.equinox.p2.ui.importexport</module> - <module>../../bundles/org.eclipse.equinox.p2.ui.admin</module> - <module>../../bundles/org.eclipse.equinox.p2.ui.admin.rcp</module> - <module>../../bundles/org.eclipse.equinox.p2.ui.discovery</module> - <module>../../bundles/org.eclipse.equinox.p2.ui.sdk</module> - <module>../../bundles/org.eclipse.equinox.p2.ui.sdk.scheduler</module> - <module>../../bundles/org.eclipse.equinox.p2.updatechecker</module> - <module>../../bundles/org.eclipse.equinox.p2.updatesite</module> - <module>../../bundles/org.eclipse.equinox.simpleconfigurator</module> - <module>../../bundles/org.eclipse.equinox.simpleconfigurator.manipulator</module> - <module>../../bundles/org.eclipse.equinox.p2.publisher.eclipse</module> - - <module>../../features/org.eclipse.equinox.p2.user.ui</module> - <module>../../features/org.eclipse.equinox.p2.rcp.feature</module> - <module>../../features/org.eclipse.equinox.p2.sdk</module> - <module>../../features/org.eclipse.equinox.p2.discovery.feature</module> - </modules> -</project> diff --git a/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent/.project b/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent/.project deleted file mode 100644 index 06f02164b..000000000 --- a/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent/.project +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.equinox.p2-parent</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.maven.ide.eclipse.maven2Builder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.maven.ide.eclipse.maven2Nature</nature> - </natures> -</projectDescription> diff --git a/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent/pom.xml b/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent/pom.xml deleted file mode 100644 index f5f5f2e84..000000000 --- a/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent/pom.xml +++ /dev/null @@ -1,112 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright (c) 2012 Eclipse Foundation. - All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Distribution License v1.0 - which accompanies this distribution, and is available at - http://www.eclipse.org/org/documents/edl-v10.php - - Contributors: - Igor Fedorenko - initial implementation ---> -<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</groupId> - <artifactId>eclipse-platform-parent</artifactId> - <relativePath>../../../eclipse-platform-parent</relativePath> - <version>4.8.0-SNAPSHOT</version> - </parent> - - <groupId>org.eclipse</groupId> - <artifactId>org.eclipse.equinox.p2-parent</artifactId> - <version>4.8.0-SNAPSHOT</version> - <packaging>pom</packaging> - - <properties> - <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/equinox/rt.equinox.p2.git</tycho.scmUrl> - </properties> - - <!-- - To build individual bundles, we specify a repository where to find parent pom, - in case it is not in local maven cache already - and that parent pom also has fuller individual-bundle profile - defined that is combined with this one. --> - <profiles> - <profile> - <id>build-individual-bundles</id> - <repositories> - <repository> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - <id>eclipse-hosted</id> - <url>https://repo.eclipse.org/content/repositories/eclipse/</url> - </repository> - </repositories> - </profile> - - <profile> - <id>osx</id> - <activation> - <property> - <name>java.vendor.url</name> - <value>http://www.apple.com/</value> - </property> - </activation> - <properties> - <tycho.test.jvmArgs>-Xmx800m -XX:MaxPermSize=256m -Dosgi.ws=cocoa -XstartOnFirstThread</tycho.test.jvmArgs> - <osgi.ws>cocoa</osgi.ws> - </properties> - </profile> - </profiles> - - <build> - <pluginManagement> - <plugins> - <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> - <plugin> - <groupId>org.eclipse.m2e</groupId> - <artifactId>lifecycle-mapping</artifactId> - <version>1.0.0</version> - <configuration> - <lifecycleMappingMetadata> - <pluginExecutions> - <pluginExecution> - <pluginExecutionFilter> - <groupId>org.eclipse.cbi.maven.plugins</groupId> - <artifactId>eclipse-cbi-plugin</artifactId> - <versionRange>[0.0.0,)</versionRange> - <goals> - <goal>generate-api-build-xml</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore></ignore> - </action> - </pluginExecution> - <pluginExecution> - <pluginExecutionFilter> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-eclipserun-plugin</artifactId> - <versionRange>[0.0.0,)</versionRange> - <goals> - <goal>eclipse-run</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore></ignore> - </action> - </pluginExecution> - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> -</project> diff --git a/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2.obr-aggregator/pom.xml b/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2.obr-aggregator/pom.xml index cd2df427f..52e9c7f2a 100644 --- a/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2.obr-aggregator/pom.xml +++ b/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2.obr-aggregator/pom.xml @@ -10,16 +10,15 @@ Igor Fedorenko - initial implementation --> <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"> - <parent> - <artifactId>org.eclipse.equinox.p2-parent</artifactId> - <groupId>org.eclipse</groupId> - <version>4.8.0-SNAPSHOT</version> - <relativePath>../org.eclipse.equinox.p2-parent</relativePath> - </parent> + <parent> + <groupId>org.eclipse.equinox.p2</groupId> + <artifactId>rt.equinox.p2</artifactId> + <version>4.9.0-SNAPSHOT</version> + <relativePath>../..</relativePath> + </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.eclipse</groupId> <artifactId>org.eclipse.equinox.p2.obr</artifactId> - <version>4.8.0-SNAPSHOT</version> <packaging>pom</packaging> <build> <plugins> diff --git a/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2.tests-parent/pom.xml b/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2.tests-parent/pom.xml index 044023d2f..2dd19b0a8 100644 --- a/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2.tests-parent/pom.xml +++ b/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2.tests-parent/pom.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2013 Eclipse Foundation and others. + Copyright (c) 2013, 2018 Eclipse Foundation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Distribution License v1.0 which accompanies this distribution, and is available at @@ -12,14 +12,13 @@ <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</groupId> - <artifactId>org.eclipse.equinox.p2-parent</artifactId> - <version>4.8.0-SNAPSHOT</version> - <relativePath>../org.eclipse.equinox.p2-parent</relativePath> + <groupId>org.eclipse.equinox.p2</groupId> + <artifactId>rt.equinox.p2</artifactId> + <version>4.9.0-SNAPSHOT</version> + <relativePath>../..</relativePath> </parent> <groupId>org.eclipse</groupId> <artifactId>org.eclipse.equinox.p2.tests-parent</artifactId> - <version>4.8.0-SNAPSHOT</version> <packaging>pom</packaging> <properties> <code.ignoredWarnings>${tests.ignoredWarnings}</code.ignoredWarnings> |