[hibernate-commits] Hibernate SVN: r12773 - in core/trunk: cache-jbosscache and 20 other directories.
hibernate-commits at lists.jboss.org
hibernate-commits at lists.jboss.org
Mon Jul 16 23:31:58 EDT 2007
Author: steve.ebersole at jboss.com
Date: 2007-07-16 23:31:57 -0400 (Mon, 16 Jul 2007)
New Revision: 12773
Modified:
core/trunk/cache-ehcache/pom.xml
core/trunk/cache-jbosscache/pom.xml
core/trunk/cache-jbosscache2/pom.xml
core/trunk/cache-oscache/pom.xml
core/trunk/cache-swarmcache/pom.xml
core/trunk/connection-c3p0/pom.xml
core/trunk/connection-proxool/pom.xml
core/trunk/core/pom.xml
core/trunk/documentation/manual/en-US/pom.xml
core/trunk/documentation/manual/es-ES/pom.xml
core/trunk/documentation/manual/fr-FR/pom.xml
core/trunk/documentation/manual/ja-JP/pom.xml
core/trunk/documentation/manual/ko-KR/pom.xml
core/trunk/documentation/manual/pom.xml
core/trunk/documentation/manual/pt-BR/pom.xml
core/trunk/documentation/manual/zh-CN/pom.xml
core/trunk/documentation/pom.xml
core/trunk/documentation/tutorial/pom.xml
core/trunk/eg/pom.xml
core/trunk/jmx/pom.xml
core/trunk/testing/pom.xml
core/trunk/testsuite/pom.xml
Log:
uploading separated parent poms
Modified: core/trunk/cache-ehcache/pom.xml
===================================================================
--- core/trunk/cache-ehcache/pom.xml 2007-07-17 03:15:53 UTC (rev 12772)
+++ core/trunk/cache-ehcache/pom.xml 2007-07-17 03:31:57 UTC (rev 12773)
@@ -3,26 +3,26 @@
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>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate-code</artifactId>
- <version>3.3.0.beta1</version>
- <relativePath>../pom.xml</relativePath>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
</parent>
-
+
<groupId>org.hibernate</groupId>
<artifactId>hibernate-ehcache</artifactId>
- <packaging>jar</packaging>
+ <version>3.3.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
- <name>Hibernate Ehcache integration</name>
+ <name>Hibernate Ehcache Integration</name>
<description>Integration of Hibernate with Ehcache</description>
<dependencies>
<dependency>
<groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${hibernate.core.version}</version>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
@@ -31,4 +31,4 @@
</dependency>
</dependencies>
-</project>
+</project>
Modified: core/trunk/cache-jbosscache/pom.xml
===================================================================
--- core/trunk/cache-jbosscache/pom.xml 2007-07-17 03:15:53 UTC (rev 12772)
+++ core/trunk/cache-jbosscache/pom.xml 2007-07-17 03:31:57 UTC (rev 12773)
@@ -3,26 +3,26 @@
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>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate-code</artifactId>
- <version>3.3.0.beta1</version>
- <relativePath>../pom.xml</relativePath>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
</parent>
-
+
<groupId>org.hibernate</groupId>
<artifactId>hibernate-jbosscache</artifactId>
- <packaging>jar</packaging>
+ <version>3.3.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
- <name>Hibernate JBossCache integration</name>
+ <name>Hibernate JBossCache Integration</name>
<description>Integration of Hibernate with JBossCache (based on JBossCache1.x APIs)</description>
<dependencies>
<dependency>
<groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${hibernate.core.version}</version>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>jboss</groupId>
@@ -62,4 +62,4 @@
</dependency>
</dependencies>
-</project>
+</project>
Modified: core/trunk/cache-jbosscache2/pom.xml
===================================================================
--- core/trunk/cache-jbosscache2/pom.xml 2007-07-17 03:15:53 UTC (rev 12772)
+++ core/trunk/cache-jbosscache2/pom.xml 2007-07-17 03:31:57 UTC (rev 12773)
@@ -3,31 +3,31 @@
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>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate-code</artifactId>
- <version>3.3.0.beta1</version>
- <relativePath>../pom.xml</relativePath>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
</parent>
-
+
<groupId>org.hibernate</groupId>
<artifactId>hibernate-jbosscache2</artifactId>
- <packaging>jar</packaging>
+ <version>3.3.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
- <name>Hibernate JBossCache2.x integration</name>
+ <name>Hibernate JBossCache2.x Integration</name>
<description>Integration of Hibernate with JBossCache (based on JBossCache2.x APIs)</description>
<dependencies>
<dependency>
<groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${hibernate.core.version}</version>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-cache</artifactId>
- <!-- does not work with idea plugin :(
+ <!-- I'd prefer this, at least until we get a GA...
<version>[2.0.0.BETA2,)</version>
-->
<version>2.0.0.BETA2</version>
@@ -38,16 +38,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-idea-plugin</artifactId>
- <configuration>
- <jdkName>1.5</jdkName>
- <jdkLevel>5.0</jdkLevel>
- <!-- why this isnt the default I have no clue -->
- <linkModules>true</linkModules>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.5</source>
@@ -57,4 +47,4 @@
</plugins>
</build>
-</project>
+</project>
Modified: core/trunk/cache-oscache/pom.xml
===================================================================
--- core/trunk/cache-oscache/pom.xml 2007-07-17 03:15:53 UTC (rev 12772)
+++ core/trunk/cache-oscache/pom.xml 2007-07-17 03:31:57 UTC (rev 12773)
@@ -3,26 +3,26 @@
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>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate-code</artifactId>
- <version>3.3.0.beta1</version>
- <relativePath>../pom.xml</relativePath>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
</parent>
-
+
<groupId>org.hibernate</groupId>
<artifactId>hibernate-oscache</artifactId>
- <packaging>jar</packaging>
+ <version>3.3.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
- <name>Hibernate OSCache integration</name>
+ <name>Hibernate OSCache Integration</name>
<description>Integration of Hibernate with OSCache</description>
<dependencies>
<dependency>
<groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${hibernate.core.version}</version>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>opensymphony</groupId>
@@ -31,4 +31,4 @@
</dependency>
</dependencies>
-</project>
+</project>
Modified: core/trunk/cache-swarmcache/pom.xml
===================================================================
--- core/trunk/cache-swarmcache/pom.xml 2007-07-17 03:15:53 UTC (rev 12772)
+++ core/trunk/cache-swarmcache/pom.xml 2007-07-17 03:31:57 UTC (rev 12773)
@@ -3,26 +3,26 @@
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>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate-code</artifactId>
- <version>3.3.0.beta1</version>
- <relativePath>../pom.xml</relativePath>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
</parent>
-
+
<groupId>org.hibernate</groupId>
<artifactId>hibernate-swarmcache</artifactId>
- <packaging>jar</packaging>
+ <version>3.3.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
- <name>Hibernate SwarmCache integration</name>
+ <name>Hibernate SwarmCache Integration</name>
<description>Integration of Hibernate with SwarmCache</description>
<dependencies>
<dependency>
<groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${hibernate.core.version}</version>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>swarmcache</groupId>
@@ -31,4 +31,4 @@
</dependency>
</dependencies>
-</project>
+</project>
Modified: core/trunk/connection-c3p0/pom.xml
===================================================================
--- core/trunk/connection-c3p0/pom.xml 2007-07-17 03:15:53 UTC (rev 12772)
+++ core/trunk/connection-c3p0/pom.xml 2007-07-17 03:31:57 UTC (rev 12773)
@@ -3,17 +3,17 @@
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>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate-code</artifactId>
- <version>3.3.0.beta1</version>
- <relativePath>../pom.xml</relativePath>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
</parent>
-
+
<groupId>org.hibernate</groupId>
<artifactId>hibernate-c3p0</artifactId>
- <packaging>jar</packaging>
+ <version>3.3.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
<name>Hibernate C3P0 ConnectionProvider</name>
<description>C3P0-based implementation of the Hibernate ConnectionProvder contract</description>
@@ -21,8 +21,8 @@
<dependencies>
<dependency>
<groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${hibernate.core.version}</version>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>c3p0</groupId>
@@ -31,4 +31,4 @@
</dependency>
</dependencies>
-</project>
+</project>
Modified: core/trunk/connection-proxool/pom.xml
===================================================================
--- core/trunk/connection-proxool/pom.xml 2007-07-17 03:15:53 UTC (rev 12772)
+++ core/trunk/connection-proxool/pom.xml 2007-07-17 03:31:57 UTC (rev 12773)
@@ -3,17 +3,17 @@
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>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate-code</artifactId>
- <version>3.3.0.beta1</version>
- <relativePath>../pom.xml</relativePath>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
</parent>
-
+
<groupId>org.hibernate</groupId>
<artifactId>hibernate-proxool</artifactId>
- <packaging>jar</packaging>
+ <version>3.3.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
<name>Hibernate Proxool ConnectionProvider</name>
<description>Proxool-based implementation of the Hibernate ConnectionProvder contract</description>
@@ -21,8 +21,8 @@
<dependencies>
<dependency>
<groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${hibernate.core.version}</version>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>proxool</groupId>
@@ -31,4 +31,4 @@
</dependency>
</dependencies>
-</project>
+</project>
Modified: core/trunk/core/pom.xml
===================================================================
--- core/trunk/core/pom.xml 2007-07-17 03:15:53 UTC (rev 12772)
+++ core/trunk/core/pom.xml 2007-07-17 03:31:57 UTC (rev 12773)
@@ -2,17 +2,17 @@
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>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-code</artifactId>
- <version>3.3.0.beta1</version>
- <relativePath>../pom.xml</relativePath>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
</parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
+ <version>3.3.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Hibernate Core</name>
@@ -32,7 +32,6 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
</dependency>
<dependency>
<groupId>dom4j</groupId>
Modified: core/trunk/documentation/manual/en-US/pom.xml
===================================================================
--- core/trunk/documentation/manual/en-US/pom.xml 2007-07-17 03:15:53 UTC (rev 12772)
+++ core/trunk/documentation/manual/en-US/pom.xml 2007-07-17 03:31:57 UTC (rev 12773)
@@ -3,61 +3,21 @@
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>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate-manual</artifactId>
- <version>3.3.0.beta1</version>
- <relativePath>../pom.xml</relativePath>
+ <artifactId>hibernate-manual-parent</artifactId>
+ <version>1</version>
</parent>
-
+
+ <groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-${translation}</artifactId>
- <packaging>docbook</packaging>
+ <version>3.3.0-SNAPSHOT</version>
+ <packaging>jdocbook</packaging>
+
<name>Hibernate Manual (${translation})</name>
+ <description>The Hibernate reference manual (${translation})</description>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jboss-docbook-plugin</artifactId>
- <version>2.0-SNAPSHOT</version>
- <extensions>true</extensions>
- <dependencies>
- <dependency>
- <groupId>com.redhat</groupId>
- <artifactId>docbook-xslt</artifactId>
- <version>0.1</version>
- </dependency>
- </dependencies>
- <configuration>
- <sourceDocumentName>master.xml</sourceDocumentName>
- <formats>
- <format>
- <formatName>pdf</formatName>
- <stylesheetResource>/standard/fopdf.xsl</stylesheetResource>
- <finalName>Hibernate_Reference.pdf</finalName>
- </format>
- <format>
- <formatName>eclipse</formatName>
- </format>
- <format>
- <formatName>html</formatName>
- <stylesheetResource>/standard/html.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- </formats>
- <options>
- <xincludeSupported>true</xincludeSupported>
- <xmlTransformerType>saxon</xmlTransformerType>
- <!-- needed for uri-resolvers; can be ommitted if using 'current' uri scheme -->
- <!-- could also locate the docbook dependency and inspect its version... -->
- <docbookVersion>1.72.0</docbookVersion>
- </options>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<properties>
<translation>en-US</translation>
</properties>
Modified: core/trunk/documentation/manual/es-ES/pom.xml
===================================================================
--- core/trunk/documentation/manual/es-ES/pom.xml 2007-07-17 03:15:53 UTC (rev 12772)
+++ core/trunk/documentation/manual/es-ES/pom.xml 2007-07-17 03:31:57 UTC (rev 12773)
@@ -3,17 +3,20 @@
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>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate-manual</artifactId>
- <version>3.3.0.beta1</version>
- <relativePath>../pom.xml</relativePath>
+ <artifactId>hibernate-manual-parent</artifactId>
+ <version>1</version>
</parent>
-
+
+ <groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-${translation}</artifactId>
- <packaging>pom</packaging>
+ <version>3.3.0-SNAPSHOT</version>
+ <packaging>jdocbook</packaging>
+
<name>Hibernate Manual (${translation})</name>
+ <description>The Hibernate reference manual (${translation})</description>
<properties>
<translation>es-ES</translation>
Modified: core/trunk/documentation/manual/fr-FR/pom.xml
===================================================================
--- core/trunk/documentation/manual/fr-FR/pom.xml 2007-07-17 03:15:53 UTC (rev 12772)
+++ core/trunk/documentation/manual/fr-FR/pom.xml 2007-07-17 03:31:57 UTC (rev 12773)
@@ -3,19 +3,23 @@
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>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate-manual</artifactId>
- <version>3.3.0.beta1</version>
- <relativePath>../pom.xml</relativePath>
+ <artifactId>hibernate-manual-parent</artifactId>
+ <version>1</version>
</parent>
-
+
+ <groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-${translation}</artifactId>
- <packaging>pom</packaging>
+ <version>3.3.0-SNAPSHOT</version>
+ <packaging>jdocbook</packaging>
+
<name>Hibernate Manual (${translation})</name>
+ <description>The Hibernate reference manual (${translation})</description>
<properties>
<translation>fr-FR</translation>
</properties>
+
</project>
Modified: core/trunk/documentation/manual/ja-JP/pom.xml
===================================================================
--- core/trunk/documentation/manual/ja-JP/pom.xml 2007-07-17 03:15:53 UTC (rev 12772)
+++ core/trunk/documentation/manual/ja-JP/pom.xml 2007-07-17 03:31:57 UTC (rev 12773)
@@ -3,17 +3,20 @@
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>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate-manual</artifactId>
- <version>3.3.0.beta1</version>
- <relativePath>../pom.xml</relativePath>
+ <artifactId>hibernate-manual-parent</artifactId>
+ <version>1</version>
</parent>
-
+
+ <groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-${translation}</artifactId>
- <packaging>pom</packaging>
+ <version>3.3.0-SNAPSHOT</version>
+ <packaging>jdocbook</packaging>
+
<name>Hibernate Manual (${translation})</name>
+ <description>The Hibernate reference manual (${translation})</description>
<properties>
<translation>ja-JP</translation>
Modified: core/trunk/documentation/manual/ko-KR/pom.xml
===================================================================
--- core/trunk/documentation/manual/ko-KR/pom.xml 2007-07-17 03:15:53 UTC (rev 12772)
+++ core/trunk/documentation/manual/ko-KR/pom.xml 2007-07-17 03:31:57 UTC (rev 12773)
@@ -3,17 +3,20 @@
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>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate-manual</artifactId>
- <version>3.3.0.beta1</version>
- <relativePath>../pom.xml</relativePath>
+ <artifactId>hibernate-manual-parent</artifactId>
+ <version>1</version>
</parent>
-
+
+ <groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-${translation}</artifactId>
- <packaging>pom</packaging>
+ <version>3.3.0-SNAPSHOT</version>
+ <packaging>jdocbook</packaging>
+
<name>Hibernate Manual (${translation})</name>
+ <description>The Hibernate reference manual (${translation})</description>
<properties>
<translation>ko-KR</translation>
Modified: core/trunk/documentation/manual/pom.xml
===================================================================
--- core/trunk/documentation/manual/pom.xml 2007-07-17 03:15:53 UTC (rev 12772)
+++ core/trunk/documentation/manual/pom.xml 2007-07-17 03:31:57 UTC (rev 12773)
@@ -3,86 +3,24 @@
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>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate-documentation</artifactId>
- <version>3.3.0.beta1</version>
- <relativePath>../pom.xml</relativePath>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
</parent>
-
+
+ <groupId>org.hibernate</groupId>
<artifactId>hibernate-manual</artifactId>
+ <version>3.3.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Hibernate Manual</name>
- <description>The Hibernate reference manual</description>
+ <name>Hibernate Manual (aggregator)</name>
+ <description>The Hibernate reference manual (aggregator)</description>
+
<modules>
<module>en-US</module>
<module>fr-FR</module>
</modules>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jboss-docbook-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-docbook-xslt</artifactId>
- <version>0.1</version>
- </dependency>
- </dependencies>
- <configuration>
- <sourceDocumentName>master.xml</sourceDocumentName>
- <formats>
- <format>
- <formatName>pdf</formatName>
- <stylesheetResource>/standard/fopdf.xsl</stylesheetResource>
- <finalName>hibernate_reference.pdf</finalName>
- </format>
- <format>
- <formatName>html</formatName>
- <stylesheetResource>/standard/html.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- </formats>
- <xincludeSupported>true</xincludeSupported>
- <options>
- <xincludeSupported>true</xincludeSupported>
- <xmlTransformerType>saxon</xmlTransformerType>
- <transformerParameters>
- <property>
- <name>custom.titlepage.img</name>
- <value>${basedir}/src/main/resources/shared/images/hibernate_logo_a.png</value>
- </property>
- </transformerParameters>
- </options>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-<!-- report plugin is currently hosed
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.jboss.maven.plugin</groupId>
- <artifactId>jboss-docbook-plugin</artifactId>
- </plugin>
- </plugins>
- </reporting>
--->
- <properties>
- <masterTranslation>en-US</masterTranslation>
- </properties>
-
</project>
Modified: core/trunk/documentation/manual/pt-BR/pom.xml
===================================================================
--- core/trunk/documentation/manual/pt-BR/pom.xml 2007-07-17 03:15:53 UTC (rev 12772)
+++ core/trunk/documentation/manual/pt-BR/pom.xml 2007-07-17 03:31:57 UTC (rev 12773)
@@ -3,17 +3,20 @@
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>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate-manual</artifactId>
- <version>3.3.0.beta1</version>
- <relativePath>.../pom.xml</relativePath>
+ <artifactId>hibernate-manual-parent</artifactId>
+ <version>1</version>
</parent>
-
+
+ <groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-${translation}</artifactId>
- <packaging>pom</packaging>
+ <version>3.3.0-SNAPSHOT</version>
+ <packaging>jdocbook</packaging>
+
<name>Hibernate Manual (${translation})</name>
+ <description>The Hibernate reference manual (${translation})</description>
<properties>
<translation>pt-BR</translation>
Modified: core/trunk/documentation/manual/zh-CN/pom.xml
===================================================================
--- core/trunk/documentation/manual/zh-CN/pom.xml 2007-07-17 03:15:53 UTC (rev 12772)
+++ core/trunk/documentation/manual/zh-CN/pom.xml 2007-07-17 03:31:57 UTC (rev 12773)
@@ -3,17 +3,20 @@
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>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate-manual</artifactId>
- <version>3.3.0.beta1</version>
- <relativePath>../pom.xml</relativePath>
+ <artifactId>hibernate-manual-parent</artifactId>
+ <version>1</version>
</parent>
-
+
+ <groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-${translation}</artifactId>
- <packaging>pom</packaging>
+ <version>3.3.0-SNAPSHOT</version>
+ <packaging>jdocbook</packaging>
+
<name>Hibernate Manual (${translation})</name>
+ <description>The Hibernate reference manual (${translation})</description>
<properties>
<translation>zh-CN</translation>
Modified: core/trunk/documentation/pom.xml
===================================================================
--- core/trunk/documentation/pom.xml 2007-07-17 03:15:53 UTC (rev 12772)
+++ core/trunk/documentation/pom.xml 2007-07-17 03:31:57 UTC (rev 12773)
@@ -3,18 +3,19 @@
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>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate-parent</artifactId>
- <version>3.3.0.beta1</version>
- <relativePath>../pom.xml</relativePath>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
</parent>
-
+
+ <groupId>org.hibernate</groupId>
<artifactId>hibernate-documentation</artifactId>
+ <version>3.3.0-SNAPSHOT</version>
<packaging>pom</packaging>
-
- <name>Hibernate Core - Documentation</name>
+
+ <name>Hibernate Core - Documentation</name>
<description>Grouping of Hibernate Core Project documentation modules</description>
<modules>
Modified: core/trunk/documentation/tutorial/pom.xml
===================================================================
--- core/trunk/documentation/tutorial/pom.xml 2007-07-17 03:15:53 UTC (rev 12772)
+++ core/trunk/documentation/tutorial/pom.xml 2007-07-17 03:31:57 UTC (rev 12773)
@@ -3,17 +3,18 @@
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>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate-documentation</artifactId>
- <version>3.3.0.beta1</version>
- <relativePath>../pom.xml</relativePath>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
</parent>
-
+
<groupId>org.hibernate</groupId>
<artifactId>hibernate-tutorial</artifactId>
+ <version>3.3.0-SNAPSHOT</version>
<packaging>war</packaging>
+
<name>Hibernate Tutorial</name>
<description>A tutorial project showcasing Hibernate usage</description>
@@ -21,7 +22,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
- <version>${hibernate.core.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: core/trunk/eg/pom.xml
===================================================================
--- core/trunk/eg/pom.xml 2007-07-17 03:15:53 UTC (rev 12772)
+++ core/trunk/eg/pom.xml 2007-07-17 03:31:57 UTC (rev 12773)
@@ -5,16 +5,16 @@
<modelVersion>4.0.0</modelVersion>
<!-- todo : this module should eventually make its way over to documentation/tutorial -->
-
+
<parent>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate-code</artifactId>
- <version>3.3.0.beta1</version>
- <relativePath>../pom.xml</relativePath>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
</parent>
-
+
<groupId>org.hibernate</groupId>
<artifactId>hibernate-eg</artifactId>
+ <version>3.3.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Hibernate Example</name>
@@ -24,7 +24,7 @@
<dependency>
<groupId>${groupId}</groupId>
<artifactId>hibernate-core</artifactId>
- <version>${hibernate.core.version}</version>
+ <version>${version}</version>
</dependency>
</dependencies>
Modified: core/trunk/jmx/pom.xml
===================================================================
--- core/trunk/jmx/pom.xml 2007-07-17 03:15:53 UTC (rev 12772)
+++ core/trunk/jmx/pom.xml 2007-07-17 03:31:57 UTC (rev 12773)
@@ -3,27 +3,31 @@
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>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate-code</artifactId>
- <version>3.3.0.beta1</version>
- <relativePath>../pom.xml</relativePath>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
</parent>
-
+
<groupId>org.hibernate</groupId>
<artifactId>hibernate-jmx</artifactId>
- <packaging>jar</packaging>
+ <version>3.3.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
<name>Hibernate JMX Module</name>
- <description>Defines Hibernate JMX functionality</description>
+ <description>Defines Hibernate JMX capabilities</description>
<dependencies>
<dependency>
<groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${hibernate.core.version}</version>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
</dependencies>
-</project>
+</project>
Modified: core/trunk/testing/pom.xml
===================================================================
--- core/trunk/testing/pom.xml 2007-07-17 03:15:53 UTC (rev 12772)
+++ core/trunk/testing/pom.xml 2007-07-17 03:31:57 UTC (rev 12773)
@@ -3,17 +3,17 @@
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>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate-code</artifactId>
- <version>3.3.0.beta1</version>
- <relativePath>../pom.xml</relativePath>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
</parent>
-
+
<groupId>org.hibernate</groupId>
<artifactId>hibernate-testing</artifactId>
- <packaging>jar</packaging>
+ <version>3.3.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
<name>Hibernate Testing</name>
<description>Hibernate JUnit test utilities</description>
@@ -21,16 +21,15 @@
<dependencies>
<dependency>
<groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${hibernate.core.version}</version>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
<!-- here we need to pull JUnit deps into compile scope... -->
<scope>compile</scope>
</dependency>
</dependencies>
-</project>
+</project>
Modified: core/trunk/testsuite/pom.xml
===================================================================
--- core/trunk/testsuite/pom.xml 2007-07-17 03:15:53 UTC (rev 12772)
+++ core/trunk/testsuite/pom.xml 2007-07-17 03:31:57 UTC (rev 12773)
@@ -3,76 +3,80 @@
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>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate-code</artifactId>
- <version>3.3.0.beta1</version>
- <relativePath>../pom.xml</relativePath>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
</parent>
-
+
<groupId>org.hibernate</groupId>
<artifactId>hibernate-testsuite</artifactId>
- <packaging>jar</packaging>
+ <version>3.3.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
<name>Hibernate Testsuite</name>
<description>The testsuite of Hibernate functionality</description>
<dependencies>
<dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${hibernate.core.version}</version>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
</dependency>
<dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
<groupId>${groupId}</groupId>
- <artifactId>hibernate-testing</artifactId>
- <version>${hibernate.core.version}</version>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>${groupId}</groupId>
- <artifactId>hibernate-ehcache</artifactId>
- <version>${hibernate.core.version}</version>
+ <artifactId>hibernate-testing</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>${groupId}</groupId>
- <artifactId>hibernate-jbosscache</artifactId>
- <version>${hibernate.core.version}</version>
+ <artifactId>hibernate-ehcache</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>${groupId}</groupId>
- <artifactId>hibernate-oscache</artifactId>
- <version>${hibernate.core.version}</version>
+ <artifactId>hibernate-jbosscache</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>${groupId}</groupId>
- <artifactId>hibernate-swarmcache</artifactId>
- <version>${hibernate.core.version}</version>
+ <artifactId>hibernate-oscache</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.11</version>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-swarmcache</artifactId>
+ <version>${version}</version>
</dependency>
<!-- these are optional on core... :( -->
<dependency>
<groupId>javassist</groupId>
<artifactId>javassist</artifactId>
<version>3.4.GA</version>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
<version>2.1_3</version>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>asm</groupId>
<artifactId>asm-attrs</artifactId>
<version>1.5.3</version>
- <optional>true</optional>
- </dependency>
+ </dependency>
<!-- optional dom4j dependency; needed here for dom4j (de)serialization -->
<dependency>
<groupId>jaxen</groupId>
@@ -95,8 +99,21 @@
<directory>src/test/resources</directory>
</testResource>
</testResources>
+
<plugins>
<plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-test-ext-plugin</artifactId>
+ <version>1.0.3</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>extend</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
@@ -111,28 +128,9 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>hsqldb</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <testResources>
- <testResource>
- <filtering>false</filtering>
- <directory>src/test/profile/hsqldb</directory>
- </testResource>
- </testResources>
- </build>
- <dependencies>
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>1.8.0.2</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
+ <properties>
+ <test.extender.cfg>${basedir}/src/test/profile/hsqldb/hsqldb-env.xml</test.extender.cfg>
+ <test.extender.env>hsqldb</test.extender.env>
+ </properties>
-</project>
+</project>
More information about the hibernate-commits
mailing list