Skip to content

Commit 33e5585

Browse files
henryjuhenryju
committed
Fixed warnings reported by Maven 3.
1 parent 47eace5 commit 33e5585

File tree

14 files changed

+52
-51
lines changed

14 files changed

+52
-51
lines changed

‎cache-ehcache/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@
1919

2020
<dependencies>
2121
<dependency>
22-
<groupId>${groupId}</groupId>
22+
<groupId>${project.groupId}</groupId>
2323
<artifactId>hibernate-core</artifactId>
24-
<version>${version}</version>
24+
<version>${project.version}</version>
2525
</dependency>
2626
<dependency>
2727
<groupId>net.sf.ehcache</groupId>
2828
<artifactId>ehcache</artifactId>
2929
<version>1.5.0</version>
3030
</dependency>
3131
<dependency>
32-
<groupId>${groupId}</groupId>
32+
<groupId>${project.groupId}</groupId>
3333
<artifactId>hibernate-testing</artifactId>
34-
<version>${version}</version>
34+
<version>${project.version}</version>
3535
<scope>test</scope>
3636
</dependency>
3737
<dependency>

‎cache-infinispan/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@
3636

3737
<dependencies>
3838
<dependency>
39-
<groupId>${groupId}</groupId>
39+
<groupId>${project.groupId}</groupId>
4040
<artifactId>hibernate-core</artifactId>
41-
<version>${version}</version>
41+
<version>${project.version}</version>
4242
</dependency>
4343
<dependency>
4444
<groupId>org.infinispan</groupId>
@@ -48,9 +48,9 @@
4848

4949
<!-- test dependencies -->
5050
<dependency>
51-
<groupId>${groupId}</groupId>
51+
<groupId>${project.groupId}</groupId>
5252
<artifactId>hibernate-testing</artifactId>
53-
<version>${version}</version>
53+
<version>${project.version}</version>
5454
<!-- <scope>test</scope> TODO fix this -->
5555
</dependency>
5656
<dependency>

‎cache-jbosscache/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@
4040

4141
<dependencies>
4242
<dependency>
43-
<groupId>${groupId}</groupId>
43+
<groupId>${project.groupId}</groupId>
4444
<artifactId>hibernate-core</artifactId>
45-
<version>${version}</version>
45+
<version>${project.version}</version>
4646
</dependency>
4747
<dependency>
4848
<groupId>org.jboss.cache</groupId>
@@ -52,9 +52,9 @@
5252

5353
<!-- test dependencies -->
5454
<dependency>
55-
<groupId>${groupId}</groupId>
55+
<groupId>${project.groupId}</groupId>
5656
<artifactId>hibernate-testing</artifactId>
57-
<version>${version}</version>
57+
<version>${project.version}</version>
5858
<scope>test</scope>
5959
</dependency>
6060
<dependency>

‎cache-oscache/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919

2020
<dependencies>
2121
<dependency>
22-
<groupId>${groupId}</groupId>
22+
<groupId>${project.groupId}</groupId>
2323
<artifactId>hibernate-core</artifactId>
24-
<version>${version}</version>
24+
<version>${project.version}</version>
2525
</dependency>
2626
<dependency>
2727
<groupId>opensymphony</groupId>

‎cache-swarmcache/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919

2020
<dependencies>
2121
<dependency>
22-
<groupId>${groupId}</groupId>
22+
<groupId>${project.groupId}</groupId>
2323
<artifactId>hibernate-core</artifactId>
24-
<version>${version}</version>
24+
<version>${project.version}</version>
2525
</dependency>
2626
<dependency>
2727
<groupId>swarmcache</groupId>

‎connection-c3p0/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919

2020
<dependencies>
2121
<dependency>
22-
<groupId>${groupId}</groupId>
22+
<groupId>${project.groupId}</groupId>
2323
<artifactId>hibernate-core</artifactId>
24-
<version>${version}</version>
24+
<version>${project.version}</version>
2525
</dependency>
2626
<dependency>
2727
<groupId>c3p0</groupId>

‎connection-proxool/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919

2020
<dependencies>
2121
<dependency>
22-
<groupId>${groupId}</groupId>
22+
<groupId>${project.groupId}</groupId>
2323
<artifactId>hibernate-core</artifactId>
24-
<version>${version}</version>
24+
<version>${project.version}</version>
2525
</dependency>
2626
<dependency>
2727
<groupId>proxool</groupId>

‎core/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
<configuration>
167167
<bytecodeInjections>
168168
<bytecodeInjection>
169-
<expression>${pom.version}</expression>
169+
<expression>${project.version}</expression>
170170
<targetMembers>
171171
<methodBodyReturn>
172172
<className>org.hibernate.Version</className>
@@ -204,6 +204,7 @@
204204
<plugin>
205205
<groupId>org.apache.maven.plugins</groupId>
206206
<artifactId>maven-javadoc-plugin</artifactId>
207+
<version>2.7</version>
207208
<configuration>
208209
<!--
209210
for the time being, gonna ignore the custom stylesheet (what did it do anyway???)

‎distribution/pom.xml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -62,17 +62,17 @@
6262
<source><![CDATA[
6363
def sourcePathName = 'javadocSourcePath'
6464
sourcePath = ant.path( id:sourcePathName ) {
65-
ant.pathElement( path: "${pom.basedir}/../cache-ehcache/src/main/java" )
66-
ant.pathElement( path: "${pom.basedir}/../cache-infinispan/src/main/java" )
67-
ant.pathElement( path: "${pom.basedir}/../cache-jbosscache/src/main/java" )
68-
ant.pathElement( path: "${pom.basedir}/../cache-oscache/src/main/java" )
69-
ant.pathElement( path: "${pom.basedir}/../cache-swarmcache/src/main/java" )
70-
ant.pathElement( path: "${pom.basedir}/../connection-c3p0/src/main/java" )
71-
ant.pathElement( path: "${pom.basedir}/../connection-proxool/src/main/java" )
72-
ant.pathElement( path: "${pom.basedir}/../entitymanager/src/main/java" )
73-
ant.pathElement( path: "${pom.basedir}/../envers/src/main/java" )
74-
ant.pathElement( path: "${pom.basedir}/../testing/src/main/java" )
75-
ant.pathElement( path: "${pom.basedir}/../core/src/main/java" )
65+
ant.pathElement( path: "${project.basedir}/../cache-ehcache/src/main/java" )
66+
ant.pathElement( path: "${project.basedir}/../cache-infinispan/src/main/java" )
67+
ant.pathElement( path: "${project.basedir}/../cache-jbosscache/src/main/java" )
68+
ant.pathElement( path: "${project.basedir}/../cache-oscache/src/main/java" )
69+
ant.pathElement( path: "${project.basedir}/../cache-swarmcache/src/main/java" )
70+
ant.pathElement( path: "${project.basedir}/../connection-c3p0/src/main/java" )
71+
ant.pathElement( path: "${project.basedir}/../connection-proxool/src/main/java" )
72+
ant.pathElement( path: "${project.basedir}/../entitymanager/src/main/java" )
73+
ant.pathElement( path: "${project.basedir}/../envers/src/main/java" )
74+
ant.pathElement( path: "${project.basedir}/../testing/src/main/java" )
75+
ant.pathElement( path: "${project.basedir}/../core/src/main/java" )
7676
ant.pathElement( path: "../core/target/generated-sources/antlr" )
7777
}
7878
@@ -82,18 +82,18 @@
8282
classPath.createPathElement().path = element
8383
}
8484
85-
targetDir = "${pom.basedir}/target/javadocs";
85+
targetDir = "${project.basedir}/target/javadocs";
8686
8787
ant.javadoc(
8888
executable: '${jdk16_home}/bin/javadoc',
8989
maxmemory: '512m',
9090
destdir: targetDir ,
9191
sourcepathref: sourcePathName,
9292
classpathref: classPathName,
93-
overview: '${pom.basedir}/src/javadoc/package.html',
94-
stylesheetfile: '${pom.basedir}/src/javadoc/stylesheet.css',
93+
overview: '${project.basedir}/src/javadoc/package.html',
94+
stylesheetfile: '${project.basedir}/src/javadoc/stylesheet.css',
9595
windowtitle: 'Hibernate JavaDocs',
96-
doctitle: 'Hibernate JavaDoc (${pom.version})',
96+
doctitle: 'Hibernate JavaDoc (${project.version})',
9797
bottom: 'Copyright &copy; 2001-2010 <a href="http://redhat.com">Red Hat, Inc.</a> All Rights Reserved.',
9898
use: true
9999
) {
@@ -146,7 +146,7 @@
146146
imagesDir = targetDir + '/images'
147147
ant.mkdir( dir: imagesDir )
148148
ant.copy( toDir: imagesDir ) {
149-
fileset( dir: "${pom.basedir}/src/javadoc/images" )
149+
fileset( dir: "${project.basedir}/src/javadoc/images" )
150150
}
151151
]]>
152152
</source>

‎entitymanager/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@
4646
<scope>test</scope>
4747
</dependency>
4848
<dependency>
49-
<groupId>${groupId}</groupId>
49+
<groupId>${project.groupId}</groupId>
5050
<artifactId>hibernate-testing</artifactId>
51-
<version>${version}</version>
51+
<version>${project.version}</version>
5252
<scope>test</scope>
5353
</dependency>
5454
<dependency>
@@ -103,7 +103,7 @@
103103
<configuration>
104104
<bytecodeInjections>
105105
<bytecodeInjection>
106-
<expression>${pom.version}</expression>
106+
<expression>${project.version}</expression>
107107
<targetMembers>
108108
<methodBodyReturn>
109109
<className>org.hibernate.ejb.Version</className>

0 commit comments

Comments
 (0)