Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Herrmann2010-10-18 10:02:33 -0400
committerStephan Herrmann2010-10-18 10:02:33 -0400
commitb865199de5b027238650eb78d912fd295c289d57 (patch)
treef08b5ac91300b7b85ee8d82bae1f16531ad19918 /maven/infrastructure
parentb53e64c67630e291021006ebcc998ac6094c4c75 (diff)
downloadorg.eclipse.objectteams-b865199de5b027238650eb78d912fd295c289d57.tar.gz
org.eclipse.objectteams-b865199de5b027238650eb78d912fd295c289d57.tar.xz
org.eclipse.objectteams-b865199de5b027238650eb78d912fd295c289d57.zip
Embellishments:
* some copyright fixes * add up-to-date scm configuration * configure for site generation * add usage pages for the site
Diffstat (limited to 'maven/infrastructure')
-rw-r--r--maven/infrastructure/parent-pom/pom.xml74
-rw-r--r--maven/infrastructure/parent-pom/src/site/apt/usage.apt63
-rw-r--r--maven/infrastructure/parent-pom/src/site/site.xml30
3 files changed, 155 insertions, 12 deletions
diff --git a/maven/infrastructure/parent-pom/pom.xml b/maven/infrastructure/parent-pom/pom.xml
index b2e53eb16..6d59a7c08 100644
--- a/maven/infrastructure/parent-pom/pom.xml
+++ b/maven/infrastructure/parent-pom/pom.xml
@@ -7,13 +7,13 @@
<version>0.8.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Objectteams parent pom</name>
+ <name>Object Teams parent pom</name>
- <url>http://www.eclipse.org/objectteams</url>
+ <url>http://download.eclipse.org/objectteams/maven/3/sites/${project.artifactId}</url>
<description>
- This is the parent pom for Object Teams Maven3 projects,
- specifying the core dependencies and configurations for building and
+ This is the parent pom for Object Teams projects using Maven3.
+ It specifies the core dependencies and configurations for building and
executing Object Teams code using Maven.
</description>
@@ -21,9 +21,9 @@
<license>
<name>Eclipse Public License Version 1.0</name>
<comments>
- This file is part of "Object Teams Development Tooling"-Software
+ This file is part of "Object Teams Development Tooling"-Software.
- Copyright 2010 GK Software AG
+ Copyright 2010 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
@@ -32,12 +32,31 @@
Please visit http://www.eclipse.org/objectteams for updates and contact.
Contributors:
- Stephan Herrmann - Initial API and implementation
- Olaf Otto - Initil concept
+ Olaf Otto - Initial concept,
+ Stephan Herrmann - Initial API and implementation.
</comments>
</license>
</licenses>
+ <organization>
+ <name>Eclipse Object Teams Project</name>
+ <url>http://www.eclipse.org/objectteams</url>
+ </organization>
+
+ <developers>
+ <developer><name>Olaf Otto</name></developer>
+ <developer><name>Stephan Herrmann</name><organization>GK Software AG</organization></developer>
+ </developers>
+
+ <mailingLists>
+ <mailingList><name>Object Teams Forum</name><archive>http://www.eclipse.org/forums/eclipse.objectteams</archive></mailingList>
+ </mailingLists>
+
+ <issueManagement>
+ <system>Bugzilla</system>
+ <url>http://bugs.eclipse.org/</url>
+ </issueManagement>
+
<repositories>
<repository>
<id>ObjectTeamsRepository</id>
@@ -59,6 +78,9 @@
<!-- Required property from settings.xml: -->
<!-- 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>
+
<!-- Our Version: -->
<otj.version>0.8.0-SNAPSHOT</otj.version>
@@ -84,6 +106,23 @@
<surefire.argline>${otj.bootcp.arg} ${otj.agent.arg} -Dot.debug -Xms128m -Xmx512m</surefire.argline>
</properties>
+ <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>
+ </scm>
+
+ <reporting>
+ <plugins>
+ <!-- See http://maven.apache.org/plugins/maven-project-info-reports-plugin/ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ </plugins>
+ </reporting>
+
<build>
<pluginManagement>
<plugins>
@@ -100,7 +139,7 @@
</configuration>
<dependencies>
<!-- compile time only dependencies: -->
- <dependency>
+ <dependency>
<groupId>org.sonatype.tycho</groupId>
<artifactId>tycho-compiler-jdt</artifactId>
<version>${tycho.version}</version>
@@ -111,13 +150,13 @@
<artifactId>org.eclipse.jdt.core</artifactId>
</exclusion>
</exclusions>
- </dependency>
+ </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>
+ </dependency>
</dependencies>
</plugin>
<!-- See http://maven.apache.org/plugins/maven-surefire-plugin/ -->
@@ -141,6 +180,12 @@
</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.0-beta-2</version>
+ </plugin>
</plugins>
</pluginManagement>
<extensions>
@@ -165,6 +210,11 @@
<!-- for deployment of this pom: -->
<distributionManagement>
+ <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>
+ </site>
<repository>
<id>ObjectTeamsRepository</id>
<uniqueVersion>false</uniqueVersion>
@@ -172,7 +222,7 @@
<!--
most values are fed from settings.xml
-->
- <url>scpexe://${ot.host}:${ot.maven.repository.path}</url>
+ <url>scpexe://${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
new file mode 100644
index 000000000..f7179f1aa
--- /dev/null
+++ b/maven/infrastructure/parent-pom/src/site/apt/usage.apt
@@ -0,0 +1,63 @@
+ ------
+ Using the Object Teams Parent POM
+ ------
+ Olaf Otto & Stephan Herrmann
+ ------
+ 2001-10-18
+ ------
+
+Using the Object Teams Parent POM
+
+ Declaring this module as the parent of your project will add basic capabilities
+ for using OT/J in your sources.
+
+* Include the parent pom
+
+ For simple cases two declarations in your pom will suffice:
+
+ [[1]] declare the maven repository for fetching Object Teams related modules
+
++-----
+ <repositories>
+ <repository>
+ <id>ObjectTeamsRepository</id>
+ <name>Object Teams Repository</name>
+ <url>http://download.eclipse.org/objectteams/maven/3/repository</url>
+ </repository>
+ </repositories>
++-----
+
+ [[1]] declare the parent pom
+
++-----
+ <parent>
+ <groupId>org.eclipse</groupId>
+ <artifactId>objectteams-parent-pom</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ </parent>
++-----
+
+* Example
+
+ See the {{{../objectteams-compile-test}objectteams-compile-test}} project for an example of how to use this parent pom.
+
+* Under the hood
+
+** Standard OT/J dependencies documented
+
+ All OT/J projects using the <<<objectteams-parent-pom>>> implicitly depend on the following artifacts which are developed
+ independent of maven and simply repackaged using the {{{../objectteams-artifact-deployer}org.eclipse:objectteams-artifact-deployer}} module:
+
+ [org.eclipse:objectteams-runtime] the Object Teams runtime repackaged from the <<<org.eclipse.objectteams.runtime>>> OSGi bundle.
+
+ [org.eclipse:objectteams-otre-agent] the Java agent that hooks the Object Teams runtime into the JVM (repackaged from file <<<otre_agent.jar>>>
+ from the <<<org.eclipse.objectteams.runtime>>> project).
+
+ [org.eclipse:objectteams-otj-compiler] a compatible replacement for <<<org.sonatype.tycho:org.eclipse.jdt.core>>> that enables the
+ <<<org.sonatype.tycho:tycho-compiler-jdt>>> plugin to compile OT/J sources.
+
+ []
+
+ 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
diff --git a/maven/infrastructure/parent-pom/src/site/site.xml b/maven/infrastructure/parent-pom/src/site/site.xml
new file mode 100644
index 000000000..c4cfe2f57
--- /dev/null
+++ b/maven/infrastructure/parent-pom/src/site/site.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schmaLocation="http://maven.apache.org/maven-1.x/plugins/xdoc/maven-navigation.xsd"
+ name="Object Teams Parent POM">
+ <bannerLeft>
+ <name>Object Teams</name>
+ <href>http://www.eclipse.org/objectteams/</href>
+ </bannerLeft>
+ <bannerRight>
+ <name>Object Teams</name>
+ <href>http://www.eclipse.org/objectteams/</href>
+ <src>http://www.eclipse.org/objectteams/images/ot_64n.png</src>
+ </bannerRight>
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-default-skin</artifactId>
+ <version>1.0</version>
+ </skin>
+ <publishDate format="dd MMM yyyy" />
+ <version position="left"/>
+ <body>
+ <links>
+ <item name="Object Teams" href="http://www.eclipse.org/objectteams" />
+ </links>
+ <menu name="Overview">
+ <item name="Usage" href="./usage.html" />
+ </menu>
+ <menu ref="reports"/>
+ </body>
+</project>

Back to the top