diff options
| author | Quentin Le Menez | 2017-03-29 16:20:09 +0000 |
|---|---|---|
| committer | Florian Noyrit | 2017-03-31 14:22:37 +0000 |
| commit | 7d612de5f0a4cb102418b6d5f4c62227568bb0a2 (patch) | |
| tree | 0746444a0ac1ab1ec12c7eedc0b94f424d30247a /plugins/developer | |
| parent | a82ba33c9533d3bfb931b7725cff7ac0478511d3 (diff) | |
| download | org.eclipse.papyrus-7d612de5f0a4cb102418b6d5f4c62227568bb0a2.tar.gz org.eclipse.papyrus-7d612de5f0a4cb102418b6d5f4c62227568bb0a2.tar.xz org.eclipse.papyrus-7d612de5f0a4cb102418b6d5f4c62227568bb0a2.zip | |
[releng] [oxygen] Update target definitions and platforms
Change-Id: Ibc3aeb24cea3ba989c3f280f392015588802e63d
Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>
Diffstat (limited to 'plugins/developer')
3 files changed, 113 insertions, 111 deletions
diff --git a/plugins/developer/org.eclipse.papyrus.def/pom.xml b/plugins/developer/org.eclipse.papyrus.def/pom.xml index 37b1d26245c..609067f5f62 100644 --- a/plugins/developer/org.eclipse.papyrus.def/pom.xml +++ b/plugins/developer/org.eclipse.papyrus.def/pom.xml @@ -1,57 +1,57 @@ -<?xml version="1.0" encoding="UTF-8"?> -<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> - <artifactId>org.eclipse.papyrus.developer</artifactId> - <groupId>org.eclipse.papyrus</groupId> - <version>0.0.1-SNAPSHOT</version> - </parent> - <artifactId>org.eclipse.papyrus.def</artifactId> - <groupId>org.eclipse.papyrus</groupId> - <version>1.2.0-SNAPSHOT</version> - <packaging>eclipse-plugin</packaging> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-clean-plugin</artifactId> - <configuration> - <filesets> - <fileset> - <directory>xtend-gen</directory> - <includes> - <include>**/*</include> - </includes> - <excludes> - <exclude>.gitignore</exclude> - </excludes> - </fileset> - </filesets> - </configuration> - </plugin> - <plugin> - <groupId>org.eclipse.xtend</groupId> - <artifactId>xtend-maven-plugin</artifactId> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>compile</goal> - </goals> - </execution> - </executions> - <configuration> - <outputDirectory>xtend-gen</outputDirectory> - <testOutputDirectory>${project.build.directory}/xtend-gen/test</testOutputDirectory> - <encoding>ISO-8859-1</encoding> - </configuration> - </plugin> - </plugins> - </build> -</project> +<?xml version="1.0" encoding="UTF-8"?>
+<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>
+ <artifactId>org.eclipse.papyrus.developer</artifactId>
+ <groupId>org.eclipse.papyrus</groupId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+ <artifactId>org.eclipse.papyrus.def</artifactId>
+ <groupId>org.eclipse.papyrus</groupId>
+ <version>1.2.0-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>xtend-gen</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <excludes>
+ <exclude>.gitignore</exclude>
+ </excludes>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.xtend</groupId>
+ <artifactId>xtend-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <outputDirectory>xtend-gen</outputDirectory>
+ <testOutputDirectory>${project.build.directory}/xtend-gen/test</testOutputDirectory>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/pom.xml b/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/pom.xml index eff52929003..421b8dc4ae8 100644 --- a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/pom.xml +++ b/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/pom.xml @@ -1,53 +1,52 @@ -<?xml version="1.0" encoding="UTF-8"?> -<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> - <artifactId>org.eclipse.papyrus.developer</artifactId> - <groupId>org.eclipse.papyrus</groupId> - <version>0.0.1-SNAPSHOT</version> - </parent> - <artifactId>org.eclipse.papyrus.dev.assistants.codegen</artifactId> - <groupId>org.eclipse.papyrus</groupId> - <version>1.2.0-SNAPSHOT</version> - <packaging>eclipse-plugin</packaging> - <build> - <plugins> - <!-- TODO: These first two plug-ins should be replaced by - Papyrus standard xtend compilation when it is integrated. - --> - - <!-- Empty out the xtend-gen folder in the clean phase. --> - <plugin> - <artifactId>maven-clean-plugin</artifactId> - <version>2.6</version> - <configuration> - <filesets> - <fileset> - <directory>xtend-gen</directory> - <excludes> - <exclude>**/.gitignore</exclude> - </excludes> - </fileset> - </filesets> - </configuration> - </plugin> - <!-- Generate Xtend sources in the compilation phase. --> - <plugin> - <groupId>org.eclipse.xtend</groupId> - <artifactId>xtend-maven-plugin</artifactId> - <version>2.7.3</version> - <executions> - <execution> - <goals> - <goal>compile</goal> - </goals> - <configuration> - <outputDirectory>xtend-gen</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> +<?xml version="1.0" encoding="UTF-8"?>
+<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>
+ <artifactId>org.eclipse.papyrus.developer</artifactId>
+ <groupId>org.eclipse.papyrus</groupId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+ <artifactId>org.eclipse.papyrus.dev.assistants.codegen</artifactId>
+ <groupId>org.eclipse.papyrus</groupId>
+ <version>1.2.0-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+ <build>
+ <plugins>
+ <!-- TODO: These first two plug-ins should be replaced by
+ Papyrus standard xtend compilation when it is integrated.
+ -->
+
+ <!-- Empty out the xtend-gen folder in the clean phase. -->
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.6</version>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>xtend-gen</directory>
+ <excludes>
+ <exclude>**/.gitignore</exclude>
+ </excludes>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ <!-- Generate Xtend sources in the compilation phase. -->
+ <plugin>
+ <groupId>org.eclipse.xtend</groupId>
+ <artifactId>xtend-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>xtend-gen</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/plugins/developer/org.eclipse.papyrus.dev.types/pom.xml b/plugins/developer/org.eclipse.papyrus.dev.types/pom.xml index 081ed0d52b7..54654858775 100644 --- a/plugins/developer/org.eclipse.papyrus.dev.types/pom.xml +++ b/plugins/developer/org.eclipse.papyrus.dev.types/pom.xml @@ -30,7 +30,10 @@ <!-- Generate Xtend sources in the compilation phase. -->
<plugin>
<groupId>org.eclipse.xtend</groupId>
- <artifactId>xtend-maven-plugin</artifactId>
+ <artifactId>xtend-maven-plugin</artifactId> + <configuration> + <encoding>UTF-8</encoding> + </configuration>
<executions>
<execution>
<goals>
|