You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2021/04/05 01:51:35 UTC
[groovy] branch master updated: GROOVY-10005: Remove groovy-jaxb
module from Groovy 4 (closes #1539)
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/master by this push:
new 359be2b GROOVY-10005: Remove groovy-jaxb module from Groovy 4 (closes #1539)
359be2b is described below
commit 359be2b662be646d2d59db8b999412691891231d
Author: Paul King <pa...@asert.com.au>
AuthorDate: Wed Mar 31 20:38:11 2021 +1000
GROOVY-10005: Remove groovy-jaxb module from Groovy 4 (closes #1539)
---
gradle/verification-metadata.xml | 10 -
licenses/LICENSE-BINZIP | 12 -
licenses/LICENSE-SDK | 12 -
licenses/jaxb-BINZIP.txt | 9 -
licenses/jaxb-license.txt | 350 ---------------------
settings.gradle | 1 -
src/bin/startGroovy | 1 -
src/bin/startGroovy.bat | 1 -
src/conf/groovy-starter.conf | 3 -
src/test/groovy/execute/ExecuteTest.groovy | 16 +-
subprojects/groovy-binary/build.gradle | 10 -
subprojects/groovy-jaxb/build.gradle | 53 ----
.../groovy/jaxb/extensions/JaxbExtensions.java | 83 -----
.../jaxb/extensions/JaxbExtensionsTest.groovy | 41 ---
.../apache/groovy/jaxb/extensions/Person.groovy | 36 ---
15 files changed, 1 insertion(+), 637 deletions(-)
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 21732a3..af3d721 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -544,11 +544,6 @@
<sha512 value="4a67cacb7a878aaa8a6e089d8b2db818665cb5c26af868974003fd2115ccc50980a5f1148995b6557ed5fa8a7a2b562a17bddbea43dd100ef800904d3cd3efa7" origin="Generated by Gradle because artifact wasn't signed"/>
</artifact>
</component>
- <component group="javax.xml.bind" name="jaxb-api" version="2.3.0">
- <artifact name="jaxb-api-2.3.0.jar">
- <pgp value="b38e195d438d44a1a8d2d2203575e1c767076ca8"/>
- </artifact>
- </component>
<component group="jaxen" name="jaxen" version="1.2.0">
<artifact name="jaxen-1.2.0.jar">
<pgp value="ca491704d613780d2bee00f2c6fc46eb51cf569c"/>
@@ -881,11 +876,6 @@
<sha512 value="9b69c25f5d87c5645524db490e5ab14275404e606da7989420913811581c9b3f732cf60aa4f9d0bbfad60180dd4c6dcb01810b185f99c94b3800bd20c09107a7" origin="Generated by Gradle because artifact wasn't signed"/>
</artifact>
</component>
- <component group="org.codehaus.groovy" name="groovy-jaxb" version="3.0.5">
- <artifact name="groovy-jaxb-3.0.5.jar">
- <sha512 value="15d45ac3d87d02ca0f0d29c9b61d6d70d2ab46f0d5dc1dc3272e8a66c59d141b7bb8fa3ca3d3a43636ee5ad9c30bfe296e167c96c615fd006bfaa6b02dbb8b44" origin="Generated by Gradle because artifact wasn't signed"/>
- </artifact>
- </component>
<component group="org.codehaus.groovy" name="groovy-json" version="2.5.12">
<artifact name="groovy-json-2.5.12.jar">
<sha512 value="a5540f8f1b25ea53e525241aa77505e48869f50dcca3b889a65b8df7599e8e18d7dc02b7dcbef452b4b4f4593d7e65ba87677ab93be325fbfe2ed7a1c94a9f60" origin="Generated by Gradle because artifact wasn't signed"/>
diff --git a/licenses/LICENSE-BINZIP b/licenses/LICENSE-BINZIP
index 9b7543f..cba7e51 100644
--- a/licenses/LICENSE-BINZIP
+++ b/licenses/LICENSE-BINZIP
@@ -223,18 +223,6 @@ BSD license. For details, see licenses/hamcrest-license.txt.
------------------------------------------------------------------------
-JAXB License (for optional groovy-jaxb extensions)
-
-This product bundles several JAXB related jars in binary form.
-
-The "javax.activation" jar is available under the CDDL 1.0 license:
-licenses/activation-license.txt
-
-The jaxb-api, jaxb-core and jaxb-impl jars use the CDDL 1.1 license:
-licenses/jaxb-license.txt
-
-------------------------------------------------------------------------
-
JLine2 License (optional dependency used with groovysh)
This product bundles the JLine2 jar, which is available under a
diff --git a/licenses/LICENSE-SDK b/licenses/LICENSE-SDK
index 1339c5c..f912246 100644
--- a/licenses/LICENSE-SDK
+++ b/licenses/LICENSE-SDK
@@ -223,18 +223,6 @@ BSD license. For details, see licenses/hamcrest-license.txt.
------------------------------------------------------------------------
-JAXB License (for optional groovy-jaxb extensions)
-
-This product bundles several JAXB related jars in binary form.
-
-The "javax.activation" jar is available under the CDDL 1.0 license:
-licenses/activation-license.txt
-
-The jaxb-api, jaxb-core and jaxb-impl jars use the CDDL 1.1 license:
-licenses/jaxb-license.txt
-
-------------------------------------------------------------------------
-
JLine2 License (optional dependency used with groovysh)
This product bundles the JLine2 jar, which is available under a
diff --git a/licenses/jaxb-BINZIP.txt b/licenses/jaxb-BINZIP.txt
deleted file mode 100644
index 30ee013..0000000
--- a/licenses/jaxb-BINZIP.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-JAXB License (for optional groovy-jaxb extensions)
-
-This product bundles several JAXB related jars in binary form.
-
-The "javax.activation" jar is available under the CDDL 1.0 license:
-licenses/activation-license.txt
-
-The jaxb-api, jaxb-core and jaxb-impl jars use the CDDL 1.1 license:
-licenses/jaxb-license.txt
diff --git a/licenses/jaxb-license.txt b/licenses/jaxb-license.txt
deleted file mode 100644
index 2355a4c..0000000
--- a/licenses/jaxb-license.txt
+++ /dev/null
@@ -1,350 +0,0 @@
-COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.1
-
-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 outstanding shares or beneficial
- ownership of such entity.
-
-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 Contributor.
-
-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 Software in Source Code form in a reasonable manner on or
- through a medium customarily used for software exchange.
-
- 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 any such warranty, support, indemnity or
- liability obligation is offered by You alone, and You hereby agree
- to indemnify the Initial Developer and every Contributor for any
- liability incurred by the Initial Developer or such Contributor as a
- result of warranty, support, indemnity or liability terms You offer.
-
- 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 form under a different license, You must make
- it absolutely clear that any terms which differ from this License
- are offered by You alone, not by the Initial Developer or
- Contributor. You hereby agree to indemnify the Initial Developer and
- every Contributor for any liability incurred by the Initial
- Developer or such Contributor as a result of any such terms You offer.
-
- 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.
-
- Oracle 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 which You originally received the Covered
- Software. Otherwise, You may also choose to use, distribute or
- otherwise make the Covered Software available under the terms of any
- subsequent version of the License published by the license steward.
-
- 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 THE COST OF ANY NECESSARY SERVICING,
- REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN
- ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED SOFTWARE IS
- AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-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 rights granted directly or
- indirectly to You by such Participant, the Initial Developer (if the
- Initial Developer is not the Participant) and all Contributors under
- Sections 2.1 and/or 2.2 of this License shall, upon 60 days notice
- from Participant terminate prospectively and automatically at the
- expiration of such 60 day notice period, unless if within such 60
- day period You withdraw Your claim with respect to the Participant
- Software against such Participant either unilaterally or pursuant to
- a written agreement with Participant.
-
- 6.3. If You assert a patent infringement claim against Participant
- alleging that the Participant Software directly or indirectly
- infringes any patent where such claim is resolved (such as by
- license or settlement) prior to the initiation of patent
- infringement litigation, then the reasonable value of the licenses
- granted by such Participant under Sections 2.1 or 2.2 shall be taken
- into account in determining the amount or value of any payment or
- license.
-
- 6.4. 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 LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER
- FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR
- LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE
- POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT
- APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH
- PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH
- LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR
- LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION
- AND LIMITATION MAY NOT APPLY TO YOU.
-
-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 herein. This U.S. Government Rights
- clause is in lieu of, and supersedes, any other FAR, DFAR, or other
- clause or provision that addresses Government rights in computer
- software under this License.
-
-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 litigation relating to this License shall be subject
- to the jurisdiction of the courts located in the jurisdiction and
- venue specified in a notice contained within the Original Software,
- with the losing party responsible for costs, including, without
- limitation, court costs and reasonable attorneys' fees and expenses.
- The application of the United Nations Convention on Contracts for
- the International Sale of Goods is expressly excluded. Any law or
- regulation which provides that the language of a contract shall be
- construed against the drafter shall not apply to this License. You
- agree that You alone are responsible for compliance with the United
- States export administration regulations (and the export control
- laws and regulation of any other countries) when You use, distribute
- or otherwise make available any Covered Software.
-
-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.
diff --git a/settings.gradle b/settings.gradle
index 2633a05..d5ff3c1 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -45,7 +45,6 @@ def subprojects = [
'groovy-docgenerator',
'groovy-groovydoc',
'groovy-groovysh',
- 'groovy-jaxb',
'groovy-jmx',
'groovy-json',
'groovy-jsr223',
diff --git a/src/bin/startGroovy b/src/bin/startGroovy
index ee4b263..5a50832 100644
--- a/src/bin/startGroovy
+++ b/src/bin/startGroovy
@@ -274,7 +274,6 @@ fi
startGroovy ( ) {
JAVA_VERSION="$("$JAVACMD" -version 2>&1 | awk -F '"' '/version/ {print $2}' | cut -d "_" -f1)"
if [ "$(expr "$JAVA_VERSION" \> "1.8.0")" ]; then
- JAVA_OPTS="$JAVA_OPTS -Dgroovy.jaxb=jaxb"
[ "$GROOVY_TURN_OFF_JAVA_WARNINGS" = "true" ] && JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.annotation=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED --add-opens=java.base/java.lang.module=ALL-UNNAMED --add-opens=java.base/java.lang.ref=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.math=ALL-UNNAMED --add-opens=java.base/ [...]
# sun.awt.windows just on windows platforms
if [ $msys = 'true' ] || [ $cygwin = 'true' ]; then
diff --git a/src/bin/startGroovy.bat b/src/bin/startGroovy.bat
index ba7e128..df264e8 100644
--- a/src/bin/startGroovy.bat
+++ b/src/bin/startGroovy.bat
@@ -289,7 +289,6 @@ for /f "tokens=3" %%g in ('call "%JAVA_EXE%" -version 2^>^&1 ^| findstr /i "vers
for /f "useback tokens=*" %%a in ('%JAVA_VERSION%') do set JAVA_VERSION=%%~a
set JAVA_VERSION=%JAVA_VERSION:~0,5%
set ADD_MODULES_OPT=--add-modules
-if "%JAVA_VERSION%" gtr "1.8.0" set JAVA_OPTS=%JAVA_OPTS% -Dgroovy.jaxb=jaxb
if "%JAVA_VERSION%" gtr "1.8.0" if "%GROOVY_TURN_OFF_JAVA_WARNINGS%" == "true" set JAVA_OPTS=%JAVA_OPTS% --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.annotation=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED --add-opens=java.base/java.lang.module=ALL-UNNAMED --add-opens=java.base/java.lang.ref=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.m [...]
if exist "%USERPROFILE%/.groovy/postinit.bat" call "%USERPROFILE%/.groovy/postinit.bat"
diff --git a/src/conf/groovy-starter.conf b/src/conf/groovy-starter.conf
index 7f9d2f3..3c700e2 100644
--- a/src/conf/groovy-starter.conf
+++ b/src/conf/groovy-starter.conf
@@ -28,9 +28,6 @@
# load required libraries
load !{groovy.home}/lib/*.jar
- # load jaxb libraries if needed (ignored if not found)
- load !{groovy.home}/lib/extras-${groovy.jaxb}/*.jar
-
# load user specific libraries
load !{user.home}/.groovy/lib/*.jar
diff --git a/src/test/groovy/execute/ExecuteTest.groovy b/src/test/groovy/execute/ExecuteTest.groovy
index f707ca3..f9bc105 100644
--- a/src/test/groovy/execute/ExecuteTest.groovy
+++ b/src/test/groovy/execute/ExecuteTest.groovy
@@ -77,11 +77,7 @@ final class ExecuteTest extends GroovyTestCase {
"groovy.ui.GroovyMain",
"-e",
"sleep(2000); println('Done'); System.exit(0)"]
- // jaxb deprecated in 9, gone in 11
- if (isAtLeastJdk('9.0') && !isAtLeastJdk('11.0')) {
- javaArgs.add(3, '--add-modules')
- javaArgs.add(4, 'java.xml.bind')
- }
+
String[] java = javaArgs.toArray()
println "Executing this command for two cases:\n${java.join(' ')}"
StringBuffer sbout = new StringBuffer()
@@ -132,11 +128,6 @@ final class ExecuteTest extends GroovyTestCase {
'-e',
"println(System.getenv('foo'))"
]
- // jaxb deprecated in 9, gone in 11
- if (isAtLeastJdk('9.0') && !isAtLeastJdk('11.0')) {
- java.add(3, '--add-modules')
- java.add(4, 'java.xml.bind')
- }
println "Executing this command:\n${java.join(' ')}"
def process = java.execute(['foo=bar'], null)
@@ -159,11 +150,6 @@ final class ExecuteTest extends GroovyTestCase {
'-e',
"println('hello')"
]
- // jaxb deprecated in 9, gone in 11
- if (isAtLeastJdk('9.0') && !isAtLeastJdk('11.0')) {
- java.add(3, '--add-modules')
- java.add(4, 'java.xml.bind')
- }
println "Executing this command:\n${java.join(' ')}"
def process = java.execute()
diff --git a/subprojects/groovy-binary/build.gradle b/subprojects/groovy-binary/build.gradle
index 9df3bbf..e6f9463 100644
--- a/subprojects/groovy-binary/build.gradle
+++ b/subprojects/groovy-binary/build.gradle
@@ -52,7 +52,6 @@ distribution {
docs ':groovy-dateutil', 'org.apache.groovy.dateutil.extensions.DateUtilExtensions'
docs ':groovy-datetime', 'org.apache.groovy.datetime.extensions.DateTimeExtensions',
'org.apache.groovy.datetime.extensions.DateTimeStaticExtensions'
- docs ':groovy-jaxb', 'org.apache.groovy.jaxb.extensions.JaxbExtensions'
docs ':groovy-sql', 'org.apache.groovy.sql.extensions.SqlExtensions'
docs ':groovy-swing', 'org.apache.groovy.swing.extensions.SwingExtensions'
docs ':groovy-xml', 'org.apache.groovy.xml.extensions.XmlExtensions'
@@ -68,7 +67,6 @@ distribution {
from(configurations.distributionsRuntimeClasspath) {
exclude {
it.file.name.contains('activation') ||
- it.file.name.startsWith('jaxb-') ||
it.file.name.contains('livetribe-jsr223') ||
it.file.name.startsWith('openbeans-') ||
it.file.name.startsWith('asm-') ||
@@ -78,14 +76,6 @@ distribution {
}
from rootProject.file('src/bin/groovy.icns')
}
- into('lib/extras-jaxb') {
- from(configurations.distributionsRuntimeClasspath) {
- include {
- it.file.name.contains('activation') ||
- it.file.name.startsWith('jaxb-')
- }
- }
- }
rootProject.allprojects {
pluginManager.withPlugin('org.apache.groovy-base') {
if (groovyLibrary.hasGrooid()) {
diff --git a/subprojects/groovy-jaxb/build.gradle b/subprojects/groovy-jaxb/build.gradle
deleted file mode 100644
index e86e9eb..0000000
--- a/subprojects/groovy-jaxb/build.gradle
+++ /dev/null
@@ -1,53 +0,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.
- */
-plugins {
- id 'org.apache.groovy-library'
-}
-
-groovyLibrary {
- optionalModule()
-
- moduleDescriptor {
- extensionClasses = 'org.apache.groovy.jaxb.extensions.JaxbExtensions'
- }
-}
-
-configurations {
- jaxb
- jaxbRuntime
-}
-
-dependencies {
- implementation rootProject
- testImplementation project(':groovy-test')
- jaxb 'javax.xml.bind:jaxb-api:2.3.0'
- jaxbRuntime 'com.sun.xml.bind:jaxb-core:2.3.0.1'
- jaxbRuntime 'com.sun.xml.bind:jaxb-impl:2.3.0.1'
- jaxbRuntime 'javax.activation:activation:1.1.1'
- if (JavaVersion.current().isJava9Compatible()) {
- spotbugs 'javax.xml.bind:jaxb-api:2.3.0'
- }
-}
-
-if (JavaVersion.current().isJava9Compatible()) {
- configurations {
- implementation.extendsFrom(jaxb)
- runtimeOnly.extendsFrom(jaxbRuntime)
- }
-}
diff --git a/subprojects/groovy-jaxb/src/main/java/org/apache/groovy/jaxb/extensions/JaxbExtensions.java b/subprojects/groovy-jaxb/src/main/java/org/apache/groovy/jaxb/extensions/JaxbExtensions.java
deleted file mode 100644
index 76fe261..0000000
--- a/subprojects/groovy-jaxb/src/main/java/org/apache/groovy/jaxb/extensions/JaxbExtensions.java
+++ /dev/null
@@ -1,83 +0,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.
- */
-package org.apache.groovy.jaxb.extensions;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
-import java.io.StringReader;
-import java.io.StringWriter;
-
-/**
- * This class defines new groovy methods which appear on Jaxb-related JDK
- * classes ({@code JAXBContext}, {@code Marshaller}) inside the Groovy environment.
- * Static methods are used with the first parameter being the destination class.
- */
-public class JaxbExtensions {
-
- /**
- * Marshall an object to a xml {@code String}.
- *
- * @param self a Marshaller which can marshall the type of the given object
- * @param jaxbElement object to marshall to a {@code String}
- * @return {@code String} representing the object as xml
- */
- public static <T> String marshal(Marshaller self, T jaxbElement) throws JAXBException {
- StringWriter sw = new StringWriter();
- self.marshal(jaxbElement, sw);
- return sw.toString();
- }
-
- /**
- * Marshall an object to a xml {@code String}.
- *
- * @param self a JaxbContext, which recognizes the type of the given object
- * @param jaxbElement object to marshall to a {@code String}
- * @return String representing the object as xml
- */
- public static <T> String marshal(JAXBContext self, T jaxbElement) throws JAXBException {
- return marshal(self.createMarshaller(), jaxbElement);
- }
-
- /**
- * Unmarshal xml data from the given {@code String} to object of the given type.
- *
- * @param self Unmarshaller, a Unmarshaller which can unmarshall the type of the given object
- * @param xml xml data as a {@link String}
- * @param declaredType appropriate JAXB mapped class to hold node's xml data
- * @return instance of destination class unmarshalled from xml
- */
- public static <T> T unmarshal(Unmarshaller self, String xml, Class<T> declaredType) throws JAXBException {
- StringReader sr = new StringReader(xml);
- return declaredType.cast(self.unmarshal(sr));
- }
-
- /**
- * Unmarshal xml data from the given {@code String} to object of the given type.
- *
- * @param self a JaxbContext, which recognizes the type of the given object
- * @param xml xml data as a {@link String}
- * @param declaredType appropriate JAXB mapped class to hold node's xml data
- * @return instance of destination class unmarshalled from xml
- */
- public static <T> T unmarshal(JAXBContext self, String xml, Class<T> declaredType) throws JAXBException {
- return unmarshal(self.createUnmarshaller(), xml, declaredType);
- }
-}
diff --git a/subprojects/groovy-jaxb/src/test/groovy/org/apache/groovy/jaxb/extensions/JaxbExtensionsTest.groovy b/subprojects/groovy-jaxb/src/test/groovy/org/apache/groovy/jaxb/extensions/JaxbExtensionsTest.groovy
deleted file mode 100644
index cdeadfa..0000000
--- a/subprojects/groovy-jaxb/src/test/groovy/org/apache/groovy/jaxb/extensions/JaxbExtensionsTest.groovy
+++ /dev/null
@@ -1,41 +0,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.
- */
-package org.apache.groovy.jaxb.extensions
-
-import javax.xml.bind.JAXBContext
-
-import groovy.test.GroovyTestCase
-
-/**
- * Test cases for {@link JaxbExtensions}
- */
-class JaxbExtensionsTest extends GroovyTestCase {
- JAXBContext jaxbContext = JAXBContext.newInstance(Person)
- Person p = new Person(name: 'JT', age: 20)
-
- void testMarshallAndUnmarshallObjectUsingExtensionMethodsForMarshallerAndUnmarshaller() {
- String xml = jaxbContext.createMarshaller().marshal(p)
- assert jaxbContext.createUnmarshaller().unmarshal(xml, Person) == p
- }
-
- void testMarshallAndUnmarshallObjectUsingExtensionMethodsForJaxbContext() {
- String xml = jaxbContext.marshal(p)
- assert jaxbContext.unmarshal(xml, Person) == p
- }
-}
\ No newline at end of file
diff --git a/subprojects/groovy-jaxb/src/test/groovy/org/apache/groovy/jaxb/extensions/Person.groovy b/subprojects/groovy-jaxb/src/test/groovy/org/apache/groovy/jaxb/extensions/Person.groovy
deleted file mode 100644
index a76b3a0..0000000
--- a/subprojects/groovy-jaxb/src/test/groovy/org/apache/groovy/jaxb/extensions/Person.groovy
+++ /dev/null
@@ -1,36 +0,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.
- */
-package org.apache.groovy.jaxb.extensions
-
-import groovy.transform.EqualsAndHashCode
-
-import javax.xml.bind.annotation.XmlAccessType
-import javax.xml.bind.annotation.XmlAccessorType
-import javax.xml.bind.annotation.XmlRootElement
-
-/**
- * DTO class for {@link JaxbExtensionsTest}
- */
-@EqualsAndHashCode
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlRootElement
-class Person {
- String name
- int age
-}