Releng: publish maven configuration for OTDT 2.1.1mvn-releases/objectteams-2.1.1

+ Add support for using OT/J in tycho builds

4 files changed, 40 insertions, 10 deletions

diff --git a/maven/infrastructure/artifact-deployer/objectteams-runtime-pom.xml b/maven/infrastructure/artifact-deployer/objectteams-runtime-pom.xml
index f9f59e18c..f4ae079df 100644
--- a/maven/infrastructure/artifact-deployer/objectteams-runtime-pom.xml
+++ b/maven/infrastructure/artifact-deployer/objectteams-runtime-pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.eclipse</groupId>
   <artifactId>objectteams-runtime</artifactId>
-  <version>2.1.0</version>
+  <version>2.1.1</version>
   <description>The OT/J Runtime Library</description>
 
   <licenses>
@@ -13,7 +13,7 @@
 		<comments>
 			This file is part of "Object Teams Development Tooling"-Software
 
-			Copyright 2010, 2011 GK Software AG and others.
+			Copyright 2010, 2012 GK Software AG and others.
 			All rights reserved. This program and the accompanying materials
 			are made available under the terms of the Eclipse Public License v1.0
 			which accompanies this distribution, and is available at
diff --git a/maven/infrastructure/artifact-deployer/pom.xml b/maven/infrastructure/artifact-deployer/pom.xml
index 8c53be255..0301eb8ac 100644
--- a/maven/infrastructure/artifact-deployer/pom.xml
+++ b/maven/infrastructure/artifact-deployer/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.eclipse</groupId>
 		<artifactId>objectteams-parent-pom</artifactId>
-		<version>2.1.0</version>
+		<version>2.1.1</version>
 		<relativePath>../parent-pom</relativePath>
 	</parent>
 
@@ -52,7 +52,7 @@
 	<properties>
 		<!-- Object Teams versions, update manually: 					-->
 		<!--   version of the signed ecotj jar file:	 				-->
-		<ecotj.version>R-2.1.0-201206090440-signed</ecotj.version> 
+		<ecotj.version>S-2.1.1-201209011843-signed</ecotj.version> 
 		<!--   version of the org.eclipse.objectteams.runtime plugin:	-->
 		<otre.version>2.1.0.201205081843</otre.version>
 		
diff --git a/maven/infrastructure/parent-pom/pom.xml b/maven/infrastructure/parent-pom/pom.xml
index 26d7d3257..de4e2ec80 100644
--- a/maven/infrastructure/parent-pom/pom.xml
+++ b/maven/infrastructure/parent-pom/pom.xml
@@ -4,7 +4,7 @@
 	
 	<groupId>org.eclipse</groupId>
 	<artifactId>objectteams-parent-pom</artifactId>
-	<version>2.1.0</version>
+	<version>2.1.1</version>
 	<packaging>pom</packaging>
 	
 	<name>Object Teams parent pom</name>
@@ -82,11 +82,11 @@
     	<project-repository-path>maven/infrastructure/parent-pom</project-repository-path>
 
 		<!-- Our Version: -->
-		<otj.version>2.1.0</otj.version>
+		<otj.version>2.1.1</otj.version>
 
 		<!-- Versions of dependencies: -->
 		<bcel.version>5.2</bcel.version>
-		<tycho.version>0.15.0</tycho.version>
+		<tycho.version>0.16.0</tycho.version>
 		
 		<!-- Absolut paths for providing startup arguments to the JVM -->
 		<otj.otre.location>${settings.localRepository}/org/eclipse/objectteams-runtime/${otj.version}/objectteams-runtime-${otj.version}.jar</otj.otre.location>
@@ -128,6 +128,7 @@
 	<build>
 		<pluginManagement>
 			<plugins>
+
 				<plugin>
 					<!--
 						Use compiler plugin with tycho as the adapter to the OT/J compiler.
@@ -162,6 +163,35 @@
 						</dependency>
 					</dependencies>
 				</plugin>
+
+				<plugin>
+					<!-- The same for tycho builds: -->
+					<groupId>org.eclipse.tycho</groupId>
+					<artifactId>tycho-compiler-plugin</artifactId>
+					<version>${tycho.version}</version>
+					<extensions>true</extensions>
+					<dependencies>
+						<dependency>
+							<groupId>org.eclipse.tycho</groupId>
+							<artifactId>tycho-compiler-jdt</artifactId>
+							<version>${tycho.version}</version>
+							<exclusions>
+								<!-- Exclude the original JDT/Core to be replaced by the OT/J variant: -->
+								<exclusion>
+									<groupId>org.eclipse.tycho</groupId>
+									<artifactId>org.eclipse.jdt.core</artifactId>
+								</exclusion>
+							</exclusions>
+						</dependency>
+						<dependency>
+							<!-- plug the OT/J compiler into the tycho-compiler-jdt plug-in: -->
+							<groupId>org.eclipse</groupId>
+							<artifactId>objectteams-otj-compiler</artifactId>
+							<version>${otj.version}</version>
+						</dependency>
+					</dependencies>
+				</plugin>
+
 				<!-- See http://maven.apache.org/plugins/maven-surefire-plugin/ -->
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
diff --git a/maven/testproject/pom.xml b/maven/testproject/pom.xml
index a17f6442a..ca489fbb4 100644
--- a/maven/testproject/pom.xml
+++ b/maven/testproject/pom.xml
@@ -5,13 +5,13 @@
 	<parent>
 		<groupId>org.eclipse</groupId>
 		<artifactId>objectteams-parent-pom</artifactId>
-		<version>2.1.0</version>
+		<version>2.1.1</version>
 	</parent>
 
 	<packaging>jar</packaging>
         
 	<artifactId>objectteams-compile-test</artifactId>
-	<version>1.0.1</version>
+	<version>1.0.2</version>
 	<name>Object Teams test project</name>
 
 	<!-- simply repeat this declaration from the parent pom, otherwise Maven duplicates the artifactId in the path -->
@@ -27,7 +27,7 @@
 			<comments>
 				This file is part of "Object Teams Development Tooling"-Software
 
-				Copyright 2010, 2011 GK Software AG and others.
+				Copyright 2010, 2012 GK Software AG and others.
 				All rights reserved. This program and the accompanying materials
 				are made available under the terms of the Eclipse Public License v1.0
 				which accompanies this distribution, and is available at