Ingest jena-shaded-guava
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/30375586 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/30375586 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/30375586 Branch: refs/heads/master Commit: 303755864effb7713715c7522f1b99c9ecf04b51 Parents: 2551df7 Author: Andy Seaborne <[email protected]> Authored: Mon Mar 30 20:27:48 2015 +0100 Committer: Andy Seaborne <[email protected]> Committed: Mon Mar 30 20:27:48 2015 +0100 ---------------------------------------------------------------------- apache-jena-osgi/jena-osgi/pom.xml | 2 +- jena-shaded-guava/.gitignore | 1 + jena-shaded-guava/DEPENDENCIES | 2 + jena-shaded-guava/LICENSE | 175 ++++++++++++++++++++++++++++++++ jena-shaded-guava/pom.xml | 109 ++++++++++++++++++++ jena-shadowed-ext/.gitignore | 1 - jena-shadowed-ext/pom.xml | 118 --------------------- pom.xml | 3 +- 8 files changed, 290 insertions(+), 121 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/30375586/apache-jena-osgi/jena-osgi/pom.xml ---------------------------------------------------------------------- diff --git a/apache-jena-osgi/jena-osgi/pom.xml b/apache-jena-osgi/jena-osgi/pom.xml index a872f6c..aed8e19 100644 --- a/apache-jena-osgi/jena-osgi/pom.xml +++ b/apache-jena-osgi/jena-osgi/pom.xml @@ -112,7 +112,7 @@ </dependency> <dependency> <groupId>org.apache.jena</groupId> - <artifactId>jena-shadowed-ext</artifactId> + <artifactId>jena-shaded-guava</artifactId> <version>2.13.1-SNAPSHOT</version> <scope>provided</scope> </dependency> http://git-wip-us.apache.org/repos/asf/jena/blob/30375586/jena-shaded-guava/.gitignore ---------------------------------------------------------------------- diff --git a/jena-shaded-guava/.gitignore b/jena-shaded-guava/.gitignore new file mode 100644 index 0000000..916e17c --- /dev/null +++ b/jena-shaded-guava/.gitignore @@ -0,0 +1 @@ +dependency-reduced-pom.xml http://git-wip-us.apache.org/repos/asf/jena/blob/30375586/jena-shaded-guava/DEPENDENCIES ---------------------------------------------------------------------- diff --git a/jena-shaded-guava/DEPENDENCIES b/jena-shaded-guava/DEPENDENCIES new file mode 100644 index 0000000..fc31f91 --- /dev/null +++ b/jena-shaded-guava/DEPENDENCIES @@ -0,0 +1,2 @@ +This module depends on com.google.guava. + http://git-wip-us.apache.org/repos/asf/jena/blob/30375586/jena-shaded-guava/LICENSE ---------------------------------------------------------------------- diff --git a/jena-shaded-guava/LICENSE b/jena-shaded-guava/LICENSE new file mode 100644 index 0000000..67db858 --- /dev/null +++ b/jena-shaded-guava/LICENSE @@ -0,0 +1,175 @@ + + 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. http://git-wip-us.apache.org/repos/asf/jena/blob/30375586/jena-shaded-guava/pom.xml ---------------------------------------------------------------------- diff --git a/jena-shaded-guava/pom.xml b/jena-shaded-guava/pom.xml new file mode 100644 index 0000000..676ba45 --- /dev/null +++ b/jena-shaded-guava/pom.xml @@ -0,0 +1,109 @@ +<?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";> + + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.jena</groupId> + <artifactId>jena-parent</artifactId> + <version>13-SNAPSHOT</version> + <relativePath>../jena-parent</relativePath> + </parent> + <artifactId>jena-shaded-guava</artifactId> + <version>2.13.1-SNAPSHOT</version> + <name>Apache Jena - Shadowed external libraries</name> + <description> + This module shades Google's Guava. + Direct use can lead to versioning problems + as some systems are dependent on specific + versions of guava. + This module uses the Shade plugin to + re-package them under the package name + org.apache.jena.ext.com.google.... + </description> + + + <dependencies> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <!-- Version number specified explicitly and not in jena-parent, + as it should only be used here, and further shadowing/bundle/NOTICE + consideration might be needed on upgrade. --> + <version>18.0</version> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + </execution> + </executions> + <configuration> + <artifactSet> + <includes> + <artifact>com.google.guava:guava</artifact> + </includes> + </artifactSet> + + <filters> + <filter> + <!-- Modify the below patterns if a later guava + contains other packages + --> + <artifact>com.google.guava:guava</artifact> + <includes> + <include>com/google/common/**</include> + <include>com/google/thirdparty/**</include> + </includes> + </filter> + </filters> + + <!-- + Shade to a different package, so the JAR we produce will not be + in conflict with any newer/older guava present in client code + depending on Jena. + --> + <relocations> + <!-- Modify the below patterns if a later guava contains other + packages --> + <relocation> + <pattern>com.google.common</pattern> + <shadedPattern>org.apache.jena.ext.com.google.common</shadedPattern> + </relocation> + <relocation> + <pattern>com.google.thirdparty</pattern> + <shadedPattern>org.apache.jena.ext.com.google.thirdparty</shadedPattern> + </relocation> + </relocations> + </configuration> + </plugin> + + </plugins> + </build> + +</project> http://git-wip-us.apache.org/repos/asf/jena/blob/30375586/jena-shadowed-ext/.gitignore ---------------------------------------------------------------------- diff --git a/jena-shadowed-ext/.gitignore b/jena-shadowed-ext/.gitignore deleted file mode 100644 index 916e17c..0000000 --- a/jena-shadowed-ext/.gitignore +++ /dev/null @@ -1 +0,0 @@ -dependency-reduced-pom.xml http://git-wip-us.apache.org/repos/asf/jena/blob/30375586/jena-shadowed-ext/pom.xml ---------------------------------------------------------------------- diff --git a/jena-shadowed-ext/pom.xml b/jena-shadowed-ext/pom.xml deleted file mode 100644 index f13d833..0000000 --- a/jena-shadowed-ext/pom.xml +++ /dev/null @@ -1,118 +0,0 @@ -<?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";> - - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.jena</groupId> - <artifactId>jena-parent</artifactId> - <version>13-SNAPSHOT</version> - <relativePath>../jena-parent</relativePath> - </parent> - <artifactId>jena-shadowed-ext</artifactId> - <version>2.13.1-SNAPSHOT</version> - <name>Apache Jena - Shadowed external libraries</name> - <description> - This module shadows some external libraries like Guava, - which we don't want to be depending on in their regular - package names, as they are likely to change/upgrade - externally and also be used in other libraries - in potentially conflicting versions. - - This module uses the Shade plugin to re-package them - under the package name - org.apache.jena.ext and is also a valid OSGi bundle. - This module should only be used internally by other - Jena modules. - </description> - - - <dependencies> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <!-- Version number specified explicitly and not in jena-parent, - as it should only be used here, and further shadowing/bundle/NOTICE - consideration might be needed on upgrade. --> - <version>18.0</version> - <!-- - As Guava does not contain a NOTICE and is also - licensed under Apache License, no additional - NOTICE is required by us. In a way we should probably - NOT include our own NOTICE file in this JAR.. - --> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - </execution> - </executions> - <configuration> - <artifactSet> - <includes> - <artifact>com.google.guava:guava</artifact> - </includes> - </artifactSet> - - <filters> - <filter> - <!-- Modify the below patterns if a later guava contains other - packages --> - <artifact>com.google.guava:guava</artifact> - <includes> - <include>com/google/common/**</include> - <include>com/google/thirdparty/**</include> - </includes> - </filter> - </filters> - - <!-- - Shade to a different package, so the JAR we produce will not be - in conflict with any newer/older guava present in client code - depending on Jena. - --> - <relocations> - <!-- Modify the below patterns if a later guava contains other - packages --> - <relocation> - <pattern>com.google.common</pattern> - <shadedPattern>org.apache.jena.ext.com.google.common</shadedPattern> - </relocation> - <relocation> - <pattern>com.google.thirdparty</pattern> - <shadedPattern>org.apache.jena.ext.com.google.thirdparty</shadedPattern> - </relocation> - </relocations> - </configuration> - </plugin> - - </plugins> - </build> - -</project> http://git-wip-us.apache.org/repos/asf/jena/blob/30375586/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 54f3d05..81e4ca0 100644 --- a/pom.xml +++ b/pom.xml @@ -64,6 +64,7 @@ <!-- The maven artifacts of the basic modules --> <modules> <module>jena-parent</module> + <!-- <module>jena-shared-guava</module> --> <!-- <module>jena-iri</module> --> <module>jena-core</module> <module>jena-arq</module> @@ -98,7 +99,7 @@ </activation> <modules> <module>jena-parent</module> - <module>jena-shadowed-ext</module> + <module>jena-shaded-guava</module> <module>jena-iri</module> <module>jena-core</module>
