Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Upgrade to tycho 0.24 and cleanup pom.xml files.
- Loading branch information
Showing
8 changed files
with
414 additions
and
382 deletions.
There are no files selected for viewing
48 changes: 24 additions & 24 deletions
48
building-and-using-generator/com.mycompany.generator.update/pom.xml
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,30 +1,30 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <project> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <parent> | ||
| <groupId>org.eclipse.acceleo.examples</groupId> | ||
| <artifactId>org.eclipse.acceleo.examples.equinox.launcher.withgenerator</artifactId> | ||
| <version>1.0.0-SNAPSHOT</version> | ||
| <relativePath>../</relativePath> | ||
| </parent> | ||
|
|
||
| <packaging>eclipse-repository</packaging> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <parent> | ||
| <groupId>org.eclipse.acceleo.examples</groupId> | ||
| <artifactId>org.eclipse.acceleo.examples.equinox.launcher.withgenerator</artifactId> | ||
| <version>1.0.0-SNAPSHOT</version> | ||
| <artifactId>com.mycompany.generator.update</artifactId> | ||
| <relativePath>../</relativePath> | ||
| </parent> | ||
|
|
||
| <packaging>eclipse-repository</packaging> | ||
| <version>1.0.0-SNAPSHOT</version> | ||
| <artifactId>com.mycompany.generator.update</artifactId> | ||
|
|
||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.eclipse.tycho</groupId> | ||
| <artifactId>tycho-p2-repository-plugin</artifactId> | ||
| <version>${tycho-version}</version> | ||
| <configuration> | ||
| <createArtifactRepository>true</createArtifactRepository> | ||
| <finalName>${project.artifactId}</finalName> | ||
| <compress>true</compress> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.eclipse.tycho</groupId> | ||
| <artifactId>tycho-p2-repository-plugin</artifactId> | ||
| <version>${tycho-version}</version> | ||
| <configuration> | ||
| <createArtifactRepository>true</createArtifactRepository> | ||
| <finalName>${project.artifactId}</finalName> | ||
| <compress>true</compress> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
|
|
||
| </project> |
117 changes: 58 additions & 59 deletions
117
building-and-using-generator/com.mycompany.generator/pom.xml
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,70 +1,69 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <project> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <parent> | ||
| <groupId>org.eclipse.acceleo.examples</groupId> | ||
| <artifactId>org.eclipse.acceleo.examples.equinox.launcher.withgenerator</artifactId> | ||
| <version>1.0.0-SNAPSHOT</version> | ||
| <relativePath>../</relativePath> | ||
| </parent> | ||
|
|
||
| <packaging>eclipse-plugin</packaging> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <parent> | ||
| <groupId>org.eclipse.acceleo.examples</groupId> | ||
| <artifactId>org.eclipse.acceleo.examples.equinox.launcher.withgenerator</artifactId> | ||
| <version>1.0.0-SNAPSHOT</version> | ||
| <artifactId>com.mycompany.generator</artifactId> | ||
| <relativePath>../</relativePath> | ||
| </parent> | ||
|
|
||
| <packaging>eclipse-plugin</packaging> | ||
| <version>1.0.0-SNAPSHOT</version> | ||
| <artifactId>com.mycompany.generator</artifactId> | ||
|
|
||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.eclipse.acceleo</groupId> | ||
| <artifactId>org.eclipse.acceleo.maven</artifactId> | ||
| <version>3.5.0-SNAPSHOT</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.slf4j</groupId> | ||
| <artifactId>slf4j-simple</artifactId> | ||
| <version>1.6.4</version> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.eclipse.acceleo</groupId> | ||
| <artifactId>org.eclipse.acceleo.maven</artifactId> | ||
| <version>3.5.0-SNAPSHOT</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.slf4j</groupId> | ||
| <artifactId>slf4j-simple</artifactId> | ||
| <version>1.6.4</version> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <build> | ||
|
|
||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.eclipse.acceleo</groupId> | ||
| <artifactId>org.eclipse.acceleo.maven</artifactId> | ||
| <version>3.5.0-SNAPSHOT</version> | ||
| <executions> | ||
| <execution> | ||
| <phase>compile</phase> | ||
| <goals> | ||
| <goal>acceleo-compile</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| <configuration> | ||
| <useBinaryResources>false</useBinaryResources> | ||
| <usePlatformResourcePath>true</usePlatformResourcePath> | ||
| <acceleoProject> | ||
| <root>${project.basedir}</root> | ||
| <entries> | ||
| <entry> | ||
| <input>src</input> | ||
| <output>target/classes</output> | ||
| </entry> | ||
| </entries> | ||
| </acceleoProject> | ||
| <packagesToRegister> | ||
|
|
||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.eclipse.acceleo</groupId> | ||
| <artifactId>org.eclipse.acceleo.maven</artifactId> | ||
| <version>3.5.0-SNAPSHOT</version> | ||
| <executions> | ||
| <execution> | ||
| <phase>compile</phase> | ||
| <goals> | ||
| <goal>acceleo-compile</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| <configuration> | ||
| <useBinaryResources>false</useBinaryResources> | ||
| <usePlatformResourcePath>true</usePlatformResourcePath> | ||
| <acceleoProject> | ||
| <root>${project.basedir}</root> | ||
| <entries> | ||
| <entry> | ||
| <input>src</input> | ||
| <output>target/classes</output> | ||
| </entry> | ||
| </entries> | ||
| </acceleoProject> | ||
| <packagesToRegister> | ||
|
|
||
| <packageToRegister>com.mycompany.devtool.DevtoolPackage</packageToRegister> | ||
| <!-- TODO : you might need to reference the java qualified class name of your xxxPackage | ||
| <packageToRegister>com.mycompany.devtool.DevtoolPackage</packageToRegister> | ||
| <!-- TODO : you might need to reference the java qualified class | ||
| name of your xxxPackage Reading this http://wiki.eclipse.org/Acceleo/Maven | ||
| would probably be a good start. --> | ||
|
|
||
| Reading this http://wiki.eclipse.org/Acceleo/Maven would probably be a good start. | ||
| --> | ||
|
|
||
| </packagesToRegister> | ||
| </configuration> | ||
| </plugin> | ||
| </packagesToRegister> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </build> | ||
| </project> |
166 changes: 87 additions & 79 deletions
166
building-and-using-generator/com.mycompany.project/pom.xml
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,85 +1,93 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <project> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <parent> | ||
| <groupId>org.eclipse.acceleo.examples</groupId> | ||
| <artifactId>org.eclipse.acceleo.examples.equinox.launcher.withgenerator</artifactId> | ||
| <version>1.0.0-SNAPSHOT</version> | ||
| <relativePath>../</relativePath> | ||
| </parent> | ||
| <packaging>pom</packaging> | ||
| <artifactId>com.mycompany.project</artifactId> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <parent> | ||
| <groupId>org.eclipse.acceleo.examples</groupId> | ||
| <artifactId>org.eclipse.acceleo.examples.equinox.launcher.withgenerator</artifactId> | ||
| <version>1.0.0-SNAPSHOT</version> | ||
| <relativePath>../</relativePath> | ||
| </parent> | ||
| <packaging>pom</packaging> | ||
| <artifactId>com.mycompany.project</artifactId> | ||
|
|
||
|
|
||
| <!-- We specify this dependency to be sure the generator is going to be built and packaged before this module will get built.--> | ||
| <dependencies> | ||
| <dependency><artifactId>com.mycompany.generator.update</artifactId> | ||
| <version>1.0.0-SNAPSHOT</version> | ||
| <groupId>org.eclipse.acceleo.examples</groupId> | ||
| </dependency> | ||
| </dependencies> | ||
| <!-- We specify this dependency to be sure the generator is going to be | ||
| built and packaged before this module will get built. --> | ||
| <dependencies> | ||
| <dependency> | ||
| <artifactId>com.mycompany.generator.update</artifactId> | ||
| <version>1.0.0-SNAPSHOT</version> | ||
| <groupId>org.eclipse.acceleo.examples</groupId> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <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.extras</groupId> | ||
| <artifactId>tycho-eclipserun-plugin</artifactId> | ||
| <version>${tycho-version}</version> | ||
| <configuration> | ||
| <repositories> | ||
| <repository> | ||
| <id>Acceleo Launcher</id> | ||
| <layout>p2</layout> | ||
| <url>https://hudson.eclipse.org/acceleo/job/master-gerrit/802/PLATFORM=platform-mars/artifact/releng/org.eclipse.acceleo-updatesite/target/repository/ | ||
| </url> | ||
| </repository> | ||
| <repository> | ||
| <id>Just built</id> | ||
| <layout>p2</layout> | ||
| <url>file:${project.basedir}/../com.mycompany.generator.update/target/repository</url> | ||
| </repository> | ||
| <repository> | ||
| <id>To get dependencies</id> | ||
| <layout>p2</layout> | ||
| <url>http://download.eclipse.org/releases/mars</url> | ||
| </repository> | ||
| </repositories> | ||
| <appArgLine>-consoleLog -application | ||
| org.eclipse.acceleo.equinox.AcceleoLauncher -data | ||
| ${project.parent.build.directory}/wks -models | ||
| platform:/resource/com.mycompany.project/model/model.xmi | ||
| -actions generate:com.mycompany.generator/com.mycompany.generator.main.Generate | ||
| -output ${project.basedir}/src-gen | ||
| </appArgLine> | ||
| <dependencies> | ||
| <!-- We need the actual launcher application --> | ||
| <dependency> | ||
| <artifactId>org.eclipse.acceleo.equinox.launcher | ||
| </artifactId> | ||
| <type>eclipse-feature</type> | ||
| </dependency> | ||
| <!-- The Eclipse feature packaging the code generator. --> | ||
| <dependency> | ||
| <artifactId>com.mycompany.generator</artifactId> | ||
| <type>eclipse-plugin</type> | ||
| </dependency> | ||
| </dependencies> | ||
| </configuration> | ||
| <executions> | ||
| <execution> | ||
| <goals> | ||
| <goal>eclipse-run</goal> | ||
| </goals> | ||
| <phase>generate-sources</phase> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| <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.extras</groupId> | ||
| <artifactId>tycho-eclipserun-plugin</artifactId> | ||
| <version>${tycho-version}</version> | ||
| <configuration> | ||
| <repositories> | ||
| <repository> | ||
| <id>Acceleo Launcher</id> | ||
| <layout>p2</layout> | ||
| <url>https://hudson.eclipse.org/acceleo/job/master-gerrit/802/PLATFORM=platform-mars/artifact/releng/org.eclipse.acceleo-updatesite/target/repository/ | ||
| </url> | ||
| </repository> | ||
| <repository> | ||
| <id>Just built</id> | ||
| <layout>p2</layout> | ||
| <url>file:${project.basedir}/../com.mycompany.generator.update/target/repository</url> | ||
| </repository> | ||
| <repository> | ||
| <id>To get dependencies</id> | ||
| <layout>p2</layout> | ||
| <url>http://download.eclipse.org/releases/mars</url> | ||
| </repository> | ||
| </repositories> | ||
| <applicationsArgs> | ||
| <args>-consoleLog</args> | ||
| <args>-application</args> | ||
| <args>org.eclipse.acceleo.equinox.AcceleoLauncher</args> | ||
| <args>-data</args> | ||
| <args>${project.parent.build.directory}/wks</args> | ||
| <args>-models</args> | ||
| <args>platform:/resource/com.mycompany.project/model/model.xmi</args> | ||
| <args>-output</args> | ||
| <args>${project.basedir}/src-gen</args> | ||
| <args>-actions</args> | ||
| <args>generate:com.mycompany.generator/com.mycompany.generator.main.Generate</args> | ||
| </applicationsArgs> | ||
| <dependencies> | ||
| <!-- We need the actual launcher application --> | ||
| <dependency> | ||
| <artifactId>org.eclipse.acceleo.equinox.launcher | ||
| </artifactId> | ||
| <type>eclipse-feature</type> | ||
| </dependency> | ||
| <!-- The Eclipse feature packaging the code generator. --> | ||
| <dependency> | ||
| <artifactId>com.mycompany.generator</artifactId> | ||
| <type>eclipse-plugin</type> | ||
| </dependency> | ||
| </dependencies> | ||
| </configuration> | ||
| <executions> | ||
| <execution> | ||
| <goals> | ||
| <goal>eclipse-run</goal> | ||
| </goals> | ||
| <phase>generate-sources</phase> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </project> |
Oops, something went wrong.