Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Herrmann2018-06-28 17:33:43 -0400
committerStephan Herrmann2018-06-28 17:33:43 -0400
commit7b1966f53cdceabfc3e0ce86a601db3b735f2743 (patch)
treea9ac6b3347a5c5745eee33a910bf2a7e7aeca2db
parent22d986d7f694b5c9f01fe87c9ef364c560d841a4 (diff)
downloadorg.eclipse.objectteams-7b1966f53cdceabfc3e0ce86a601db3b735f2743.tar.gz
org.eclipse.objectteams-7b1966f53cdceabfc3e0ce86a601db3b735f2743.tar.xz
org.eclipse.objectteams-7b1966f53cdceabfc3e0ce86a601db3b735f2743.zip
published OT 2.6.2 maven artifacts
-rw-r--r--maven/infrastructure/artifact-deployer/README-UPLOAD.txt16
-rw-r--r--maven/infrastructure/artifact-deployer/objectteams-otdre-pom.xml2
-rw-r--r--maven/infrastructure/artifact-deployer/objectteams-otre-pom.xml2
-rw-r--r--maven/infrastructure/artifact-deployer/pom.xml37
-rw-r--r--maven/infrastructure/parent-pom-otdre/pom.xml9
-rw-r--r--maven/infrastructure/parent-pom-otdre/src/site/apt/usage.apt4
-rw-r--r--maven/infrastructure/parent-pom/pom.xml23
-rw-r--r--maven/infrastructure/parent-pom/src/site/apt/usage.apt4
-rw-r--r--maven/testproject/pom.xml6
-rw-r--r--maven/testproject/src/site/apt/usage.apt4
10 files changed, 56 insertions, 51 deletions
diff --git a/maven/infrastructure/artifact-deployer/README-UPLOAD.txt b/maven/infrastructure/artifact-deployer/README-UPLOAD.txt
index ff528447a..8ff567103 100644
--- a/maven/infrastructure/artifact-deployer/README-UPLOAD.txt
+++ b/maven/infrastructure/artifact-deployer/README-UPLOAD.txt
@@ -2,20 +2,16 @@ Steps for "deploying":
Deploy to a local directory:
- create & enable a new profile local.deploy.target defining:
+ - protocol (set to "file", not "scpexe")
- ot.host
- ot.maven.repository.basepath
-
-Temporarily modify upload URLs from scpexe: to file: in
-- parent-pom
-- parent-pom-otdre
-- artifact-deployer
-- testproject
-Manually copy to server (versions as of 2.6.1):
+Manually copy to server (versions as of 2.6.2):
$ cd localrepo/repository
-$ for f in * ; do scp -r ${f}/2.6.1 sherrmann@build.eclipse.org:downloads/objectteams/maven/3/repository/org/eclipse/objectteams/${f}/; done
-$ for f in objectteams-otdre objectteams-otdre-agent; do scp -r ${f}/1.3.1 sherrmann@build.eclipse.org:downloads/objectteams/maven/3/repository/org/eclipse/objectteams/${f}/; done
-$ scp -r objectteams-compile-test/1.1.2 sherrmann@build.eclipse.org:downloads/objectteams/maven/3/repository/org/eclipse/objectteams/objectteams-compile-test/
+$ cd org/eclipse/objectteams
+$ for f in * ; do scp -r ${f}/2.6.2 sherrmann@build.eclipse.org:downloads/objectteams/maven/3/repository/org/eclipse/objectteams/${f}/; done
+$ for f in objectteams-otdre objectteams-otdre-agent; do scp -r ${f}/1.3.2 sherrmann@build.eclipse.org:downloads/objectteams/maven/3/repository/org/eclipse/objectteams/${f}/; done
+$ scp -r objectteams-compile-test/1.1.3 sherrmann@build.eclipse.org:downloads/objectteams/maven/3/repository/org/eclipse/objectteams/objectteams-compile-test/
$ cd localrepo/sites
$ scp -r * sherrmann@build.eclipse.org:downloads/objectteams/maven/3/sites/
diff --git a/maven/infrastructure/artifact-deployer/objectteams-otdre-pom.xml b/maven/infrastructure/artifact-deployer/objectteams-otdre-pom.xml
index 011954c1c..452936122 100644
--- a/maven/infrastructure/artifact-deployer/objectteams-otdre-pom.xml
+++ b/maven/infrastructure/artifact-deployer/objectteams-otdre-pom.xml
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.objectteams</groupId>
<artifactId>objectteams-otdre</artifactId>
- <version>2.6.1</version>
+ <version>2.6.2</version>
<description>The Object Teams Dynamic Runtime Environment (OTDRE)</description>
<licenses>
diff --git a/maven/infrastructure/artifact-deployer/objectteams-otre-pom.xml b/maven/infrastructure/artifact-deployer/objectteams-otre-pom.xml
index e95e4ef2c..b7ce8c5e4 100644
--- a/maven/infrastructure/artifact-deployer/objectteams-otre-pom.xml
+++ b/maven/infrastructure/artifact-deployer/objectteams-otre-pom.xml
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.objectteams</groupId>
<artifactId>objectteams-otre</artifactId>
- <version>2.6.1</version>
+ <version>2.6.2</version>
<description>The Object Teams Runtime Environment (OTRE)</description>
<licenses>
diff --git a/maven/infrastructure/artifact-deployer/pom.xml b/maven/infrastructure/artifact-deployer/pom.xml
index e4879a998..d23cbb364 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.6.1</version>
+ <version>2.6.2</version>
<relativePath>../parent-pom</relativePath>
</parent>
@@ -51,22 +51,25 @@
<!-- ecj.export.dir : directory where the batch compiler jar is located -->
<properties>
- <!-- Object Teams versions, update manually: -->
+ <!-- deploy using either scpexe or file protocol: -->
+ <protocol>scpexe</protocol>
+
+ <!-- Object Teams versions, update manually: -->
<!-- version of the signed ecotj jar file: -->
- <ecotj.version>R-2.6.1-201712031505-signed</ecotj.version>
+ <ecotj.version>R-2.6.2-201803031337-signed</ecotj.version>
<!-- version of the org.eclipse.objectteams.runtime plugin: -->
- <otre.version>2.5.0.201606070956</otre.version>
+ <otre.version>2.6.2.201804012017</otre.version>
<otruntime.version>2.6.0.201706061121</otruntime.version>
<!-- version of the org.eclipse.objectteams.otredyn plugin: -->
- <otredyn.version>1.3.1.201712031505</otredyn.version>
+ <otredyn.version>1.3.2.201804012017</otredyn.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.otre_${otre.version}.jar</otre.jar.file>
- <ot.runtime.jar.file>${otre.export.dir}-${otre.version}/org.eclipse.objectteams.runtime_${otruntime.version}.jar</ot.runtime.jar.file>
- <otre-agent.jar.file>${otre.export.dir}-${otre.version}/otre_agent.jar</otre-agent.jar.file>
- <otdre.jar.file>${otre.export.dir}-${otre.version}/org.eclipse.objectteams.otredyn_${otredyn.version}.jar</otdre.jar.file>
- <otdre-agent.jar.file>${otre.export.dir}-${otre.version}/otredyn_agent.jar</otdre-agent.jar.file>
+ <otre.jar.file>${otre.export.dir}-${project.version}/org.eclipse.objectteams.otre_${otre.version}.jar</otre.jar.file>
+ <ot.runtime.jar.file>${otre.export.dir}-${project.version}/org.eclipse.objectteams.runtime_${otruntime.version}.jar</ot.runtime.jar.file>
+ <otre-agent.jar.file>${otre.export.dir}-${project.version}/otre_agent.jar</otre-agent.jar.file>
+ <otdre.jar.file>${otre.export.dir}-${project.version}/org.eclipse.objectteams.otredyn_${otredyn.version}.jar</otdre.jar.file>
+ <otdre-agent.jar.file>${otre.export.dir}-${project.version}/otredyn_agent.jar</otdre-agent.jar.file>
<!-- Repository path of this module within the Object Teams git: -->
<project-repository-path>maven/infrastructure/artifacts-deployer</project-repository-path>
@@ -84,7 +87,7 @@
<site>
<id>otSiteRepo</id>
<name>Object Teams sites repository for Maven 3</name>
- <url>scpexe://${ot.host}:${ot.maven.repository.basepath}/sites/${project.artifactId}</url>
+ <url>${protocol}://${ot.host}:${ot.maven.repository.basepath}/sites/${project.artifactId}</url>
</site>
</distributionManagement>
@@ -104,7 +107,7 @@
<configuration>
<repositoryId>otEclipseRepo</repositoryId>
<packaging>jar</packaging>
- <url>scpexe://${ot.host}:${ot.maven.repository.basepath}/repository</url>
+ <url>${protocol}://${ot.host}:${ot.maven.repository.basepath}/repository</url>
<!-- The file to be deployed -->
<file>${ot.runtime.jar.file}</file>
<groupId>${project.groupId}</groupId>
@@ -122,7 +125,7 @@
<configuration>
<repositoryId>otEclipseRepo</repositoryId>
<packaging>jar</packaging>
- <url>scpexe://${ot.host}:${ot.maven.repository.basepath}/repository</url>
+ <url>${protocol}://${ot.host}:${ot.maven.repository.basepath}/repository</url>
<!-- The file to be deployed -->
<file>${otre.jar.file}</file>
<groupId>${project.groupId}</groupId>
@@ -141,7 +144,7 @@
<configuration>
<repositoryId>otEclipseRepo</repositoryId>
<packaging>jar</packaging>
- <url>scpexe://${ot.host}:${ot.maven.repository.basepath}/repository</url>
+ <url>${protocol}://${ot.host}:${ot.maven.repository.basepath}/repository</url>
<!-- The file to be deployed -->
<file>${otre-agent.jar.file}</file>
<groupId>${project.groupId}</groupId>
@@ -160,7 +163,7 @@
<configuration>
<repositoryId>otEclipseRepo</repositoryId>
<packaging>jar</packaging>
- <url>scpexe://${ot.host}:${ot.maven.repository.basepath}/repository</url>
+ <url>${protocol}://${ot.host}:${ot.maven.repository.basepath}/repository</url>
<!-- The file to be deployed -->
<file>${otdre.jar.file}</file>
<groupId>${project.groupId}</groupId>
@@ -179,7 +182,7 @@
<configuration>
<repositoryId>otEclipseRepo</repositoryId>
<packaging>jar</packaging>
- <url>scpexe://${ot.host}:${ot.maven.repository.basepath}/repository</url>
+ <url>${protocol}://${ot.host}:${ot.maven.repository.basepath}/repository</url>
<!-- The file to be deployed -->
<file>${otdre-agent.jar.file}</file>
<groupId>${project.groupId}</groupId>
@@ -198,7 +201,7 @@
<configuration>
<repositoryId>otEclipseRepo</repositoryId>
<packaging>jar</packaging>
- <url>scpexe://${ot.host}:${ot.maven.repository.basepath}/repository</url>
+ <url>${protocol}://${ot.host}:${ot.maven.repository.basepath}/repository</url>
<!-- The file to be deployed -->
<file>${ecotj.jar.file}</file>
<groupId>${project.groupId}</groupId>
diff --git a/maven/infrastructure/parent-pom-otdre/pom.xml b/maven/infrastructure/parent-pom-otdre/pom.xml
index 3f3e3b195..5ecde746d 100644
--- a/maven/infrastructure/parent-pom-otdre/pom.xml
+++ b/maven/infrastructure/parent-pom-otdre/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.objectteams</groupId>
<artifactId>objectteams-parent-pom</artifactId>
- <version>2.6.1</version>
+ <version>2.6.2</version>
</parent>
<artifactId>objectteams-otdre-parent-pom</artifactId>
@@ -66,6 +66,9 @@
<!-- Repository path of this module within the Object Teams git: -->
<project-repository-path>maven/infrastructure/parent-pom-otdre</project-repository-path>
+ <!-- deploy using either scpexe or file protocol: -->
+ <protocol>scpexe</protocol>
+
<!-- Select OTDRE: -->
<otj.weaving.scheme>otdre</otj.weaving.scheme>
<objectteams-otre.version>${otdre.version}</objectteams-otre.version>
@@ -103,7 +106,7 @@
otherwise the variables from the below URL will be pasted verbatim for references
to the parent pom =:-0
-->
- <url>scpexe://${ot.host}:${ot.maven.repository.basepath}/sites/${project.artifactId}</url>
+ <url>${protocol}://${ot.host}:${ot.maven.repository.basepath}/sites/${project.artifactId}</url>
</site>
<repository>
<id>ObjectTeamsRepository</id>
@@ -112,7 +115,7 @@
<!--
most values are fed from settings.xml
-->
- <url>scpexe://${ot.host}:${ot.maven.repository.basepath}/repository</url>
+ <url>${protocol}://${ot.host}:${ot.maven.repository.basepath}/repository</url>
<layout>default</layout>
</repository>
</distributionManagement>
diff --git a/maven/infrastructure/parent-pom-otdre/src/site/apt/usage.apt b/maven/infrastructure/parent-pom-otdre/src/site/apt/usage.apt
index db68ca147..c68be001c 100644
--- a/maven/infrastructure/parent-pom-otdre/src/site/apt/usage.apt
+++ b/maven/infrastructure/parent-pom-otdre/src/site/apt/usage.apt
@@ -3,7 +3,7 @@
------
Olaf Otto & Stephan Herrmann
------
- 2018-02-06
+ 2018-06-28
------
Using the Object Teams OTDRE Parent POM
@@ -38,7 +38,7 @@ Using the Object Teams OTDRE Parent POM
<parent>
<groupId>org.eclipse.objectteams</groupId>
<artifactId>objectteams-otdre-parent-pom</artifactId>
- <version>2.6.1</version>
+ <version>2.6.2</version>
</parent>
+-----
diff --git a/maven/infrastructure/parent-pom/pom.xml b/maven/infrastructure/parent-pom/pom.xml
index ead16d20f..d1e3f8cb7 100644
--- a/maven/infrastructure/parent-pom/pom.xml
+++ b/maven/infrastructure/parent-pom/pom.xml
@@ -4,7 +4,7 @@
<groupId>org.eclipse.objectteams</groupId>
<artifactId>objectteams-parent-pom</artifactId>
- <version>2.6.1</version>
+ <version>2.6.2</version>
<packaging>pom</packaging>
<name>Object Teams parent pom</name>
@@ -85,14 +85,17 @@
<!-- Repository path of this module within the Object Teams git: -->
<project-repository-path>maven/infrastructure/parent-pom</project-repository-path>
- <!-- Our Version: -->
- <otj.version>2.6.1</otj.version>
- <otdre.version>1.3.1</otdre.version>
+ <!-- deploy using either scpexe or file protocol: -->
+ <protocol>scpexe</protocol>
+
+ <!-- Our Version: -->
+ <otj.version>2.6.2</otj.version>
+ <otdre.version>1.3.2</otdre.version>
<!-- Versions of dependencies: -->
<bcel.version>5.2</bcel.version>
- <tycho.version>0.26.0</tycho.version>
- <apt.version>1.3.60</apt.version> <!-- pulled from maven central to be compatible with latest JDT -->
+ <tycho.version>1.2.0</tycho.version>
+ <apt.version>1.3.110</apt.version> <!-- pulled from maven central to be compatible with latest JDT -->
<!-- **** Main switch for OTRE vs. OTDRE (here we default to OTRE): **** -->
<otj.weaving.scheme>otre</otj.weaving.scheme>
@@ -171,11 +174,11 @@
<exclusions>
<!-- Exclude the original JDT/Core to be replaced by the OT/J variant: -->
<exclusion>
- <groupId>org.eclipse.tycho</groupId>
+ <groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.core</artifactId>
</exclusion>
<exclusion>
- <groupId>org.eclipse.tycho</groupId>
+ <groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.compiler.apt</artifactId>
</exclusion>
</exclusions>
@@ -305,7 +308,7 @@
otherwise the variables from the below URL will be pasted verbatim for references
to the parent pom =:-0
-->
- <url>scpexe://${ot.host}:${ot.maven.repository.basepath}/sites/${project.artifactId}</url>
+ <url>${protocol}://${ot.host}:${ot.maven.repository.basepath}/sites/${project.artifactId}</url>
</site>
<repository>
<id>ObjectTeamsRepository</id>
@@ -314,7 +317,7 @@
<!--
most values are fed from settings.xml
-->
- <url>scpexe://${ot.host}:${ot.maven.repository.basepath}/repository</url>
+ <url>${protocol}://${ot.host}:${ot.maven.repository.basepath}/repository</url>
<layout>default</layout>
</repository>
</distributionManagement>
diff --git a/maven/infrastructure/parent-pom/src/site/apt/usage.apt b/maven/infrastructure/parent-pom/src/site/apt/usage.apt
index 8dd74ee66..15358996d 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
------
- 2018-02-06
+ 2018-06-28
------
Using the Object Teams Parent POM
@@ -40,7 +40,7 @@ Using the Object Teams Parent POM
<parent>
<groupId>org.eclipse.objectteams</groupId>
<artifactId>objectteams-parent-pom</artifactId>
- <version>2.6.1</version>
+ <version>2.6.2</version>
</parent>
+-----
diff --git a/maven/testproject/pom.xml b/maven/testproject/pom.xml
index 78d8caadf..7d3a50f98 100644
--- a/maven/testproject/pom.xml
+++ b/maven/testproject/pom.xml
@@ -5,13 +5,13 @@
<parent>
<groupId>org.eclipse.objectteams</groupId>
<artifactId>objectteams-otdre-parent-pom</artifactId>
- <version>2.6.1</version>
+ <version>2.6.2</version>
</parent>
<packaging>jar</packaging>
<artifactId>objectteams-compile-test</artifactId>
- <version>1.1.2</version>
+ <version>1.1.3</version>
<name>Object Teams test project</name>
<!-- simply repeat this declaration from the parent pom, otherwise Maven duplicates the artifactId in the path -->
@@ -69,7 +69,7 @@
<site>
<id>otSiteRepo</id>
<name>Object Teams sites repository for Maven 3</name>
- <url>scpexe://${ot.host}:${ot.maven.repository.basepath}/sites/${project.artifactId}</url>
+ <url>${protocol}://${ot.host}:${ot.maven.repository.basepath}/sites/${project.artifactId}</url>
</site>
</distributionManagement>
diff --git a/maven/testproject/src/site/apt/usage.apt b/maven/testproject/src/site/apt/usage.apt
index f0d8a78ae..807344242 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
------
- 2018-02-06
+ 2018-06-28
------
Using Object Teams with Maven3
@@ -33,7 +33,7 @@ Using Object Teams with Maven3
<parent>
<groupId>org.eclipse.objectteams</groupId>
<artifactId>objectteams-otdre-parent-pom</artifactId>
- <version>2.6.1</version>
+ <version>2.6.2</version>
</parent>
+-----

Back to the top