[hibernate-commits] Hibernate SVN: r19010 - in search/trunk: hibernate-search and 1 other directories.
hibernate-commits at lists.jboss.org
hibernate-commits at lists.jboss.org
Tue Mar 16 14:36:37 EDT 2010
Author: hardy.ferentschik
Date: 2010-03-16 14:36:37 -0400 (Tue, 16 Mar 2010)
New Revision: 19010
Modified:
search/trunk/hibernate-search/pom.xml
search/trunk/hibernate-search/src/main/assembly/dist.xml
search/trunk/pom.xml
Log:
HSEARCH-468
Modified: search/trunk/hibernate-search/pom.xml
===================================================================
--- search/trunk/hibernate-search/pom.xml 2010-03-16 18:36:12 UTC (rev 19009)
+++ search/trunk/hibernate-search/pom.xml 2010-03-16 18:36:37 UTC (rev 19010)
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Id:$ -->
<!--
* Hibernate, Relational Persistence for Idiomatic Java
*
@@ -63,6 +64,11 @@
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
@@ -169,10 +175,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<configuration>
- <releaseProfiles>release</releaseProfiles>
- <goals>package javadoc:javadoc org.jboss.maven.plugins:maven-jdocbook-plugin:2.2.0:resources
- org.jboss.maven.plugins:maven-jdocbook-plugin:2.2.0:generate assembly:assembly
- </goals>
+ <goals>deploy org.jboss.maven.plugins:maven-jdocbook-plugin:2.2.0:resources org.jboss.maven.plugins:maven-jdocbook-plugin:2.2.0:generate assembly:assembly</goals>
</configuration>
</plugin>
<plugin>
Modified: search/trunk/hibernate-search/src/main/assembly/dist.xml
===================================================================
--- search/trunk/hibernate-search/src/main/assembly/dist.xml 2010-03-16 18:36:12 UTC (rev 19009)
+++ search/trunk/hibernate-search/src/main/assembly/dist.xml 2010-03-16 18:36:37 UTC (rev 19010)
@@ -3,7 +3,6 @@
<id>dist</id>
<formats>
<format>tar.gz</format>
- <format>tar.bz2</format>
<format>zip</format>
</formats>
@@ -19,8 +18,12 @@
<fileSet>
<directory>target</directory>
<outputDirectory>/dist</outputDirectory>
+ <excludes>
+ <exclude>*-javadoc.jar</exclude>
+ <exclude>*-sources.jar</exclude>
+ </excludes>
<includes>
- <include>*.jar</include>
+ <include>hibernate-*.jar</include>
</includes>
</fileSet>
<fileSet>
@@ -32,13 +35,23 @@
<outputDirectory>/dist/docs/manual</outputDirectory>
</fileSet>
<fileSet>
+ <directory>..</directory>
+ <outputDirectory></outputDirectory>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <includes>
+ <include>lgpl.txt</include>
+ <include>readme.txt</include>
+ <include>changelog.txt</include>
+ </includes>
+ </fileSet>
+ <fileSet>
<directory>.</directory>
<outputDirectory></outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
- <excludes>
- <exclude>target/**</exclude>
- <exclude>hibernate-search-archetype/**</exclude>
- </excludes>
- </fileSet>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/**/*</include>
+ </includes>
+ </fileSet>
</fileSets>
</assembly>
Modified: search/trunk/pom.xml
===================================================================
--- search/trunk/pom.xml 2010-03-16 18:36:12 UTC (rev 19009)
+++ search/trunk/pom.xml 2010-03-16 18:36:37 UTC (rev 19010)
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Id:$ -->
<!--
* Hibernate, Relational Persistence for Idiomatic Java
*
@@ -137,12 +138,6 @@
<version>${slf4jVersion}</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4jVersion}</version>
@@ -275,7 +270,12 @@
<artifactId>javassist</artifactId>
<version>3.4.GA</version>
<optional>true</optional>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -347,6 +347,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.4.3</version>
+ <configuration>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ </configuration>
</plugin>
<plugin>
<groupId>org.jboss.maven.plugins</groupId>
@@ -382,6 +385,13 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.0-beta-9</version>
+ <configuration>
+ <preparationGoals>clean install</preparationGoals>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ <allowTimestampedSnapshots>true</allowTimestampedSnapshots>
+ <remoteTagging>true</remoteTagging>
+ <goals>deploy</goals>
+ </configuration>
</plugin>
<plugin>
<groupId>org.jboss.maven.plugins</groupId>
@@ -392,15 +402,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.5</version>
- <executions>
- <execution>
- <id>make-javadoc</id>
- <phase>package</phase>
- <goals>
- <goal>javadoc</goal>
- </goals>
- </execution>
- </executions>
</plugin>
</plugins>
</pluginManagement>
@@ -417,7 +418,8 @@
<snapshotRepository>
<id>snapshots.jboss.org</id>
<name>JBoss Snapshot Repository</name>
- <url>dav:https://snapshots.jboss.org/maven2</url>
+ <url>file:///Users/hardy/tmp/snapshot</url>
+ <!--url>dav:https://snapshots.jboss.org/maven2</url-->
</snapshotRepository>
</distributionManagement>
More information about the hibernate-commits
mailing list