Author: philharveyonline Date: Fri Jan 18 17:32:32 2013 New Revision: 1435260
URL: http://svn.apache.org/viewvc?rev=1435260&view=rev Log: PROTON-194: top-level pom's modules profile-specific to avoid building/testing more than is needed. Also moved Java's proton.py to correct place Added: qpid/proton/branches/jni-binding/proton-j/proton-api/src/main/scripts/ qpid/proton/branches/jni-binding/proton-j/proton-api/src/main/scripts/proton.py - copied, changed from r1435120, qpid/proton/branches/jni-binding/proton-j/proton/src/main/scripts/proton.py Removed: qpid/proton/branches/jni-binding/proton-j/proton/src/main/scripts/proton.py Modified: qpid/proton/branches/jni-binding/design/api-reconciliation/pom.xml qpid/proton/branches/jni-binding/pom.xml qpid/proton/branches/jni-binding/proton-j/pom.xml qpid/proton/branches/jni-binding/proton-j/proton-api/pom.xml qpid/proton/branches/jni-binding/proton-j/proton/pom.xml qpid/proton/branches/jni-binding/tests/pom.xml Modified: qpid/proton/branches/jni-binding/design/api-reconciliation/pom.xml URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/design/api-reconciliation/pom.xml?rev=1435260&r1=1435259&r2=1435260&view=diff ============================================================================== --- qpid/proton/branches/jni-binding/design/api-reconciliation/pom.xml (original) +++ qpid/proton/branches/jni-binding/design/api-reconciliation/pom.xml Fri Jan 18 17:32:32 2013 @@ -108,5 +108,6 @@ Can be run using sensible defaults using <groupId>org.apache</groupId> <artifactId>apache</artifactId> <version>12</version> + <relativePath></relativePath> </parent> </project> Modified: qpid/proton/branches/jni-binding/pom.xml URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/pom.xml?rev=1435260&r1=1435259&r2=1435260&view=diff ============================================================================== --- qpid/proton/branches/jni-binding/pom.xml (original) +++ qpid/proton/branches/jni-binding/pom.xml Fri Jan 18 17:32:32 2013 @@ -32,9 +32,21 @@ <maven>3.0</maven> </prerequisites> - <modules> - <module>proton-j</module> - <module>tests</module> - </modules> - + <profiles> + <profile> + <id>proton-c</id> + <modules> + <module>proton-j/proton-api</module> + <module>tests</module> + </modules> + </profile> + <profile> + <id>proton-j</id> + <modules> + <module>proton-j</module> + <module>tests</module> + </modules> + </profile> + </profiles> + </project> 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=1435260&r1=1435259&r2=1435260&view=diff ============================================================================== --- qpid/proton/branches/jni-binding/proton-j/pom.xml (original) +++ qpid/proton/branches/jni-binding/proton-j/pom.xml Fri Jan 18 17:32:32 2013 @@ -20,6 +20,7 @@ <groupId>org.apache</groupId> <artifactId>apache</artifactId> <version>12</version> + <relativePath></relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: qpid/proton/branches/jni-binding/proton-j/proton-api/pom.xml URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-j/proton-api/pom.xml?rev=1435260&r1=1435259&r2=1435260&view=diff ============================================================================== --- qpid/proton/branches/jni-binding/proton-j/proton-api/pom.xml (original) +++ qpid/proton/branches/jni-binding/proton-j/proton-api/pom.xml Fri Jan 18 17:32:32 2013 @@ -25,4 +25,15 @@ <artifactId>proton-api</artifactId> + <build> + <resources> + <resource> + <directory>${basedir}/src/main/resources</directory> + </resource> + <resource> + <directory>${basedir}/src/main/scripts</directory> + </resource> + </resources> + </build> + </project> Copied: qpid/proton/branches/jni-binding/proton-j/proton-api/src/main/scripts/proton.py (from r1435120, qpid/proton/branches/jni-binding/proton-j/proton/src/main/scripts/proton.py) URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-j/proton-api/src/main/scripts/proton.py?p2=qpid/proton/branches/jni-binding/proton-j/proton-api/src/main/scripts/proton.py&p1=qpid/proton/branches/jni-binding/proton-j/proton/src/main/scripts/proton.py&r1=1435120&r2=1435260&rev=1435260&view=diff ============================================================================== (empty) Modified: qpid/proton/branches/jni-binding/proton-j/proton/pom.xml URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-j/proton/pom.xml?rev=1435260&r1=1435259&r2=1435260&view=diff ============================================================================== --- qpid/proton/branches/jni-binding/proton-j/proton/pom.xml (original) +++ qpid/proton/branches/jni-binding/proton-j/proton/pom.xml Fri Jan 18 17:32:32 2013 @@ -46,15 +46,4 @@ </dependency> </dependencies> - <build> - <resources> - <resource> - <directory>${basedir}/src/main/resources</directory> - </resource> - <resource> - <directory>${basedir}/src/main/scripts</directory> - </resource> - </resources> - </build> - </project> Modified: qpid/proton/branches/jni-binding/tests/pom.xml URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/tests/pom.xml?rev=1435260&r1=1435259&r2=1435260&view=diff ============================================================================== --- qpid/proton/branches/jni-binding/tests/pom.xml (original) +++ qpid/proton/branches/jni-binding/tests/pom.xml Fri Jan 18 17:32:32 2013 @@ -126,5 +126,6 @@ To override this, run Maven like so: &qu <groupId>org.apache</groupId> <artifactId>apache</artifactId> <version>12</version> + <relativePath></relativePath> </parent> </project> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
