Skip to content

Commit

Permalink
[BF] added last fixes to prepare release
Browse files Browse the repository at this point in the history
  • Loading branch information
@jochenwierum
jochenwierum committed Feb 18, 2014
1 parent c6bb5fb commit 018ea4c
Show file tree
Hide file tree
Showing 6 changed files with 295 additions and 302 deletions.
226 changes: 114 additions & 112 deletions archetype-fitgoodies-quickstart/src/main/resources/archetype-resources/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,116 +1,118 @@
#set($dollar = '$')
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>\${groupId}</groupId>
<artifactId>\${artifactId}</artifactId>
<version>\${version}</version>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.14</version>
</dependency>
<dependency>
<groupId>de.cologneintelligence</groupId>
<artifactId>fitgoodies</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>10.1.3.1</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
<optimize>true</optimize>
<debug>true</debug>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>10.1.3.1</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.14</version>
</dependency>
</dependencies>
<executions>
<execution>
<id>default</id>
<phase>integration-test</phase>
<goals>
<goal>run</goal>
</goals>
<inherited>true</inherited>
<configuration>
<tasks>
<property name="tests" value="\${basedir}/src/test/fixtures" />
<property name="target"
value="\${project.build.directory}/fit" />
<property name="reltarget" value="fit" />
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId>
<version>${version}</version>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.14</version>
</dependency>
<dependency>
<groupId>de.cologneintelligence</groupId>
<artifactId>fitgoodies</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>10.1.3.1</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
<optimize>true</optimize>
<debug>true</debug>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>10.1.3.1</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.14</version>
</dependency>
</dependencies>
<executions>
<execution>
<id>default</id>
<phase>integration-test</phase>
<goals>
<goal>run</goal>
</goals>
<inherited>true</inherited>
<configuration>
<tasks>
<property name="tests" value="${dollar}{basedir}/src/test/fixtures" />
<property name="target"
value="${dollar}{project.build.directory}/fit" />
<property name="reltarget" value="fit" />

<copy todir="\${target}">
<fileset dir="\${tests}" erroronmissingdir="false"
casesensitive="false" excludes="**/*.html" />
</copy>
<mkdir dir="${dollar}{target}" />
<copy todir="${dollar}{target}">
<fileset dir="${dollar}{tests}" erroronmissingdir="false"
casesensitive="false" excludes="**/*.html" />
</copy>

<java
classname="de.cologneintelligence.fitgoodies.runners.FitRunner"
dir="\${project.build.directory}" fork="true"
failonerror="true">
<classpath>
<path refid="maven.test.classpath" />
</classpath>
<arg value="-s" />
<arg value="\${tests}" />
<arg value="-d" />
<arg value="\${reltarget}" />
<arg value="-e" />
<arg value="utf-8" />
</java>
</tasks>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>selenium-maven-plugin</artifactId>
<version>2.3</version>
<executions>
<execution>
<phase>pre-integration-test</phase>
<goals>
<goal>start-server</goal>
</goals>
<configuration>
<background>true</background>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<java
classname="de.cologneintelligence.fitgoodies.runners.FitRunner"
dir="${dollar}{project.build.directory}" fork="true"
failonerror="true">
<classpath>
<path refid="maven.test.classpath" />
</classpath>
<arg value="-s" />
<arg value="${dollar}{tests}" />
<arg value="-d" />
<arg value="${dollar}{reltarget}" />
<arg value="-e" />
<arg value="utf-8" />
</java>
</tasks>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>selenium-maven-plugin</artifactId>
<version>2.3</version>
<executions>
<execution>
<phase>pre-integration-test</phase>
<goals>
<goal>start-server</goal>
</goals>
<configuration>
<background>true</background>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
8 changes: 4 additions & 4 deletions fitgoodies/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,10 @@
<version>2.7.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.sanityinc</groupId>
<artifactId>jargs</artifactId>
<version>2.0-SNAPSHOT</version>
<dependency>
<groupId>net.sf.jopt-simple</groupId>
<artifactId>jopt-simple</artifactId>
<version>4.6</version>
</dependency>
</dependencies>

Expand Down
113 changes: 0 additions & 113 deletions .../src/main/java/de/cologneintelligence/fitgoodies/file/builder/FixtureFileListBuilder.java
View file

This file was deleted.

Loading

0 comments on commit 018ea4c

Please sign in to comment.