You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ph...@apache.org on 2013/01/16 17:39:17 UTC
svn commit: r1434025 - in /qpid/proton/branches/jni-binding: pom.xml
proton-j/pom.xml tests/proton-system-tests/pom.xml
Author: philharveyonline
Date: Wed Jan 16 16:39:15 2013
New Revision: 1434025
URL: http://svn.apache.org/viewvc?rev=1434025&view=rev
Log:
PROTON-194: modify Maven set-up so that proton-j and proton-system-tests do not depend on top-level proton-project, thereby allowing these sub-projects to be independently checked out and built
Modified:
qpid/proton/branches/jni-binding/pom.xml
qpid/proton/branches/jni-binding/proton-j/pom.xml
qpid/proton/branches/jni-binding/tests/proton-system-tests/pom.xml
Modified: qpid/proton/branches/jni-binding/pom.xml
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/pom.xml?rev=1434025&r1=1434024&r2=1434025&view=diff
==============================================================================
--- qpid/proton/branches/jni-binding/pom.xml (original)
+++ qpid/proton/branches/jni-binding/pom.xml Wed Jan 16 16:39:15 2013
@@ -28,31 +28,10 @@
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <properties>
- <junit-version>4.10</junit-version>
- </properties>
-
<prerequisites>
<maven>3.0</maven>
</prerequisites>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- <optimize>true</optimize>
- <debug>true</debug>
- <showDeprecation>true</showDeprecation>
- <showWarnings>true</showWarnings>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<modules>
<module>proton-j</module>
<module>tests/proton-system-tests</module>
Modified: qpid/proton/branches/jni-binding/proton-j/pom.xml
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-j/pom.xml?rev=1434025&r1=1434024&r2=1434025&view=diff
==============================================================================
--- qpid/proton/branches/jni-binding/proton-j/pom.xml (original)
+++ qpid/proton/branches/jni-binding/proton-j/pom.xml Wed Jan 16 16:39:15 2013
@@ -17,15 +17,38 @@
-->
<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">
<parent>
- <groupId>org.apache.qpid</groupId>
- <artifactId>proton-project</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>12</version>
</parent>
<modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.qpid</groupId>
<artifactId>proton-j</artifactId>
+ <version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
+ <properties>
+ <junit-version>4.10</junit-version>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ <optimize>true</optimize>
+ <debug>true</debug>
+ <showDeprecation>true</showDeprecation>
+ <showWarnings>true</showWarnings>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
Modified: qpid/proton/branches/jni-binding/tests/proton-system-tests/pom.xml
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/tests/proton-system-tests/pom.xml?rev=1434025&r1=1434024&r2=1434025&view=diff
==============================================================================
--- qpid/proton/branches/jni-binding/tests/proton-system-tests/pom.xml (original)
+++ qpid/proton/branches/jni-binding/tests/proton-system-tests/pom.xml Wed Jan 16 16:39:15 2013
@@ -20,14 +20,10 @@
-->
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.qpid</groupId>
- <artifactId>proton-project</artifactId>
- <version>1.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
+ <groupId>org.apache.qpid</groupId>
<artifactId>proton-system-tests</artifactId>
+ <version>1.0-SNAPSHOT</version>
<description><![CDATA[The Proton system tests execute against either the Java or the C implementations, based on the chosen profile.
@@ -38,17 +34,34 @@ To override this, run Maven like so: "mv
]]>
</description>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ <optimize>true</optimize>
+ <debug>true</debug>
+ <showDeprecation>true</showDeprecation>
+ <showWarnings>true</showWarnings>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit-version}</version>
+ <version>4.10</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>proton-api</artifactId>
- <version>${project.parent.version}</version>
+ <version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
@@ -62,7 +75,7 @@ To override this, run Maven like so: "mv
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>proton-j-impl</artifactId>
- <version>${project.parent.version}</version>
+ <version>1.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
</dependencies>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org