Releng: update Maven support to OT/J 2.3.0
- adjust to new organization of runtime/otre
- improve surfire launch: fewer jars on the bootclasspath
- fix groupId, some locations said "org.eclipse" lacking "objectteams"
diff --git a/maven/infrastructure/artifact-deployer/objectteams-runtime-pom.xml b/maven/infrastructure/artifact-deployer/objectteams-otre-pom.xml
similarity index 89%
rename from maven/infrastructure/artifact-deployer/objectteams-runtime-pom.xml
rename to maven/infrastructure/artifact-deployer/objectteams-otre-pom.xml
index f6e70c9..d456a44 100644
--- a/maven/infrastructure/artifact-deployer/objectteams-runtime-pom.xml
+++ b/maven/infrastructure/artifact-deployer/objectteams-otre-pom.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.objectteams</groupId>
- <artifactId>objectteams-runtime</artifactId>
- <version>2.1.2</version>
- <description>The OT/J Runtime Library</description>
+ <artifactId>objectteams-otre</artifactId>
+ <version>2.3.0</version>
+ <description>The Object Teams Runtime Environment (OTRE)</description>
<licenses>
<license>
diff --git a/maven/infrastructure/artifact-deployer/pom.xml b/maven/infrastructure/artifact-deployer/pom.xml
index bbe1517..eeb3f8c 100644
--- a/maven/infrastructure/artifact-deployer/pom.xml
+++ b/maven/infrastructure/artifact-deployer/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.objectteams</groupId>
<artifactId>objectteams-parent-pom</artifactId>
- <version>2.2.0</version>
+ <version>2.3.0</version>
<relativePath>../parent-pom</relativePath>
</parent>
@@ -24,7 +24,7 @@
<comments>
This file is part of "Object Teams Development Tooling"-Software
- Copyright 2010, 2013 GK Software AG and others.
+ Copyright 2010, 2014 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
@@ -45,20 +45,22 @@
<!-- ot.maven.repository.path : absolute path to the maven repository on ot.host -->
<!-- LOCAL: -->
<!-- otre.export.dir : directory where exported otre jars are located: -->
- <!-- org.eclipse.objectteams.runtime_${otre.version}.jar -->
- <!-- otre_min.jar, otre_agent.jar -->
+ <!-- org.eclipse.objectteams.otre_${otre.version}.jar -->
+ <!-- org.eclipse.objectteams.runtime_${otre.version}.jar -->
+ <!-- otre_agent.jar -->
<!-- ecj.export.dir : directory where the batch compiler jar is located -->
<properties>
<!-- Object Teams versions, update manually: -->
<!-- version of the signed ecotj jar file: -->
- <ecotj.version>R-2.2.0-201306071800-signed</ecotj.version>
+ <ecotj.version>R-2.3.0-201406101336-signed</ecotj.version>
<!-- version of the org.eclipse.objectteams.runtime plugin: -->
- <otre.version>2.2.0.201305210612</otre.version>
+ <otre.version>2.3.0.201406101339</otre.version>
<!-- locate the jar files to install/deploy: -->
<ecotj.jar.file>${ecj.export.dir}/ecotj-${ecotj.version}.jar</ecotj.jar.file>
- <otre.jar.file>${otre.export.dir}-${otre.version}/org.eclipse.objectteams.runtime_${otre.version}.jar</otre.jar.file>
+ <otre.jar.file>${otre.export.dir}-${otre.version}/org.eclipse.objectteams.otre_${otre.version}.jar</otre.jar.file>
+ <ot.runtime.jar.file>${otre.export.dir}-${otre.version}/org.eclipse.objectteams.runtime_${otre.version}.jar</ot.runtime.jar.file>
<otre-agent.jar.file>${otre.export.dir}-${otre.version}/otre_agent.jar</otre-agent.jar.file>
<!-- Repository path of this module within the Object Teams git: -->
@@ -89,6 +91,24 @@
<version>2.4</version>
<executions>
<execution>
+ <id>deploy-ot-runtime-as-maven-artifact</id>
+ <phase>deploy</phase>
+ <goals>
+ <goal>deploy-file</goal>
+ </goals>
+ <configuration>
+ <repositoryId>otEclipseRepo</repositoryId>
+ <packaging>jar</packaging>
+ <url>scpexe://${ot.host}:${ot.maven.repository.basepath}/repository</url>
+ <!-- The file to be deployed -->
+ <file>${ot.runtime.jar.file}</file>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>objectteams-runtime</artifactId>
+ <version>${otj.version}</version>
+ <packaging>jar</packaging>
+ </configuration>
+ </execution>
+ <execution>
<id>deploy-otre-as-maven-artifact</id>
<phase>deploy</phase>
<goals>
@@ -101,9 +121,10 @@
<!-- The file to be deployed -->
<file>${otre.jar.file}</file>
<groupId>${project.groupId}</groupId>
- <artifactId>objectteams-runtime</artifactId>
+ <artifactId>objectteams-otre</artifactId>
<version>${otj.version}</version>
<packaging>jar</packaging>
+ <pomFile>objectteams-otre-pom.xml</pomFile>
</configuration>
</execution>
<execution>
@@ -152,6 +173,22 @@
<version>2.3</version>
<executions>
<execution>
+ <id>install-ot-runtime-as-maven-artifact</id>
+ <phase>install</phase>
+ <goals>
+ <goal>install-file</goal>
+ </goals>
+ <configuration>
+ <packaging>jar</packaging>
+ <!-- The file to be deployed -->
+ <file>${ot.runtime.jar.file}</file>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>objectteams-runtime</artifactId>
+ <version>${otj.version}</version>
+ <packaging>jar</packaging>
+ </configuration>
+ </execution>
+ <execution>
<id>install-otre-as-maven-artifact</id>
<phase>install</phase>
<goals>
@@ -162,10 +199,10 @@
<!-- The file to be deployed -->
<file>${otre.jar.file}</file>
<groupId>${project.groupId}</groupId>
- <artifactId>objectteams-runtime</artifactId>
+ <artifactId>objectteams-otre</artifactId>
<version>${otj.version}</version>
<packaging>jar</packaging>
- <pomFile>objectteams-runtime-pom.xml</pomFile>
+ <pomFile>objectteams-otre-pom.xml</pomFile>
</configuration>
</execution>
<execution>