diff options
author | Alexander Kurtakov | 2018-05-30 12:26:57 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2018-05-30 12:40:10 +0000 |
commit | 33eac236175466f911fdd0a2259c1a84da968f18 (patch) | |
tree | fd208b2a68a5471303f23f58ee76b0e94a3886f5 | |
parent | 5e4727436bcdb4d509cb39aff99949886efa3b4c (diff) | |
download | eclipse.platform.team-33eac236175466f911fdd0a2259c1a84da968f18.tar.gz eclipse.platform.team-33eac236175466f911fdd0a2259c1a84da968f18.tar.xz eclipse.platform.team-33eac236175466f911fdd0a2259c1a84da968f18.zip |
Bug 535191 - POM version change for 4.9 releaseI20180601-0915I20180601-0900I20180531-2125I20180531-2000I20180531-1245I20180531-0910
Rearranged tests to be modules of their parent so tycho set-version
works.
Update version for o.e.cvs to satisfy comparator.
Change-Id: Ifcbd5eefef676e8038a5dfa43307fd91b0410e61
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
30 files changed, 43 insertions, 40 deletions
diff --git a/bundles/org.eclipse.compare.core/pom.xml b/bundles/org.eclipse.compare.core/pom.xml index 7f3233922..41c38675f 100644 --- a/bundles/org.eclipse.compare.core/pom.xml +++ b/bundles/org.eclipse.compare.core/pom.xml @@ -14,7 +14,7 @@ <parent> <artifactId>eclipse.platform.team</artifactId> <groupId>eclipse.platform.team</groupId> - <version>4.8.0-SNAPSHOT</version> + <version>4.9.0-SNAPSHOT</version> <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.compare</groupId> diff --git a/bundles/org.eclipse.compare.win32/pom.xml b/bundles/org.eclipse.compare.win32/pom.xml index e08b7db8f..11014ee07 100644 --- a/bundles/org.eclipse.compare.win32/pom.xml +++ b/bundles/org.eclipse.compare.win32/pom.xml @@ -14,7 +14,7 @@ <parent> <artifactId>eclipse.platform.team</artifactId> <groupId>eclipse.platform.team</groupId> - <version>4.8.0-SNAPSHOT</version> + <version>4.9.0-SNAPSHOT</version> <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.compare</groupId> diff --git a/bundles/org.eclipse.compare/pom.xml b/bundles/org.eclipse.compare/pom.xml index b93d54527..1499d542f 100644 --- a/bundles/org.eclipse.compare/pom.xml +++ b/bundles/org.eclipse.compare/pom.xml @@ -14,7 +14,7 @@ <parent> <artifactId>eclipse.platform.team</artifactId> <groupId>eclipse.platform.team</groupId> - <version>4.8.0-SNAPSHOT</version> + <version>4.9.0-SNAPSHOT</version> <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.compare</groupId> diff --git a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86/pom.xml b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86/pom.xml index 3e03d59ac..458808592 100644 --- a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86/pom.xml +++ b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86/pom.xml @@ -14,7 +14,7 @@ <parent> <artifactId>eclipse.platform.team</artifactId> <groupId>eclipse.platform.team</groupId> - <version>4.8.0-SNAPSHOT</version> + <version>4.9.0-SNAPSHOT</version> <relativePath>../../../../</relativePath> </parent> <groupId>org.eclipse.core</groupId> diff --git a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/pom.xml b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/pom.xml index c4dec817d..55835cc30 100644 --- a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/pom.xml +++ b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/pom.xml @@ -14,7 +14,7 @@ <parent> <artifactId>eclipse.platform.team</artifactId> <groupId>eclipse.platform.team</groupId> - <version>4.8.0-SNAPSHOT</version> + <version>4.9.0-SNAPSHOT</version> <relativePath>../../../../</relativePath> </parent> <groupId>org.eclipse.core</groupId> diff --git a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86/pom.xml b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86/pom.xml index 569895929..fa4597bfb 100644 --- a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86/pom.xml +++ b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86/pom.xml @@ -14,7 +14,7 @@ <parent> <artifactId>eclipse.platform.team</artifactId> <groupId>eclipse.platform.team</groupId> - <version>4.8.0-SNAPSHOT</version> + <version>4.9.0-SNAPSHOT</version> <relativePath>../../../../</relativePath> </parent> <groupId>org.eclipse.core</groupId> diff --git a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/pom.xml b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/pom.xml index 77d8390fc..b7f584069 100644 --- a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/pom.xml +++ b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/pom.xml @@ -14,7 +14,7 @@ <parent> <artifactId>eclipse.platform.team</artifactId> <groupId>eclipse.platform.team</groupId> - <version>4.8.0-SNAPSHOT</version> + <version>4.9.0-SNAPSHOT</version> <relativePath>../../../../</relativePath> </parent> <groupId>org.eclipse.core</groupId> diff --git a/bundles/org.eclipse.core.net/pom.xml b/bundles/org.eclipse.core.net/pom.xml index a907545c1..3841e88e4 100644 --- a/bundles/org.eclipse.core.net/pom.xml +++ b/bundles/org.eclipse.core.net/pom.xml @@ -14,7 +14,7 @@ <parent> <artifactId>eclipse.platform.team</artifactId> <groupId>eclipse.platform.team</groupId> - <version>4.8.0-SNAPSHOT</version> + <version>4.9.0-SNAPSHOT</version> <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.core</groupId> diff --git a/bundles/org.eclipse.cvs/META-INF/MANIFEST.MF b/bundles/org.eclipse.cvs/META-INF/MANIFEST.MF index efe9ebbac..ac07b0820 100644 --- a/bundles/org.eclipse.cvs/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.cvs/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.cvs; singleton:=true -Bundle-Version: 1.4.500.qualifier +Bundle-Version: 1.4.600.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/bundles/org.eclipse.cvs/pom.xml b/bundles/org.eclipse.cvs/pom.xml index 1e215475f..3cf0e790f 100644 --- a/bundles/org.eclipse.cvs/pom.xml +++ b/bundles/org.eclipse.cvs/pom.xml @@ -14,12 +14,12 @@ <parent> <groupId>eclipse.platform.team</groupId> <artifactId>eclipse.platform.team</artifactId> - <version>4.8.0-SNAPSHOT</version> + <version>4.9.0-SNAPSHOT</version> <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.cvs</groupId> <artifactId>org.eclipse.cvs</artifactId> - <version>1.4.500-SNAPSHOT</version> + <version>1.4.600-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> <plugins> diff --git a/bundles/org.eclipse.jsch.core/pom.xml b/bundles/org.eclipse.jsch.core/pom.xml index 3981b06c7..646cee40a 100644 --- a/bundles/org.eclipse.jsch.core/pom.xml +++ b/bundles/org.eclipse.jsch.core/pom.xml @@ -14,7 +14,7 @@ <parent> <artifactId>eclipse.platform.team</artifactId> <groupId>eclipse.platform.team</groupId> - <version>4.8.0-SNAPSHOT</version> + <version>4.9.0-SNAPSHOT</version> <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.jsch</groupId> diff --git a/bundles/org.eclipse.jsch.ui/pom.xml b/bundles/org.eclipse.jsch.ui/pom.xml index 001f6aa15..10f3beacb 100644 --- a/bundles/org.eclipse.jsch.ui/pom.xml +++ b/bundles/org.eclipse.jsch.ui/pom.xml @@ -14,7 +14,7 @@ <parent> <artifactId>eclipse.platform.team</artifactId> <groupId>eclipse.platform.team</groupId> - <version>4.8.0-SNAPSHOT</version> + <version>4.9.0-SNAPSHOT</version> <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.jsch</groupId> diff --git a/bundles/org.eclipse.team.core/pom.xml b/bundles/org.eclipse.team.core/pom.xml index fe0f84c06..057604e9b 100644 --- a/bundles/org.eclipse.team.core/pom.xml +++ b/bundles/org.eclipse.team.core/pom.xml @@ -14,7 +14,7 @@ <parent> <artifactId>eclipse.platform.team</artifactId> <groupId>eclipse.platform.team</groupId> - <version>4.8.0-SNAPSHOT</version> + <version>4.9.0-SNAPSHOT</version> <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.team</groupId> diff --git a/bundles/org.eclipse.team.cvs.core/pom.xml b/bundles/org.eclipse.team.cvs.core/pom.xml index d37aac869..106342b87 100644 --- a/bundles/org.eclipse.team.cvs.core/pom.xml +++ b/bundles/org.eclipse.team.cvs.core/pom.xml @@ -14,7 +14,7 @@ <parent> <artifactId>eclipse.platform.team</artifactId> <groupId>eclipse.platform.team</groupId> - <version>4.8.0-SNAPSHOT</version> + <version>4.9.0-SNAPSHOT</version> <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.team</groupId> diff --git a/bundles/org.eclipse.team.cvs.ssh2/pom.xml b/bundles/org.eclipse.team.cvs.ssh2/pom.xml index 6bff44dbe..1bf6c7882 100644 --- a/bundles/org.eclipse.team.cvs.ssh2/pom.xml +++ b/bundles/org.eclipse.team.cvs.ssh2/pom.xml @@ -14,7 +14,7 @@ <parent> <artifactId>eclipse.platform.team</artifactId> <groupId>eclipse.platform.team</groupId> - <version>4.8.0-SNAPSHOT</version> + <version>4.9.0-SNAPSHOT</version> <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.team</groupId> diff --git a/bundles/org.eclipse.team.cvs.ui/pom.xml b/bundles/org.eclipse.team.cvs.ui/pom.xml index 920feca04..ac9619224 100644 --- a/bundles/org.eclipse.team.cvs.ui/pom.xml +++ b/bundles/org.eclipse.team.cvs.ui/pom.xml @@ -14,7 +14,7 @@ <parent> <artifactId>eclipse.platform.team</artifactId> <groupId>eclipse.platform.team</groupId> - <version>4.8.0-SNAPSHOT</version> + <version>4.9.0-SNAPSHOT</version> <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.team</groupId> diff --git a/bundles/org.eclipse.team.genericeditor.diff.extension/pom.xml b/bundles/org.eclipse.team.genericeditor.diff.extension/pom.xml index 9f7cc9db6..e736117da 100644 --- a/bundles/org.eclipse.team.genericeditor.diff.extension/pom.xml +++ b/bundles/org.eclipse.team.genericeditor.diff.extension/pom.xml @@ -14,7 +14,7 @@ <parent> <artifactId>eclipse.platform.team</artifactId> <groupId>eclipse.platform.team</groupId> - <version>4.8.0-SNAPSHOT</version> + <version>4.9.0-SNAPSHOT</version> <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.team</groupId> diff --git a/bundles/org.eclipse.team.ui/pom.xml b/bundles/org.eclipse.team.ui/pom.xml index caca8b037..13f4aa89b 100644 --- a/bundles/org.eclipse.team.ui/pom.xml +++ b/bundles/org.eclipse.team.ui/pom.xml @@ -14,7 +14,7 @@ <parent> <artifactId>eclipse.platform.team</artifactId> <groupId>eclipse.platform.team</groupId> - <version>4.8.0-SNAPSHOT</version> + <version>4.9.0-SNAPSHOT</version> <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.team</groupId> diff --git a/bundles/org.eclipse.ui.net/pom.xml b/bundles/org.eclipse.ui.net/pom.xml index 97f531a95..cc2534657 100644 --- a/bundles/org.eclipse.ui.net/pom.xml +++ b/bundles/org.eclipse.ui.net/pom.xml @@ -14,7 +14,7 @@ <parent> <artifactId>eclipse.platform.team</artifactId> <groupId>eclipse.platform.team</groupId> - <version>4.8.0-SNAPSHOT</version> + <version>4.9.0-SNAPSHOT</version> <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.ui</groupId> diff --git a/examples/org.eclipse.compare.examples.xml/pom.xml b/examples/org.eclipse.compare.examples.xml/pom.xml index ef4a0f35c..4c1f6257b 100644 --- a/examples/org.eclipse.compare.examples.xml/pom.xml +++ b/examples/org.eclipse.compare.examples.xml/pom.xml @@ -14,7 +14,7 @@ <parent> <artifactId>eclipse.platform.team</artifactId> <groupId>eclipse.platform.team</groupId> - <version>4.8.0-SNAPSHOT</version> + <version>4.9.0-SNAPSHOT</version> <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.compare</groupId> diff --git a/examples/org.eclipse.compare.examples/pom.xml b/examples/org.eclipse.compare.examples/pom.xml index ca3507268..70107d800 100644 --- a/examples/org.eclipse.compare.examples/pom.xml +++ b/examples/org.eclipse.compare.examples/pom.xml @@ -14,7 +14,7 @@ <parent> <artifactId>eclipse.platform.team</artifactId> <groupId>eclipse.platform.team</groupId> - <version>4.8.0-SNAPSHOT</version> + <version>4.9.0-SNAPSHOT</version> <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.compare</groupId> diff --git a/examples/org.eclipse.team.examples.filesystem/pom.xml b/examples/org.eclipse.team.examples.filesystem/pom.xml index f2f456c8e..db0aff9fd 100644 --- a/examples/org.eclipse.team.examples.filesystem/pom.xml +++ b/examples/org.eclipse.team.examples.filesystem/pom.xml @@ -14,7 +14,7 @@ <parent> <artifactId>eclipse.platform.team</artifactId> <groupId>eclipse.platform.team</groupId> - <version>4.8.0-SNAPSHOT</version> + <version>4.9.0-SNAPSHOT</version> <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.team</groupId> diff --git a/features/org.eclipse.cvs-feature/pom.xml b/features/org.eclipse.cvs-feature/pom.xml index 14c7eb6b8..5e5d465ef 100644 --- a/features/org.eclipse.cvs-feature/pom.xml +++ b/features/org.eclipse.cvs-feature/pom.xml @@ -14,7 +14,7 @@ <parent> <artifactId>eclipse.platform.team</artifactId> <groupId>eclipse.platform.team</groupId> - <version>4.8.0-SNAPSHOT</version> + <version>4.9.0-SNAPSHOT</version> <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.cvs.feature</groupId> @@ -15,14 +15,13 @@ <parent> <groupId>org.eclipse</groupId> <artifactId>eclipse-platform-parent</artifactId> - <version>4.8.0-SNAPSHOT</version> - + <version>4.9.0-SNAPSHOT</version> <relativePath>../eclipse-platform-parent</relativePath> </parent> <groupId>eclipse.platform.team</groupId> <artifactId>eclipse.platform.team</artifactId> - <version>4.8.0-SNAPSHOT</version> + <version>4.9.0-SNAPSHOT</version> <packaging>pom</packaging> <properties> @@ -79,11 +78,7 @@ <module>bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64</module> <module>bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86</module> <module>bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64</module> - - <module>tests/org.eclipse.compare.tests</module> - <module>tests/org.eclipse.core.tests.net</module> - <module>tests/org.eclipse.jsch.tests</module> - <module>tests/org.eclipse.team.tests.cvs.core</module> - <module>tests/org.eclipse.team.tests.core</module> + <module>tests</module> + </modules> </project> diff --git a/tests/org.eclipse.compare.tests/pom.xml b/tests/org.eclipse.compare.tests/pom.xml index 51ef6594d..79bd9475e 100644 --- a/tests/org.eclipse.compare.tests/pom.xml +++ b/tests/org.eclipse.compare.tests/pom.xml @@ -14,7 +14,8 @@ <parent> <artifactId>eclipse.platform.team.tests</artifactId> <groupId>eclipse.platform.team</groupId> - <version>4.8.0-SNAPSHOT</version> + <version>4.9.0-SNAPSHOT</version> + <relativePath>..</relativePath> </parent> <groupId>org.eclipse.compare</groupId> <artifactId>org.eclipse.compare.tests</artifactId> diff --git a/tests/org.eclipse.core.tests.net/pom.xml b/tests/org.eclipse.core.tests.net/pom.xml index 8112de8d7..aad366a8d 100644 --- a/tests/org.eclipse.core.tests.net/pom.xml +++ b/tests/org.eclipse.core.tests.net/pom.xml @@ -14,7 +14,7 @@ <parent> <artifactId>eclipse.platform.team.tests</artifactId> <groupId>eclipse.platform.team</groupId> - <version>4.8.0-SNAPSHOT</version> + <version>4.9.0-SNAPSHOT</version> </parent> <groupId>org.eclipse.core</groupId> <artifactId>org.eclipse.core.tests.net</artifactId> diff --git a/tests/org.eclipse.jsch.tests/pom.xml b/tests/org.eclipse.jsch.tests/pom.xml index bc179dbb2..a31d4578f 100644 --- a/tests/org.eclipse.jsch.tests/pom.xml +++ b/tests/org.eclipse.jsch.tests/pom.xml @@ -14,7 +14,7 @@ <parent> <artifactId>eclipse.platform.team.tests</artifactId> <groupId>eclipse.platform.team</groupId> - <version>4.8.0-SNAPSHOT</version> + <version>4.9.0-SNAPSHOT</version> </parent> <groupId>org.eclipse.jsch</groupId> <artifactId>org.eclipse.jsch.tests</artifactId> diff --git a/tests/org.eclipse.team.tests.core/pom.xml b/tests/org.eclipse.team.tests.core/pom.xml index ecb662936..776b1ef60 100644 --- a/tests/org.eclipse.team.tests.core/pom.xml +++ b/tests/org.eclipse.team.tests.core/pom.xml @@ -14,7 +14,7 @@ <parent> <artifactId>eclipse.platform.team.tests</artifactId> <groupId>eclipse.platform.team</groupId> - <version>4.8.0-SNAPSHOT</version> + <version>4.9.0-SNAPSHOT</version> </parent> <groupId>org.eclipse.team</groupId> <artifactId>org.eclipse.team.tests.core</artifactId> diff --git a/tests/org.eclipse.team.tests.cvs.core/pom.xml b/tests/org.eclipse.team.tests.cvs.core/pom.xml index d2f6ae4d9..1c3b17772 100644 --- a/tests/org.eclipse.team.tests.cvs.core/pom.xml +++ b/tests/org.eclipse.team.tests.cvs.core/pom.xml @@ -14,7 +14,7 @@ <parent> <artifactId>eclipse.platform.team.tests</artifactId> <groupId>eclipse.platform.team</groupId> - <version>4.8.0-SNAPSHOT</version> + <version>4.9.0-SNAPSHOT</version> </parent> <groupId>org.eclipse.team</groupId> <artifactId>org.eclipse.team.tests.cvs.core</artifactId> diff --git a/tests/pom.xml b/tests/pom.xml index fec566e9b..67fd9961b 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -14,12 +14,19 @@ <parent> <groupId>eclipse.platform.team</groupId> <artifactId>eclipse.platform.team</artifactId> - <version>4.8.0-SNAPSHOT</version> + <version>4.9.0-SNAPSHOT</version> + <relativePath>..</relativePath> </parent> <artifactId>eclipse.platform.team.tests</artifactId> - <version>4.8.0-SNAPSHOT</version> <packaging>pom</packaging> <properties> <code.ignoredWarnings>${tests.ignoredWarnings}</code.ignoredWarnings> </properties> + <modules> + <module>org.eclipse.compare.tests</module> + <module>org.eclipse.core.tests.net</module> + <module>org.eclipse.jsch.tests</module> + <module>org.eclipse.team.tests.cvs.core</module> + <module>org.eclipse.team.tests.core</module> + </modules> </project> |