Apache
/
openjpa
mirror of https://github.com/apache/openjpa.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OPENJPA-1712 use project.version instead of pom.version 

git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@986294 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Donald Woods 2010-08-17 12:30:40 +00:00
parent 5185b5900f
commit 5e38145fa1
15 changed files with 36 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openjpa-all/pom.xml
View File

@ -108,7 +108,7 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
<version>${pom.version}</version>
<version>${project.version}</version>
</dependency>
<!-- include commons-logging -->
<dependency>

2
openjpa-examples/pom.xml
View File

@ -46,7 +46,7 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-persistence-jdbc</artifactId>
<version>${pom.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>

6
openjpa-integration/daytrader/pom.xml
View File

@ -48,7 +48,7 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
<version>${pom.version}</version>
<version>${project.version}</version>
</dependency>
<!-- Maybe one day we can used published artifacts for this...
<dependency>
@ -65,7 +65,7 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-persistence-jdbc</artifactId>
<version>${pom.version}</version>
<version>${project.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
@ -158,7 +158,7 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
<version>${pom.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
</plugin>

6
openjpa-integration/examples/pom.xml
View File

@ -66,11 +66,11 @@
<delete dir="${examples.base}" quiet="true" />
<mkdir dir="${examples.base}" />
<unzip overwrite="false" dest="${examples.base}" src="../../openjpa-project/target/site/downloads/apache-openjpa-${pom.version}-binary.zip" />
<unzip overwrite="false" dest="${examples.base}" src="../../openjpa-project/target/site/downloads/apache-openjpa-${project.version}-binary.zip" />
<path id="assembly.classpath">
<fileset dir="${examples.base}">
<include name="**/openjpa-all-${pom.version}.jar" />
<include name="**/openjpa-all-${project.version}.jar" />
</fileset>
</path>
<available classname="org.apache.openjpa.conf.OpenJPAVersion" classpathref="assembly.classpath" property="unzip.success" />
@ -99,7 +99,7 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-all</artifactId>
<version>${pom.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
</project>

4
openjpa-integration/tck/pom.xml
View File

@ -201,7 +201,7 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-all</artifactId>
<version>${pom.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
</profile>
@ -430,7 +430,7 @@ databaseName=${db.name}
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-kernel</artifactId>
<version>${pom.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
</profile>

4
openjpa-integration/validation/pom.xml
View File

@ -149,7 +149,7 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
<version>${pom.version}</version>
<version>${project.version}</version>
<!-- allow profiles to decide which validation spec to use -->
<exclusions>
<exclusion>
@ -161,7 +161,7 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-persistence-jdbc</artifactId>
<version>${pom.version}</version>
<version>${project.version}</version>
<!-- <classifier>tests</classifier> -->
<type>test-jar</type>
<scope>test</scope>

2
openjpa-jdbc/pom.xml
View File

@ -40,7 +40,7 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-kernel</artifactId>
<version>${pom.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>

2
openjpa-kernel/pom.xml
View File

@ -40,7 +40,7 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-lib</artifactId>
<version>${pom.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>

4
openjpa-persistence-jdbc/pom.xml
View File

@ -683,12 +683,12 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-jdbc</artifactId>
<version>${pom.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-persistence</artifactId>
<version>${pom.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>commons-dbcp</groupId>

4
openjpa-persistence-locking/pom.xml
View File

@ -688,12 +688,12 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-persistence-jdbc</artifactId>
<version>${pom.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-persistence-jdbc</artifactId>
<version>${pom.version}</version>
<version>${project.version}</version>
<!-- <classifier>test-base</classifier> -->
<type>test-jar</type>
<scope>test</scope>

2
openjpa-persistence/pom.xml
View File

@ -40,7 +40,7 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-kernel</artifactId>
<version>${pom.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>

8
openjpa-slice/pom.xml
View File

@ -40,12 +40,12 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-kernel</artifactId>
<version>${pom.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-jdbc</artifactId>
<version>${pom.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@ -55,13 +55,13 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-persistence</artifactId>
<version>${pom.version}</version>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-persistence-jdbc</artifactId>
<version>${pom.version}</version>
<version>${project.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>

6
openjpa-xmlstore/pom.xml
View File

@ -40,12 +40,12 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-kernel</artifactId>
<version>${pom.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-persistence-jdbc</artifactId>
<version>${pom.version}</version>
<version>${project.version}</version>
<!-- <classifier>test-base</classifier> -->
<type>test-jar</type>
<scope>test</scope>
@ -107,7 +107,7 @@
<groupId>org.apache.openjpa</groupId>
<!-- use o-p-j instead of openjpa to avoid cyclical dependency in maven graph -->
<artifactId>openjpa-persistence-jdbc</artifactId>
<version>${pom.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
</plugin>

14
openjpa/pom.xml
View File

@ -129,17 +129,17 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-lib</artifactId>
<version>${pom.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-kernel</artifactId>
<version>${pom.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-jdbc</artifactId>
<version>${pom.version}</version>
<version>${project.version}</version>
<!--
Need to exclude jaxb, so the following will not get included
as compile depends in the aggregate JAR by the shade plugin:
@ -196,22 +196,22 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-persistence</artifactId>
<version>${pom.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-persistence-jdbc</artifactId>
<version>${pom.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-xmlstore</artifactId>
<version>${pom.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-slice</artifactId>
<version>${pom.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
</project>

4
pom.xml
View File

@ -167,7 +167,7 @@
<include name="META-INF/*.txt" />
</patternset>
<fileset dir="${project.build.directory}">
<include name="${artifactId}-${pom.version}.jar" />
<include name="${artifactId}-${project.version}.jar" />
</fileset>
</unzip>
</tasks>
@ -299,6 +299,8 @@
<exclude>**/*.log</exclude>
<exclude>**/maven-eclipse.xml</exclude>
<exclude>**/rat.txt</exclude>
<exclude>release.properties</exclude>
<exclude>DEPENDENCIES</exclude>
<!-- Exclude internal build-only repository -->
<exclude>**/internal-repository/**</exclude>
</excludes>