Updated maven integration for the 2.1.0 release.
diff --git a/maven/infrastructure/artifact-deployer/.gitignore b/maven/infrastructure/artifact-deployer/.gitignore
index 650751b..a846ad3 100644
--- a/maven/infrastructure/artifact-deployer/.gitignore
+++ b/maven/infrastructure/artifact-deployer/.gitignore
@@ -1,2 +1,3 @@
/.settings
/.project
+/target
diff --git a/maven/infrastructure/artifact-deployer/objectteams-runtime-pom.xml b/maven/infrastructure/artifact-deployer/objectteams-runtime-pom.xml
index 8b08253..f9f59e1 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-SNAPSHOT</version>
+ <version>2.1.0</version>
<description>The OT/J Runtime Library</description>
<licenses>
diff --git a/maven/infrastructure/artifact-deployer/pom.xml b/maven/infrastructure/artifact-deployer/pom.xml
index 14c2b37..8c53be2 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-SNAPSHOT</version>
+ <version>2.1.0</version>
<relativePath>../parent-pom</relativePath>
</parent>
@@ -24,7 +24,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
@@ -51,25 +51,25 @@
<properties>
<!-- Object Teams versions, update manually: -->
- <!-- version of the ecotj jar file: -->
- <ecotj.version>S-2.1.0M6-201203201245</ecotj.version>
+ <!-- version of the signed ecotj jar file: -->
+ <ecotj.version>R-2.1.0-201206090440-signed</ecotj.version>
<!-- version of the org.eclipse.objectteams.runtime plugin: -->
- <otre.version>2.1.0.201201311800</otre.version>
+ <otre.version>2.1.0.201205081843</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}/org.eclipse.objectteams.runtime_${otre.version}.jar</otre.jar.file>
- <otre-agent.jar.file>${otre.export.dir}/otre_agent.jar</otre-agent.jar.file>
+ <otre.jar.file>${otre.export.dir}-${otre.version}/org.eclipse.objectteams.runtime_${otre.version}.jar</otre.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 svn: -->
- <project-repository-path>trunk/maven/infrastructure/artifacts-deployer</project-repository-path>
+ <!-- Repository path of this module within the Object Teams git: -->
+ <project-repository-path>maven/infrastructure/artifacts-deployer</project-repository-path>
</properties>
<!-- Override inherited declaration, otherwise Maven appends the artifactId to the path -->
<scm>
- <connection>scm:svn:svn://dev.eclipse.org/svnroot/tools/org.eclipse.objectteams/tags/mvn-releases/objectteams-artifact-deployer-2.0.0</connection>
- <developerConnection>scm:svn:svn+ssh://${username}@dev.eclipse.org/svnroot/tools/org.eclipse.objectteams/tags/mvn-releases/objectteams-artifact-deployer-2.0.0</developerConnection>
- <url>http://dev.eclipse.org/viewcvs/index.cgi/tags/mvn-releases/objectteams-artifact-deployer-2.0.0?root=TOOLS_OBJECTTEAMS</url>
+ <connection>scm:git:git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git/${project-repository-path}</connection>
+ <developerConnection>scm:git:ssh://${username}@git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git/${project-repository-path}</developerConnection>
+ <url>http://git.eclipse.org/c/objectteams/org.eclipse.objectteams.git/${project-repository-path}</url>
</scm>
<!-- simply repeat this declaration from the parent pom, otherwise Maven duplicates the artifactId in the path -->
diff --git a/maven/infrastructure/parent-pom/.gitignore b/maven/infrastructure/parent-pom/.gitignore
index 541e887..7836579 100644
--- a/maven/infrastructure/parent-pom/.gitignore
+++ b/maven/infrastructure/parent-pom/.gitignore
@@ -1,2 +1,3 @@
/.project
/.settings
+/target
diff --git a/maven/infrastructure/parent-pom/pom.xml b/maven/infrastructure/parent-pom/pom.xml
index ce2cac5..4aa0f0f 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-SNAPSHOT</version>
+ <version>2.1.0</version>
<packaging>pom</packaging>
<name>Object Teams parent pom</name>
@@ -23,7 +23,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
@@ -79,14 +79,14 @@
<!-- settings.localRepository path to the local Maven repository. -->
<properties>
<!-- Repository path of this module within the Object Teams svn: -->
- <project-repository-path>trunk/maven/infrastructure/parent-pom</project-repository-path>
+ <project-repository-path>maven/infrastructure/parent-pom</project-repository-path>
<!-- Our Version: -->
- <otj.version>2.1.0-SNAPSHOT</otj.version>
+ <otj.version>2.1.0</otj.version>
<!-- Versions of dependencies: -->
<bcel.version>5.2</bcel.version>
- <tycho.version>0.14.1</tycho.version>
+ <tycho.version>0.15.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>
@@ -108,10 +108,10 @@
<scm>
<!-- WTF: release will "improve" the connection to using svn+ssh and advertize this for anonymous access !@#!%$ -->
- <connection>scm:svn:svn://dev.eclipse.org/svnroot/tools/org.eclipse.objectteams/${project-repository-path}</connection>
- <developerConnection>scm:svn:svn+ssh://${username}@dev.eclipse.org/svnroot/tools/org.eclipse.objectteams/${project-repository-path}</developerConnection>
+ <connection>scm:git:git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git/${project-repository-path}</connection>
+ <developerConnection>scm:git:ssh://${username}@git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git/${project-repository-path}</developerConnection>
<!-- WTF: release will "improve" the connection to using svn+ssh and advertize this for web access !@#!%$ -->
- <url>http://dev.eclipse.org/viewcvs/index.cgi/${project-repository-path}?root=TOOLS_OBJECTTEAMS</url>
+ <url>http://git.eclipse.org/c/objectteams/org.eclipse.objectteams.git</url>
</scm>
<reporting>
@@ -187,7 +187,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.0-beta-2</version>
+ <version>3.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -202,7 +202,7 @@
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh-external</artifactId>
- <version>1.0-beta-6</version>
+ <version>2.2</version>
</extension>
</extensions>
</build>
diff --git a/maven/infrastructure/parent-pom/src/site/apt/usage.apt b/maven/infrastructure/parent-pom/src/site/apt/usage.apt
index 5d3a435..7810069 100644
--- a/maven/infrastructure/parent-pom/src/site/apt/usage.apt
+++ b/maven/infrastructure/parent-pom/src/site/apt/usage.apt
@@ -3,7 +3,7 @@
------
Olaf Otto & Stephan Herrmann
------
- 2001-10-18
+ 2012-07-05
------
Using the Object Teams Parent POM
@@ -33,7 +33,7 @@
<parent>
<groupId>org.eclipse</groupId>
<artifactId>objectteams-parent-pom</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>2.1.0</version>
</parent>
+-----
diff --git a/maven/testproject/.gitignore b/maven/testproject/.gitignore
index a846ad3..e205143 100644
--- a/maven/testproject/.gitignore
+++ b/maven/testproject/.gitignore
@@ -1,3 +1,4 @@
/.settings
/.project
/target
+/.classpath
diff --git a/maven/testproject/pom.xml b/maven/testproject/pom.xml
index 501047b..13fefeb 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-SNAPSHOT</version>
+ <version>2.1.0</version>
</parent>
<packaging>jar</packaging>
<artifactId>objectteams-compile-test</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.1</version>
<name>Object Teams test project</name>
<!-- simply repeat this declaration from the parent pom, otherwise Maven duplicates the artifactId in the path -->
@@ -53,14 +53,14 @@
<properties>
<!-- Relative path of this module: -->
- <project-repository-path>trunk/maven/testproject</project-repository-path>
+ <project-repository-path>maven/testproject</project-repository-path>
</properties>
<!-- Override inherited declaration, otherwise Maven appends the artifactId to the path -->
<scm>
- <connection>scm:svn:svn://dev.eclipse.org/svnroot/tools/org.eclipse.objectteams/${project-repository-path}</connection>
- <developerConnection>scm:svn:svn+ssh://dev.eclipse.org/svnroot/tools/org.eclipse.objectteams/${project-repository-path}</developerConnection>
- <url>http://dev.eclipse.org/viewcvs/index.cgi/${project-repository-path}?root=TOOLS_OBJECTTEAMS</url>
+ <connection>scm:git:git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git/${project-repository-path}</connection>
+ <developerConnection>scm:git:ssh://${username}@git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git/${project-repository-path}</developerConnection>
+ <url>http://git.eclipse.org/c/objectteams/org.eclipse.objectteams.git/${project-repository-path}</url>
</scm>
<!-- simply repeat this declaration from the parent pom, otherwise Maven duplicates the artifactId in the path -->
diff --git a/maven/testproject/src/site/apt/usage.apt b/maven/testproject/src/site/apt/usage.apt
index de43a00..3e673fa 100644
--- a/maven/testproject/src/site/apt/usage.apt
+++ b/maven/testproject/src/site/apt/usage.apt
@@ -3,7 +3,7 @@
------
Olaf Otto & Stephan Herrmann
------
- 2001-10-18
+ 2012-07-05
------
Using Object Teams with Maven3
@@ -33,7 +33,7 @@
<parent>
<groupId>org.eclipse</groupId>
<artifactId>objectteams-parent-pom</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>2.1.0</version>
</parent>
+-----
@@ -64,4 +64,4 @@
* Source
- See the full source of {{{http://dev.eclipse.org/viewcvs/index.cgi/trunk/maven/testproject/pom.xml?root=TOOLS_OBJECTTEAMS&revision=HEAD}pom.xml}}.
\ No newline at end of file
+ See the full source of {{{http://git.eclipse.org/c/objectteams/org.eclipse.objectteams.git/tree/maven/testproject/pom.xml}pom.xml}}.
\ No newline at end of file