This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-javax-activation.git
The following commit(s) were added to refs/heads/master by this push:
new acdc334 SLING-9057 update to version 1.2.2 of embedded activation
acdc334 is described below
commit acdc334cf272abc5ac2252727a1965285996eda7
Author: Konrad Windszus <[email protected]>
AuthorDate: Sat Jul 25 15:17:21 2020 +0200
SLING-9057 update to version 1.2.2 of embedded activation
This closes #1
---
pom.xml | 7 +-
src/main/appended-resources/META-INF/LICENSE | 136 ---------------------------
src/main/appended-resources/META-INF/NOTICE | 4 -
3 files changed, 4 insertions(+), 143 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1923c11..d7ba8f5 100755
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
<description>The Apache Sling javax.activation bundle contributes an
OSGi-compatible activation bundle.</description>
<properties>
- <javax.activation.version>1.1.1</javax.activation.version>
+ <javax.activation.version>1.2.2</javax.activation.version>
<site.javadoc.exclude>**.impl.**</site.javadoc.exclude>
</properties>
@@ -62,9 +62,10 @@
</plugins>
</build>
<dependencies>
+ <!-- https://eclipse-ee4j.github.io/jaf/ -->
<dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>jakarta.activation</artifactId>
<version>${javax.activation.version}</version>
</dependency>
<!-- Compendium 4.2.0 is needed to access BundleTracker -->
diff --git a/src/main/appended-resources/META-INF/LICENSE
b/src/main/appended-resources/META-INF/LICENSE
deleted file mode 100644
index db655ca..0000000
--- a/src/main/appended-resources/META-INF/LICENSE
+++ /dev/null
@@ -1,136 +0,0 @@
-
-
-APACHE SLING JAVAX.ACTIVATION SUBCOMPONENTS:
-
-The Apache Sling javax.activation includes a number of subcomponents with
-separate copyright notices and license terms. Your use of the source
-code for the these subcomponents is subject to the terms and
-conditions of the following licenses.
-
-
-For the Activation library component:
-
-COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
-
-1. Definitions.
-
- 1.1. Contributor. means each individual or entity that creates or
contributes to the creation of Modifications.
-
- 1.2. Contributor Version. means the combination of the Original Software,
prior Modifications used by a Contributor (if any), and the Modifications made
by that particular Contributor.
-
- 1.3. Covered Software. means (a) the Original Software, or (b)
Modifications, or (c) the combination of files containing Original Software
with files containing Modifications, in each case including portions thereof.
-
- 1.4. Executable. means the Covered Software in any form other than Source
Code.
-
- 1.5. Initial Developer. means the individual or entity that first makes
Original Software available under this License.
-
- 1.6. Larger Work. means a work which combines Covered Software or portions
thereof with code not governed by the terms of this License.
-
- 1.7. License. means this document.
-
- 1.8. Licensable. means having the right to grant, to the maximum extent
possible, whether at the time of the initial grant or subsequently acquired,
any and all of the rights conveyed herein.
-
- 1.9. Modifications. means the Source Code and Executable form of any of the
following:
-
- A. Any file that results from an addition to, deletion from or
modification of the contents of a file containing Original Software or previous
Modifications;
-
- B. Any new file that contains any part of the Original Software or
previous Modification; or
-
- C. Any new file that is contributed or otherwise made available under
the terms of this License.
-
- 1.10. Original Software. means the Source Code and Executable form of
computer software code that is originally released under this License.
-
- 1.11. Patent Claims. means any patent claim(s), now owned or hereafter
acquired, including without limitation, method, process, and apparatus claims,
in any patent Licensable by grantor.
-
- 1.12. Source Code. means (a) the common form of computer software code in
which modifications are made and (b) associated documentation included in or
with such code.
-
- 1.13. You. (or .Your.) means an individual or a legal entity exercising
rights under, and complying with all of the terms of, this License. For legal
entities, .You. includes any entity which controls, is controlled by, or is
under common control with You. For purposes of this definition, .control. means
(a) the power, direct or indirect, to cause the direction or management of such
entity, whether by contract or otherwise, or (b) ownership of more than fifty
percent (50%) of the outs [...]
-
-2. License Grants.
-
- 2.1. The Initial Developer Grant.
-
- Conditioned upon Your compliance with Section 3.1 below and subject to
third party intellectual property claims, the Initial Developer hereby grants
You a world-wide, royalty-free, non-exclusive license:
-
- (a) under intellectual property rights (other than patent or
trademark) Licensable by Initial Developer, to use, reproduce, modify, display,
perform, sublicense and distribute the Original Software (or portions thereof),
with or without Modifications, and/or as part of a Larger Work; and
-
- (b) under Patent Claims infringed by the making, using or selling of
Original Software, to make, have made, use, practice, sell, and offer for sale,
and/or otherwise dispose of the Original Software (or portions thereof).
-
- (c) The licenses granted in Sections 2.1(a) and (b) are effective on
the date Initial Developer first distributes or otherwise makes the Original
Software available to a third party under the terms of this License.
-
- (d) Notwithstanding Section 2.1(b) above, no patent license is
granted: (1) for code that You delete from the Original Software, or (2) for
infringements caused by: (i) the modification of the Original Software, or (ii)
the combination of the Original Software with other software or devices.
-
- 2.2. Contributor Grant.
-
- Conditioned upon Your compliance with Section 3.1 below and subject to
third party intellectual property claims, each Contributor hereby grants You a
world-wide, royalty-free, non-exclusive license:
-
- (a) under intellectual property rights (other than patent or
trademark) Licensable by Contributor to use, reproduce, modify, display,
perform, sublicense and distribute the Modifications created by such
Contributor (or portions thereof), either on an unmodified basis, with other
Modifications, as Covered Software and/or as part of a Larger Work; and
-
- (b) under Patent Claims infringed by the making, using, or selling of
Modifications made by that Contributor either alone and/or in combination with
its Contributor Version (or portions of such combination), to make, use, sell,
offer for sale, have made, and/or otherwise dispose of: (1) Modifications made
by that Contributor (or portions thereof); and (2) the combination of
Modifications made by that Contributor with its Contributor Version (or
portions of such combination).
-
- (c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective
on the date Contributor first distributes or otherwise makes the Modifications
available to a third party.
-
- (d) Notwithstanding Section 2.2(b) above, no patent license is
granted: (1) for any code that Contributor has deleted from the Contributor
Version; (2) for infringements caused by: (i) third party modifications of
Contributor Version, or (ii) the combination of Modifications made by that
Contributor with other software (except as part of the Contributor Version) or
other devices; or (3) under Patent Claims infringed by Covered Software in the
absence of Modifications made by that [...]
-
-3. Distribution Obligations.
-
- 3.1. Availability of Source Code.
- Any Covered Software that You distribute or otherwise make available in
Executable form must also be made available in Source Code form and that Source
Code form must be distributed only under the terms of this License. You must
include a copy of this License with every copy of the Source Code form of the
Covered Software You distribute or otherwise make available. You must inform
recipients of any such Covered Software in Executable form as to how they can
obtain such Covered Soft [...]
-
- 3.2. Modifications.
- The Modifications that You create or to which You contribute are
governed by the terms of this License. You represent that You believe Your
Modifications are Your original creation(s) and/or You have sufficient rights
to grant the rights conveyed by this License.
-
- 3.3. Required Notices.
- You must include a notice in each of Your Modifications that identifies
You as the Contributor of the Modification. You may not remove or alter any
copyright, patent or trademark notices contained within the Covered Software,
or any notices of licensing or any descriptive text giving attribution to any
Contributor or the Initial Developer.
-
- 3.4. Application of Additional Terms.
- You may not offer or impose any terms on any Covered Software in Source
Code form that alters or restricts the applicable version of this License or
the recipients. rights hereunder. You may choose to offer, and to charge a fee
for, warranty, support, indemnity or liability obligations to one or more
recipients of Covered Software. However, you may do so only on Your own behalf,
and not on behalf of the Initial Developer or any Contributor. You must make it
absolutely clear that an [...]
-
- 3.5. Distribution of Executable Versions.
- You may distribute the Executable form of the Covered Software under the
terms of this License or under the terms of a license of Your choice, which may
contain terms different from this License, provided that You are in compliance
with the terms of this License and that the license for the Executable form
does not attempt to limit or alter the recipient.s rights in the Source Code
form from the rights set forth in this License. If You distribute the Covered
Software in Executable [...]
-
- 3.6. Larger Works.
- You may create a Larger Work by combining Covered Software with other
code not governed by the terms of this License and distribute the Larger Work
as a single product. In such a case, You must make sure the requirements of
this License are fulfilled for the Covered Software.
-
-4. Versions of the License.
-
- 4.1. New Versions.
- Sun Microsystems, Inc. is the initial license steward and may publish
revised and/or new versions of this License from time to time. Each version
will be given a distinguishing version number. Except as provided in Section
4.3, no one other than the license steward has the right to modify this License.
-
- 4.2. Effect of New Versions.
- You may always continue to use, distribute or otherwise make the Covered
Software available under the terms of the version of the License under which
You originally received the Covered Software. If the Initial Developer includes
a notice in the Original Software prohibiting it from being distributed or
otherwise made available under any subsequent version of the License, You must
distribute and make the Covered Software available under the terms of the
version of the License under [...]
-
- 4.3. Modified Versions.
- When You are an Initial Developer and You want to create a new license
for Your Original Software, You may create and use a modified version of this
License if You: (a) rename the license and remove any references to the name of
the license steward (except to note that the license differs from this
License); and (b) otherwise make it clear that the license contains terms which
differ from this License.
-
-5. DISCLAIMER OF WARRANTY.
-
- COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN .AS IS. BASIS,
WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT
LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF DEFECTS,
MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK
AS TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD
ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL
DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME [...]
-
-6. TERMINATION.
-
- 6.1. This License and the rights granted hereunder will terminate
automatically if You fail to comply with terms herein and fail to cure such
breach within 30 days of becoming aware of the breach. Provisions which, by
their nature, must remain in effect beyond the termination of this License
shall survive.
-
- 6.2. If You assert a patent infringement claim (excluding declaratory
judgment actions) against Initial Developer or a Contributor (the Initial
Developer or Contributor against whom You assert such claim is referred to as
.Participant.) alleging that the Participant Software (meaning the Contributor
Version where the Participant is a Contributor or the Original Software where
the Participant is the Initial Developer) directly or indirectly infringes any
patent, then any and all rig [...]
-
- 6.3. In the event of termination under Sections 6.1 or 6.2 above, all
end user licenses that have been validly granted by You or any distributor
hereunder prior to termination (excluding licenses granted to You by any
distributor) shall survive termination.
-
-7. LIMITATION OF LIABILITY.
-
- UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING
NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY
OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY SUPPLIER OF
ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL,
INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER
FAILURE OR MALFUNCTION, OR ANY AND AL [...]
-
-8. U.S. GOVERNMENT END USERS.
-
- The Covered Software is a .commercial item,. as that term is defined in 48
C.F.R. 2.101 (Oct. 1995), consisting of .commercial computer software. (as that
term is defined at 48 C.F.R. � 252.227-7014(a)(1)) and .commercial computer
software documentation. as such terms are used in 48 C.F.R. 12.212 (Sept.
1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through
227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Software
with only those rights set forth [...]
-
-9. MISCELLANEOUS.
-
- This License represents the complete agreement concerning subject matter
hereof. If any provision of this License is held to be unenforceable, such
provision shall be reformed only to the extent necessary to make it
enforceable. This License shall be governed by the law of the jurisdiction
specified in a notice contained within the Original Software (except to the
extent applicable law, if any, provides otherwise), excluding such
jurisdiction.s conflict-of-law provisions. Any litigati [...]
-
-10. RESPONSIBILITY FOR CLAIMS.
-
- As between Initial Developer and the Contributors, each party is
responsible for claims and damages arising, directly or indirectly, out of its
utilization of rights under this License and You agree to work with Initial
Developer and Contributors to distribute such responsibility on an equitable
basis. Nothing herein is intended or shall be deemed to constitute any
admission of liability.
-
- NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION
LICENSE (CDDL)
-
- The code released under the CDDL shall be governed by the laws of the State
of California (excluding conflict-of-law provisions). Any litigation relating
to this License shall be subject to the jurisdiction of the Federal Courts of
the Northern District of California and the state courts of the State of
California, with venue lying in Santa Clara County, California.
diff --git a/src/main/appended-resources/META-INF/NOTICE
b/src/main/appended-resources/META-INF/NOTICE
deleted file mode 100644
index ffabdaf..0000000
--- a/src/main/appended-resources/META-INF/NOTICE
+++ /dev/null
@@ -1,4 +0,0 @@
-
-This product includes software developed at
-Sun Microsystems
-licensed under CDDL 1.0
