SLFO-pool/modello
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync from SUSE:SLFO:Main modello revision fb7edfa9056da8c422f5f841ce3a73ad

Browse Source
This commit is contained in:
Adrian Schröter 2024-05-03 16:47:46 +02:00
commit fffd3ea58d
11 changed files with 1126 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
.gitattributes vendored Normal file
View File

@ -0,0 +1,23 @@
## Default LFS
*.7z filter=lfs diff=lfs merge=lfs -text
*.bsp filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text
*.gem filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text
*.jar filter=lfs diff=lfs merge=lfs -text
*.lz filter=lfs diff=lfs merge=lfs -text
*.lzma filter=lfs diff=lfs merge=lfs -text
*.obscpio filter=lfs diff=lfs merge=lfs -text
*.oxt filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.rpm filter=lfs diff=lfs merge=lfs -text
*.tbz filter=lfs diff=lfs merge=lfs -text
*.tbz2 filter=lfs diff=lfs merge=lfs -text
*.tgz filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
*.txz filter=lfs diff=lfs merge=lfs -text
*.whl filter=lfs diff=lfs merge=lfs -text
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text

184
0001-Revert-Switch-to-codehaus-plexus-build-api-1.2.0-345.patch Normal file
View File

@ -0,0 +1,184 @@
From f892c4e5906fcacaec99a146a2a36dd4ca5d5166 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Sun, 27 Aug 2023 07:49:01 +0200
Subject: [PATCH] Revert "Switch to codehaus plexus-build-api 1.2.0 (#345)"
This reverts commit c689155598257f225963b9332f57fe72dfd78753.
---
modello-core/pom.xml | 2 +-
.../codehaus/modello/plugin/AbstractModelloGenerator.java | 2 +-
modello-maven-plugin/pom.xml | 2 +-
.../modello/maven/AbstractModelloGeneratorMojo.java | 2 +-
.../codehaus/modello/maven/ModelloConvertersMojoTest.java | 8 +-------
.../org/codehaus/modello/maven/ModelloJavaMojoTest.java | 8 +-------
modello-plugins/modello-plugin-java/pom.xml | 2 +-
.../codehaus/modello/AbstractModelloGeneratorTest.java | 6 ------
pom.xml | 4 ++--
9 files changed, 9 insertions(+), 27 deletions(-)
diff --git a/modello-core/pom.xml b/modello-core/pom.xml
index 636c03fe..7f9adf39 100644
--- a/modello-core/pom.xml
+++ b/modello-core/pom.xml
@@ -13,7 +13,7 @@
<dependencies>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
+ <groupId>org.sonatype.plexus</groupId>
<artifactId>plexus-build-api</artifactId>
</dependency>
<dependency>
diff --git a/modello-core/src/main/java/org/codehaus/modello/plugin/AbstractModelloGenerator.java b/modello-core/src/main/java/org/codehaus/modello/plugin/AbstractModelloGenerator.java
index bb59b439..334e16e8 100644
--- a/modello-core/src/main/java/org/codehaus/modello/plugin/AbstractModelloGenerator.java
+++ b/modello-core/src/main/java/org/codehaus/modello/plugin/AbstractModelloGenerator.java
@@ -43,7 +43,6 @@ import org.codehaus.modello.model.ModelField;
import org.codehaus.modello.model.Version;
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;
-import org.codehaus.plexus.build.BuildContext;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.context.Context;
import org.codehaus.plexus.context.ContextException;
@@ -51,6 +50,7 @@ import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.io.CachingWriter;
+import org.sonatype.plexus.build.incremental.BuildContext;
/**
* @author <a href="mailto:jason@modello.org">Jason van Zyl</a>
diff --git a/modello-maven-plugin/pom.xml b/modello-maven-plugin/pom.xml
index 3687fb05..57227449 100644
--- a/modello-maven-plugin/pom.xml
+++ b/modello-maven-plugin/pom.xml
@@ -121,7 +121,7 @@
<artifactId>modello-plugin-velocity</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
+ <groupId>org.sonatype.plexus</groupId>
<artifactId>plexus-build-api</artifactId>
</dependency>
</dependencies>
diff --git a/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/AbstractModelloGeneratorMojo.java b/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/AbstractModelloGeneratorMojo.java
index 762b5784..51b75a12 100644
--- a/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/AbstractModelloGeneratorMojo.java
+++ b/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/AbstractModelloGeneratorMojo.java
@@ -41,8 +41,8 @@ import org.codehaus.modello.ModelloParameterConstants;
import org.codehaus.modello.core.ModelloCore;
import org.codehaus.modello.model.Model;
import org.codehaus.modello.model.ModelValidationException;
-import org.codehaus.plexus.build.BuildContext;
import org.codehaus.plexus.util.StringUtils;
+import org.sonatype.plexus.build.incremental.BuildContext;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
diff --git a/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloConvertersMojoTest.java b/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloConvertersMojoTest.java
index 779f178d..23f466d3 100644
--- a/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloConvertersMojoTest.java
+++ b/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloConvertersMojoTest.java
@@ -26,10 +26,9 @@ import java.io.File;
import java.util.Arrays;
import org.codehaus.modello.core.ModelloCore;
-import org.codehaus.plexus.ContainerConfiguration;
import org.codehaus.plexus.PlexusTestCase;
-import org.codehaus.plexus.build.BuildContext;
import org.codehaus.plexus.util.FileUtils;
+import org.sonatype.plexus.build.incremental.BuildContext;
/**
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
@@ -99,9 +98,4 @@ public class ModelloConvertersMojoTest extends PlexusTestCase {
assertFalse("The generated java file doesn't exist: '" + javaFile.getAbsolutePath() + "'.", javaFile.exists());
}
-
- @Override
- protected void customizeContainerConfiguration(ContainerConfiguration containerConfiguration) {
- containerConfiguration.setClassPathScanning("cache");
- }
}
diff --git a/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloJavaMojoTest.java b/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloJavaMojoTest.java
index f15b4031..bb5bb7cf 100644
--- a/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloJavaMojoTest.java
+++ b/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloJavaMojoTest.java
@@ -26,10 +26,9 @@ import java.io.File;
import java.util.Arrays;
import org.codehaus.modello.core.ModelloCore;
-import org.codehaus.plexus.ContainerConfiguration;
import org.codehaus.plexus.PlexusTestCase;
-import org.codehaus.plexus.build.BuildContext;
import org.codehaus.plexus.util.FileUtils;
+import org.sonatype.plexus.build.incremental.BuildContext;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
@@ -97,9 +96,4 @@ public class ModelloJavaMojoTest extends PlexusTestCase {
assertFalse(
"The generated java file shouldn't exist: '" + javaFile.getAbsolutePath() + "'.", javaFile.exists());
}
-
- @Override
- protected void customizeContainerConfiguration(ContainerConfiguration containerConfiguration) {
- containerConfiguration.setClassPathScanning("cache");
- }
}
diff --git a/modello-plugins/modello-plugin-java/pom.xml b/modello-plugins/modello-plugin-java/pom.xml
index ea94c3c6..6ba7c01f 100644
--- a/modello-plugins/modello-plugin-java/pom.xml
+++ b/modello-plugins/modello-plugin-java/pom.xml
@@ -17,7 +17,7 @@
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
+ <groupId>org.sonatype.plexus</groupId>
<artifactId>plexus-build-api</artifactId>
</dependency>
diff --git a/modello-test/src/main/java/org/codehaus/modello/AbstractModelloGeneratorTest.java b/modello-test/src/main/java/org/codehaus/modello/AbstractModelloGeneratorTest.java
index f46cece1..e71231fb 100644
--- a/modello-test/src/main/java/org/codehaus/modello/AbstractModelloGeneratorTest.java
+++ b/modello-test/src/main/java/org/codehaus/modello/AbstractModelloGeneratorTest.java
@@ -32,7 +32,6 @@ import java.io.Reader;
import java.util.Optional;
import java.util.Properties;
-import org.codehaus.plexus.ContainerConfiguration;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.ReaderFactory;
@@ -108,9 +107,4 @@ public abstract class AbstractModelloGeneratorTest extends PlexusTestCase {
new File(getOutputDirectory(), generatedXsdName));
return saxParser;
}
-
- @Override
- protected void customizeContainerConfiguration(ContainerConfiguration containerConfiguration) {
- containerConfiguration.setClassPathScanning("cache");
- }
}
diff --git a/pom.xml b/pom.xml
index 88f8ed6f..9a4ac6df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -347,9 +347,9 @@
<version>4.0.0</version>
</dependency>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
+ <groupId>org.sonatype.plexus</groupId>
<artifactId>plexus-build-api</artifactId>
- <version>1.2.0</version>
+ <version>0.0.7</version>
</dependency>
<dependency>
<groupId>junit</groupId>
--
2.41.0

202
LICENSE-2.0.txt Normal file
View File

@ -0,0 +1,202 @@
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.

4
_multibuild Normal file
View File

@ -0,0 +1,4 @@
<multibuild>
<package>modello-maven-plugin</package>
</multibuild>

BIN
modello-2.1.2-source-release.zip (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
modello-build.tar.xz (Stored with Git LFS) Normal file
View File

Binary file not shown.

35
modello-cli-domasxpp3.patch Normal file
View File

@ -0,0 +1,35 @@
--- modello-2.1.2/modello-core/src/main/java/org/codehaus/modello/ModelloCli.java 2023-09-04 23:38:10.194571922 +0200
+++ modello-2.1.2/modello-core/src/main/java/org/codehaus/modello/ModelloCli.java 2023-09-05 12:10:26.198361088 +0200
@@ -105,11 +105,24 @@
System.exit(1);
}
+ if ( StringUtils.equalsIgnoreCase( javaSource, "true" ) || StringUtils.equalsIgnoreCase( javaSource, "false" ) ) {
+ // The old useJava5 parameter at this position
+ System.err.println( "Missing required parameter: Java Source (replacing the old \"Use Java5\" parameter)" );
+
+ usage();
+
+ System.exit( 1 );
+ }
+
parameters.setProperty(ModelloParameterConstants.OUTPUT_JAVA_SOURCE, javaSource);
if (args.length > 6) {
parameters.setProperty(ModelloParameterConstants.ENCODING, args[6]);
}
+
+ if ( args.length > 7 ) {
+ parameters.setProperty( ModelloParameterConstants.DOM_AS_XPP3, args[7] );
+ }
}
// ----------------------------------------------------------------------
@@ -118,6 +131,6 @@
private static void usage() {
System.err.println("Usage: modello <model> <outputType> <output directory> <modelVersion> <packageWithVersion>"
- + "<javaSource> [<encoding>]");
+ + " <javaSource> [<encoding> [<domAsXpp3>]]" );
}
}

172
modello-maven-plugin.changes Normal file
View File

@ -0,0 +1,172 @@
-------------------------------------------------------------------
Wed Sep 6 14:43:46 UTC 2023 - Fridrich Strba <fstrba@suse.com>
- Upgrade to upstream version 2.1.2
* Changes of version 2.1.2
+ Switch to codehaus plexus-build-api 1.2.0 (reverted by a
patch in this package)
+ Add plexus 13 parent and reformat
+ Remove readonly flag from basedir: support .mdo from any
location
+ Require Maven 3.5.4+
+ Prepare to run with Java 19+
* Changes of version 2.1.1
+ replace generatedBy context value by template
+ add velocityBasedir to select where to load (shared) .vm from
* Changes of version 2.1.0
+ Make the Xpp3Reader#read(XmlPullParser, boolean strict) public
+ Fix json encoding
+ Support arbitrary element names via 'xs:any'
+ Call setter only after object has been populated
+ replace handwritten components.xml with annotations
+ Optionally enforce required elements in XSDs
+ Add a velocity template based generator
+ Use optimised plexus-utils CachingWriter
- Added patch:
* 0001-Revert-Switch-to-codehaus-plexus-build-api-1.2.0-345.patch
+ use the version of plexus-build-api that we have packaged
- Modified patch:
* modello-cli-domasxpp3.patch
+ rediff to changed context
-------------------------------------------------------------------
Fri May 13 08:54:49 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Upgrade to upstream version 2.0.0
* New features and improvements
+ Add Modello 2.0.0 model XSD
+ Manage xdoc anchor name conflicts (2 classes with same anchor)
+ Drop unnecessary check for identical branches
+ Require Maven 3.1.1
+ Use a caching writer to avoid overwriting identical files
+ Migrate from codehaus:wstx to
com.fasterxml.woodstox:woodstox-core 6.2.4
+ Make location handling more memory efficient
+ Xpp3 extended writer
+ Refactor some old java APIs usage
+ Add a new field fileComment
* Bug Fixes
+ Fix javaSource default value
+ Fix modello-plugin-snakeyaml
* Dependency updates
+ Bump maven-javadoc-plugin from 3.3.1 to 3.3.2
+ Bump release-drafter/release-drafter from 5.17.6 to 5.18.0
+ Bump taglist-maven-plugin from 2.4 to 3.0.0
+ Bump checkstyle from 9.2.1 to 9.3
+ Bump xmlunit-core from 2.8.4 to 2.9.0
+ Bump junit from 4.12 to 4.13.1 in
/modello-maven-plugin/src/it/maven-model
+ Bump xercesImpl from 2.12.1 to 2.12.2 in
/modello-plugins/modello-plugin-xsd
+ Bump xercesImpl from 2.12.1 to 2.12.2 in
/modello-plugins/modello-plugin-jsonschema
+ Bump mavenPluginTools from 3.6.2 to 3.6.4
+ Bump maven-compiler-plugin from 3.8.1 to 3.9.0
+ Bump maven-jar-plugin from 3.2.0 to 3.2.2
+ Bump release-drafter/release-drafter from 5.15.0 to 5.17.6
+ Bump woodstox-core from 6.2.7 to 6.2.8
+ Bump maven-release-plugin from 3.0.0-M4 to 3.0.0-M5
+ Bump checkstyle from 9.2 to 9.2.1
+ Bump maven-site-plugin from 3.9.1 to 3.10.0
+ Bump snakeyaml from 1.29 to 1.30
+ Bump jackson-bom from 2.13.0 to 2.13.1
+ Bump xmlunit-core from 2.8.3 to 2.8.4
+ Bump plexus-compiler-javac from 2.8.8 to 2.9.0
+ Bump woodstox-core from 6.2.6 to 6.2.7
+ Bump maven-shared-resources from 3 to 4
+ Bump plexus-compiler-api from 2.8.8 to 2.9.0
+ Bump mavenPluginTools from 3.6.1 to 3.6.2
+ Bump checkstyle from 9.0.1 to 9.2
+ Bump xmlunit-core from 2.8.2 to 2.8.3
+ Bump checkstyle from 9.0 to 9.0.1
+ Bump checkstyle from 8.45.1 to 9.0
+ Bump jackson-bom from 2.12.5 to 2.13.0
+ Bump org.eclipse.sisu.plexus from 0.3.4 to 0.3.5
+ Bump jsoup from 1.14.2 to 1.14.3
+ Bump actions/setup-java from 2.3.0 to 2.3.1
+ Bump maven-pmd-plugin from 3.14.0 to 3.15.0
+ Bump maven-javadoc-plugin from 3.3.0 to 3.3.1
+ Bump plexus-utils from 3.2.0 to 3.4.1
+ Bump jackson-bom from 2.12.4 to 2.12.5
+ Bump actions/setup-java from 2.2.0 to 2.3.0
+ Bump checkstyle from 8.42 to 8.45.1
+ Bump plexus-velocity from 1.2 to 1.3
+ Bump maven-enforcer-plugin from 3.0.0-M3 to 3.0.0
+ Bump jackson-bom from 2.12.3 to 2.12.4
+ Bump stax2-api from 4.2 to 4.2.1
+ Bump actions/setup-java from 1 to 2.2.0
+ Bump actions/setup-java from 1 to 2.2.0
+ Bump maven-gpg-plugin from 1.6 to 3.0.1
+ Bump woodstox-core from 6.2.4 to 6.2.6
+ Bump maven-dependency-plugin from 3.1.2 to 3.2.0
+ Bump maven-javadoc-plugin from 3.2.0 to 3.3.0
+ Bump snakeyaml from 1.28 to 1.29
+ Bump maven-project-info-reports-plugin from 3.1.1 to 3.1.2
+ Bump actions/cache from 2.1.5 to 2.1.6
+ Bump maven-assembly-plugin from 3.2.0 to 3.3.0
+ Bump maven-jxr-plugin from 3.0.0 to 3.1.1
+ Bump xercesImpl from 2.12.0 to 2.12.1
+ [Snyk] Security upgrade org.jsoup:jsoup from 1.13.1 to 1.14.2
+ Bump actions/checkout from 2 to 2.3.4
+ Bump xmlunit-core from 2.8.1 to 2.8.2
+ Bump maven-surefire-report-plugin from 2.22.1 to 2.22.2
+ Bump maven-scm-publish-plugin from 3.0.0 to 3.1.0
+ Bump snakeyaml from 1.26 to 1.28
+ Bump maven-verifier-plugin from 1.0 to 1.1
+ Bump xml-apis from 1.3.04 to 2.0.2
+ Bump jackson-bom from 2.11.3 to 2.12.3
+ Bump xmlunit from 1.2 to 1.6
+ Bump plexus-compiler-javac from 2.1 to 2.8.8
+ Bump actions/cache from v2.1.4 to v2.1.5
+ Bump release-drafter/release-drafter from v5.12.1 to v5.15.0
+ Bump maven-site-plugin from 3.7.1 to 3.9.1
+ Bump maven-jxr-plugin from 2.5 to 3.0.0
+ Bump actions/cache from v2.1.3 to v2.1.4
+ Bump maven-surefire-plugin from 2.22.1 to 2.22.2
+ Bump plexus-compiler-api from 2.1 to 2.8.8
+ Bump maven-resources-plugin from 3.0.1 to 3.2.0
+ Bump release-drafter/release-drafter from v5.11.0 to v5.12.1
+ Bump xmlunit-core from 2.7.0 to 2.8.1
+ Bump actions/cache from v2.1.2 to v2.1.3
+ Bump jaxb-api from 2.1 to 2.3.1
+ Bump junit from 4.12 to 4.13.1
+ Bump actions/cache from v2.1.0 to v2.1.2
+ Bump maven-checkstyle-plugin from 2.15 to 3.1.1
+ Bump xercesImpl from 2.8.1 to 2.12.0 in
/modello-plugins/modello-plugin-jsonschema
+ Bump xercesImpl from 2.8.1 to 2.12.0 in
/modello-plugins/modello-plugin-xsd
+ Bump xercesImpl from 2.8.1 to 2.12.0
+ Bump xmlunit-core from 2.3.0 to 2.7.0
+ Bump snakeyaml from 1.12 to 1.26
+ Bump maven-compiler-plugin from 3.8.0 to 3.8.1
+ Bump maven-dependency-plugin from 2.1 to 3.1.2
+ Bump persistence-api from 1.0 to 1.0.2
+ Bump maven-enforcer-plugin from 3.0.0-M1 to 3.0.0-M3
+ Bump maven-pmd-plugin from 3.11.0 to 3.13.0
+ Bump maven-clean-plugin from 3.0.0 to 3.1.0
* Documentation updates
+ codehaus is dead
+ remove defunct mailing list info
-------------------------------------------------------------------
Tue Mar 22 14:07:46 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Build with java source and target levels 8
-------------------------------------------------------------------
Mon Apr 26 10:52:49 UTC 2021 - Fridrich Strba <fstrba@suse.com>
- Upgrade to upstream version 1.11
- Depend on the jackson and jsonschema plugins too
-------------------------------------------------------------------
Thu Nov 21 14:59:57 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Upgrade to upstream version 1.10.0
-------------------------------------------------------------------
Tue Mar 12 08:34:05 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Initial packaging of modello-maven-plugin separate package
* Allows building the rest of modello without needing maven

125
modello-maven-plugin.spec Normal file
View File

@ -0,0 +1,125 @@
#
# spec file
#
# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%global parent modello
%global subname maven-plugin
Name: %{parent}-%{subname}
Version: 2.1.2
Release: 0
Summary: Modello Maven Plugin
License: Apache-2.0 AND MIT
Group: Development/Libraries/Java
URL: https://codehaus-plexus.github.io/modello/modello-maven-plugin
Source0: https://repo1.maven.org/maven2/org/codehaus/%{parent}/%{parent}/%{version}/%{parent}-%{version}-source-release.zip
Source1: https://www.apache.org/licenses/LICENSE-2.0.txt
Patch0: modello-cli-domasxpp3.patch
Patch1: 0001-Revert-Switch-to-codehaus-plexus-build-api-1.2.0-345.patch
BuildRequires: fdupes
BuildRequires: maven-local
BuildRequires: unzip
BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin)
BuildRequires: mvn(org.apache.maven:maven-core)
BuildRequires: mvn(org.apache.maven:maven-model)
BuildRequires: mvn(org.apache.maven:maven-plugin-api)
BuildRequires: mvn(org.codehaus.modello:modello-core) = %{version}
BuildRequires: mvn(org.codehaus.modello:modello-plugin-converters) = %{version}
BuildRequires: mvn(org.codehaus.modello:modello-plugin-dom4j) = %{version}
BuildRequires: mvn(org.codehaus.modello:modello-plugin-java) = %{version}
BuildRequires: mvn(org.codehaus.modello:modello-plugin-jdom) = %{version}
BuildRequires: mvn(org.codehaus.modello:modello-plugin-sax) = %{version}
BuildRequires: mvn(org.codehaus.modello:modello-plugin-stax) = %{version}
BuildRequires: mvn(org.codehaus.modello:modello-plugin-xdoc) = %{version}
BuildRequires: mvn(org.codehaus.modello:modello-plugin-xpp3) = %{version}
BuildRequires: mvn(org.codehaus.modello:modello-plugin-xsd) = %{version}
BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata)
BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
BuildRequires: mvn(org.codehaus.plexus:plexus:pom:)
BuildRequires: mvn(org.sonatype.plexus:plexus-build-api)
#!BuildRequires: maven-compiler-plugin-bootstrap
#!BuildRequires: maven-jar-plugin-bootstrap
#!BuildRequires: maven-javadoc-plugin-bootstrap
#!BuildRequires: maven-plugin-plugin-bootstrap
#!BuildRequires: maven-resources-plugin-bootstrap
#!BuildRequires: maven-surefire-plugin-bootstrap
BuildArch: noarch
%description
Modello is a Data Model toolkit in use by the Apache Maven Project.
Modello is a framework for code generation from a simple model.
Modello generates code from a simple model format based on a plugin
architecture, various types of code and descriptors can be generated
from the single model, including Java POJOs, XML
marshallers/unmarshallers, XSD and documentation.
Modello Maven Plugin enables the use of Modello in Maven builds.
%package javadoc
Summary: Javadoc for %{name}
Group: Documentation/HTML
%description javadoc
API documentation for %{name}.
%prep
%setup -q -n %{parent}-%{version}
%patch0 -p1
%patch1 -p1
cp -p %{SOURCE1} LICENSE
%pom_remove_plugin :maven-site-plugin
%pom_remove_plugin :maven-enforcer-plugin
%pom_remove_dep :plexus-xml modello-core
%pom_remove_dep :sisu-guice modello-core
%pom_add_dep com.google.inject:guice modello-core
%pom_remove_dep :jackson-bom
%pom_disable_module modello-plugin-jackson modello-plugins
%pom_disable_module modello-plugin-jsonschema modello-plugins
%pom_disable_module modello-plugin-snakeyaml modello-plugins
%pom_disable_module modello-plugin-velocity modello-plugins
%pom_remove_dep :modello-plugin-jackson modello-maven-plugin
%pom_remove_dep :modello-plugin-jsonschema modello-maven-plugin
%pom_remove_dep :modello-plugin-snakeyaml modello-maven-plugin
%pom_remove_dep :modello-plugin-velocity modello-maven-plugin
rm -f modello-maven-plugin/src/main/java/org/codehaus/modello/maven/ModelloVelocityMojo.java
%pom_disable_module modello-test
%build
pushd %{name}
%{mvn_build} -f -- -Dsource=8
popd
%install
pushd %{name}
%mvn_install
popd
%fdupes -s %{buildroot}%{_javadocdir}
%files -f %{name}/.mfiles
%license LICENSE
%files javadoc -f %{name}/.mfiles-javadoc
%license LICENSE
%changelog

196
modello.changes Normal file
View File

@ -0,0 +1,196 @@
-------------------------------------------------------------------
Mon Sep 11 16:10:44 UTC 2023 - Fridrich Strba <fstrba@suse.com>
- Cleanup unnecessary dependencies
-------------------------------------------------------------------
Wed Sep 6 14:43:46 UTC 2023 - Fridrich Strba <fstrba@suse.com>
- Upgrade to upstream version 2.1.2
* Changes of version 2.1.2
+ Switch to codehaus plexus-build-api 1.2.0 (reverted by a
patch in this package)
+ Add plexus 13 parent and reformat
+ Remove readonly flag from basedir: support .mdo from any
location
+ Require Maven 3.5.4+
+ Prepare to run with Java 19+
* Changes of version 2.1.1
+ replace generatedBy context value by template
+ add velocityBasedir to select where to load (shared) .vm from
* Changes of version 2.1.0
+ Make the Xpp3Reader#read(XmlPullParser, boolean strict) public
+ Fix json encoding
+ Support arbitrary element names via 'xs:any'
+ Call setter only after object has been populated
+ replace handwritten components.xml with annotations
+ Optionally enforce required elements in XSDs
+ Add a velocity template based generator
+ Use optimised plexus-utils CachingWriter
- Added patch:
* 0001-Revert-Switch-to-codehaus-plexus-build-api-1.2.0-345.patch
+ use the version of plexus-build-api that we have packaged
- Modified patch:
* modello-cli-domasxpp3.patch
+ rediff to changed context
-------------------------------------------------------------------
Thu May 4 14:27:26 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
- Add _multibuild to define 2nd spec file as additional flavor.
Eliminates the need for source package links in OBS.
-------------------------------------------------------------------
Fri May 13 08:52:25 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Upgrade to upstream version 2.0.0
* New features and improvements
+ Add Modello 2.0.0 model XSD
+ Manage xdoc anchor name conflicts (2 classes with same anchor)
+ Drop unnecessary check for identical branches
+ Require Maven 3.1.1
+ Use a caching writer to avoid overwriting identical files
+ Migrate from codehaus:wstx to
com.fasterxml.woodstox:woodstox-core 6.2.4
+ Make location handling more memory efficient
+ Xpp3 extended writer
+ Refactor some old java APIs usage
+ Add a new field fileComment
* Bug Fixes
+ Fix javaSource default value
+ Fix modello-plugin-snakeyaml
* Dependency updates
+ Bump maven-javadoc-plugin from 3.3.1 to 3.3.2
+ Bump release-drafter/release-drafter from 5.17.6 to 5.18.0
+ Bump taglist-maven-plugin from 2.4 to 3.0.0
+ Bump checkstyle from 9.2.1 to 9.3
+ Bump xmlunit-core from 2.8.4 to 2.9.0
+ Bump junit from 4.12 to 4.13.1 in
/modello-maven-plugin/src/it/maven-model
+ Bump xercesImpl from 2.12.1 to 2.12.2 in
/modello-plugins/modello-plugin-xsd
+ Bump xercesImpl from 2.12.1 to 2.12.2 in
/modello-plugins/modello-plugin-jsonschema
+ Bump mavenPluginTools from 3.6.2 to 3.6.4
+ Bump maven-compiler-plugin from 3.8.1 to 3.9.0
+ Bump maven-jar-plugin from 3.2.0 to 3.2.2
+ Bump release-drafter/release-drafter from 5.15.0 to 5.17.6
+ Bump woodstox-core from 6.2.7 to 6.2.8
+ Bump maven-release-plugin from 3.0.0-M4 to 3.0.0-M5
+ Bump checkstyle from 9.2 to 9.2.1
+ Bump maven-site-plugin from 3.9.1 to 3.10.0
+ Bump snakeyaml from 1.29 to 1.30
+ Bump jackson-bom from 2.13.0 to 2.13.1
+ Bump xmlunit-core from 2.8.3 to 2.8.4
+ Bump plexus-compiler-javac from 2.8.8 to 2.9.0
+ Bump woodstox-core from 6.2.6 to 6.2.7
+ Bump maven-shared-resources from 3 to 4
+ Bump plexus-compiler-api from 2.8.8 to 2.9.0
+ Bump mavenPluginTools from 3.6.1 to 3.6.2
+ Bump checkstyle from 9.0.1 to 9.2
+ Bump xmlunit-core from 2.8.2 to 2.8.3
+ Bump checkstyle from 9.0 to 9.0.1
+ Bump checkstyle from 8.45.1 to 9.0
+ Bump jackson-bom from 2.12.5 to 2.13.0
+ Bump org.eclipse.sisu.plexus from 0.3.4 to 0.3.5
+ Bump jsoup from 1.14.2 to 1.14.3
+ Bump actions/setup-java from 2.3.0 to 2.3.1
+ Bump maven-pmd-plugin from 3.14.0 to 3.15.0
+ Bump maven-javadoc-plugin from 3.3.0 to 3.3.1
+ Bump plexus-utils from 3.2.0 to 3.4.1
+ Bump jackson-bom from 2.12.4 to 2.12.5
+ Bump actions/setup-java from 2.2.0 to 2.3.0
+ Bump checkstyle from 8.42 to 8.45.1
+ Bump plexus-velocity from 1.2 to 1.3
+ Bump maven-enforcer-plugin from 3.0.0-M3 to 3.0.0
+ Bump jackson-bom from 2.12.3 to 2.12.4
+ Bump stax2-api from 4.2 to 4.2.1
+ Bump actions/setup-java from 1 to 2.2.0
+ Bump actions/setup-java from 1 to 2.2.0
+ Bump maven-gpg-plugin from 1.6 to 3.0.1
+ Bump woodstox-core from 6.2.4 to 6.2.6
+ Bump maven-dependency-plugin from 3.1.2 to 3.2.0
+ Bump maven-javadoc-plugin from 3.2.0 to 3.3.0
+ Bump snakeyaml from 1.28 to 1.29
+ Bump maven-project-info-reports-plugin from 3.1.1 to 3.1.2
+ Bump actions/cache from 2.1.5 to 2.1.6
+ Bump maven-assembly-plugin from 3.2.0 to 3.3.0
+ Bump maven-jxr-plugin from 3.0.0 to 3.1.1
+ Bump xercesImpl from 2.12.0 to 2.12.1
+ [Snyk] Security upgrade org.jsoup:jsoup from 1.13.1 to 1.14.2
+ Bump actions/checkout from 2 to 2.3.4
+ Bump xmlunit-core from 2.8.1 to 2.8.2
+ Bump maven-surefire-report-plugin from 2.22.1 to 2.22.2
+ Bump maven-scm-publish-plugin from 3.0.0 to 3.1.0
+ Bump snakeyaml from 1.26 to 1.28
+ Bump maven-verifier-plugin from 1.0 to 1.1
+ Bump xml-apis from 1.3.04 to 2.0.2
+ Bump jackson-bom from 2.11.3 to 2.12.3
+ Bump xmlunit from 1.2 to 1.6
+ Bump plexus-compiler-javac from 2.1 to 2.8.8
+ Bump actions/cache from v2.1.4 to v2.1.5
+ Bump release-drafter/release-drafter from v5.12.1 to v5.15.0
+ Bump maven-site-plugin from 3.7.1 to 3.9.1
+ Bump maven-jxr-plugin from 2.5 to 3.0.0
+ Bump actions/cache from v2.1.3 to v2.1.4
+ Bump maven-surefire-plugin from 2.22.1 to 2.22.2
+ Bump plexus-compiler-api from 2.1 to 2.8.8
+ Bump maven-resources-plugin from 3.0.1 to 3.2.0
+ Bump release-drafter/release-drafter from v5.11.0 to v5.12.1
+ Bump xmlunit-core from 2.7.0 to 2.8.1
+ Bump actions/cache from v2.1.2 to v2.1.3
+ Bump jaxb-api from 2.1 to 2.3.1
+ Bump junit from 4.12 to 4.13.1
+ Bump actions/cache from v2.1.0 to v2.1.2
+ Bump maven-checkstyle-plugin from 2.15 to 3.1.1
+ Bump xercesImpl from 2.8.1 to 2.12.0 in
/modello-plugins/modello-plugin-jsonschema
+ Bump xercesImpl from 2.8.1 to 2.12.0 in
/modello-plugins/modello-plugin-xsd
+ Bump xercesImpl from 2.8.1 to 2.12.0
+ Bump xmlunit-core from 2.3.0 to 2.7.0
+ Bump snakeyaml from 1.12 to 1.26
+ Bump maven-compiler-plugin from 3.8.0 to 3.8.1
+ Bump maven-dependency-plugin from 2.1 to 3.1.2
+ Bump persistence-api from 1.0 to 1.0.2
+ Bump maven-enforcer-plugin from 3.0.0-M1 to 3.0.0-M3
+ Bump maven-pmd-plugin from 3.11.0 to 3.13.0
+ Bump maven-clean-plugin from 3.0.0 to 3.1.0
* Documentation updates
+ codehaus is dead
+ remove defunct mailing list info
- Modified patch:
* Adapt to the change of parameter from useJava5 to javaSource
-------------------------------------------------------------------
Tue Mar 22 14:07:24 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Build with java source and target levels 8
-------------------------------------------------------------------
Mon Apr 26 10:52:49 UTC 2021 - Fridrich Strba <fstrba@suse.com>
- Upgrade to upstream version 1.11
- Build the jackson and jsonschema plugins too
-------------------------------------------------------------------
Thu Nov 21 14:58:23 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Upgrade to upstream version 1.10.0
- Modified patch:
* modello-cli-domasxpp3.patch
+ rediff to changed line endings
-------------------------------------------------------------------
Fri Mar 15 14:15:55 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Added patch:
* modello-cli-domasxpp3.patch
+ allow setting on command-line the domAsXpp3 property that
modello-maven-plugin can set in pom.xml file
-------------------------------------------------------------------
Tue Mar 12 08:12:31 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Initial packaging of modello 1.9.1
- Generate and customize ant build files

179
modello.spec Normal file
View File

@ -0,0 +1,179 @@
#
# spec file for package modello
#
# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: modello
Version: 2.1.2
Release: 0
Summary: Modello Data Model toolkit
License: Apache-2.0 AND MIT
Group: Development/Libraries/Java
URL: https://codehaus-plexus.github.io/modello
Source0: https://repo1.maven.org/maven2/org/codehaus/%{name}/%{name}/%{version}/%{name}-%{version}-source-release.zip
Source1: https://www.apache.org/licenses/LICENSE-2.0.txt
Source100: %{name}-build.tar.xz
Patch0: modello-cli-domasxpp3.patch
Patch1: 0001-Revert-Switch-to-codehaus-plexus-build-api-1.2.0-345.patch
BuildRequires: ant
BuildRequires: aopalliance
BuildRequires: atinject
BuildRequires: fdupes
BuildRequires: google-guice
BuildRequires: guava
BuildRequires: javapackages-local >= 6
BuildRequires: jsoup
BuildRequires: plexus-build-api
BuildRequires: plexus-classworlds
BuildRequires: plexus-containers-component-annotations
BuildRequires: plexus-metadata-generator
BuildRequires: plexus-utils
BuildRequires: sisu-plexus
BuildRequires: unzip
Requires: aopalliance
Requires: atinject
Requires: google-guice
Requires: guava
Requires: javapackages-tools
Requires: plexus-build-api
Requires: plexus-classworlds
Requires: plexus-containers-component-annotations
Requires: plexus-utils
Requires: sisu-inject
Requires: sisu-plexus
BuildArch: noarch
%description
Modello is a Data Model toolkit in use by the Apache Maven Project.
Modello is a framework for code generation from a simple model.
Modello generates code from a simple model format based on a plugin
architecture, various types of code and descriptors can be generated
from the single model, including Java POJOs, XML
marshallers/unmarshallers, XSD and documentation.
%package javadoc
Summary: Javadoc for %{name}
Group: Development/Libraries/Java
%description javadoc
API documentation for %{name}.
%prep
%setup -q -a100
%patch0 -p1
%patch1 -p1
cp -p %{SOURCE1} LICENSE
%pom_remove_plugin :maven-site-plugin
%pom_remove_plugin :maven-enforcer-plugin
%pom_remove_dep :plexus-xml modello-core
%pom_remove_dep :sisu-guice modello-core
%pom_add_dep com.google.inject:guice modello-core
%pom_remove_dep :jackson-bom
%pom_disable_module modello-plugin-jackson modello-plugins
%pom_disable_module modello-plugin-jsonschema modello-plugins
%pom_disable_module modello-plugin-snakeyaml modello-plugins
%pom_disable_module modello-plugin-velocity modello-plugins
%pom_remove_dep :modello-plugin-jackson modello-maven-plugin
%pom_remove_dep :modello-plugin-jsonschema modello-maven-plugin
%pom_remove_dep :modello-plugin-snakeyaml modello-maven-plugin
%pom_remove_dep :modello-plugin-velocity modello-maven-plugin
rm -f modello-maven-plugin/src/main/java/org/codehaus/modello/maven/ModelloVelocityMojo.java
%pom_disable_module modello-test
%build
mkdir -p lib
build-jar-repository -s lib \
aopalliance \
atinject \
commons-cli \
guava/guava \
guice/google-guice \
jdom2/jdom2 \
jsoup \
objectweb-asm/asm \
org.eclipse.sisu.inject \
org.eclipse.sisu.plexus \
plexus/classworlds \
plexus/cli \
plexus/plexus-build-api \
plexus/utils \
plexus-containers/plexus-component-annotations \
plexus-metadata-generator \
qdox
%{ant} \
-Dtest.skip=true \
package javadoc
%install
# jars
install -dm 0755 %{buildroot}%{_javadir}/%{name}
for i in core; do
install -pm 0644 %{name}-${i}/target/%{name}-${i}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}-${i}.jar
done
for i in converters dom4j java jdom sax stax xdoc xml xpp3 xsd; do
install -pm 0644 %{name}-plugins/%{name}-plugin-${i}/target/%{name}-plugin-${i}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}-plugin-${i}.jar
done
# poms
install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
for i in core; do
%{mvn_install_pom} %{name}-${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}-${i}.pom
%add_maven_depmap %{name}/%{name}-${i}.pom %{name}/%{name}-${i}.jar
done
for i in converters dom4j java jdom sax stax xdoc xml xpp3 xsd; do
%{mvn_install_pom} %{name}-plugins/%{name}-plugin-${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}-plugin-${i}.pom
%add_maven_depmap %{name}/%{name}-plugin-${i}.pom %{name}/%{name}-plugin-${i}.jar
done
# javadoc
install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
for i in core; do
install -dm 0755 %{buildroot}%{_javadocdir}/%{name}/%{name}-${i}
cp -pr %{name}-${i}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/%{name}-${i}/
done
for i in converters dom4j java jdom sax stax xdoc xml xpp3 xsd; do
install -dm 0755 %{buildroot}%{_javadocdir}/%{name}/%{name}-plugin-${i}
cp -pr %{name}-plugins/%{name}-plugin-${i}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/%{name}-plugin-${i}/
done
%fdupes -s %{buildroot}%{_javadocdir}
# script
%jpackage_script org.codehaus.modello.ModelloCli "" "" modello:org.eclipse.sisu.plexus:org.eclipse.sisu.inject:google-guice:aopalliance:atinject:plexus-containers/plexus-component-annotations:plexus/classworlds:plexus/utils:plexus/plexus-build-api:guava %{name} true
%files -f .mfiles
%license LICENSE
%{_bindir}/*
%files javadoc
%license LICENSE
%{_javadocdir}/%{name}
%changelog