Repository: qpid-proton-j Updated Branches: refs/heads/master 67c219517 -> 23bdf7b47
PROTON-1385: add initial release assemblies, plus some work on tidying up the poms Project: http://git-wip-us.apache.org/repos/asf/qpid-proton-j/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton-j/commit/d0433631 Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton-j/tree/d0433631 Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton-j/diff/d0433631 Branch: refs/heads/master Commit: d043363137015cef4ff4cd0a2d0422f4fb036a4d Parents: 67c2195 Author: Robert Gemmell <[email protected]> Authored: Wed Jan 18 17:58:22 2017 +0000 Committer: Robert Gemmell <[email protected]> Committed: Wed Jan 18 17:58:22 2017 +0000 ---------------------------------------------------------------------- apache-qpid-proton-j/README.md | 1 + apache-qpid-proton-j/pom.xml | 87 +++++++++ apache-qpid-proton-j/src/main/assembly/LICENSE | 203 ++++++++++++++++++++ apache-qpid-proton-j/src/main/assembly/NOTICE | 5 + apache-qpid-proton-j/src/main/assembly/bin.xml | 118 ++++++++++++ apache-qpid-proton-j/src/main/assembly/src.xml | 81 ++++++++ examples/engine/pom.xml | 5 +- examples/reactor/pom.xml | 7 +- pom.xml | 72 +++++-- proton-j/pom.xml | 13 +- tests/pom.xml | 20 +- 11 files changed, 576 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/d0433631/apache-qpid-proton-j/README.md ---------------------------------------------------------------------- diff --git a/apache-qpid-proton-j/README.md b/apache-qpid-proton-j/README.md new file mode 100644 index 0000000..a0f87fc --- /dev/null +++ b/apache-qpid-proton-j/README.md @@ -0,0 +1 @@ +This module is used to produce the Apache Qpid Proton-J release assemblies. http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/d0433631/apache-qpid-proton-j/pom.xml ---------------------------------------------------------------------- diff --git a/apache-qpid-proton-j/pom.xml b/apache-qpid-proton-j/pom.xml new file mode 100644 index 0000000..24b6877 --- /dev/null +++ b/apache-qpid-proton-j/pom.xml @@ -0,0 +1,87 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--><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>0.17.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + + <artifactId>apache-qpid-proton-j</artifactId> + <packaging>pom</packaging> + <name>Apache Qpid Proton-J</name> + + <dependencies> + <dependency> + <groupId>org.apache.qpid</groupId> + <artifactId>proton-j</artifactId> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>make-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>src/main/assembly/bin.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <profiles> + <profile> + <id>apache-release</id> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>make-src-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>src/main/assembly/src.xml</descriptor> + </descriptors> + <tarLongFileMode>gnu</tarLongFileMode> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> +</project> http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/d0433631/apache-qpid-proton-j/src/main/assembly/LICENSE ---------------------------------------------------------------------- diff --git a/apache-qpid-proton-j/src/main/assembly/LICENSE b/apache-qpid-proton-j/src/main/assembly/LICENSE new file mode 100644 index 0000000..6b0b127 --- /dev/null +++ b/apache-qpid-proton-j/src/main/assembly/LICENSE @@ -0,0 +1,203 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/d0433631/apache-qpid-proton-j/src/main/assembly/NOTICE ---------------------------------------------------------------------- diff --git a/apache-qpid-proton-j/src/main/assembly/NOTICE b/apache-qpid-proton-j/src/main/assembly/NOTICE new file mode 100644 index 0000000..a058415 --- /dev/null +++ b/apache-qpid-proton-j/src/main/assembly/NOTICE @@ -0,0 +1,5 @@ +Apache Qpid Proton-J +Copyright 2012-2017 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/d0433631/apache-qpid-proton-j/src/main/assembly/bin.xml ---------------------------------------------------------------------- diff --git a/apache-qpid-proton-j/src/main/assembly/bin.xml b/apache-qpid-proton-j/src/main/assembly/bin.xml new file mode 100644 index 0000000..d9b15bc --- /dev/null +++ b/apache-qpid-proton-j/src/main/assembly/bin.xml @@ -0,0 +1,118 @@ +<?xml version='1.0'?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd";> + <id>bin</id> + <formats> + <format>tar.gz</format> + </formats> + <baseDirectory>apache-qpid-proton-j-${project.version}</baseDirectory> + <fileSets> + <fileSet> + <directory>${basedir}/src/main/assembly/</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>NOTICE</include> + <include>LICENSE</include> + </includes> + <fileMode>0644</fileMode> + <directoryMode>0755</directoryMode> + </fileSet> + </fileSets> + <dependencySets> + <dependencySet> + <outputDirectory>/lib</outputDirectory> + <useProjectArtifact>false</useProjectArtifact> + <useTransitiveFiltering>true</useTransitiveFiltering> + </dependencySet> + </dependencySets> + <moduleSets> + <moduleSet> + <useAllReactorProjects>true</useAllReactorProjects> + <includes> + <include>org.apache.qpid:proton-j-engine-examples</include> + </includes> + <sources> + <includeModuleDirectory>false</includeModuleDirectory> + <fileSets> + <fileSet> + <directory>src</directory> + <outputDirectory>examples/engine/src</outputDirectory> + <fileMode>0644</fileMode> + <directoryMode>0755</directoryMode> + </fileSet> + <fileSet> + <outputDirectory>examples/engine</outputDirectory> + <includes> + <include>pom.xml</include> + </includes> + <fileMode>0644</fileMode> + </fileSet> + <fileSet> + <outputDirectory>examples/engine</outputDirectory> + <includes> + <include>drain</include> + <include>spout</include> + <include>server</include> + </includes> + <fileMode>0755</fileMode> + </fileSet> + </fileSets> + </sources> + </moduleSet> + <moduleSet> + <useAllReactorProjects>true</useAllReactorProjects> + <includes> + <include>org.apache.qpid:proton-j-reactor-examples</include> + </includes> + <sources> + <includeModuleDirectory>false</includeModuleDirectory> + <fileSets> + <fileSet> + <directory>src</directory> + <outputDirectory>examples/reactor/src</outputDirectory> + <fileMode>0644</fileMode> + <directoryMode>0755</directoryMode> + </fileSet> + <fileSet> + <outputDirectory>examples/reactor</outputDirectory> + <includes> + <include>pom.xml</include> + <include>README.md</include> + </includes> + <fileMode>0644</fileMode> + </fileSet> + <fileSet> + <outputDirectory>examples/engine</outputDirectory> + <includes> + <include>run</include> + </includes> + <fileMode>0755</fileMode> + </fileSet> + </fileSets> + </sources> + </moduleSet> + + </moduleSets> +</assembly> + http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/d0433631/apache-qpid-proton-j/src/main/assembly/src.xml ---------------------------------------------------------------------- diff --git a/apache-qpid-proton-j/src/main/assembly/src.xml b/apache-qpid-proton-j/src/main/assembly/src.xml new file mode 100644 index 0000000..639847a --- /dev/null +++ b/apache-qpid-proton-j/src/main/assembly/src.xml @@ -0,0 +1,81 @@ +<?xml version='1.0' encoding='UTF-8'?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> + +<assembly> + <id>src</id> + <formats> + <format>tar.gz</format> + </formats> + <baseDirectory>apache-qpid-proton-j-${project.version}-src</baseDirectory> + <fileSets> + <!-- main project directory structure --> + <fileSet> + <directory>${project.basedir}/..</directory> + <outputDirectory>/</outputDirectory> + <useDefaultExcludes>true</useDefaultExcludes> + <excludes> + <!-- build output --> + <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/).*${project.build.directory}.*]</exclude> + + <!-- NOTE: Most of the following excludes should not be required + if the standard release process is followed. This is because the + release plugin checks out project sources into a location like + target/checkout, then runs the build from there. The result is + a source-release archive that comes from a pretty clean directory + structure. + + HOWEVER, if the release plugin is configured to run extra goals + or generate a project website, it's definitely possible that some + of these files will be present. So, it's safer to exclude them. + --> + + <!-- IDEs --> + <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?maven-eclipse\.xml]</exclude> + <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.project]</exclude> + <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.classpath]</exclude> + <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iws]</exclude> + <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.idea(/.*)?]</exclude> + <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?out(/.*)?]</exclude> + <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.ipr]</exclude> + <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iml]</exclude> + <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.settings(/.*)?]</exclude> + <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.externalToolBuilders(/.*)?]</exclude> + <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.deployables(/.*)?]</exclude> + <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.wtpmodules(/.*)?]</exclude> + + <!-- misc --> + <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?cobertura\.ser]</exclude> + + <!-- release-plugin temp files --> + <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?pom\.xml\.releaseBackup]</exclude> + <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?release\.properties]</exclude> + + <!-- Jython class files --> + <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?.*\$py\.class]</exclude> + + <!-- Git mailmap file --> + <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.mailmap]</exclude> + + <!-- jenkins workspace local repo --> + <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.repository(/.*)?]</exclude> + </excludes> + </fileSet> + </fileSets> +</assembly> http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/d0433631/examples/engine/pom.xml ---------------------------------------------------------------------- diff --git a/examples/engine/pom.xml b/examples/engine/pom.xml index 75fe422..9e83fda 100644 --- a/examples/engine/pom.xml +++ b/examples/engine/pom.xml @@ -24,14 +24,13 @@ </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>proton-j-engine-demo</artifactId> - <name>proton-j-engine-demo</name> + <artifactId>proton-j-engine-examples</artifactId> + <name>Proton-J Engine Examples</name> <dependencies> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>proton-j</artifactId> - <version>${project.parent.version}</version> </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/d0433631/examples/reactor/pom.xml ---------------------------------------------------------------------- diff --git a/examples/reactor/pom.xml b/examples/reactor/pom.xml index 32e995e..5d09020 100644 --- a/examples/reactor/pom.xml +++ b/examples/reactor/pom.xml @@ -25,17 +25,12 @@ <modelVersion>4.0.0</modelVersion> <artifactId>proton-j-reactor-examples</artifactId> - <name>proton-j-reactor-examples</name> + <name>Proton-J Reactor Examples</name> <dependencies> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>proton-j</artifactId> - <version>${project.parent.version}</version> </dependency> </dependencies> - - <scm> - <url>http://svn.apache.org/viewvc/qpid/proton/</url> - </scm> </project> http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/d0433631/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 7dea454..6c74648 100644 --- a/pom.xml +++ b/pom.xml @@ -29,16 +29,51 @@ <version>0.17.0-SNAPSHOT</version> <packaging>pom</packaging> + <name>Proton-J Parent</name> + <properties> <maven.compiler.source>1.7</maven.compiler.source> <maven.compiler.target>1.7</maven.compiler.target> + <!-- Test dependency versions --> <junit-version>4.12</junit-version> <mockito-version>1.10.19</mockito-version> + <jython-version>2.7.0</jython-version> + <!-- Plugin versions --> <maven-bundle-plugin-version>3.2.0</maven-bundle-plugin-version> </properties> + <dependencyManagement> + <dependencies> + <!-- Internal module dependencies --> + <dependency> + <groupId>org.apache.qpid</groupId> + <artifactId>proton-j</artifactId> + <version>${project.version}</version> + </dependency> + <!-- Test dependencies --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junit-version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>${mockito-version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.python</groupId> + <artifactId>jython-standalone</artifactId> + <version>${jython-version}</version> + <scope>test</scope> + </dependency> + </dependencies> + </dependencyManagement> + <build> <plugins> <plugin> @@ -93,26 +128,12 @@ </pluginManagement> </build> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${junit-version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <version>${mockito-version}</version> - <scope>test</scope> - </dependency> - </dependencies> - <modules> <module>proton-j</module> <module>tests</module> <module>examples/engine</module> <module>examples/reactor</module> + <module>apache-qpid-proton-j</module> </modules> <url>http://qpid.apache.org/proton</url> @@ -131,6 +152,27 @@ </ciManagement> <profiles> + <!-- Override the apache-release profile from the parent. Skip creating + a source release here, we have a release module that does it. --> + <profile> + <id>apache-release</id> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>source-release-assembly</id> + <configuration> + <skipAssembly>true</skipAssembly> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + <profile> <id>sources</id> <build> http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/d0433631/proton-j/pom.xml ---------------------------------------------------------------------- diff --git a/proton-j/pom.xml b/proton-j/pom.xml index cb60c1d..d2598cc 100644 --- a/proton-j/pom.xml +++ b/proton-j/pom.xml @@ -24,9 +24,10 @@ <modelVersion>4.0.0</modelVersion> <artifactId>proton-j</artifactId> - <name>proton-j</name> <packaging>bundle</packaging> + <name>Proton-J</name> + <dependencies> <dependency> <groupId>org.bouncycastle</groupId> @@ -34,6 +35,16 @@ <version>1.53</version> <scope>test</scope> </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <scope>test</scope> + </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/d0433631/tests/pom.xml ---------------------------------------------------------------------- diff --git a/tests/pom.xml b/tests/pom.xml index 732f0a1..ed09038 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -20,17 +20,16 @@ --> <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> - - <artifactId>proton-tests</artifactId> - <name>proton-tests</name> - <parent> <groupId>org.apache.qpid</groupId> <artifactId>proton-project</artifactId> <version>0.17.0-SNAPSHOT</version> </parent> - <description>The Proton python system tests execute against the Java or C implementation, using Maven (via this pom) and CMake/CTest respectively. + <artifactId>proton-tests</artifactId> + <name>Proton-J Python Tests</name> + + <description>The Proton python system tests execute against the Java implementation, using Maven (via this pom). To run the tests against proton-j, execute: @@ -44,10 +43,6 @@ mvn test \ -Dproton.pythontest.always_colorize=true </description> - <scm> - <url>http://svn.apache.org/viewvc/qpid/proton/</url> - </scm> - <properties> <testReportOutputDirectory>${basedir}/target/surefire-reports</testReportOutputDirectory> </properties> @@ -94,7 +89,11 @@ mvn test \ <dependency> <groupId>org.apache.qpid</groupId> <artifactId>proton-j</artifactId> - <version>${project.parent.version}</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.bouncycastle</groupId> @@ -104,7 +103,6 @@ mvn test \ <dependency> <groupId>org.python</groupId> <artifactId>jython-standalone</artifactId> - <version>2.7.0</version> <scope>test</scope> </dependency> </dependencies> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
