diff options
| author | Alexander Kurtakov | 2018-10-16 19:47:12 +0000 |
|---|---|---|
| committer | Alexander Kurtakov | 2018-10-16 20:29:23 +0000 |
| commit | c99edc9d2b13accf266e3f3ca3af55faa836ce5d (patch) | |
| tree | 9d690c0e672d64dcd6db89a82f23e6627a6c1021 | |
| parent | b893a60e8b4839d3d13271a579de9751d4b4521c (diff) | |
| download | org.eclipse.linuxtools-c99edc9d2b13accf266e3f3ca3af55faa836ce5d.tar.gz org.eclipse.linuxtools-c99edc9d2b13accf266e3f3ca3af55faa836ce5d.tar.xz org.eclipse.linuxtools-c99edc9d2b13accf266e3f3ca3af55faa836ce5d.zip | |
Releng updates.
* Set min maven version.
* Update mylyn docs to 3.0.27
* merge multiple tycho-p2-repository-plugin sections to fix warnings
* run repo checks against 4.9
Change-Id: I87d57dcb9cccfe51f2a68b77190085ce393a9e18
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
Reviewed-on: https://git.eclipse.org/r/131014
Tested-by: CI Bot
| -rw-r--r-- | pom.xml | 4 | ||||
| -rw-r--r-- | releng/org.eclipse.linuxtools.docker-site/pom.xml | 11 | ||||
| -rw-r--r-- | releng/org.eclipse.linuxtools.mylyn-site/pom.xml | 11 | ||||
| -rw-r--r-- | releng/org.eclipse.linuxtools.releng-site/pom.xml | 11 |
4 files changed, 11 insertions, 26 deletions
@@ -17,7 +17,7 @@ <modelVersion>4.0.0</modelVersion> <prerequisites> - <maven>3.3.1</maven> + <maven>3.3.9</maven> </prerequisites> <groupId>org.eclipse.linuxtools</groupId> <artifactId>linuxtools-parent</artifactId> @@ -269,7 +269,7 @@ <dependency> <groupId>org.eclipse.mylyn.docs</groupId> <artifactId>org.eclipse.mylyn.wikitext.mediawiki.ant</artifactId> - <version>3.0.26</version> + <version>3.0.27</version> </dependency> </dependencies> </plugin> diff --git a/releng/org.eclipse.linuxtools.docker-site/pom.xml b/releng/org.eclipse.linuxtools.docker-site/pom.xml index 02e753d706..c6107967ca 100644 --- a/releng/org.eclipse.linuxtools.docker-site/pom.xml +++ b/releng/org.eclipse.linuxtools.docker-site/pom.xml @@ -90,11 +90,6 @@ </configuration> </execution> </executions> - </plugin> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-p2-repository-plugin</artifactId> - <version>${tycho-version}</version> <configuration> <extraArtifactRepositoryProperties> <p2.statsURI>http://download.eclipse.org/stats</p2.statsURI> @@ -120,7 +115,7 @@ <jvmArgs> <arg>-DreportRepoDir=${project.build.directory}/repository</arg> <arg>-DreportOutputDir=${project.build.directory}/repository/buildInfo</arg> - <arg>-DreferenceRepo=/home/data/httpd/download.eclipse.org/releases/oxygen/</arg> + <arg>-DreferenceRepo=/home/data/httpd/download.eclipse.org/releases/2018-09/</arg> </jvmArgs> <executionEnvironment>JavaSE-1.8</executionEnvironment> <dependencies> @@ -144,8 +139,8 @@ <layout>p2</layout> </repository> <repository> - <id>eclipse-4.7.3a</id> - <url>http://download.eclipse.org/eclipse/updates/4.7/R-4.7.3a-201803300640/</url> + <id>eclipse-4.9</id> + <url>http://download.eclipse.org/eclipse/updates/4.9/R-4.9-201809060745/</url> <layout>p2</layout> </repository> </repositories> diff --git a/releng/org.eclipse.linuxtools.mylyn-site/pom.xml b/releng/org.eclipse.linuxtools.mylyn-site/pom.xml index c95274c3b6..44314470ff 100644 --- a/releng/org.eclipse.linuxtools.mylyn-site/pom.xml +++ b/releng/org.eclipse.linuxtools.mylyn-site/pom.xml @@ -90,11 +90,6 @@ </configuration> </execution> </executions> - </plugin> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-p2-repository-plugin</artifactId> - <version>${tycho-version}</version> <configuration> <extraArtifactRepositoryProperties> <p2.statsURI>http://download.eclipse.org/stats</p2.statsURI> @@ -120,7 +115,7 @@ <jvmArgs> <arg>-DreportRepoDir=${project.build.directory}/repository</arg> <arg>-DreportOutputDir=${project.build.directory}/repository/buildInfo</arg> - <arg>-DreferenceRepo=/home/data/httpd/download.eclipse.org/releases/oxygen/</arg> + <arg>-DreferenceRepo=/home/data/httpd/download.eclipse.org/releases/2018-09/</arg> </jvmArgs> <executionEnvironment>JavaSE-1.8</executionEnvironment> <dependencies> @@ -144,8 +139,8 @@ <layout>p2</layout> </repository> <repository> - <id>eclipse-4.7.3a</id> - <url>http://download.eclipse.org/eclipse/updates/4.7/R-4.7.3a-201803300640/</url> + <id>eclipse-4.9</id> + <url>http://download.eclipse.org/eclipse/updates/4.9/R-4.9-201809060745/</url> <layout>p2</layout> </repository> </repositories> diff --git a/releng/org.eclipse.linuxtools.releng-site/pom.xml b/releng/org.eclipse.linuxtools.releng-site/pom.xml index 1611c08753..84c7439353 100644 --- a/releng/org.eclipse.linuxtools.releng-site/pom.xml +++ b/releng/org.eclipse.linuxtools.releng-site/pom.xml @@ -90,11 +90,6 @@ </configuration> </execution> </executions> - </plugin> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-p2-repository-plugin</artifactId> - <version>${tycho-version}</version> <configuration> <extraArtifactRepositoryProperties> <p2.statsURI>http://download.eclipse.org/stats</p2.statsURI> @@ -120,7 +115,7 @@ <jvmArgs> <arg>-DreportRepoDir=${project.build.directory}/repository</arg> <arg>-DreportOutputDir=${project.build.directory}/repository/buildInfo</arg> - <arg>-DreferenceRepo=/home/data/httpd/download.eclipse.org/releases/oxygen/</arg> + <arg>-DreferenceRepo=/home/data/httpd/download.eclipse.org/releases/2018-09/</arg> </jvmArgs> <executionEnvironment>JavaSE-1.8</executionEnvironment> <dependencies> @@ -144,8 +139,8 @@ <layout>p2</layout> </repository> <repository> - <id>eclipse-4.7.3a</id> - <url>http://download.eclipse.org/eclipse/updates/4.7/R-4.7.3a-201803300640/</url> + <id>eclipse-4.9</id> + <url>http://download.eclipse.org/eclipse/updates/4.9/R-4.9-201809060745/</url> <layout>p2</layout> </repository> </repositories> |