Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Herrmann2018-02-06 00:30:34 +0000
committerStephan Herrmann2018-02-06 11:56:14 +0000
commit0e7e71e3e0cf84440445cf375f8fa885bbe397e9 (patch)
tree7d8b5c74ff76bf68bfe7b55f4b8ee83b87c1ad57
parentf7b4a08acfebcc52b645d5fefd4c28a6d39c5d07 (diff)
downloadorg.eclipse.objectteams-0e7e71e3e0cf84440445cf375f8fa885bbe397e9.tar.gz
org.eclipse.objectteams-0e7e71e3e0cf84440445cf375f8fa885bbe397e9.tar.xz
org.eclipse.objectteams-0e7e71e3e0cf84440445cf375f8fa885bbe397e9.zip
Releng: Maven configuration for OT/J 2.6.1
-rw-r--r--maven/infrastructure/artifact-deployer/README-UPLOAD.txt26
-rw-r--r--maven/infrastructure/artifact-deployer/objectteams-otdre-pom.xml20
-rw-r--r--maven/infrastructure/artifact-deployer/objectteams-otre-pom.xml4
-rw-r--r--maven/infrastructure/artifact-deployer/pom.xml11
-rw-r--r--maven/infrastructure/parent-pom-otdre/pom.xml43
-rw-r--r--maven/infrastructure/parent-pom-otdre/src/site/apt/usage.apt9
-rw-r--r--maven/infrastructure/parent-pom/pom.xml37
-rw-r--r--maven/infrastructure/parent-pom/src/site/apt/usage.apt8
-rw-r--r--maven/testproject/pom.xml6
-rw-r--r--maven/testproject/src/site/apt/usage.apt6
10 files changed, 126 insertions, 44 deletions
diff --git a/maven/infrastructure/artifact-deployer/README-UPLOAD.txt b/maven/infrastructure/artifact-deployer/README-UPLOAD.txt
new file mode 100644
index 000000000..ff528447a
--- /dev/null
+++ b/maven/infrastructure/artifact-deployer/README-UPLOAD.txt
@@ -0,0 +1,26 @@
+Steps for "deploying":
+
+Deploy to a local directory:
+- create & enable a new profile local.deploy.target defining:
+ - 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):
+$ 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 localrepo/sites
+$ scp -r * sherrmann@build.eclipse.org:downloads/objectteams/maven/3/sites/
+
+On the server update maven-metadata (excluding objectteams-weaver-maven-plugin):
+- edit maven-metadata.xml
+$ for f in objectteams-[a-v]*; do md5sum $f/maven-metadata.xml > $f/maven-metadata.xml.md5; done
+$ for f in objectteams-[a-v]*; do sha1sum $f/maven-metadata.xml > $f/maven-metadata.xml.sha1; done \ No newline at end of file
diff --git a/maven/infrastructure/artifact-deployer/objectteams-otdre-pom.xml b/maven/infrastructure/artifact-deployer/objectteams-otdre-pom.xml
index ed039b4d1..011954c1c 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.5.0</version>
+ <version>2.6.1</version>
<description>The Object Teams Dynamic Runtime Environment (OTDRE)</description>
<licenses>
@@ -13,7 +13,7 @@
<comments>
This file is part of "Object Teams Development Tooling"-Software
- Copyright 2016 GK Software AG and others.
+ Copyright 2016, 2018 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
@@ -31,8 +31,20 @@
<dependencies>
<dependency>
<groupId>org.ow2.asm</groupId>
- <artifactId>asm-all</artifactId>
- <version>5.0.1</version>
+ <artifactId>asm</artifactId>
+ <version>6.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-commons</artifactId>
+ <version>6.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-tree</artifactId>
+ <version>6.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/maven/infrastructure/artifact-deployer/objectteams-otre-pom.xml b/maven/infrastructure/artifact-deployer/objectteams-otre-pom.xml
index 1df111a15..e95e4ef2c 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.5.0</version>
+ <version>2.6.1</version>
<description>The Object Teams Runtime Environment (OTRE)</description>
<licenses>
@@ -13,7 +13,7 @@
<comments>
This file is part of "Object Teams Development Tooling"-Software
- Copyright 2010, 2016 GK Software AG and others.
+ Copyright 2010, 2018 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 05406316b..e4879a998 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.5.0</version>
+ <version>2.6.1</version>
<relativePath>../parent-pom</relativePath>
</parent>
@@ -24,7 +24,7 @@
<comments>
This file is part of "Object Teams Development Tooling"-Software
- Copyright 2010, 2016 GK Software AG and others.
+ Copyright 2010, 2018 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
@@ -53,16 +53,17 @@
<properties>
<!-- Object Teams versions, update manually: -->
<!-- version of the signed ecotj jar file: -->
- <ecotj.version>R-2.5.0-201606070953-signed</ecotj.version>
+ <ecotj.version>R-2.6.1-201712031505-signed</ecotj.version>
<!-- version of the org.eclipse.objectteams.runtime plugin: -->
<otre.version>2.5.0.201606070956</otre.version>
+ <otruntime.version>2.6.0.201706061121</otruntime.version>
<!-- version of the org.eclipse.objectteams.otredyn plugin: -->
- <otredyn.version>1.2.0.201606070956</otredyn.version>
+ <otredyn.version>1.3.1.201712031505</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_${otre.version}.jar</ot.runtime.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>
diff --git a/maven/infrastructure/parent-pom-otdre/pom.xml b/maven/infrastructure/parent-pom-otdre/pom.xml
index 6c64ebcf1..3f3e3b195 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.5.0</version>
+ <version>2.6.1</version>
</parent>
<artifactId>objectteams-otdre-parent-pom</artifactId>
@@ -27,7 +27,7 @@
<comments>
This file is part of "Object Teams Development Tooling"-Software.
- Copyright 2016 GK Software AG and others.
+ Copyright 2016, 2018 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
@@ -71,10 +71,16 @@
<objectteams-otre.version>${otdre.version}</objectteams-otre.version>
<!-- Select ASM: -->
- <asm.version>5.0.1</asm.version>
+ <asm.version>6.0</asm.version>
<otj.bytecode.lib.groupId>org.ow2.asm</otj.bytecode.lib.groupId>
- <otj.bytecode.lib.artifactId>asm-all</otj.bytecode.lib.artifactId>
+ <otj.bytecode.lib.artifactId>asm</otj.bytecode.lib.artifactId>
<otj.bytecode.lib.version>${asm.version}</otj.bytecode.lib.version>
+
+ <asm.location>${settings.localRepository}/org/ow2/asm/asm/${asm.version}/asm-${asm.version}.jar</asm.location>
+ <asm.commons.location>${settings.localRepository}/org/ow2/asm/asm-commons/${asm.version}/asm-commons-${asm.version}.jar</asm.commons.location>
+ <asm.tree.location>${settings.localRepository}/org/ow2/asm/asm-tree/${asm.version}/asm-tree-${asm.version}.jar</asm.tree.location>
+
+ <otj.bootcp.arg>-Xbootclasspath/a:${otj.runtime.location}:${asm.location}:${asm.commons.location}:${asm.tree.location}</otj.bootcp.arg>
</properties>
<scm>
@@ -110,5 +116,32 @@
<layout>default</layout>
</repository>
</distributionManagement>
-
+
+ <dependencies>
+ <!-- Since ASM is now split into several jars, we need to list additional ones here -->
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-commons</artifactId>
+ <version>6.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-tree</artifactId>
+ <version>6.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-util</artifactId>
+ <version>6.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-analysis</artifactId>
+ <version>6.0</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
</project> \ No newline at end of file
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 a74491bc9..db68ca147 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
------
- 2016-06-12
+ 2018-02-06
------
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.5.0</version>
+ <version>2.6.1</version>
</parent>
+-----
@@ -67,6 +67,7 @@ Using the Object Teams OTDRE Parent POM
[]
- The following module is indirectly used:
+ The following modules are indirectly used:
- [org.ow2.asm:asm-all] the original {{{http://asm.ow2.org/}ASM}} byte code library. \ No newline at end of file
+ [org.ow2.asm:asm] the original {{{http://asm.ow2.org/}ASM}} byte code library, along with its auxiliary modules <<<asm-commons>>>, <<<asm-tree>>>, <<<asm-util>>> and <<<asm-analysis>>>
+ \ No newline at end of file
diff --git a/maven/infrastructure/parent-pom/pom.xml b/maven/infrastructure/parent-pom/pom.xml
index 9c943cfa8..ead16d20f 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.5.0</version>
+ <version>2.6.1</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, 2016 GK Software AG and others.
+ Copyright 2010, 2018 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
@@ -86,13 +86,13 @@
<project-repository-path>maven/infrastructure/parent-pom</project-repository-path>
<!-- Our Version: -->
- <otj.version>2.5.0</otj.version>
- <otdre.version>1.2.0</otdre.version>
+ <otj.version>2.6.1</otj.version>
+ <otdre.version>1.3.1</otdre.version>
<!-- Versions of dependencies: -->
<bcel.version>5.2</bcel.version>
- <tycho.version>0.24.0</tycho.version>
- <apt.version>1.2.100.v20160418-1457-SNAPSHOT</apt.version> <!-- pulled from tycho-snapshots to be compatible with latest JDT -->
+ <tycho.version>0.26.0</tycho.version>
+ <apt.version>1.3.60</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>
@@ -139,7 +139,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.2</version>
+ <version>2.9</version>
</plugin>
</plugins>
</reporting>
@@ -151,13 +151,13 @@
<plugin>
<!--
Use compiler plugin with tycho as the adapter to the OT/J compiler.
- Using java 1.7 language level is recommended, default is 1.3, OT/J needs 1.5 minimum
+ Using java 1.8 language level is recommended, default is 1.3, OT/J needs 1.5 minimum
-->
<artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>1.8</source>
+ <target>1.8</target>
<compilerId>jdt</compilerId>
<flavor>otj</flavor>
<compilerArgument>-ot.weaving:${otj.weaving.scheme}</compilerArgument>
@@ -174,6 +174,10 @@
<groupId>org.eclipse.tycho</groupId>
<artifactId>org.eclipse.jdt.core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>org.eclipse.jdt.compiler.apt</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -183,7 +187,7 @@
<version>${otj.version}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.tycho</groupId>
+ <groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.compiler.apt</artifactId>
<version>${apt.version}</version>
</dependency>
@@ -207,6 +211,10 @@
<groupId>org.eclipse.tycho</groupId>
<artifactId>org.eclipse.jdt.core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>org.eclipse.jdt.compiler.apt</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -216,7 +224,7 @@
<version>${otj.version}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.tycho</groupId>
+ <groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.compiler.apt</artifactId>
<version>${apt.version}</version>
</dependency>
@@ -244,11 +252,10 @@
</dependency>
</dependencies>
</plugin>
- <!-- ensure new version of this plug-in (maven3-compatible): -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.3</version>
+ <version>3.7</version>
</plugin>
</plugins>
</pluginManagement>
@@ -256,7 +263,7 @@
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh-external</artifactId>
- <version>2.2</version>
+ <version>3.0.0</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 9878b87f1..8dd74ee66 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
------
- 2016-06-12
+ 2018-02-06
------
Using the Object Teams Parent POM
@@ -15,6 +15,8 @@ Using the Object Teams Parent POM
This pom supports the traditional {{{http://help.eclipse.org/topic/org.eclipse.objectteams.otdt.doc/guide/weavingscheme.html}weaving scheme OTRE}}.
For OTDRE please use {{{../objectteams-otdre-parent-pom}org.eclipse.objectteams:objectteams-otdre-parent-pom}} instead.
+
+ <<Note:>> Due to limitations of the used version of BCEL (see below) the OTRE weaver is unable to process class files that have been compiled for Java 8.
* Include the parent pom
@@ -38,7 +40,7 @@ Using the Object Teams Parent POM
<parent>
<groupId>org.eclipse.objectteams</groupId>
<artifactId>objectteams-parent-pom</artifactId>
- <version>2.5.0</version>
+ <version>2.6.1</version>
</parent>
+-----
@@ -69,4 +71,4 @@ Using the Object Teams Parent POM
The following module is indirectly used:
- [org.apache.bcel:bcel] the original {{{http://jakarta.apache.org/bcel}apache bcel}} Byte Code Engineering Library. \ No newline at end of file
+ [org.apache.bcel:bcel] the original {{{http://jakarta.apache.org/bcel}apache bcel}} Byte Code Engineering Library. Object Teams still uses the version 5.2 which is <<incompatible>> with the byte code of <<Java 8>>. Due to the lack of support for rewriting stack map tables, however, a migration to the current version 6 of BCEL would not make the weaver Java 8 compatible, as a Java 8 VM no longer tolerates class files without this attribute. \ No newline at end of file
diff --git a/maven/testproject/pom.xml b/maven/testproject/pom.xml
index cc8a9c16e..78d8caadf 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.5.0</version>
+ <version>2.6.1</version>
</parent>
<packaging>jar</packaging>
<artifactId>objectteams-compile-test</artifactId>
- <version>1.1.1</version>
+ <version>1.1.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, 2015 GK Software AG and others.
+ Copyright 2010, 2018 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/testproject/src/site/apt/usage.apt b/maven/testproject/src/site/apt/usage.apt
index 78011aa68..f0d8a78ae 100644
--- a/maven/testproject/src/site/apt/usage.apt
+++ b/maven/testproject/src/site/apt/usage.apt
@@ -3,12 +3,12 @@
------
Olaf Otto & Stephan Herrmann
------
- 2016-06-12
+ 2018-02-06
------
Using Object Teams with Maven3
- Declaring <<<org.eclipse.objectteams:objectteams-parent-pom>>> as the parent of your project will add basic capabilities
+ Declaring <<<org.eclipse.objectteams:objectteams-otdre-parent-pom>>> as the parent of your project will add basic capabilities
for using OT/J in your sources.
* Include the parent pom
@@ -33,7 +33,7 @@ Using Object Teams with Maven3
<parent>
<groupId>org.eclipse.objectteams</groupId>
<artifactId>objectteams-otdre-parent-pom</artifactId>
- <version>2.5.0</version>
+ <version>2.6.1</version>
</parent>
+-----

Back to the top