diff options
| author | David Williams | 2015-03-15 04:25:29 +0000 |
|---|---|---|
| committer | David Williams | 2015-03-15 04:25:29 +0000 |
| commit | bbd067d691b25dd842982be2745bafa80c4e484d (patch) | |
| tree | 5ac85f4c3f542c297f394f1bc5848a59dd241155 /eclipse-platform-parent/pom.xml | |
| parent | 53d446f654512ab7112f3a75237de9a1dae510ea (diff) | |
| download | eclipse.platform.releng.aggregator-bbd067d691b25dd842982be2745bafa80c4e484d.tar.gz eclipse.platform.releng.aggregator-bbd067d691b25dd842982be2745bafa80c4e484d.tar.xz eclipse.platform.releng.aggregator-bbd067d691b25dd842982be2745bafa80c4e484d.zip | |
[releng] Synch master with macapp branch, in prep of using Tycho
23-SNAPSHOT.
Diffstat (limited to 'eclipse-platform-parent/pom.xml')
| -rw-r--r-- | eclipse-platform-parent/pom.xml | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml index 90aacbf9a..00d3c7aac 100644 --- a/eclipse-platform-parent/pom.xml +++ b/eclipse-platform-parent/pom.xml @@ -63,10 +63,16 @@ <releaseNumberSDK>4.5</releaseNumberSDK> <releaseNumberPlatform>4.5</releaseNumberPlatform> - <!-- using locally built (forked) snapshot version for bug 461207 and bug 431116--> + <!-- using staged, or locally built (forked) snapshot version for bug 461207 and bug 431116 <tycho.version>0.23.0-SNAPSHOT</tycho.version> <tycho-extras.version>0.23.0-SNAPSHOT</tycho-extras.version> + --> + + <tycho.version>0.22.0</tycho.version> + <tycho-extras.version>0.22.0</tycho-extras.version> + <cbi-plugins.version>1.1.1</cbi-plugins.version> + <!-- The tycho-eclipserun-plugin will create its instance of Eclipse from this 'eclipiserun-repo' repository, such as for computing .api-descriptions. @@ -88,10 +94,7 @@ <!-- using snapshot repo for Tycho 0.23.0-SNAPSHOT, such as for bug 461207 --> <!-- Does it hurt to always leave snapshot repo here? Even if not used? --> <tycho-snapshot-repo.url>https://repo.eclipse.org/content/repositories/tycho-snapshots/</tycho-snapshot-repo.url> - <!-- using snapshot repo for Tycho 0.23.0-SNAPSHOT, such as for bug 461207 --> - <!-- Does it hurt to always leave snapshot repo here? Even if not used? --> - <tycho-snapshot-repo.url>https://repo.eclipse.org/content/repositories/tycho-snapshots/</tycho-snapshot-repo.url> - <tycho-repo.url>https://oss.sonatype.org/content/repositories/public/</tycho-repo.url> + <tycho-repo.url>https://oss.sonatype.org/content/repositories/public/</tycho-repo.url> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <cbi-jdt-repo.url>https://repo.eclipse.org/content/repositories/eclipse-staging/</cbi-jdt-repo.url> @@ -415,7 +418,7 @@ <args>${project.build.directory}/@dot.xml</args> </compilerArgs> - <!-- Use this form for Tycho 23 or greater + <!-- Use this form for Tycho 23 or greater <log>xml</log> <logDirectory>${project.build.directory}/compilelogs</logDirectory> --> @@ -757,7 +760,8 @@ <!-- this is to fix some lucene 3.x compatibility issue --> <argLine>-Dhelp.lucene.tokenizer=standard</argLine> <!-- actuall indexer call --> - <appArgLine>-data target/apibuild-workspace -application org.eclipse.ant.core.antRunner -buildfile target/.apibuild.xml</appArgLine> + <appArgLine>-data target/apibuild-workspace -application org.eclipse.ant.core.antRunner -buildfile + target/.apibuild.xml</appArgLine> <dependencies> <!-- list of bundles that we need --> <dependency> |