Bug 512810: [BPMN][Oxygen] build configuration :
- use maven target/ instead of bin/ and specify src/ for source
- java 1.8 in pom
- update oxygen dependencies bundles version number
Change-Id: I5d0b3e0c425feaf5c7ebc0676997f1c09ae59586
Signed-off-by: Géry Deloge <gery.deloge@cea.fr>
diff --git a/org.eclipse.papyrus.bpmn.diagram.collaboration/.classpath b/org.eclipse.papyrus.bpmn.diagram.collaboration/.classpath
index 1bdfad3..c2df960 100755
--- a/org.eclipse.papyrus.bpmn.diagram.collaboration/.classpath
+++ b/org.eclipse.papyrus.bpmn.diagram.collaboration/.classpath
@@ -3,5 +3,5 @@
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.papyrus.bpmn.diagram.collaboration/META-INF/MANIFEST.MF b/org.eclipse.papyrus.bpmn.diagram.collaboration/META-INF/MANIFEST.MF
index 5cc530e..4e8be60 100755
--- a/org.eclipse.papyrus.bpmn.diagram.collaboration/META-INF/MANIFEST.MF
+++ b/org.eclipse.papyrus.bpmn.diagram.collaboration/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Export-Package: org.eclipse.papyrus.bpmn.diagram.collaboration
-Require-Bundle: org.eclipse.ui,
+Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
org.eclipse.core.runtime,
org.eclipse.papyrus.bpmn;bundle-version="0.7.0",
org.eclipse.papyrus.bpmn.diagram.common;bundle-version="0.7.0",
diff --git a/org.eclipse.papyrus.bpmn.diagram.collaboration/build.properties b/org.eclipse.papyrus.bpmn.diagram.collaboration/build.properties
index fed474f..4812589 100755
--- a/org.eclipse.papyrus.bpmn.diagram.collaboration/build.properties
+++ b/org.eclipse.papyrus.bpmn.diagram.collaboration/build.properties
@@ -1,5 +1,5 @@
source.. = src/
-output.. = bin/
+output.. = target/classes/
bin.includes = META-INF/,\
.,\
plugin.xml,\
diff --git a/org.eclipse.papyrus.bpmn.diagram.common/.classpath b/org.eclipse.papyrus.bpmn.diagram.common/.classpath
index 16d067f..c93a9d1 100755
--- a/org.eclipse.papyrus.bpmn.diagram.common/.classpath
+++ b/org.eclipse.papyrus.bpmn.diagram.common/.classpath
@@ -3,5 +3,5 @@
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.papyrus.bpmn.diagram.common/META-INF/MANIFEST.MF b/org.eclipse.papyrus.bpmn.diagram.common/META-INF/MANIFEST.MF
index 4ce6418..e571a5e 100755
--- a/org.eclipse.papyrus.bpmn.diagram.common/META-INF/MANIFEST.MF
+++ b/org.eclipse.papyrus.bpmn.diagram.common/META-INF/MANIFEST.MF
@@ -1,17 +1,17 @@
Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
+Require-Bundle: org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.bpmn;bundle-version="0.7.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0",
org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.composite;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.composite;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.communication;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.activity;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"
+ org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.communication;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.activity;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.core;bundle-version="2.3.0",
+ org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)"
Export-Package: org.eclipse.papyrus.bpmn.diagram.common,
org.eclipse.papyrus.bpmn.diagram.common.commands,
org.eclipse.papyrus.bpmn.diagram.common.edit.part,
diff --git a/org.eclipse.papyrus.bpmn.diagram.common/build.properties b/org.eclipse.papyrus.bpmn.diagram.common/build.properties
index e940c93..915d8fb 100755
--- a/org.eclipse.papyrus.bpmn.diagram.common/build.properties
+++ b/org.eclipse.papyrus.bpmn.diagram.common/build.properties
@@ -1,5 +1,5 @@
source.. = src/
-output.. = bin/
+output.. = target/classes/
bin.includes = META-INF/,\
.,\
plugin.xml,\
diff --git a/org.eclipse.papyrus.bpmn.diagram.process/.classpath b/org.eclipse.papyrus.bpmn.diagram.process/.classpath
index 1bdfad3..c2df960 100755
--- a/org.eclipse.papyrus.bpmn.diagram.process/.classpath
+++ b/org.eclipse.papyrus.bpmn.diagram.process/.classpath
@@ -3,5 +3,5 @@
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.papyrus.bpmn.diagram.process/build.properties b/org.eclipse.papyrus.bpmn.diagram.process/build.properties
index 246bd2e..4982bf1 100755
--- a/org.eclipse.papyrus.bpmn.diagram.process/build.properties
+++ b/org.eclipse.papyrus.bpmn.diagram.process/build.properties
@@ -1,5 +1,5 @@
source.. = src/
-output.. = bin/
+output.. = target/classes/
bin.includes = META-INF/,\
.,\
plugin.xml,\
diff --git a/org.eclipse.papyrus.bpmn.diagram.ui/.classpath b/org.eclipse.papyrus.bpmn.diagram.ui/.classpath
index 1bdfad3..c2df960 100755
--- a/org.eclipse.papyrus.bpmn.diagram.ui/.classpath
+++ b/org.eclipse.papyrus.bpmn.diagram.ui/.classpath
@@ -3,5 +3,5 @@
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.papyrus.bpmn.diagram.ui/build.properties b/org.eclipse.papyrus.bpmn.diagram.ui/build.properties
index eee1808..7e85f2d 100755
--- a/org.eclipse.papyrus.bpmn.diagram.ui/build.properties
+++ b/org.eclipse.papyrus.bpmn.diagram.ui/build.properties
@@ -1,5 +1,5 @@
source.. = src/
-output.. = bin/
+output.. = target/classes/
bin.includes = META-INF/,\
.,\
plugin.xml,\
diff --git a/org.eclipse.papyrus.bpmn.diagram/.classpath b/org.eclipse.papyrus.bpmn.diagram/.classpath
index 1bdfad3..c2df960 100755
--- a/org.eclipse.papyrus.bpmn.diagram/.classpath
+++ b/org.eclipse.papyrus.bpmn.diagram/.classpath
@@ -3,5 +3,5 @@
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.papyrus.bpmn.diagram/META-INF/MANIFEST.MF b/org.eclipse.papyrus.bpmn.diagram/META-INF/MANIFEST.MF
index 7e6ccd0..e3dc04b 100755
--- a/org.eclipse.papyrus.bpmn.diagram/META-INF/MANIFEST.MF
+++ b/org.eclipse.papyrus.bpmn.diagram/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Export-Package: org.eclipse.papyrus.bpmn.diagram
-Require-Bundle: org.eclipse.ui,
+Require-Bundle: org.eclipse.ui;bundle-version="[3.108.0,4.0.0)",
org.eclipse.core.runtime,
org.eclipse.papyrus.bpmn;bundle-version="0.7.0",
org.eclipse.papyrus.bpmn.diagram.common;bundle-version="0.7.0",
diff --git a/org.eclipse.papyrus.bpmn.diagram/build.properties b/org.eclipse.papyrus.bpmn.diagram/build.properties
index 3686139..5ceb810 100755
--- a/org.eclipse.papyrus.bpmn.diagram/build.properties
+++ b/org.eclipse.papyrus.bpmn.diagram/build.properties
@@ -1,5 +1,5 @@
source.. = src/
-output.. = bin/
+output.. = target/classes/
bin.includes = META-INF/,\
.,\
plugin.xml,\
diff --git a/org.eclipse.papyrus.bpmn.tests/.classpath b/org.eclipse.papyrus.bpmn.tests/.classpath
index eca7bdb..43b9862 100755
--- a/org.eclipse.papyrus.bpmn.tests/.classpath
+++ b/org.eclipse.papyrus.bpmn.tests/.classpath
@@ -3,5 +3,5 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.papyrus.bpmn.tests/build.properties b/org.eclipse.papyrus.bpmn.tests/build.properties
index 34d2e4d..56d7765 100755
--- a/org.eclipse.papyrus.bpmn.tests/build.properties
+++ b/org.eclipse.papyrus.bpmn.tests/build.properties
@@ -1,4 +1,4 @@
source.. = src/
-output.. = bin/
+output.. = target/classes/
bin.includes = META-INF/,\
.
diff --git a/org.eclipse.papyrus.bpmn/.classpath b/org.eclipse.papyrus.bpmn/.classpath
index 26765d0..fdd8156 100755
--- a/org.eclipse.papyrus.bpmn/.classpath
+++ b/org.eclipse.papyrus.bpmn/.classpath
@@ -4,5 +4,5 @@
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="custom-src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.papyrus.bpmn/META-INF/MANIFEST.MF b/org.eclipse.papyrus.bpmn/META-INF/MANIFEST.MF
index 2ccad60..b425c96 100755
--- a/org.eclipse.papyrus.bpmn/META-INF/MANIFEST.MF
+++ b/org.eclipse.papyrus.bpmn/META-INF/MANIFEST.MF
@@ -3,10 +3,10 @@
org.eclipse.papyrus.bpmn.BPMNProfile,
org.eclipse.papyrus.bpmn.BPMNProfile.impl,
org.eclipse.papyrus.bpmn.BPMNProfile.util
-Require-Bundle: org.eclipse.ui;bundle-version="3.107.0",
- org.eclipse.core.runtime;bundle-version="3.11.0",
+Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.11.0,4.0.0)",
org.eclipse.uml2.uml;bundle-version="5.1.0";visibility:=reexport,
- org.eclipse.papyrus.infra.types.core;bundle-version="2.0.0",
+ org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)",
org.apache.log4j;bundle-version="1.2.15",
org.eclipse.emf.ecore,
org.eclipse.emf.common
diff --git a/org.eclipse.papyrus.bpmn/build.properties b/org.eclipse.papyrus.bpmn/build.properties
index 323d0a0..a2e9a71 100755
--- a/org.eclipse.papyrus.bpmn/build.properties
+++ b/org.eclipse.papyrus.bpmn/build.properties
@@ -1,6 +1,6 @@
source.. = src/,\
custom-src
-output.. = bin/
+output.. = target/classes/
bin.includes = META-INF/,\
.,\
plugin.xml,\
diff --git a/org.eclipse.papyrus.bpmn/pom.xml b/org.eclipse.papyrus.bpmn/pom.xml
index 44d1a1b..57fc763 100755
--- a/org.eclipse.papyrus.bpmn/pom.xml
+++ b/org.eclipse.papyrus.bpmn/pom.xml
@@ -8,4 +8,8 @@
</parent>
<artifactId>org.eclipse.papyrus.bpmn</artifactId>
<packaging>eclipse-plugin</packaging>
+
+ <build>
+ <sourceDirectory>custom-src</sourceDirectory>
+ </build>
</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index a41e0a3..3803233 100755
--- a/pom.xml
+++ b/pom.xml
@@ -2,13 +2,13 @@
<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>
-
+
<parent>
<groupId>org.eclipse.papyrus.components</groupId>
<artifactId>org.eclipse.papyrus.components.parent</artifactId>
<version>0.0.22</version>
</parent>
-
+
<groupId>org.eclipse.papyrus.bpmn</groupId>
<artifactId>org.eclipse.papyrus.bpmn.parent</artifactId>
<version>0.8.0-SNAPSHOT</version>
@@ -16,9 +16,11 @@
<name>BPMN</name>
<description>A Papyrus DSML for the BPMN OMG norm</description>
<url>https://eclipse.org/papyrus/components/${component.shortname}/</url>
- <inceptionYear>2015</inceptionYear>
-
+ <inceptionYear>2015</inceptionYear>
+
<properties>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
<component.shortname>bpmn</component.shortname>
<component.fullartifactId>org.eclipse.papyrus.bpmn</component.fullartifactId>
<component.hudson.tabname>bpmn</component.hudson.tabname>
@@ -42,11 +44,11 @@
<module>org.eclipse.papyrus.bpmn.tests</module>
<module>org.eclipse.papyrus.bpmn.diagram.common.tests</module>
-
+
<module>org.eclipse.papyrus.bpmn.targetplatform.oxygen</module>
<module>releng</module>
- </modules>
-
+ </modules>
+
<ciManagement>
<system>Hudson</system>
<url>https://hudson.eclipse.org/papyrus/view/${component.hudson.tabname}/</url>
@@ -63,7 +65,7 @@
<distribution>repo</distribution>
</license>
</licenses>
-
+
<distributionManagement>
<site>
<id>git.eclipse.org.server</id>
@@ -101,8 +103,15 @@
<updatePolicy>daily</updatePolicy>
</snapshots>
</repository>
+ <repository>
+ <id>eclipse-oxygen</id>
+ <url>http://download.eclipse.org/releases/oxygen</url>
+ <layout>p2</layout>
+ </repository>
</repositories>
-
-
+
+ <build>
+ <sourceDirectory>src</sourceDirectory>
+ </build>
</project>
\ No newline at end of file
