Skip to content

Commit

Permalink
Fixed warnings reported by Maven 3.
Browse files Browse the repository at this point in the history
  • Loading branch information
@henryju @emmanuelbernard
henryju authored and emmanuelbernard committed Oct 26, 2010
1 parent e980f6a commit c66026e
Show file tree
Hide file tree
Showing 14 changed files with 52 additions and 51 deletions.
8 changes: 4 additions & 4 deletions cache-ehcache/pom.xml
View file
Expand Up @@ -19,19 +19,19 @@

<dependencies>
<dependency>
<groupId>${groupId}</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>hibernate-core</artifactId>
<version>${version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
<version>1.5.0</version>
</dependency>
<dependency>
<groupId>${groupId}</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>hibernate-testing</artifactId>
<version>${version}</version>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
8 changes: 4 additions & 4 deletions cache-infinispan/pom.xml
View file
Expand Up @@ -36,9 +36,9 @@

<dependencies>
<dependency>
<groupId>${groupId}</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>hibernate-core</artifactId>
<version>${version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
Expand All @@ -48,9 +48,9 @@

<!-- test dependencies -->
<dependency>
<groupId>${groupId}</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>hibernate-testing</artifactId>
<version>${version}</version>
<version>${project.version}</version>
<!-- <scope>test</scope> TODO fix this -->
</dependency>
<dependency>
Expand Down
8 changes: 4 additions & 4 deletions cache-jbosscache/pom.xml
View file
Expand Up @@ -40,9 +40,9 @@

<dependencies>
<dependency>
<groupId>${groupId}</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>hibernate-core</artifactId>
<version>${version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.cache</groupId>
Expand All @@ -52,9 +52,9 @@

<!-- test dependencies -->
<dependency>
<groupId>${groupId}</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>hibernate-testing</artifactId>
<version>${version}</version>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions cache-oscache/pom.xml
View file
Expand Up @@ -19,9 +19,9 @@

<dependencies>
<dependency>
<groupId>${groupId}</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>hibernate-core</artifactId>
<version>${version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>opensymphony</groupId>
Expand Down
4 changes: 2 additions & 2 deletions cache-swarmcache/pom.xml
View file
Expand Up @@ -19,9 +19,9 @@

<dependencies>
<dependency>
<groupId>${groupId}</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>hibernate-core</artifactId>
<version>${version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>swarmcache</groupId>
Expand Down
4 changes: 2 additions & 2 deletions connection-c3p0/pom.xml
View file
Expand Up @@ -19,9 +19,9 @@

<dependencies>
<dependency>
<groupId>${groupId}</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>hibernate-core</artifactId>
<version>${version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>c3p0</groupId>
Expand Down
4 changes: 2 additions & 2 deletions connection-proxool/pom.xml
View file
Expand Up @@ -19,9 +19,9 @@

<dependencies>
<dependency>
<groupId>${groupId}</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>hibernate-core</artifactId>
<version>${version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>proxool</groupId>
Expand Down
3 changes: 2 additions & 1 deletion core/pom.xml
View file
Expand Up @@ -166,7 +166,7 @@
<configuration>
<bytecodeInjections>
<bytecodeInjection>
<expression>${pom.version}</expression>
<expression>${project.version}</expression>
<targetMembers>
<methodBodyReturn>
<className>org.hibernate.Version</className>
Expand Down Expand Up @@ -204,6 +204,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.7</version>
<configuration>
<!--
for the time being, gonna ignore the custom stylesheet (what did it do anyway???)
Expand Down
32 changes: 16 additions & 16 deletions distribution/pom.xml
View file
Expand Up @@ -62,17 +62,17 @@
<source><![CDATA[
def sourcePathName = 'javadocSourcePath'
sourcePath = ant.path( id:sourcePathName ) {
ant.pathElement( path: "${pom.basedir}/../cache-ehcache/src/main/java" )
ant.pathElement( path: "${pom.basedir}/../cache-infinispan/src/main/java" )
ant.pathElement( path: "${pom.basedir}/../cache-jbosscache/src/main/java" )
ant.pathElement( path: "${pom.basedir}/../cache-oscache/src/main/java" )
ant.pathElement( path: "${pom.basedir}/../cache-swarmcache/src/main/java" )
ant.pathElement( path: "${pom.basedir}/../connection-c3p0/src/main/java" )
ant.pathElement( path: "${pom.basedir}/../connection-proxool/src/main/java" )
ant.pathElement( path: "${pom.basedir}/../entitymanager/src/main/java" )
ant.pathElement( path: "${pom.basedir}/../envers/src/main/java" )
ant.pathElement( path: "${pom.basedir}/../testing/src/main/java" )
ant.pathElement( path: "${pom.basedir}/../core/src/main/java" )
ant.pathElement( path: "${project.basedir}/../cache-ehcache/src/main/java" )
ant.pathElement( path: "${project.basedir}/../cache-infinispan/src/main/java" )
ant.pathElement( path: "${project.basedir}/../cache-jbosscache/src/main/java" )
ant.pathElement( path: "${project.basedir}/../cache-oscache/src/main/java" )
ant.pathElement( path: "${project.basedir}/../cache-swarmcache/src/main/java" )
ant.pathElement( path: "${project.basedir}/../connection-c3p0/src/main/java" )
ant.pathElement( path: "${project.basedir}/../connection-proxool/src/main/java" )
ant.pathElement( path: "${project.basedir}/../entitymanager/src/main/java" )
ant.pathElement( path: "${project.basedir}/../envers/src/main/java" )
ant.pathElement( path: "${project.basedir}/../testing/src/main/java" )
ant.pathElement( path: "${project.basedir}/../core/src/main/java" )
ant.pathElement( path: "../core/target/generated-sources/antlr" )
}
Expand All @@ -82,18 +82,18 @@
classPath.createPathElement().path = element
}
targetDir = "${pom.basedir}/target/javadocs";
targetDir = "${project.basedir}/target/javadocs";
ant.javadoc(
executable: '${jdk16_home}/bin/javadoc',
maxmemory: '512m',
destdir: targetDir ,
sourcepathref: sourcePathName,
classpathref: classPathName,
overview: '${pom.basedir}/src/javadoc/package.html',
stylesheetfile: '${pom.basedir}/src/javadoc/stylesheet.css',
overview: '${project.basedir}/src/javadoc/package.html',
stylesheetfile: '${project.basedir}/src/javadoc/stylesheet.css',
windowtitle: 'Hibernate JavaDocs',
doctitle: 'Hibernate JavaDoc (${pom.version})',
doctitle: 'Hibernate JavaDoc (${project.version})',
bottom: 'Copyright &copy; 2001-2010 <a href="http://redhat.com">Red Hat, Inc.</a> All Rights Reserved.',
use: true
) {
Expand Down Expand Up @@ -146,7 +146,7 @@
imagesDir = targetDir + '/images'
ant.mkdir( dir: imagesDir )
ant.copy( toDir: imagesDir ) {
fileset( dir: "${pom.basedir}/src/javadoc/images" )
fileset( dir: "${project.basedir}/src/javadoc/images" )
}
]]>
</source>
Expand Down
6 changes: 3 additions & 3 deletions entitymanager/pom.xml
View file
Expand Up @@ -46,9 +46,9 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>${groupId}</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>hibernate-testing</artifactId>
<version>${version}</version>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -103,7 +103,7 @@
<configuration>
<bytecodeInjections>
<bytecodeInjection>
<expression>${pom.version}</expression>
<expression>${project.version}</expression>
<targetMembers>
<methodBodyReturn>
<className>org.hibernate.ejb.Version</className>
Expand Down
6 changes: 3 additions & 3 deletions envers/pom.xml
View file
Expand Up @@ -131,17 +131,17 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>${version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
<version>${version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-testing</artifactId>
<version>${version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
Expand Down
4 changes: 2 additions & 2 deletions parent/pom.xml
View file
Expand Up @@ -275,7 +275,7 @@
<packagesheader>Hibernate Packages</packagesheader>
<doctitle>Hibernate Core ${project.version}</doctitle>
<windowtitle>Hibernate Core ${project.version}</windowtitle>
<bottom><![CDATA[Copyright &copy; ${inceptionYear}-{currentYear} <a href="http://redhat.com">Red Hat Middleware, LLC.</a> All Rights Reserved]]></bottom>
<bottom><![CDATA[Copyright &copy; ${project.inceptionYear}-{currentYear} <a href="http://redhat.com">Red Hat Middleware, LLC.</a> All Rights Reserved]]></bottom>
<excludePackageNames>orh.hibernate.tutorial*</excludePackageNames>
<groups>
<group>
Expand Down Expand Up @@ -628,7 +628,7 @@
<properties>
<db.dialect>org.hibernate.dialect.DerbyDialect</db.dialect>
<jdbc.driver>org.apache.derby.jdbc.EmbeddedDriver</jdbc.driver>
<jdbc.url>jdbc:derby:${pom.build.outputDirectory}/test/derby;create=true</jdbc.url>
<jdbc.url>jdbc:derby:${project.build.outputDirectory}/test/derby;create=true</jdbc.url>
<jdbc.user>sa</jdbc.user>
<jdbc.pass/>
<jdbc.isolation/>
Expand Down
4 changes: 2 additions & 2 deletions testing/pom.xml
View file
Expand Up @@ -19,9 +19,9 @@

<dependencies>
<dependency>
<groupId>${groupId}</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>hibernate-core</artifactId>
<version>${version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down
8 changes: 4 additions & 4 deletions testsuite/pom.xml
View file
Expand Up @@ -24,14 +24,14 @@

<dependencies>
<dependency>
<groupId>${groupId}</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>hibernate-core</artifactId>
<version>${version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${groupId}</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>hibernate-testing</artifactId>
<version>${version}</version>
<version>${project.version}</version>
</dependency>
<!-- these are optional on core... :( -->
<dependency>
Expand Down

0 comments on commit c66026e

Please sign in to comment.