releng: Update to Tycho 0.23.

* Few iu removed from docker site. Tycho 0.23 resolves from reactor and
as no bundle has dependency on these ius compilation failed.
* Drop versions of site modules.
* Have single definition of tycho versions as one can not mix two
versions in the same build.
* Update maven antrun and resources plugin to newer versions.

Change-Id: Id8b0db5acfec8af2a87a0c160a7c471ad4f7e6fe
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
Reviewed-on: https://git.eclipse.org/r/49646
Tested-by: Hudson CI

6 files changed, 10 insertions, 39 deletions

diff --git a/containers/org.eclipse.linuxtools.docker-feature/pom.xml b/containers/org.eclipse.linuxtools.docker-feature/pom.xml
index 8d093950a3..32e9f6ee72 100644
--- a/containers/org.eclipse.linuxtools.docker-feature/pom.xml
+++ b/containers/org.eclipse.linuxtools.docker-feature/pom.xml
@@ -39,7 +39,7 @@
       <plugin>
         <groupId>org.eclipse.tycho</groupId>
         <artifactId>tycho-p2-plugin</artifactId>
-        <version>${tychoVersion}</version>
+        <version>${tycho-version}</version>
         <executions>
           <execution>
             <id>attached-p2-metadata</id>
diff --git a/containers/pom.xml b/containers/pom.xml
index af53e6c721..01eda223b4 100644
--- a/containers/pom.xml
+++ b/containers/pom.xml
@@ -13,14 +13,12 @@
         </parent>
 
 	<properties>
-		<tychoVersion>0.22.0</tychoVersion>
-		<tychoExtrasVersion>${tychoVersion}</tychoExtrasVersion>
 		<memoryOptions1>-Xms512m -Xmx1024m -XX:PermSize=256m</memoryOptions1>
 		<memoryOptions2>-XX:MaxPermSize=256m</memoryOptions2>
 		<systemProperties></systemProperties>
 		<platformSystemProperties></platformSystemProperties>
 		<applejdkProperties></applejdkProperties>
-		<maven.antrun.plugin.version>1.3</maven.antrun.plugin.version>
+		<maven.antrun.plugin.version>1.8</maven.antrun.plugin.version>
   	<tycho.scmUrl>scm:git:https://github.com/jbdevstudio/linuxtools-docker.git</tycho.scmUrl>
   </properties>
   
@@ -31,24 +29,12 @@
     <module>org.eclipse.linuxtools.docker-feature</module>
   </modules>
 
-	<repositories>
-		<repository>
-			<id>mars</id>
-			<layout>p2</layout>
-			<url>http://download.eclipse.org/releases/mars</url>
-		</repository>
-		<repository>
-	 		<id>license</id>
-			<layout>p2</layout>
-			<url>http://download.eclipse.org/cbi/updates/license</url>
-		</repository>
-	</repositories>
 	<build>
 		<plugins>
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-packaging-plugin</artifactId>
-				<version>${tychoVersion}</version>
+				<version>${tycho-version}</version>
 				<configuration>
 					<sourceReferences>
 						<generate>true</generate>
@@ -86,7 +72,7 @@
 					<dependency>
 						<groupId>org.eclipse.tycho.extras</groupId>
 						<artifactId>tycho-sourceref-jgit</artifactId>
-						<version>${tychoExtrasVersion}</version>
+						<version>${tycho-extras-version}</version>
 					</dependency>
 				</dependencies>
 			</plugin>
@@ -94,14 +80,14 @@
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-maven-plugin</artifactId>
-				<version>${tychoVersion}</version>
+				<version>${tycho-version}</version>
 				<extensions>true</extensions>
 			</plugin>
 
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-compiler-plugin</artifactId>
-				<version>${tychoVersion}</version>
+				<version>${tycho-version}</version>
 				<configuration>
 					<encoding>UTF-8</encoding>
 				</configuration>
@@ -110,7 +96,7 @@
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-source-plugin</artifactId>
-				<version>${tychoVersion}</version>
+				<version>${tycho-version}</version>
 				<executions>
 					<execution>
 						<id>plugin-source</id>
@@ -123,7 +109,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-resources-plugin</artifactId>
-				<version>2.4.1</version>
+				<version>2.7</version>
 				<configuration>
 					<encoding>ISO-8859-1</encoding>
 				</configuration>
diff --git a/pom.xml b/pom.xml
index ec1fb74a02..7e3dfb54c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,8 +51,8 @@
   <properties>
     <mirror-repo-name>updates-nightly</mirror-repo-name>
     <mirror-docker-repo-name>updates-docker-nightly</mirror-docker-repo-name>
-    <tycho-version>0.22.0</tycho-version>
-    <tycho-extras-version>0.22.0</tycho-extras-version>
+    <tycho-version>0.23.0</tycho-version>
+    <tycho-extras-version>0.23.0</tycho-extras-version>
     <target-platform>linuxtools-e4.5</target-platform>
     <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
     <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
diff --git a/releng/org.eclipse.linuxtools.docker-site/category.xml b/releng/org.eclipse.linuxtools.docker-site/category.xml
index c37ff52b0a..ef7cd5035a 100644
--- a/releng/org.eclipse.linuxtools.docker-site/category.xml
+++ b/releng/org.eclipse.linuxtools.docker-site/category.xml
@@ -20,21 +20,12 @@
    <iu id="com.fasterxml.jackson.core.jackson-databind" version="0.0.0">
         <category name="Linux Tools"/>
    </iu>
-   <iu id="com.fasterxml.jackson.dataformat.jackson-dataformat-yaml" version="0.0.0">
-        <category name="Linux Tools"/>
-   </iu>
-   <iu id="com.fasterxml.jackson.datatype.jackson-datatype-guava" version="0.0.0">
-        <category name="Linux Tools"/>
-   </iu>
    <iu id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base" version="0.0.0">
         <category name="Linux Tools"/>
    </iu>
    <iu id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" version="0.0.0">
         <category name="Linux Tools"/>
    </iu>
-   <iu id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations" version="0.0.0">
-        <category name="Linux Tools"/>
-   </iu>
    <iu id="javax.ws.rs" version="0.0.0">
         <category name="Linux Tools"/>
    </iu>
diff --git a/releng/org.eclipse.linuxtools.docker-site/pom.xml b/releng/org.eclipse.linuxtools.docker-site/pom.xml
index 52e8010e4b..bf781b7153 100644
--- a/releng/org.eclipse.linuxtools.docker-site/pom.xml
+++ b/releng/org.eclipse.linuxtools.docker-site/pom.xml
@@ -114,7 +114,4 @@
   </build>
 
   <name>Linux Tools Docker p2 Repository</name>
-  <!-- see http://issues.sonatype.org/browse/TYCHO-313 -->
-  <version>3.2.0-SNAPSHOT</version>
-
 </project>
diff --git a/releng/org.eclipse.linuxtools.releng-site/pom.xml b/releng/org.eclipse.linuxtools.releng-site/pom.xml
index 67403d8d40..0c5b7b154b 100644
--- a/releng/org.eclipse.linuxtools.releng-site/pom.xml
+++ b/releng/org.eclipse.linuxtools.releng-site/pom.xml
@@ -114,7 +114,4 @@
   </build>
 
   <name>Linux Tools p2 Repository</name>
-  <!-- see http://issues.sonatype.org/browse/TYCHO-313 -->
-  <version>3.2.0-SNAPSHOT</version>
-
 </project>