Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornickboldt2018-08-28 17:04:19 +0000
committernickboldt2018-08-28 17:04:19 +0000
commit84f971fc3f350c9665940195bf1db7252a098fb7 (patch)
tree252f96afd57961130523f6c4a62f8716ee9d77ef
parentc52cc1632ea617660cb9adc563bdee63fa5b9aa5 (diff)
downloadorg.eclipse.tm-84f971fc3f350c9665940195bf1db7252a098fb7.tar.gz
org.eclipse.tm-84f971fc3f350c9665940195bf1db7252a098fb7.tar.xz
org.eclipse.tm-84f971fc3f350c9665940195bf1db7252a098fb7.zip
use the same tycho and maven-resources plugin versions (1.2, 2.7) for both rse and terminal
Change-Id: I1a4d0db8e41130778bf5a3c4bf2780ca738c6a47 Signed-off-by: nickboldt <nboldt@redhat.com>
-rw-r--r--pom.xml6
-rw-r--r--terminal/admin/pom-config.xml2
2 files changed, 4 insertions, 4 deletions
diff --git a/pom.xml b/pom.xml
index 8660851dd..d1c7626ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,9 +12,9 @@
<properties>
<tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/tm/org.eclipse.tm.git</tycho.scmUrl>
- <tycho-version>1.1.0</tycho-version>
- <tycho-extras-version>1.1.0</tycho-extras-version>
- <maven-resources-version>2.6</maven-resources-version>
+ <tycho-version>1.2.0</tycho-version>
+ <tycho-extras-version>${tycho-version}</tycho-extras-version>
+ <maven-resources-version>2.7</maven-resources-version>
<!-- TODO: switch to 4.9-I-builds after June 27, 2018 -->
<sdk-version>4.8milestones</sdk-version>
diff --git a/terminal/admin/pom-config.xml b/terminal/admin/pom-config.xml
index b1e043063..8582572c6 100644
--- a/terminal/admin/pom-config.xml
+++ b/terminal/admin/pom-config.xml
@@ -43,7 +43,7 @@
<!-- Using Java 8 for Tycho with a Java 7 target should be possible but
takes some config -->
<!-- See https://bugs.eclipse.org/bugs/show_bug.cgi?id=518104 for reference -->
- <tycho-version>0.23.1</tycho-version>
+ <tycho-version>1.2.0</tycho-version>
<tycho-extras-version>${tycho-version}</tycho-extras-version>
<maven-resources-version>2.7</maven-resources-version>
<maven-antrun-version>1.8</maven-antrun-version>

Back to the top