Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormistria2011-07-26 16:08:13 +0000
committermistria2011-07-26 16:08:13 +0000
commit5e82926deb2fda6753a6aabb7516a1a1d9900cbf (patch)
treebe34474ba813188138792b4d8021f7a5ada559f8
parent38d94d9711107fcee3df8471542753b6f9173de6 (diff)
downloadorg.eclipse.gmf-tooling-5e82926deb2fda6753a6aabb7516a1a1d9900cbf.tar.gz
org.eclipse.gmf-tooling-5e82926deb2fda6753a6aabb7516a1a1d9900cbf.tar.xz
org.eclipse.gmf-tooling-5e82926deb2fda6753a6aabb7516a1a1d9900cbf.zip
333270: Improved pom organization and artifact naming
-rw-r--r--releng/.project11
-rw-r--r--releng/org.eclipse.gmf.tooling-parent/.cvsignore1
-rw-r--r--releng/org.eclipse.gmf.tooling-parent/pom.xml267
-rw-r--r--releng/org.eclipse.gmf.tooling-repository/.cvsignore1
-rwxr-xr-xreleng/org.eclipse.gmf.tooling-repository/category.xml24
-rw-r--r--releng/org.eclipse.gmf.tooling-repository/pom.xml110
6 files changed, 11 insertions, 403 deletions
diff --git a/releng/.project b/releng/.project
new file mode 100644
index 000000000..9838d30fc
--- /dev/null
+++ b/releng/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>releng</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
diff --git a/releng/org.eclipse.gmf.tooling-parent/.cvsignore b/releng/org.eclipse.gmf.tooling-parent/.cvsignore
deleted file mode 100644
index eb5a316cb..000000000
--- a/releng/org.eclipse.gmf.tooling-parent/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-target
diff --git a/releng/org.eclipse.gmf.tooling-parent/pom.xml b/releng/org.eclipse.gmf.tooling-parent/pom.xml
deleted file mode 100644
index 23287f782..000000000
--- a/releng/org.eclipse.gmf.tooling-parent/pom.xml
+++ /dev/null
@@ -1,267 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2011, BonitaSoft S.A. 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 http://www.eclipse.org/legal/epl-v10.html author: Mickael Istria, BonitaSoft
- S.A. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.eclipse.gmf</groupId>
- <artifactId>org.eclipse.gmf.tooling-parent</artifactId>
- <version>2.4.0-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>Parent project for GMF Tooling build</name>
- <description>Parent project for GMF Tooling build</description>
-
- <prerequisites>
- <maven>3.0</maven>
- </prerequisites>
-
- <properties>
- <tycho-version>0.12.0</tycho-version>
- <javadocReportOutputDirectory>${basedir}/../../doc/org.eclipse.gmf.doc/reference</javadocReportOutputDirectory>
- <javadocDestDir>api</javadocDestDir>
- </properties>
-
- <modules>
- <!-- plugins -->
- <module>../../plugins/org.eclipse.gmf.graphdef</module>
- <module>../../plugins/org.eclipse.gmf.graphdef.codegen</module>
- <module>../../plugins/org.eclipse.gmf.graphdef.codegen.ui</module>
- <module>../../plugins/org.eclipse.gmf.graphdef.edit</module>
- <module>../../plugins/org.eclipse.gmf.graphdef.editor</module>
- <module>../../plugins/org.eclipse.gmf.tooldef</module>
- <module>../../plugins/org.eclipse.gmf.tooldef.edit</module>
- <module>../../plugins/org.eclipse.gmf.map</module>
- <module>../../plugins/org.eclipse.gmf.map.edit</module>
- <module>../../plugins/org.eclipse.gmf.map.editor</module>
- <module>../../plugins/org.eclipse.gmf.bridge</module>
- <module>../../plugins/org.eclipse.gmf.bridge.trace</module>
- <module>../../plugins/org.eclipse.gmf.bridge.ui</module>
- <module>../../plugins/org.eclipse.gmf.bridge.ui.dashboard</module>
- <module>../../plugins/org.eclipse.gmf.codegen</module>
- <module>../../plugins/org.eclipse.gmf.codegen.edit</module>
- <module>../../plugins/org.eclipse.gmf.codegen.lite</module>
- <module>../../plugins/org.eclipse.gmf.codegen.lite.ui</module>
- <module>../../plugins/org.eclipse.gmf.codegen.ui</module>
- <module>../../plugins/org.eclipse.gmf.common</module>
- <!-- module>../../plugins/org.eclipse.gmf.formtk</module-->
- <module>../../plugins/org.eclipse.gmf.runtime.lite</module>
- <module>../../plugins/org.eclipse.gmf.runtime.lite.svg</module>
- <module>../../plugins/org.eclipse.gmf.sdk</module>
- <module>../../plugins/org.eclipse.gmf.templates.legacy</module>
- <module>../../plugins/org.eclipse.gmf.tooling</module>
- <module>../../plugins/org.eclipse.gmf.ui.capabilities</module>
- <module>../../plugins/org.eclipse.gmf.validate</module>
- <module>../../plugins/org.eclipse.gmf.xpand</module>
- <module>../../plugins/org.eclipse.gmf.xpand.ant</module>
- <module>../../plugins/org.eclipse.gmf.xpand.editor</module>
- <module>../../plugins/org.eclipse.gmf.xpand.migration</module>
- <module>../../plugins/org.eclipse.gmf.xpand.qvtlibrary</module>
- <module>../../examples/org.eclipse.gmf.ecore.editor</module>
- <!-- Doc -->
- <module>../../doc/org.eclipse.gmf.doc</module>
- <module>../../doc/org.eclipse.gmf.doc.ui</module>
-
- <!-- features -->
- <!-- Currently disabled since they require sources, not yet handled -->
- <module>../../features/org.eclipse.gmf.doc-feature</module>
- <!-- module>../../features/org.eclipse.gmf.europa-feature</module>
- <module>../../features/org.eclipse.gmf.platform-feature</module-->
- <module>../../features/org.eclipse.gmf.sdk.experimental.source-feature</module>
- <module>../../features/org.eclipse.gmf.sdk.experimental-feature</module>
- <module>../../features/org.eclipse.gmf.sdk-feature</module>
- <module>../../features/org.eclipse.gmf.tooling.source-feature</module>
- <module>../../features/org.eclipse.gmf.tooling-feature</module>
- <!-- module>../../features/org.eclipse.gmf.xpand-feature</module -->
-
- <!-- examples -->
- <module>../../examples/org.eclipse.gmf.examples</module>
- <module>../../examples/org.eclipse.gmf.examples.design2d</module>
- <module>../../examples/org.eclipse.gmf.examples.design2d.notation</module>
- <!-- module>../../examples/org.eclipse.gmf.examples.eclipsecon</module>
- <module>../../examples/org.eclipse.gmf.examples.eclipsecon.diagram</module>
- <module>../../examples/org.eclipse.gmf.examples.eclipsecon.diagram.custom</module>
- <module>../../examples/org.eclipse.gmf.examples.eclipsecon.library</module>
- <module>../../examples/org.eclipse.gmf.examples.eclipsecon.library.diagram</module>
- <module>../../examples/org.eclipse.gmf.examples.eclipsecon.library.diagram.custom</module>
- <module>../../examples/org.eclipse.gmf.examples.eclipsecon.library.edit</module>
- <module>../../examples/org.eclipse.gmf.examples.eclipsecon.library.editor</module>
- <module>../../examples/org.eclipse.gmf.examples.eclipsecon.library.notation</module-->
- <!-- module>../../examples/org.eclipse.gmf.examples.mindmap</module>
- <module>../../examples/org.eclipse.gmf.examples.mindmap.edit</module>
- <module>../../examples/org.eclipse.gmf.examples.mindmap.diagram</module>
- <module>../../examples/org.eclipse.gmf.examples.mindmap.diagram.pure</module>
- <module>../../examples/org.eclipse.gmf.examples.mindmap.diagram.custom</module>
- <module>../../examples/org.eclipse.gmf.examples.mindmap.lite</module>
- <module>../../examples/org.eclipse.gmf.examples.mindmap.lite.edit</module>
- <module>../../examples/org.eclipse.gmf.examples.mindmap.lite.rcp</module>
- <module>../../examples/org.eclipse.gmf.examples.mindmap.rcp.diagram</module-->
- <!-- module>../../examples/org.eclipse.gmf.examples.taipan</module>
- <module>../../examples/org.eclipse.gmf.examples.taipan.edit</module>
- <module>../../examples/org.eclipse.gmf.examples.taipan.editor</module>
- <module>../../examples/org.eclipse.gmf.examples.taipan.editor.rcp</module>
- <module>../../examples/org.eclipse.gmf.examples.taipan.gmf.editor</module>
- <module>../../examples/org.eclipse.gmf.examples.taipan.gmf.editor.rcp</module>
- <module>../../examples/org.eclipse.gmf.examples.taipan.port.diagram</module>
- <module>../../examples/org.eclipse.gmf.examples.taipan.port.diagram.rcp</module>
- <module>../../examples/org.eclipse.gmf.examples.taipan.ui</module -->
- <module>../../examples/org.eclipse.gmf.examples.ui.pde</module>
- <!-- module>../../examples/org.eclipse.gmf.sketch</module> <module>../../examples/org.eclipse.gmf.sketch.edit</module>
- <module>../../examples/org.eclipse.gmf.sketch.editor</module> <module>../../examples/org.eclipse.gmf.sketch.transformer</module -->
- <!-- Features -->
- <module>../../features/org.eclipse.gmf.examples-feature</module>
- <module>../../features/org.eclipse.gmf.examples.pde-feature</module>
-
- <!-- tests, should be a separate build against newly built repo, to test
- also created repo (whole distribution) -->
- <!-- module>../../features/org.eclipse.gmf.tests.experimental-feature</module -->
- <!-- module>../../features/org.eclipse.gmf.tests-feature</module -->
- <module>../../tests/org.eclipse.gmf.tests</module>
- <module>../../tests/org.eclipse.gmf.tests.lite</module>
- <module>../../tests/org.eclipse.gmf.tests.xpand</module>
- <module>../../tests/org.eclipse.gmf.tests.xpand.migration</module>
-
- <!-- Repo -->
- <module>../org.eclipse.gmf.tooling-repository</module>
- </modules>
-
- <mailingLists>
- <mailingList>
- <name>GMF-dev Mailing List</name>
- <post>gmf-dev@eclipse.org</post>
- <subscribe>https://dev.eclipse.org/mailman/listinfo/gmf-dev</subscribe>
- <unsubscribe>https://dev.eclipse.org/mailman/listinfo/gmf-dev</unsubscribe>
- <archive>http://dev.eclipse.org/mhonarc/lists/gmf-dev</archive>
- </mailingList>
- </mailingLists>
-
- <issueManagement>
- <url>https://bugs.eclipse.org/bugs/buglist.cgi?classification=Modeling;query_format=advanced;component=GMF-tooling;product=GMP</url>
- <system>Bugzilla</system>
- </issueManagement>
-
- <licenses>
- <license>
- <name>Eclipse Public License v1.0</name>
- <comments>
- 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
- http://www.eclipse.org/legal/epl-v10.htm
- </comments>
- </license>
- </licenses>
-
-
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-maven-plugin</artifactId>
- <version>${tycho-version}</version>
- <extensions>true</extensions>
- </plugin>
-
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <resolver>p2</resolver>
- <environments>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86_64</arch>
- </environment>
- </environments>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.8</version>
- <configuration>
- <minmemory>128m</minmemory>
- <maxmemory>1g</maxmemory>
- </configuration>
- <executions>
- <execution>
- <id>aggregate</id>
- <goals>
- <goal>aggregate</goal>
- </goals>
- <phase>generate-resources</phase>
- <configuration>
- <minmemory>128m</minmemory>
- <maxmemory>1024m</maxmemory>
- <reportOutputDirectory>../../doc/org.eclipse.gmf.doc/reference</reportOutputDirectory>
- <destDir>api</destDir>
- <excludePackageNames>*.internal:*.internal.*:*.tests:*.tests.*:*.examples:*.examples.*</excludePackageNames>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>helios</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <repositories>
- <repository>
- <id>Helios</id>
- <layout>p2</layout>
- <url>http://download.eclipse.org/releases/helios</url>
- </repository>
- </repositories>
- </profile>
- <profile>
- <id>indigo</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <repositories>
- <repository>
- <id>Indigo</id>
- <layout>p2</layout>
- <url>http://download.eclipse.org/releases/indigo</url>
- </repository>
- </repositories>
- </profile>
- </profiles>
-
-</project>
diff --git a/releng/org.eclipse.gmf.tooling-repository/.cvsignore b/releng/org.eclipse.gmf.tooling-repository/.cvsignore
deleted file mode 100644
index eb5a316cb..000000000
--- a/releng/org.eclipse.gmf.tooling-repository/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-target
diff --git a/releng/org.eclipse.gmf.tooling-repository/category.xml b/releng/org.eclipse.gmf.tooling-repository/category.xml
deleted file mode 100755
index 0bdd29ccb..000000000
--- a/releng/org.eclipse.gmf.tooling-repository/category.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site
- mirrorsURL="http://www.eclipse.org/downloads/download.php?file=/modeling/gmp/gmf-tooling/updates/milestones/site.xml&amp;format=xml">
- <description url="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/milestones">
- A generative framework and runtime for developing graphical applications which leverage both the Eclipse Modeling Framework (EMF) and Graphical Editing Framework (GEF).
- </description>
- <feature url="features/org.eclipse.gmf.tooling_2.4.0.qualifier.jar" id="org.eclipse.gmf.tooling" version="2.4.0.qualifier">
- <category name="GMF Tooling"/>
- </feature>
- <feature url="features/org.eclipse.gmf.sdk_2.4.0.qualifier.jar" id="org.eclipse.gmf.sdk" version="2.4.0.qualifier">
- <category name="GMF Tooling"/>
- </feature>
- <feature url="features/org.eclipse.gmf.sdk.experimental_1.2.0.qualifier.jar" id="org.eclipse.gmf.sdk.experimental" version="1.2.0.qualifier">
- <category name="GMF Tooling"/>
- </feature>
- <feature url="features/org.eclipse.gmf.examples_1.4.0.qualifier.jar" id="org.eclipse.gmf.examples" version="1.4.0.qualifier">
- <category name="GMF Tooling - Examples"/>
- </feature>
- <feature url="features/org.eclipse.gmf.examples.pde_1.4.0.qualifier.jar" id="org.eclipse.gmf.examples.pde" version="1.4.0.qualifier">
- <category name="GMF Tooling - Examples"/>
- </feature>
- <category-def name="GMF Tooling" label="GMF Tooling"/>
- <category-def name="GMF Tooling - Examples" label="GMF Tooling - Examples"/>
-</site>
diff --git a/releng/org.eclipse.gmf.tooling-repository/pom.xml b/releng/org.eclipse.gmf.tooling-repository/pom.xml
deleted file mode 100644
index df734aeec..000000000
--- a/releng/org.eclipse.gmf.tooling-repository/pom.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.eclipse.gmf</groupId>
- <artifactId>org.eclipse.gmf.tooling-repository</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <packaging>eclipse-repository</packaging>
-
- <parent>
- <groupId>org.eclipse.gmf</groupId>
- <artifactId>org.eclipse.gmf.tooling-parent</artifactId>
- <version>2.4.0-SNAPSHOT</version>
- <relativePath>../org.eclipse.gmf.tooling-parent</relativePath>
- </parent>
-
- <profiles>
- <profile>
- <id>build-at-eclipse-org</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.dash.maven</groupId>
- <artifactId>eclipse-maven-signing-plugin</artifactId>
- <version>1.0.0</version>
- <executions>
- <!-- Pack the p2 repository. -->
- <execution>
- <id>pack</id>
- <phase>package</phase>
- <configuration>
- <inputFile>${project.build.directory}/org.eclipse.gmf.tooling-repository.zip</inputFile>
- </configuration>
- <goals>
- <goal>pack</goal>
- </goals>
- </execution>
- <!-- Sign the p2 repository -->
- <execution>
- <id>sign</id>
- <configuration>
- <inputFile>${project.build.directory}/org.eclipse.gmf.tooling-repository.zip</inputFile>
- <signerInputDirectory>/home/data/httpd/download-staging.priv/modeling/gmf/gmf-tooling</signerInputDirectory>
- </configuration>
- <phase>package</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- <!-- Repack the p2 repository -->
- <execution>
- <id>repack</id>
- <configuration>
- <inputFile>${project.build.directory}/signed/site_assembly.zip</inputFile>
- </configuration>
- <phase>package</phase>
- <goals>
- <goal>pack</goal>
- </goals>
- </execution>
- <!-- Signing and packing alters checksums so fix them -->
- <execution>
- <id>fixCheckSums</id>
- <phase>package</phase>
- <goals>
- <goal>fixCheckSums</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy</id>
- <phase>install</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <delete includeemptydirs="false">
- <fileset
- dir="/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/updates/dev-snapshots">
- <include name="**" />
- </fileset>
- </delete>
- <copy includeemptydirs="false"
- todir="/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/updates/dev-snapshots">
- <fileset dir="target/checksumFix">
- <include name="**" />
- </fileset>
- </copy>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
- <pluginRepositories>
- <pluginRepository>
- <id>eclipse-nexus</id>
- <url>http://maven.eclipse.org/nexus/content/groups/public/</url>
- </pluginRepository>
- </pluginRepositories>
-
-</project> \ No newline at end of file

Back to the top