Skip to content

Commit

Permalink
Merge branch 'dev' into fix-#1564-property-implements-abstract-method
Browse files Browse the repository at this point in the history
  • Loading branch information
@fdodino
fdodino committed Dec 29, 2018
2 parents a8521a6 + 02d7f28 commit da6b0f8
Show file tree
Hide file tree
Showing 13 changed files with 307 additions and 270 deletions.
57 changes: 25 additions & 32 deletions org.uqbar.project.wollok.game/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,38 +4,26 @@
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>

<parent>
<relativePath>../org.uqbar.project.wollok.releng/pom.xml</relativePath>
<groupId>org.uqbar-project</groupId>
<artifactId>wollok-parent</artifactId>
<version>1.7.2-SNAPSHOT</version>
</parent>
<parent>
<relativePath>../org.uqbar.project.wollok.releng/pom.xml</relativePath>
<groupId>org.uqbar-project</groupId>
<artifactId>wollok-parent</artifactId>
<version>1.7.2-SNAPSHOT</version>
</parent>

<artifactId>org.uqbar.project.wollok.game</artifactId>
<packaging>eclipse-plugin</packaging>

<name>Wollok Game</name>

<dependencies>
<!-- uncommment just for running copy-dependencies and moving them to /lib folder
we are not using maven for this.
<dependency>
<groupId>com.badlogicgames.gdx</groupId>
<artifactId>gdx</artifactId>
<version>1.6.0</version>
</dependency>
<dependency>
<groupId>com.badlogicgames.gdx</groupId>
<artifactId>gdx-backend-lwjgl</artifactId>
<version>1.6.0</version>
</dependency>
<dependency>
<groupId>com.badlogicgames.gdx</groupId>
<artifactId>gdx-platform</artifactId>
<version>1.6.0</version>
<classifier>natives-desktop</classifier>
</dependency>
-->
<!-- uncommment just for running copy-dependencies and moving them to /lib
folder we are not using maven for this. <dependency> <groupId>com.badlogicgames.gdx</groupId>
<artifactId>gdx</artifactId> <version>1.6.0</version> </dependency> <dependency>
<groupId>com.badlogicgames.gdx</groupId> <artifactId>gdx-backend-lwjgl</artifactId>
<version>1.6.0</version> </dependency> <dependency> <groupId>com.badlogicgames.gdx</groupId>
<artifactId>gdx-platform</artifactId> <version>1.6.0</version> <classifier>natives-desktop</classifier>
</dependency> -->
</dependencies>

<build>
Expand All @@ -53,17 +41,22 @@
<dependency>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.core</artifactId>
<version>3.12.2</version>
<version>3.13.102</version>
</dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.core.runtime</artifactId>
<version>3.12.0</version>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.compiler.apt</artifactId>
<version>1.3.110</version>
</dependency>
<dependency>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.compiler.tool</artifactId>
<version>1.2.101</version>
</dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.equinox.common</artifactId>
<version>3.9.0</version>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.codegen</artifactId>
<version>2.11.0</version>
</dependency>
</dependencies>
</plugin>
Expand Down
43 changes: 24 additions & 19 deletions org.uqbar.project.wollok.launch/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>

<parent>
<relativePath>../org.uqbar.project.wollok.releng/pom.xml</relativePath>
<groupId>org.uqbar-project</groupId>
<artifactId>wollok-parent</artifactId>
<version>1.7.2-SNAPSHOT</version>
</parent>
<parent>
<relativePath>../org.uqbar.project.wollok.releng/pom.xml</relativePath>
<groupId>org.uqbar-project</groupId>
<artifactId>wollok-parent</artifactId>
<version>1.7.2-SNAPSHOT</version>
</parent>

<artifactId>org.uqbar.project.wollok.launch</artifactId>
<packaging>eclipse-plugin</packaging>

<name>Wollok Launch</name>

<properties>
<updateSiteFolder>dev</updateSiteFolder>
<!-- Properties relative to the distant host where to upload the repo -->
Expand All @@ -33,19 +33,24 @@
<dependency>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.core</artifactId>
<version>3.12.2</version>
<version>3.13.102</version>
</dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.core.runtime</artifactId>
<version>3.12.0</version>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.compiler.apt</artifactId>
<version>1.3.110</version>
</dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.equinox.common</artifactId>
<version>3.9.0</version>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.compiler.tool</artifactId>
<version>1.2.101</version>
</dependency>
</dependencies>
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.codegen</artifactId>
<version>2.11.0</version>
</dependency>
</dependencies>
</plugin>
<!-- copy all dependencies -->
<plugin>
Expand Down Expand Up @@ -127,14 +132,14 @@
</plugins>
</pluginManagement>
</build>
<profiles>

<profiles>
<!-- This profile is used to generate and upload the SDK packages -->
<profile>
<id>uploadProducts</id>

<build>
<plugins>
<plugins>
<!-- upload -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand All @@ -161,5 +166,5 @@
</build>
</profile>
</profiles>

</project>
33 changes: 19 additions & 14 deletions org.uqbar.project.wollok.lib/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>

<parent>
<relativePath>../org.uqbar.project.wollok.releng/pom.xml</relativePath>
<groupId>org.uqbar-project</groupId>
<artifactId>wollok-parent</artifactId>
<version>1.7.2-SNAPSHOT</version>
</parent>
<parent>
<relativePath>../org.uqbar.project.wollok.releng/pom.xml</relativePath>
<groupId>org.uqbar-project</groupId>
<artifactId>wollok-parent</artifactId>
<version>1.7.2-SNAPSHOT</version>
</parent>

<artifactId>org.uqbar.project.wollok.lib</artifactId>
<packaging>eclipse-plugin</packaging>
Expand All @@ -25,19 +25,24 @@
<dependency>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.core</artifactId>
<version>3.12.2</version>
<version>3.13.102</version>
</dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.core.runtime</artifactId>
<version>3.12.0</version>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.compiler.apt</artifactId>
<version>1.3.110</version>
</dependency>
<dependency>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.compiler.tool</artifactId>
<version>1.2.101</version>
</dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.equinox.common</artifactId>
<version>3.9.0</version>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.codegen</artifactId>
<version>2.11.0</version>
</dependency>
</dependencies>
</dependencies>
</plugin>
</plugins>
<pluginManagement>
Expand Down
33 changes: 19 additions & 14 deletions org.uqbar.project.wollok.product.ui/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>

<parent>
<relativePath>../org.uqbar.project.wollok.releng/pom.xml</relativePath>
<groupId>org.uqbar-project</groupId>
<artifactId>wollok-parent</artifactId>
<version>1.7.2-SNAPSHOT</version>
</parent>
<parent>
<relativePath>../org.uqbar.project.wollok.releng/pom.xml</relativePath>
<groupId>org.uqbar-project</groupId>
<artifactId>wollok-parent</artifactId>
<version>1.7.2-SNAPSHOT</version>
</parent>

<artifactId>org.uqbar.project.wollok.product.ui</artifactId>
<packaging>eclipse-plugin</packaging>
Expand All @@ -25,19 +25,24 @@
<dependency>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.core</artifactId>
<version>3.12.2</version>
<version>3.13.102</version>
</dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.core.runtime</artifactId>
<version>3.12.0</version>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.compiler.apt</artifactId>
<version>1.3.110</version>
</dependency>
<dependency>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.compiler.tool</artifactId>
<version>1.2.101</version>
</dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.equinox.common</artifactId>
<version>3.9.0</version>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.codegen</artifactId>
<version>2.11.0</version>
</dependency>
</dependencies>
</dependencies>
</plugin>
</plugins>
<pluginManagement>
Expand Down
52 changes: 25 additions & 27 deletions org.uqbar.project.wollok.releng/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,24 @@
<version>${xtext.version}</version>
<dependencies>
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.equinox.common</artifactId>
<version>3.9.0</version>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.core</artifactId>
<version>3.13.102</version>
</dependency>
<dependency>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.compiler.apt</artifactId>
<version>1.3.110</version>
</dependency>
<dependency>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.compiler.tool</artifactId>
<version>1.2.101</version>
</dependency>
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.codegen</artifactId>
<version>2.11.0</version>
</dependency>
</dependencies>
<executions>
Expand Down Expand Up @@ -373,30 +388,13 @@
<!-- code coverage -->

<!-- CHANGELOG generation -->
<!--plugin>
<groupId>com.github.danielflower.mavenplugins</groupId>
<artifactId>gitlog-maven-plugin</artifactId>
<version>1.13.2</version>
<executions>
<execution>
<goals>
<goal>generate</goal>
</goals>
</execution>
</executions>
<configuration>
<generateMarkdownChangeLog>true</generateMarkdownChangeLog>
<markdownChangeLogFilename>CHANGELOG.md</markdownChangeLogFilename>
<generatePlainTextChangeLog>true</generatePlainTextChangeLog>
<simpleHTMLChangeLogFilename>CHANGELOG.txt</simpleHTMLChangeLogFilename>
<generateJSONChangeLog>false</generateJSONChangeLog>
<excludeCommitsPattern>!(.*#.*)</excludeCommitsPattern>
<outputDirectory>${project.basedir}</outputDirectory>
</configuration>
</plugin-->
<!--plugin> <groupId>com.github.danielflower.mavenplugins</groupId> <artifactId>gitlog-maven-plugin</artifactId>
<version>1.13.2</version> <executions> <execution> <goals> <goal>generate</goal>
</goals> </execution> </executions> <configuration> <generateMarkdownChangeLog>true</generateMarkdownChangeLog>
<markdownChangeLogFilename>CHANGELOG.md</markdownChangeLogFilename> <generatePlainTextChangeLog>true</generatePlainTextChangeLog>
<simpleHTMLChangeLogFilename>CHANGELOG.txt</simpleHTMLChangeLogFilename>
<generateJSONChangeLog>false</generateJSONChangeLog> <excludeCommitsPattern>!(.*#.*)</excludeCommitsPattern>
<outputDirectory>${project.basedir}</outputDirectory> </configuration> </plugin -->
<!-- commit changelog -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
Loading

0 comments on commit da6b0f8

Please sign in to comment.