Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDawid Pakuła2019-04-09 11:57:01 -0400
committerDawid Pakuła2019-04-09 12:21:03 -0400
commiteaa33689491d384c9beac9efbcf98b5eb27e521d (patch)
tree15c2813d3e073a742c0732c9ac2dc639501126bd
parent83a280048303e4ae04b6bd14d5254146139b712a (diff)
downloadorg.eclipse.pdt-eaa33689491d384c9beac9efbcf98b5eb27e521d.tar.gz
org.eclipse.pdt-eaa33689491d384c9beac9efbcf98b5eb27e521d.tar.xz
org.eclipse.pdt-eaa33689491d384c9beac9efbcf98b5eb27e521d.zip
No bug - Tycho and target definition update
Change-Id: I9511a51b9abc0f0a55f55adcda6cbec940325d5a Signed-off-by: Dawid Pakuła <zulus@w3des.net>
-rw-r--r--dev/org.eclipse.php-repository/pom.xml35
-rw-r--r--dev/org.eclipse.php.target.current/org.eclipse.php.target.current.target2
-rw-r--r--dev/org.eclipse.php.target.next/org.eclipse.php.target.next.target2
-rw-r--r--pom.xml39
4 files changed, 15 insertions, 63 deletions
diff --git a/dev/org.eclipse.php-repository/pom.xml b/dev/org.eclipse.php-repository/pom.xml
index 9de5627d3..a6113162b 100644
--- a/dev/org.eclipse.php-repository/pom.xml
+++ b/dev/org.eclipse.php-repository/pom.xml
@@ -43,41 +43,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-eclipserun-plugin</artifactId>
- <version>${tycho-version}</version>
- <executions>
- <execution>
- <id>add-repo-properties</id>
- <goals>
- <goal>eclipse-run</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <appArgLine>-application org.eclipse.wtp.releng.tools.addRepoProperties</appArgLine>
- <argLine><![CDATA[-DartifactRepoDirectory=${project.build.directory}/repository -Dp2MirrorsURL=${p2.mirrorsURL} -Dp2StatsURI=${p2.statsURL} -DstatsTrackedArtifacts=${p2.statsTrackedArtifacts} -DstatsArtifactsSuffix=-${project.version}]]></argLine>
- <executionEnvironment>JavaSE-1.8</executionEnvironment>
- <dependencies>
- <dependency>
- <artifactId>org.eclipse.wtp.releng.tools.feature</artifactId>
- <type>eclipse-feature</type>
- </dependency>
- </dependencies>
- <repositories>
- <repository>
- <url>http://download.eclipse.org/webtools/releng/repository</url>
- <layout>p2</layout>
- </repository>
- <repository>
- <url>http://download.eclipse.org/releases/${eclipse.name}</url>
- <layout>p2</layout>
- </repository>
- </repositories>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho-version}</version>
diff --git a/dev/org.eclipse.php.target.current/org.eclipse.php.target.current.target b/dev/org.eclipse.php.target.current/org.eclipse.php.target.current.target
index 3f6485bbb..ea52c85c1 100644
--- a/dev/org.eclipse.php.target.current/org.eclipse.php.target.current.target
+++ b/dev/org.eclipse.php.target.current/org.eclipse.php.target.current.target
@@ -15,7 +15,7 @@
<unit id="org.eclipse.zest.core" version="0.0.0"/>
<unit id="org.eclipse.zest.layouts" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/photon/"/>
+<repository location="http://download.eclipse.org/releases/2019-03/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
<unit id="com.google.gson" version="2.2.4.v201311231704"/>
diff --git a/dev/org.eclipse.php.target.next/org.eclipse.php.target.next.target b/dev/org.eclipse.php.target.next/org.eclipse.php.target.next.target
index bc4a990c8..12a618fa3 100644
--- a/dev/org.eclipse.php.target.next/org.eclipse.php.target.next.target
+++ b/dev/org.eclipse.php.target.next/org.eclipse.php.target.next.target
@@ -23,7 +23,7 @@
<unit id="org.eclipse.birt.chart.device.swt" version=""/>
-<repository location="http://download.eclipse.org/releases/photon/"/>
+<repository location="http://download.eclipse.org/releases/2019-06/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
diff --git a/pom.xml b/pom.xml
index 57aa9a503..8c09e0930 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
<!-- this is the parent POM from which all modules inherit common settings -->
<properties>
- <tycho-version>1.2.0</tycho-version>
+ <tycho-version>1.4.0</tycho-version>
<antrun-version>1.8</antrun-version>
<maven.test.failure.ignore>true</maven.test.failure.ignore>
<test.vmargs />
@@ -23,8 +23,8 @@
<tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/pdt/org.eclipse.pdt.git</tycho.scmUrl>
<tycho.testArgLine />
<eclipseNext>false</eclipseNext>
- <p2.mirrorsPrefix>/tools/pdt/updates/6.2/</p2.mirrorsPrefix>
- <p2.statsURL>http://download.eclipse.org/stats</p2.statsURL>
+ <p2.mirrorsPrefix>/tools/pdt/updates/6.3/</p2.mirrorsPrefix>
+ <p2.statsURI>http://download.eclipse.org/stats</p2.statsURI>
<p2.mirrorsURL>https://www.eclipse.org/downloads/download.php?format=xml&amp;file=${p2.mirrorsPrefix}</p2.mirrorsURL>
<p2.statsTrackedArtifacts>org.eclipse.php,org.eclipse.php.mylyn,org.eclipse.php.composer</p2.statsTrackedArtifacts>
</properties>
@@ -66,7 +66,11 @@
<artifactId>tycho-p2-repository-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
- <xzCompress>false</xzCompress>
+ <xzCompress>true</xzCompress>
+ <extraArtifactRepositoryProperties>
+ <p2.statsURI>${p2.statsURI}</p2.statsURI>
+ <p2.mirrorsURL>${p2.mirrorsURL}</p2.mirrorsURL>
+ </extraArtifactRepositoryProperties>
</configuration>
</plugin>
<plugin>
@@ -83,6 +87,9 @@
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-plugin</artifactId>
<version>${tycho-version}</version>
+ <configuration>
+ <generateDownloadStatsProperty>true</generateDownloadStatsProperty>
+ </configuration>
</plugin>
</plugins>
</pluginManagement>
@@ -134,11 +141,6 @@
<environment>
<os>win32</os>
<ws>win32</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
<arch>x86_64</arch>
</environment>
<environment>
@@ -156,11 +158,6 @@
<ws>cocoa</ws>
<arch>x86_64</arch>
</environment>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86</arch>
- </environment>
</environments>
</configuration>
</plugin>
@@ -227,7 +224,7 @@
</property>
</activation>
<properties>
- <eclipse.name>photon</eclipse.name>
+ <eclipse.name>2019-06</eclipse.name>
</properties>
<modules>
<module>dev/org.eclipse.php.target.next</module>
@@ -246,16 +243,6 @@
<version>${project.version}</version>
</artifact>
</target>
- <dependency-resolution>
- <extraRequirements>
- <requirement>
- <type>eclipse-feature</type>
- <id>org.eclipse.dltk.core.index.lucene</id>
- <versionRange>5.9.0.201801191115</versionRange>
- <!-- Eclipse Photon M4 repository contain problematic DLTK 5.9 build, we need newer version. -->
- </requirement>
- </extraRequirements>
- </dependency-resolution>
</configuration>
</plugin>
</plugins>
@@ -269,7 +256,7 @@
</property>
</activation>
<properties>
- <eclipse.name>photon</eclipse.name>
+ <eclipse.name>2019-03</eclipse.name>
</properties>
<modules>
<module>dev/org.eclipse.php.target.current</module>

Back to the top