Skip to content

Commit

Permalink
Merge pull request wakaleo#13 from VDD/continuous-delivery
Browse files Browse the repository at this point in the history 
Continuous delivery
  • Loading branch information
@wakaleo
wakaleo committed Mar 5, 2013
2 parents f9e7ba5 + e90a926 commit 7925e7c
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 63 deletions.
8 changes: 3 additions & 5 deletions gameoflife-acceptance-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,9 @@
<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>gameoflife</artifactId>
<groupId>com.wakaleo.gameoflife</groupId>
<version>0.9.47-SNAPSHOT</version>
</parent>
<groupId>com.wakaleo.gameoflife</groupId>
<artifactId>gameoflife-acceptance-tests</artifactId>
<version>1.0-SNAPSHOT</version>
<name>gameoflife-acceptance-tests</name>
<properties>
<target.version>0.9.22</target.version>
Expand All @@ -16,6 +13,7 @@
<jetty.stop.port>9999</jetty.stop.port>
<webdriver.base.url>http://localhost:${jetty.port}</webdriver.base.url>
<webdriver.driver>firefox</webdriver.driver>
<thucydides.version>0.9.22</thucydides.version>
</properties>
<dependencies>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion ...e-acceptance-tests/src/test/java/com/wakaleo/gameoflife/webtests/pages/EnterGridPage.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import org.openqa.selenium.WebElement;
import org.openqa.selenium.support.FindBy;

@DefaultUrl("http://localhost:9090/new")
@DefaultUrl("http://localhost:9090/gameoflife/new")
public class EnterGridPage extends GameOfLifePage {

@FindBy(id = "submit")
Expand Down
2 changes: 1 addition & 1 deletion ...-acceptance-tests/src/test/java/com/wakaleo/gameoflife/webtests/pages/GameOfLifePage.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import org.openqa.selenium.WebElement;
import org.openqa.selenium.support.FindBy;

@DefaultUrl("http://localhost:9090")
@DefaultUrl("http://localhost:9090/gameoflife")
public class GameOfLifePage extends PageObject {

@FindBy(linkText = "home")
Expand Down
2 changes: 1 addition & 1 deletion ...oflife-acceptance-tests/src/test/java/com/wakaleo/gameoflife/webtests/pages/HomePage.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import org.openqa.selenium.WebElement;
import org.openqa.selenium.support.FindBy;

@DefaultUrl("http://localhost:9090/home")
@DefaultUrl("http://localhost:9090/gameoflife/home")
public class HomePage extends GameOfLifePage {

@FindBy(linkText = "New Game")
Expand Down
2 changes: 1 addition & 1 deletion gameoflife-build/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>gameoflife</artifactId>
<groupId>com.wakaleo.gameoflife</groupId>
<version>0.9.67-SNAPSHOT</version>
<version>1.0-SNAPSHOT</version>
</parent>
<artifactId>gameoflife-build</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion gameoflife-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>gameoflife</artifactId>
<groupId>com.wakaleo.gameoflife</groupId>
<version>0.9.67-SNAPSHOT</version>
<version>1.0-SNAPSHOT</version>
</parent>
<groupId>com.wakaleo.gameoflife</groupId>
<artifactId>gameoflife-core</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions gameoflife-web/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>gameoflife</artifactId>
<groupId>com.wakaleo.gameoflife</groupId>
<version>0.9.67-SNAPSHOT</version>
<version>1.0-SNAPSHOT</version>
</parent>
<groupId>com.wakaleo.gameoflife</groupId>
<artifactId>gameoflife-web</artifactId>
Expand Down Expand Up @@ -121,7 +121,7 @@
<dependency>
<groupId>com.wakaleo.gameoflife</groupId>
<artifactId>gameoflife-core</artifactId>
<version>0.9.67-SNAPSHOT</version>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
Expand Down
73 changes: 22 additions & 51 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.wakaleo.gameoflife</groupId>
<artifactId>gameoflife</artifactId>
<version>0.9.67-SNAPSHOT</version>
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>gameoflife</name>
<url>https://github.com/wakaleo/game-of-life</url>
Expand All @@ -16,6 +16,8 @@
<targetJdk>1.6</targetJdk>
<github.account>wakaleo</github.account>
<thucydides.version>0.9.22</thucydides.version>
<jelastic.context>gameoflife</jelastic.context>
<jelastic.environment>wakaleo</jelastic.environment>
</properties>

<scm>
Expand Down Expand Up @@ -134,10 +136,9 @@
<configuration>
<email>${jelastic.username}</email>
<password>${jelastic.password}</password>
<context>gameoflife</context>
<environment>wakaleo</environment>
<context>${jelastic.context}</context>
<environment>${jelastic.environment}</environment>
<api_hoster>app.jelastic.servint.net</api_hoster>
<finalName>gameoflife</finalName>
</configuration>
</plugin>

Expand Down Expand Up @@ -233,66 +234,36 @@
<id>metrics</id>
<build>
<plugins>

<!-- CODE COVERAGE -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>${cobertura.version}</version>
<configuration>
<formats>
<format>html</format>
<format>xml</format>
</formats>
</configuration>
<executions>
<execution>
<goals>
<goal>clean</goal>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>

<!-- CHECKSTYLE -->
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.9.1</version>
<dependencies>
<dependency>
<groupId>com.wakaleo.gameoflife</groupId>
<artifactId>gameoflife-build</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
<configuration>
<configLocation>custom-checkstyle.xml</configLocation>
</configuration>
</plugin>
<!--<plugin>-->
<!--<artifactId>maven-checkstyle-plugin</artifactId>-->
<!--<version>2.9.1</version>-->
<!--<dependencies>-->
<!--<dependency>-->
<!--<groupId>com.wakaleo.gameoflife</groupId>-->
<!--<artifactId>gameoflife-build</artifactId>-->
<!--<version>${project.version}</version>-->
<!--</dependency>-->
<!--</dependencies>-->
<!--<configuration>-->
<!--<configLocation>custom-checkstyle.xml</configLocation>-->
<!--</configuration>-->
<!--</plugin>-->

<!-- PMD -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>2.5</version>
<dependencies>
<dependency>
<groupId>com.wakaleo.gameoflife</groupId>
<artifactId>gameoflife-build</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
<configuration>
<targetJdk>1.6</targetJdk>
<aggregate>true</aggregate>
<format>xml</format>
<rulesets>
<ruleset>pmd-rules.xml</ruleset>
</rulesets>
<!-- CPD options -->
<minimumTokens>20</minimumTokens>
<ignoreIdentifiers>true</ignoreIdentifiers>
<!--<ignoreIdentifiers>true</ignoreIdentifiers>-->
<failOnViolation>true</failOnViolation>
<failurePriority>2</failurePriority>
</configuration>
</plugin>

Expand Down

0 comments on commit 7925e7c

Please sign in to comment.