diff options
| author | David Williams | 2016-04-14 16:08:06 +0000 |
|---|---|---|
| committer | David Williams | 2016-04-14 16:08:06 +0000 |
| commit | bb6d388c7a1abecaffd285834a1f20065ea7b29b (patch) | |
| tree | 35ec8148128f3f668b51ec31b5f505dbd0fa1be6 /eclipse-platform-parent/pom.xml | |
| parent | acf779695e6ea16a690f1c6837b11185a53885f2 (diff) | |
| download | eclipse.platform.releng.aggregator-bb6d388c7a1abecaffd285834a1f20065ea7b29b.tar.gz eclipse.platform.releng.aggregator-bb6d388c7a1abecaffd285834a1f20065ea7b29b.tar.xz eclipse.platform.releng.aggregator-bb6d388c7a1abecaffd285834a1f20065ea7b29b.zip | |
[releng] We should not use the value of some thing to set that thing.
Plus prep to test Tycho 0.25.0
Diffstat (limited to 'eclipse-platform-parent/pom.xml')
| -rw-r--r-- | eclipse-platform-parent/pom.xml | 42 |
1 files changed, 22 insertions, 20 deletions
diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml index 756bb4171..17a38b640 100644 --- a/eclipse-platform-parent/pom.xml +++ b/eclipse-platform-parent/pom.xml @@ -158,7 +158,7 @@ jgit.dirtyWorkingTree checking was added as of Tycho 0.19.0 see: https://bugs.eclipse.org/419030 --> - <jgit.dirtyWorkingTree>ignore</jgit.dirtyWorkingTree> + <jgit.dirtyWorkingTree-platformDefault>ignore</jgit.dirtyWorkingTree-platformDefault> <qualifier.format>'v'yyyyMMdd-HHmm</qualifier.format> @@ -178,12 +178,12 @@ </distributionManagement> <pluginRepositories> - <!-- only for staged Tycho builds - <pluginRepository> - <id>tycho-staged</id> - <url>https://oss.sonatype.org/content/repositories/orgeclipsetycho-1022/</url> - </pluginRepository> - --> + <!-- only for staged Tycho builds + <pluginRepository> + <id>tycho-0.25.0-staged</id> + <url>https://oss.sonatype.org/content/repositories/orgeclipsetycho-1035/</url> + </pluginRepository> +--> <pluginRepository> <id>tycho</id> @@ -244,7 +244,7 @@ This build-individual-repository.properties file is used to specify an alternative p2 repository from where to get the most recent prereqs of artifacts that are required by, but not built by, the "build-individual-repository" profile. On Eclipse.org Platform HIPP we change this to N-builds when doing infrequent I-builds, but use I-builds repository - when doing frequent I-builds. To give another example of use, those doing "local builds" may want to point it to their + when doing frequent I-builds. To give another example of use, those doing "local builds" may want to point it to their own local build repository if they are working with a complex change that spans multiple repositories. But the property file is not required and for most uses the default of the latest I-build will suffice. @@ -347,18 +347,20 @@ <environment> <os>solaris</os> <ws>gtk</ws> - <arch>sparc</arch> - </environment> - <environment> - <os>solaris</os> - <ws>gtk</ws> - <arch>x86</arch> - </environment> - <environment> - <os>solaris</os> - <ws>gtk</ws> <arch>x86_64</arch> - </environment> + </environment> +<!-- solaris 32 bit environments to be removed --> + <environment> + <os>solaris</os> + <ws>gtk</ws> + <arch>sparc</arch> + </environment> + <environment> + <os>solaris</os> + <ws>gtk</ws> + <arch>x86</arch> + </environment> +<!-- solaris 32 bit environments to be removed --> <environment> <os>hpux</os> <ws>gtk</ws> @@ -552,7 +554,7 @@ <jgit.ignore> pom.xml </jgit.ignore> - <jgit.dirtyWorkingTree>${jgit.dirtyWorkingTree}</jgit.dirtyWorkingTree> + <jgit.dirtyWorkingTree>${jgit.dirtyWorkingTree-platformDefault}</jgit.dirtyWorkingTree> <sourceReferences> <generate>true</generate> </sourceReferences> |