Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'github/master' into version-2
- Loading branch information
Showing
5 changed files
with
157 additions
and
151 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,137 +1,147 @@ | ||
| <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>io.github.lorenzobettini.edelta</groupId> | ||
| <artifactId>edelta.parent</artifactId> | ||
| <version>0.7.1-SNAPSHOT</version> | ||
| </parent> | ||
| <artifactId>edelta</artifactId> | ||
| <packaging>eclipse-plugin</packaging> | ||
| 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>io.github.lorenzobettini.edelta</groupId> | ||
| <artifactId>edelta.parent</artifactId> | ||
| <version>0.7.1-SNAPSHOT</version> | ||
| </parent> | ||
| <artifactId>edelta</artifactId> | ||
| <packaging>eclipse-plugin</packaging> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>io.github.lorenzobettini.edelta</groupId> | ||
| <artifactId>edelta.lib</artifactId> | ||
| <version>${project.version}</version> | ||
| </dependency> | ||
| </dependencies> | ||
| <dependencies> | ||
| <dependency> | ||
| <groupId>io.github.lorenzobettini.edelta</groupId> | ||
| <artifactId>edelta.lib</artifactId> | ||
| <version>${project.version}</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.eclipse.emf</groupId> | ||
| <artifactId>org.eclipse.emf.mwe.core</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.eclipse.xtext</groupId> | ||
| <artifactId>org.eclipse.xtext.ecore</artifactId> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.codehaus.mojo</groupId> | ||
| <artifactId>exec-maven-plugin</artifactId> | ||
| <version>1.4.0</version> | ||
| <configuration> | ||
| <skip>${mwe2.skip}</skip> | ||
| </configuration> | ||
| <executions> | ||
| <execution> | ||
| <id>mwe2GenerateEMFClasses</id> | ||
| <phase>generate-sources</phase> | ||
| <goals> | ||
| <goal>java</goal> | ||
| </goals> | ||
| <configuration> | ||
| <mainClass>org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher</mainClass> | ||
| <arguments> | ||
| <argument>/${project.basedir}/src/edelta/GenerateEdeltaModel.mwe2</argument> | ||
| <argument>-p</argument> | ||
| <argument>rootPath=/${project.basedir}/..</argument> | ||
| </arguments> | ||
| <classpathScope>compile</classpathScope> | ||
| <includePluginDependencies>true</includePluginDependencies> | ||
| <cleanupDaemonThreads>false</cleanupDaemonThreads><!-- see https://bugs.eclipse.org/bugs/show_bug.cgi?id=475098#c3 --> | ||
| </configuration> | ||
| </execution> | ||
| <execution> | ||
| <id>mwe2Launcher</id> | ||
| <phase>generate-sources</phase> | ||
| <goals> | ||
| <goal>java</goal> | ||
| </goals> | ||
| <configuration> | ||
| <mainClass>org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher</mainClass> | ||
| <arguments> | ||
| <argument>/${project.basedir}/src/edelta/GenerateEdelta.mwe2</argument> | ||
| <argument>-p</argument> | ||
| <argument>rootPath=/${project.basedir}/..</argument> | ||
| </arguments> | ||
| <classpathScope>compile</classpathScope> | ||
| <includePluginDependencies>true</includePluginDependencies> | ||
| <cleanupDaemonThreads>false</cleanupDaemonThreads><!-- see https://bugs.eclipse.org/bugs/show_bug.cgi?id=475098#c3 --> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.eclipse.emf</groupId> | ||
| <artifactId>org.eclipse.emf.mwe2.launch</artifactId> | ||
| <version>${mwe2Version}</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.eclipse.xtext</groupId> | ||
| <artifactId>org.eclipse.xtext.common.types</artifactId> | ||
| <version>${xtextVersion}</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.eclipse.xtext</groupId> | ||
| <artifactId>org.eclipse.xtext.xtext.generator</artifactId> | ||
| <version>${xtextVersion}</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.eclipse.xtext</groupId> | ||
| <artifactId>org.eclipse.xtext.xbase</artifactId> | ||
| <version>${xtextVersion}</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.eclipse.xtext</groupId> | ||
| <artifactId>xtext-antlr-generator</artifactId> | ||
| <version>2.1.1</version> | ||
| </dependency> | ||
| </dependencies> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.eclipse.xtend</groupId> | ||
| <artifactId>xtend-maven-plugin</artifactId> | ||
| </plugin> | ||
| </plugins> | ||
| <pluginManagement> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.eclipse.m2e</groupId> | ||
| <artifactId>lifecycle-mapping</artifactId> | ||
| <version>1.0.0</version> | ||
| <configuration> | ||
| <lifecycleMappingMetadata> | ||
| <pluginExecutions> | ||
| <pluginExecution> | ||
| <pluginExecutionFilter> | ||
| <groupId> | ||
| org.codehaus.mojo | ||
| </groupId> | ||
| <artifactId> | ||
| exec-maven-plugin | ||
| </artifactId> | ||
| <versionRange> | ||
| [1.2.1,) | ||
| </versionRange> | ||
| <goals> | ||
| <goal>java</goal> | ||
| </goals> | ||
| </pluginExecutionFilter> | ||
| <action> | ||
| <ignore></ignore> | ||
| </action> | ||
| </pluginExecution> | ||
| </pluginExecutions> | ||
| </lifecycleMappingMetadata> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </pluginManagement> | ||
| </build> | ||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.codehaus.mojo</groupId> | ||
| <artifactId>exec-maven-plugin</artifactId> | ||
| <version>1.4.0</version> | ||
| <configuration> | ||
| <skip>${mwe2.skip}</skip> | ||
| </configuration> | ||
| <executions> | ||
| <execution> | ||
| <id>mwe2GenerateEMFClasses</id> | ||
| <phase>generate-sources</phase> | ||
| <goals> | ||
| <goal>java</goal> | ||
| </goals> | ||
| <configuration> | ||
| <mainClass>org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher</mainClass> | ||
| <arguments> | ||
| <argument>/${project.basedir}/src/edelta/GenerateEdeltaModel.mwe2</argument> | ||
| <argument>-p</argument> | ||
| <argument>rootPath=/${project.basedir}/..</argument> | ||
| </arguments> | ||
| <classpathScope>compile</classpathScope> | ||
| <includePluginDependencies>true</includePluginDependencies> | ||
| <cleanupDaemonThreads>false</cleanupDaemonThreads><!-- see | ||
| https://bugs.eclipse.org/bugs/show_bug.cgi?id=475098#c3 --> | ||
| </configuration> | ||
| </execution> | ||
| <execution> | ||
| <id>mwe2Launcher</id> | ||
| <phase>generate-sources</phase> | ||
| <goals> | ||
| <goal>java</goal> | ||
| </goals> | ||
| <configuration> | ||
| <mainClass>org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher</mainClass> | ||
| <arguments> | ||
| <argument>/${project.basedir}/src/edelta/GenerateEdelta.mwe2</argument> | ||
| <argument>-p</argument> | ||
| <argument>rootPath=/${project.basedir}/..</argument> | ||
| </arguments> | ||
| <classpathScope>compile</classpathScope> | ||
| <includePluginDependencies>true</includePluginDependencies> | ||
| <cleanupDaemonThreads>false</cleanupDaemonThreads><!-- see | ||
| https://bugs.eclipse.org/bugs/show_bug.cgi?id=475098#c3 --> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.eclipse.emf</groupId> | ||
| <artifactId>org.eclipse.emf.mwe2.launch</artifactId> | ||
| <version>${mwe2Version}</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.eclipse.xtext</groupId> | ||
| <artifactId>org.eclipse.xtext.common.types</artifactId> | ||
| <version>${xtextVersion}</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.eclipse.xtext</groupId> | ||
| <artifactId>org.eclipse.xtext.xtext.generator</artifactId> | ||
| <version>${xtextVersion}</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.eclipse.xtext</groupId> | ||
| <artifactId>org.eclipse.xtext.xbase</artifactId> | ||
| <version>${xtextVersion}</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.eclipse.xtext</groupId> | ||
| <artifactId>xtext-antlr-generator</artifactId> | ||
| <version>2.1.1</version> | ||
| </dependency> | ||
| </dependencies> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.eclipse.xtend</groupId> | ||
| <artifactId>xtend-maven-plugin</artifactId> | ||
| </plugin> | ||
| </plugins> | ||
| <pluginManagement> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.eclipse.m2e</groupId> | ||
| <artifactId>lifecycle-mapping</artifactId> | ||
| <version>1.0.0</version> | ||
| <configuration> | ||
| <lifecycleMappingMetadata> | ||
| <pluginExecutions> | ||
| <pluginExecution> | ||
| <pluginExecutionFilter> | ||
| <groupId> | ||
| org.codehaus.mojo | ||
| </groupId> | ||
| <artifactId> | ||
| exec-maven-plugin | ||
| </artifactId> | ||
| <versionRange> | ||
| [1.2.1,) | ||
| </versionRange> | ||
| <goals> | ||
| <goal>java</goal> | ||
| </goals> | ||
| </pluginExecutionFilter> | ||
| <action> | ||
| <ignore></ignore> | ||
| </action> | ||
| </pluginExecution> | ||
| </pluginExecutions> | ||
| </lifecycleMappingMetadata> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </pluginManagement> | ||
| </build> | ||
|
|
||
| </project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters