summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Wouters2014-06-02 07:35:01 (EDT)
committerLaurent Wouters2014-06-02 07:35:01 (EDT)
commite62569ef71c4cfbfa9583fe1d5ba9314f74170c3 (patch)
treec6bc3e39a99c4fa8ce4e772a49332ed95fe3eb79
parent8983ebd426b67124423463e8a642c0a5145e4e17 (diff)
downloadorg.eclipse.papyrus-e62569ef71c4cfbfa9583fe1d5ba9314f74170c3.zip
org.eclipse.papyrus-e62569ef71c4cfbfa9583fe1d5ba9314f74170c3.tar.gz
org.eclipse.papyrus-e62569ef71c4cfbfa9583fe1d5ba9314f74170c3.tar.bz2
[releng] Fixing the Tycho build of the extra plugins with 'python releng/toolkit/tycho-generate.py'refs/changes/10/27710/1
Signed-off-by: Laurent Wouters <laurent.wouters@cea.fr>
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.examples/pom.xml14
-rwxr-xr-xreleng/top-pom-dev.xml1
-rwxr-xr-xreleng/top-pom-extras.xml6
-rwxr-xr-xreleng/top-pom-main.xml34
4 files changed, 35 insertions, 20 deletions
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.examples/pom.xml b/extraplugins/codegen/org.eclipse.papyrus.cpp.examples/pom.xml
new file mode 100644
index 0000000..4cc311e
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.examples/pom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>org.eclipse.papyrus</artifactId>
+ <groupId>org.eclipse.papyrus</groupId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../../../releng/top-pom-extras.xml</relativePath>
+ </parent>
+ <artifactId>org.eclipse.papyrus.cpp.examples</artifactId>
+ <groupId>org.eclipse.papyrus</groupId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+</project> \ No newline at end of file
diff --git a/releng/top-pom-dev.xml b/releng/top-pom-dev.xml
index aa66e85..40393e0 100755
--- a/releng/top-pom-dev.xml
+++ b/releng/top-pom-dev.xml
@@ -8,7 +8,6 @@
<modules>
<module>../features/papyrus-dev-features/org.eclipse.papyrus.dev.feature</module>
<module>../plugins/developer/org.eclipse.papyrus.codegen</module>
- <module>../plugins/developer/org.eclipse.papyrus.def</module>
<module>../plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request</module>
<module>../plugins/developer/org.eclipse.papyrus.documentation.plugin</module>
<module>../plugins/developer/org.eclipse.papyrus.documentation.plugin.edit</module>
diff --git a/releng/top-pom-extras.xml b/releng/top-pom-extras.xml
index 375fb66..2882d12 100755
--- a/releng/top-pom-extras.xml
+++ b/releng/top-pom-extras.xml
@@ -40,8 +40,11 @@
<module>../extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui</module>
<module>../extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems</module>
<module>../extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit</module>
+ <module>../extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints</module>
+ <module>../extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject</module>
<module>../extraplugins/codegen/org.eclipse.papyrus.cpp.codegen</module>
<module>../extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui</module>
+ <module>../extraplugins/codegen/org.eclipse.papyrus.cpp.examples</module>
<module>../extraplugins/codegen/org.eclipse.papyrus.cpp.profile</module>
<module>../plugins/customization/org.eclipse.papyrus.customization</module>
<module>../extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate</module>
@@ -93,7 +96,6 @@
<module>../extraplugins/marte/org.eclipse.papyrus.marte.vsl.ui</module>
<module>../extraplugins/migration/org.eclipse.papyrus.migration.properties.model</module>
<module>../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core</module>
- <module>../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp</module>
<module>../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc</module>
<module>../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui</module>
<module>../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation</module>
@@ -360,4 +362,4 @@
</plugin>
</plugins>
</build>
-</project>
+</project> \ No newline at end of file
diff --git a/releng/top-pom-main.xml b/releng/top-pom-main.xml
index 08e65b7..95a63ab 100755
--- a/releng/top-pom-main.xml
+++ b/releng/top-pom-main.xml
@@ -210,7 +210,6 @@
<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css</module>
<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment</module>
<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd</module>
- <module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.synchronizeview</module>
<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.icons</module>
<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview</module>
<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu</module>
@@ -225,6 +224,7 @@
<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition</module>
<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols</module>
<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties</module>
+ <module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.synchronizeview</module>
<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing</module>
<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase</module>
<module>../plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards</module>
@@ -287,13 +287,13 @@
<module>../plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading</module>
<module>../plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.widgets</module>
<module>../plugins/views/properties/org.eclipse.papyrus.views.properties</module>
+ <module>../plugins/doc/org.eclipse.papyrus.views.properties.doc</module>
<module>../plugins/views/properties/org.eclipse.papyrus.views.properties.model</module>
<module>../plugins/views/properties/org.eclipse.papyrus.views.properties.model.edit</module>
<module>../plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor</module>
<module>../plugins/views/org.eclipse.papyrus.views.search</module>
<module>../plugins/views/validation/org.eclipse.papyrus.views.validation</module>
<module>../plugins/xwt/org.eclipse.papyrus.xwt</module>
- <module>../plugins/doc/org.eclipse.papyrus.views.properties.doc</module>
<module>main</module>
</modules>
<properties>
@@ -521,21 +521,21 @@
</executions>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>${findbugs.version}</version>
- <configuration>
- <findbugsXmlOutput>true</findbugsXmlOutput>
- <failOnError>false</failOnError>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>${findbugs.version}</version>
+ <configuration>
+ <findbugsXmlOutput>true</findbugsXmlOutput>
+ <failOnError>false</failOnError>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project> \ No newline at end of file