Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ant/docs/examples/5-minute-tutorial/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,6 @@
To run this example:
- Have [Apache Ant](https://ant.apache.org) installed
- Have [H2 Sakila database](https://github.com/hibernate/sakila-h2) running
- Issue `ant` from a command-line window
- Issue `ant -Dhibernate.version=${hibernate.version} -Dh2.version=${h2.version} -Djavaee-api.version=${javaee-api.version}`
from a command-line window opened in this folder

3 changes: 2 additions & 1 deletion ant/docs/examples/classpath/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@
-->
To run this example:
- Have [Apache Ant](https://ant.apache.org) installed
- Issue `ant` from a command-line window
- Issue `ant -Dhibernate.version=${hibernate.version} -Dh2.version=${h2.version} -Djavaee-api.version=${javaee-api.version}`
from a command-line window opened in this folder
6 changes: 3 additions & 3 deletions ant/docs/examples/common/included.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
-->
<project name="common" xmlns:ivy="antlib:org.apache.ivy.ant">

<property name="hibernate-tools.version" value="@project.version@"/>
<property name="javaee-api.version" value="@javaee-api.version@"/>
<property name="hibernate-tools.version" value="${hibernate.version}"/>
<property name="javaee-api.version" value="${javaee-api.version}"/>
<property name="jdbc-driver.org" value="com.h2database"/>
<property name="jdbc-driver.module" value="h2"/>
<property name="jdbc-driver.version" value="@h2.version@"/>
<property name="jdbc-driver.version" value="${h2.version}"/>

<ivy:cachepath
organisation="org.hibernate.tool"
Expand Down
3 changes: 2 additions & 1 deletion ant/docs/examples/configuration/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@
-->
To run this example:
- Have [Apache Ant](https://ant.apache.org) installed
- Issue `ant` from a command-line window
- Issue `ant -Dhibernate.version=${hibernate.version} -Dh2.version=${h2.version} -Djavaee-api.version=${javaee-api.version}`
from a command-line window opened in this folder
3 changes: 2 additions & 1 deletion ant/docs/examples/jpa/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@
-->
To run this example:
- Have [Apache Ant](https://ant.apache.org) installed
- Issue `ant` from a command-line window
- Issue `ant -Dhibernate.version=${hibernate.version} -Dh2.version=${h2.version} -Djavaee-api.version=${javaee-api.version}`
from a command-line window opened in this folder
3 changes: 2 additions & 1 deletion ant/docs/examples/native/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@
-->
To run this example:
- Have [Apache Ant](https://ant.apache.org) installed
- Issue `ant` from a command-line window
- Issue `ant -Dhibernate.version=${hibernate.version} -Dh2.version=${h2.version} -Djavaee-api.version=${javaee-api.version}`
from a command-line window opened in this folder
3 changes: 2 additions & 1 deletion ant/docs/examples/properties/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@
-->
To run this example:
- Have [Apache Ant](https://ant.apache.org) installed
- Issue `ant` from a command-line window
- Issue `ant -Dhibernate.version=${hibernate.version} -Dh2.version=${h2.version} -Djavaee-api.version=${javaee-api.version}`
from a command-line window opened in this folder
3 changes: 2 additions & 1 deletion ant/docs/examples/templatepath/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,5 @@
To run this example:
- Have [Apache Ant](https://ant.apache.org) installed
- Have [H2 Sakila database](https://github.com/hibernate/sakila-h2) running
- Issue `ant` from a command-line window
- Issue `ant -Dhibernate.version=${hibernate.version} -Dh2.version=${h2.version} -Djavaee-api.version=${javaee-api.version}`
from a command-line window opened in this folder
65 changes: 37 additions & 28 deletions ant/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
<properties>
<!-- This is a publicly distributed module that should be published: -->
<deploy.skip>false</deploy.skip>
<!-- To run the integration tests we need to set ${hibernate.version} -->
<hibernate.version>${project.version}</hibernate.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -68,33 +70,10 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>filter-test-resources</id>
<phase>process-test-resources</phase>
<goals>
<goal>testResources</goal>
</goals>
<configuration>
<resources>
<resource>
<directory>${project.build.testOutputDirectory}</directory>
<filtering>true</filtering>
<includes>
<include>common/included.xml</include>
</includes>
</resource>
</resources>
<delimiters>
<delimiter>@*@</delimiter>
</delimiters>
</configuration>
</execution>
</executions>
</plugin>
<!-- Prepare the integration tests :
* Add the 'src/it/java' folder as as source of additional tests (only contains integration tests)
* Add the contents of the 'docs/examples' folder as additional test resources
-->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
Expand Down Expand Up @@ -130,8 +109,38 @@
</execution>
</executions>
</plugin>
<!-- Prepare the integration tests
* Filter the 'common/included.xml' file, and replace the delimited values with their actual properties
-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>filter-test-resources</id>
<phase>process-test-resources</phase>
<goals>
<goal>testResources</goal>
</goals>
<configuration>
<resources>
<resource>
<directory>${project.build.testOutputDirectory}</directory>
<filtering>true</filtering>
<includes>
<include>common/included.xml</include>
</includes>
</resource>
</resources>
<delimiters>
<delimiter>@*@</delimiter>
</delimiters>
</configuration>
</execution>
</executions>
</plugin>
<!-- run the integration tests -->
<plugin>
<!-- run the integration tests -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<executions>
Expand Down