From e242f5db98752c1e646953e2a444544ca07e0432 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Mon, 1 Nov 2021 18:45:45 +0000 Subject: [PATCH] PRODSEC-4343 Build the MMT tool in alfreaco-community-repo so it picks up the latest libraries (#785) The code form MMT comes from this project anyway --- .gitignore | 5 +- mmt/pom.xml | 112 ++++++++++++++++++++ mmt/src/main/resources/LICENSE | 165 ++++++++++++++++++++++++++++++ packaging/docker-alfresco/pom.xml | 1 + pom.xml | 8 +- repository/pom.xml | 2 +- 6 files changed, 284 insertions(+), 9 deletions(-) create mode 100644 mmt/pom.xml create mode 100644 mmt/src/main/resources/LICENSE diff --git a/.gitignore b/.gitignore index 807053c6c5..c1cc042ee9 100644 --- a/.gitignore +++ b/.gitignore @@ -24,16 +24,17 @@ target *.log.* # Mobile Tools for Java (J2ME) - .mtj .tmp/ # Package Files # - *.jar *.war *.ear +# maven-shade-plugin for mmt tool +dependency-reduced-pom.xml + # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* diff --git a/mmt/pom.xml b/mmt/pom.xml new file mode 100644 index 0000000000..3a44af817b --- /dev/null +++ b/mmt/pom.xml @@ -0,0 +1,112 @@ + + 4.0.0 + alfresco-mmt + Alfresco Module Management Tool + jar + + + org.alfresco + alfresco-community-repo + 14.26-SNAPSHOT + + + + + org.alfresco + alfresco-repository + ${project.version} + + + de.schlichtherle.truezip + truezip-driver-zip + ${dependency.truezip.version} + + + de.schlichtherle.truezip + truezip-file + ${dependency.truezip.version} + + + org.apache.maven + maven-artifact + ${dependency.maven-artifact.version} + + + + + + + maven-shade-plugin + + + make-mmt + + shade + + + + + + + + org.alfresco.repo.module.tool.ModuleManagementTool + + + + + + de.schlichtherle.truezip:* + org.alfresco:alfresco-core + org.alfresco:alfresco-repository + org.apache.commons:commons-compress + org.safehaus.jug:jug + org.alfresco.surf:spring-surf-core + org.tukaani:xz + org.apache.maven:maven-artifact + + + + + org.alfresco:alfresco-core + + org/alfresco/error/AlfrescoRuntimeException.class + org/alfresco/util/Pair.class + org/alfresco/util/EqualsHelper.class + org/alfresco/util/VersionNumber.class + + + + org.apache.maven:maven-artifact + + org/apache/maven/artifact/versioning/**/*.class + + + + org.alfresco:alfresco-repository + + org/alfresco/repo/module/tool/default-file-mapping.properties + org/alfresco/repo/module/**/*.class + org/alfresco/service/cmr/module/**/*.class + + + + org.alfresco.surf:spring-surf-core + + org/springframework/extensions/surf/util/I18NUtil.class + org/springframework/extensions/surf/util/ISO8601DateFormat.class + org/springframework/extensions/surf/exception/PlatformRuntimeException.class + + + + + de.schlichtherle.truezip:truezip-driver-zip + + META-INF/services/de.schlichtherle.truezip.fs.spi.FsDriverService + + + + + + + + diff --git a/mmt/src/main/resources/LICENSE b/mmt/src/main/resources/LICENSE new file mode 100644 index 0000000000..e8bec28dfa --- /dev/null +++ b/mmt/src/main/resources/LICENSE @@ -0,0 +1,165 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 967d8a650f..645ce50146 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -71,6 +71,7 @@ org.alfresco alfresco-mmt jar + ${project.version} false ${project.build.directory}/alfresco-mmt diff --git a/pom.xml b/pom.xml index f3d9e8b507..d58f4a883a 100644 --- a/pom.xml +++ b/pom.xml @@ -17,6 +17,7 @@ data-model repository remote-api + mmt packaging amps @@ -43,7 +44,6 @@ ${project.build.directory}/alf_data 1.0.12 - 6.0 2.4.1 7.1 6.0.1 @@ -90,6 +90,7 @@ 3.38.0 1.0.52 3.1.1 + 3.8.3 2.3.3 2.3.3 @@ -289,11 +290,6 @@ - - org.alfresco - alfresco-mmt - ${dependency.alfresco-mmt.version} - org.alfresco alfresco-server-root diff --git a/repository/pom.xml b/repository/pom.xml index 9282d8a72b..1377b1948e 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -191,7 +191,7 @@ org.apache.maven maven-artifact - 3.8.3 + ${dependency.maven-artifact.version} de.schlichtherle.truezip