Author: aadamchik
Date: Sun Jan 30 10:24:05 2011
New Revision: 1065244
URL: http://svn.apache.org/viewvc?rev=1065244&view=rev
Log:
working on Maven warnings
version -> project.version
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/pom.xml
cayenne/main/trunk/framework/cayenne-project-unpublished/pom.xml
cayenne/main/trunk/framework/cayenne-tools/pom.xml
cayenne/main/trunk/framework/cayenne-wocompat-unpublished/pom.xml
cayenne/main/trunk/framework/maven-cayenne-plugin/pom.xml
cayenne/main/trunk/itests/cayenne-runtime-itest/pom.xml
cayenne/main/trunk/itests/cayenne-tools-itest/pom.xml
cayenne/main/trunk/modeler/cayenne-modeler-generic-ext/pom.xml
cayenne/main/trunk/modeler/cayenne-modeler-mac-ext/pom.xml
cayenne/main/trunk/modeler/cayenne-modeler/pom.xml
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/pom.xml?rev=1065244&r1=1065243&r2=1065244&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/pom.xml (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/pom.xml Sun Jan 30
10:24:05 2011
@@ -38,13 +38,13 @@
<dependency>
<groupId>org.apache.cayenne.build-tools</groupId>
<artifactId>cayenne-test-utilities</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.cayenne.unpublished</groupId>
<artifactId>cayenne-di-unpublished</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.objectstyle</groupId>
Modified: cayenne/main/trunk/framework/cayenne-project-unpublished/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project-unpublished/pom.xml?rev=1065244&r1=1065243&r2=1065244&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project-unpublished/pom.xml (original)
+++ cayenne/main/trunk/framework/cayenne-project-unpublished/pom.xml Sun Jan 30
10:24:05 2011
@@ -40,20 +40,20 @@
<dependency>
<groupId>org.apache.cayenne.build-tools</groupId>
<artifactId>cayenne-test-utilities</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.cayenne.unpublished</groupId>
<artifactId>cayenne-di-unpublished</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cayenne.unpublished</groupId>
<artifactId>cayenne-jdk1.5-unpublished</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
Modified: cayenne/main/trunk/framework/cayenne-tools/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-tools/pom.xml?rev=1065244&r1=1065243&r2=1065244&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-tools/pom.xml (original)
+++ cayenne/main/trunk/framework/cayenne-tools/pom.xml Sun Jan 30 10:24:05 2011
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.apache.cayenne.build-tools</groupId>
<artifactId>cayenne-test-utilities</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
@@ -81,21 +81,21 @@
<dependency>
<groupId>org.apache.cayenne.unpublished</groupId>
<artifactId>cayenne-legal-unpublished</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.cayenne.unpublished</groupId>
<artifactId>cayenne-jdk1.5-unpublished</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.cayenne.unpublished</groupId>
<artifactId>cayenne-project-unpublished</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
@@ -127,7 +127,7 @@
</outputDirectory>
<resourceBundles>
<resourceBundle>
-
org.apache.cayenne.unpublished:cayenne-legal-unpublished:${version}
+
org.apache.cayenne.unpublished:cayenne-legal-unpublished:${project.version}
</resourceBundle>
</resourceBundles>
</configuration>
Modified: cayenne/main/trunk/framework/cayenne-wocompat-unpublished/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-wocompat-unpublished/pom.xml?rev=1065244&r1=1065243&r2=1065244&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-wocompat-unpublished/pom.xml (original)
+++ cayenne/main/trunk/framework/cayenne-wocompat-unpublished/pom.xml Sun Jan
30 10:24:05 2011
@@ -40,14 +40,14 @@
<dependency>
<groupId>org.apache.cayenne.build-tools</groupId>
<artifactId>cayenne-test-utilities</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.cayenne.unpublished</groupId>
<artifactId>cayenne-jdk1.5-unpublished</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
Modified: cayenne/main/trunk/framework/maven-cayenne-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/maven-cayenne-plugin/pom.xml?rev=1065244&r1=1065243&r2=1065244&view=diff
==============================================================================
--- cayenne/main/trunk/framework/maven-cayenne-plugin/pom.xml (original)
+++ cayenne/main/trunk/framework/maven-cayenne-plugin/pom.xml Sun Jan 30
10:24:05 2011
@@ -66,26 +66,26 @@
<dependency>
<groupId>org.apache.cayenne.unpublished</groupId>
<artifactId>cayenne-jdk1.5-unpublished</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.cayenne.unpublished</groupId>
<artifactId>cayenne-project-unpublished</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-server</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-tools</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
Modified: cayenne/main/trunk/itests/cayenne-runtime-itest/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/itests/cayenne-runtime-itest/pom.xml?rev=1065244&r1=1065243&r2=1065244&view=diff
==============================================================================
--- cayenne/main/trunk/itests/cayenne-runtime-itest/pom.xml (original)
+++ cayenne/main/trunk/itests/cayenne-runtime-itest/pom.xml Sun Jan 30 10:24:05
2011
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.apache.cayenne.build-tools</groupId>
<artifactId>cayenne-test-utilities</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>compile</scope>
</dependency>
@@ -53,13 +53,13 @@
<dependency>
<groupId>org.apache.cayenne.unpublished</groupId>
<artifactId>cayenne-di-unpublished</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cayenne.unpublished</groupId>
<artifactId>cayenne-jdk1.5-unpublished</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
Modified: cayenne/main/trunk/itests/cayenne-tools-itest/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/itests/cayenne-tools-itest/pom.xml?rev=1065244&r1=1065243&r2=1065244&view=diff
==============================================================================
--- cayenne/main/trunk/itests/cayenne-tools-itest/pom.xml (original)
+++ cayenne/main/trunk/itests/cayenne-tools-itest/pom.xml Sun Jan 30 10:24:05
2011
@@ -45,32 +45,32 @@
<dependency>
<groupId>org.apache.cayenne.build-tools</groupId>
<artifactId>cayenne-test-utilities</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.cayenne.unpublished</groupId>
<artifactId>cayenne-di-unpublished</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cayenne.unpublished</groupId>
<artifactId>cayenne-jdk1.5-unpublished</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-tools</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cayenne.plugins</groupId>
<artifactId>maven-cayenne-plugin</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
Modified: cayenne/main/trunk/modeler/cayenne-modeler-generic-ext/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/modeler/cayenne-modeler-generic-ext/pom.xml?rev=1065244&r1=1065243&r2=1065244&view=diff
==============================================================================
--- cayenne/main/trunk/modeler/cayenne-modeler-generic-ext/pom.xml (original)
+++ cayenne/main/trunk/modeler/cayenne-modeler-generic-ext/pom.xml Sun Jan 30
10:24:05 2011
@@ -38,27 +38,27 @@
<dependency>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-modeler</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cayenne.unpublished</groupId>
<artifactId>cayenne-di-unpublished</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.cayenne.unpublished</groupId>
<artifactId>cayenne-jdk1.5-unpublished</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.cayenne.unpublished</groupId>
<artifactId>cayenne-project-unpublished</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
Modified: cayenne/main/trunk/modeler/cayenne-modeler-mac-ext/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/modeler/cayenne-modeler-mac-ext/pom.xml?rev=1065244&r1=1065243&r2=1065244&view=diff
==============================================================================
--- cayenne/main/trunk/modeler/cayenne-modeler-mac-ext/pom.xml (original)
+++ cayenne/main/trunk/modeler/cayenne-modeler-mac-ext/pom.xml Sun Jan 30
10:24:05 2011
@@ -38,27 +38,27 @@
<dependency>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-modeler</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cayenne.unpublished</groupId>
<artifactId>cayenne-di-unpublished</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.cayenne.unpublished</groupId>
<artifactId>cayenne-jdk1.5-unpublished</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.cayenne.unpublished</groupId>
<artifactId>cayenne-project-unpublished</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: cayenne/main/trunk/modeler/cayenne-modeler/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/modeler/cayenne-modeler/pom.xml?rev=1065244&r1=1065243&r2=1065244&view=diff
==============================================================================
--- cayenne/main/trunk/modeler/cayenne-modeler/pom.xml (original)
+++ cayenne/main/trunk/modeler/cayenne-modeler/pom.xml Sun Jan 30 10:24:05 2011
@@ -76,34 +76,34 @@
<dependency>
<groupId>org.apache.cayenne.unpublished</groupId>
<artifactId>cayenne-legal-unpublished</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.cayenne.unpublished</groupId>
<artifactId>cayenne-jdk1.5-unpublished</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.cayenne.unpublished</groupId>
<artifactId>cayenne-project-unpublished</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-tools</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cayenne.unpublished</groupId>
<artifactId>cayenne-wocompat-unpublished</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
@@ -144,7 +144,7 @@
</outputDirectory>
<resourceBundles>
<resourceBundle>
-
org.apache.cayenne.unpublished:cayenne-legal-unpublished:${version}
+
org.apache.cayenne.unpublished:cayenne-legal-unpublished:${project.version}
</resourceBundle>
</resourceBundles>
</configuration>
