Repository: cayenne Updated Branches: refs/heads/master 5331b8c5c -> 924a6696a
making tutorial poms inherit from Cayenne pom for consistency Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/a6fcc2ee Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/a6fcc2ee Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/a6fcc2ee Branch: refs/heads/master Commit: a6fcc2eeee94c2062f8acb1577d3b9236c95aa62 Parents: 5331b8c Author: aadamchik <[email protected]> Authored: Fri Nov 28 18:25:48 2014 +0300 Committer: aadamchik <[email protected]> Committed: Fri Nov 28 18:25:48 2014 +0300 ---------------------------------------------------------------------- tutorials/pom.xml | 3 ++- tutorials/tutorial-rop-client/pom.xml | 36 ++++++----------------------- tutorials/tutorial-rop-server/pom.xml | 37 ++++++------------------------ tutorials/tutorial/pom.xml | 21 ++++++----------- 4 files changed, 23 insertions(+), 74 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/a6fcc2ee/tutorials/pom.xml ---------------------------------------------------------------------- diff --git a/tutorials/pom.xml b/tutorials/pom.xml index 39a2bcc..9170a5d 100644 --- a/tutorials/pom.xml +++ b/tutorials/pom.xml @@ -24,7 +24,8 @@ <artifactId>cayenne-parent</artifactId> <version>4.0.M2-SNAPSHOT</version> </parent> - <groupId>org.apache.cayenne.parents</groupId> + + <groupId>org.apache.cayenne.tutorials</groupId> <artifactId>cayenne-tutorials-parent</artifactId> <name>Cayenne Tutorials</name> <packaging>pom</packaging> http://git-wip-us.apache.org/repos/asf/cayenne/blob/a6fcc2ee/tutorials/tutorial-rop-client/pom.xml ---------------------------------------------------------------------- diff --git a/tutorials/tutorial-rop-client/pom.xml b/tutorials/tutorial-rop-client/pom.xml index 6125c67..3fd1621 100644 --- a/tutorials/tutorial-rop-client/pom.xml +++ b/tutorials/tutorial-rop-client/pom.xml @@ -15,21 +15,24 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.cayenne</groupId> + <parent> + <groupId>org.apache.cayenne.tutorials</groupId> + <artifactId>cayenne-tutorials-parent</artifactId> + <version>4.0.M2-SNAPSHOT</version> + </parent> + <artifactId>tutorial-rop-client</artifactId> <name>Cayenne ROP Client Tutorial</name> - <version>4.0.M2-SNAPSHOT</version> <dependencies> <dependency> <groupId>org.apache.cayenne</groupId> <artifactId>cayenne-client</artifactId> - <version>4.0.M2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>com.caucho</groupId> <artifactId>resin-hessian</artifactId> - <version>3.1.6</version> </dependency> </dependencies> @@ -37,37 +40,12 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> - <version>2.5</version> <configuration> <skip>true</skip> </configuration> </plugin> </plugins> </build> - - <repositories> - <repository> - <id>objectstyle</id> - <name>ObjectStyle Repository</name> - <url>http://maven.objectstyle.org/nexus/content/groups/cayenne-deps</url> - <layout>default</layout> - <snapshots> - <enabled>false</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - </repositories> </project> http://git-wip-us.apache.org/repos/asf/cayenne/blob/a6fcc2ee/tutorials/tutorial-rop-server/pom.xml ---------------------------------------------------------------------- diff --git a/tutorials/tutorial-rop-server/pom.xml b/tutorials/tutorial-rop-server/pom.xml index 36c5741..03e2120 100644 --- a/tutorials/tutorial-rop-server/pom.xml +++ b/tutorials/tutorial-rop-server/pom.xml @@ -15,42 +15,35 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.cayenne</groupId> + <parent> + <groupId>org.apache.cayenne.tutorials</groupId> + <artifactId>cayenne-tutorials-parent</artifactId> + <version>4.0.M2-SNAPSHOT</version> + </parent> + <artifactId>tutorial-rop-server</artifactId> <name>Cayenne ROP Server Tutorial</name> - <version>4.0.M2-SNAPSHOT</version> <packaging>war</packaging> <dependencies> <dependency> <groupId>org.apache.cayenne</groupId> <artifactId>cayenne-server</artifactId> - <version>4.0.M2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> - <version>10.7.1.1</version> </dependency> <dependency> <groupId>com.caucho</groupId> <artifactId>resin-hessian</artifactId> - <version>3.1.6</version> </dependency> </dependencies> <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> - <plugin> <groupId>org.mortbay.jetty</groupId> <artifactId>maven-jetty-plugin</artifactId> <version>6.1.22</version> @@ -66,7 +59,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> - <version>2.5</version> <configuration> <skip>true</skip> </configuration> @@ -74,19 +66,4 @@ </plugins> </build> - <repositories> - <repository> - <id>objectstyle</id> - <name>ObjectStyle Repository</name> - <url>http://maven.objectstyle.org/nexus/content/groups/cayenne-deps</url> - <layout>default</layout> - <snapshots> - <enabled>false</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - </repositories> - </project> http://git-wip-us.apache.org/repos/asf/cayenne/blob/a6fcc2ee/tutorials/tutorial/pom.xml ---------------------------------------------------------------------- diff --git a/tutorials/tutorial/pom.xml b/tutorials/tutorial/pom.xml index d15efdc..b1197c3 100644 --- a/tutorials/tutorial/pom.xml +++ b/tutorials/tutorial/pom.xml @@ -15,36 +15,30 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.cayenne</groupId> + <parent> + <groupId>org.apache.cayenne.tutorials</groupId> + <artifactId>cayenne-tutorials-parent</artifactId> + <version>4.0.M2-SNAPSHOT</version> + </parent> + <artifactId>tutorial</artifactId> <name>Cayenne Tutorial</name> - <version>4.0.M2-SNAPSHOT</version> <dependencies> <dependency> <groupId>org.apache.cayenne</groupId> <artifactId>cayenne-server</artifactId> - <version>4.0.M2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> - <version>10.7.1.1</version> </dependency> </dependencies> <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> - <plugin> <groupId>org.mortbay.jetty</groupId> <artifactId>maven-jetty-plugin</artifactId> <version>6.1.22</version> @@ -52,7 +46,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> - <version>2.5</version> <configuration> <skip>true</skip> </configuration>
