Compare commits
No commits in common. "rawhide" and "f18" have entirely different histories.
15 changed files with 287 additions and 635 deletions
|
|
@ -1 +0,0 @@
|
|||
1
|
||||
28
.gitignore
vendored
28
.gitignore
vendored
|
|
@ -1,21 +1,7 @@
|
|||
/results_*
|
||||
/*.src.rpm
|
||||
|
||||
/modello-1.0-alpha-15-src.tar.gz
|
||||
/modello-1.0.1-src.tar.gz
|
||||
/modello-1.1-src.tar.gz
|
||||
/modello-1.4-src.tar.xz
|
||||
/modello-1.4.1-source-release.zip
|
||||
/modello-1.5-source-release.zip
|
||||
/modello-1.6-source-release.zip
|
||||
/LICENSE-2.0.txt
|
||||
/modello-1.7-source-release.zip
|
||||
/modello-1.8.1-source-release.zip
|
||||
/modello-1.8.2-source-release.zip
|
||||
/modello-1.8.3-source-release.zip
|
||||
/modello-1.9.1-source-release.zip
|
||||
/modello-1.10.0-source-release.zip
|
||||
/modello-1.11-source-release.zip
|
||||
/modello-2.0.0-source-release.zip
|
||||
/modello-2.1.1-source-release.zip
|
||||
/modello-2.1.2-source-release.zip
|
||||
modello-1.0-alpha-15-src.tar.gz
|
||||
modello-1.0.1-src.tar.gz
|
||||
modello-1.1-src.tar.gz
|
||||
modello-1.4-src.tar.xz
|
||||
modello-1.4.1-source-release.zip
|
||||
modello-1.5-source-release.zip
|
||||
/.project
|
||||
|
|
|
|||
|
|
@ -1,184 +0,0 @@
|
|||
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ø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ø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
|
||||
|
||||
274
changelog
274
changelog
|
|
@ -1,274 +0,0 @@
|
|||
* Wed Aug 21 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.2-10
|
||||
- Fix for Sisu 0.9.0.M3
|
||||
|
||||
* Wed Jul 24 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.2-9
|
||||
- Install license files in licensedir instead of docdir
|
||||
|
||||
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.2-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Fri May 31 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.2-7
|
||||
- Switch to a newer patch macro syntax
|
||||
|
||||
* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 2.1.2-6
|
||||
- Rebuilt for java-21-openjdk as system jdk
|
||||
|
||||
* Fri Feb 23 2024 Jiri Vanek <jvanek@redhat.com> - 2.1.2-5
|
||||
- bump of release for for java-21-openjdk as system jdk
|
||||
|
||||
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.2-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.2-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.2-2
|
||||
- Convert License tag to SPDX format
|
||||
|
||||
* Mon Aug 28 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.2-1
|
||||
- Update to upstream version 2.1.2
|
||||
|
||||
* Mon Aug 21 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.1-1
|
||||
- Update to upstream version 2.1.1
|
||||
|
||||
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Fri Mar 31 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.0-5
|
||||
- Rebuild with no changes
|
||||
|
||||
* Tue Mar 21 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.0-4
|
||||
- Port to Google Guice 5
|
||||
|
||||
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Fri Apr 22 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.0-1
|
||||
- Update to upstream version 2.0.0
|
||||
- Remove dependency on Jsoup
|
||||
|
||||
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1.11-8
|
||||
- Rebuilt for java-17-openjdk as system jdk
|
||||
|
||||
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.11-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.11-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.11-5
|
||||
- Bootstrap build
|
||||
- Non-bootstrap build
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.11-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.11-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 0:1.11-2
|
||||
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
|
||||
|
||||
* Thu May 14 2020 Fabio Valentini <decathorpe@gmail.com> - 0:1.11-1
|
||||
- Update to version 1.11.
|
||||
|
||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.10.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.11-2
|
||||
- Mass rebuild for javapackages-tools 201902
|
||||
|
||||
* Tue Aug 20 2019 Fabio Valentini <decathorpe@gmail.com> - 0:1.10.0-1
|
||||
- Update to version 1.10.0.
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.9.1-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Wed Jun 26 2019 Marian Koncek <mkoncek@redhat.com> - 1.11-1
|
||||
- Update to upstream version 1.11
|
||||
|
||||
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.10.0-2
|
||||
- Mass rebuild for javapackages-tools 201901
|
||||
|
||||
* Sat Apr 13 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.10.0-1
|
||||
- Update to upstream version 1.10.0
|
||||
|
||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.9.1-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Tue Jul 31 2018 Severin Gehwolf <sgehwolf@redhat.com> - 0:1.9.1-7
|
||||
- Add explicit requires on javapackages-tools for modello script.
|
||||
|
||||
* Tue Jul 17 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.9.1-6
|
||||
- Allow conditionally building without snakeyaml
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.9.1-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.9.1-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Mon Nov 27 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.9.1-3
|
||||
- Contitionally allow building without jackson
|
||||
|
||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.9.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Wed Mar 29 2017 Michael Simacek <msimacek@redhat.com> - 0:1.9.1-1
|
||||
- Update to upstream version 1.9.1
|
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.8.3-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Wed Jun 15 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.8.3-4
|
||||
- Regenerate build-requires
|
||||
- Remove old obsoletes/provides
|
||||
|
||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.8.3-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.8.3-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Thu Mar 26 2015 Michael Simacek <msimacek@redhat.com> - 0:1.8.3-1
|
||||
- Update to upstream version 1.8.3
|
||||
|
||||
* Mon Nov 3 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.8.2-1
|
||||
- Update to upstream version 1.8.2
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.8.1-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.8.1-4
|
||||
- Use Requires: java-headless rebuild (#1067528)
|
||||
|
||||
* Tue Feb 18 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.8.1-3
|
||||
- Backport upstream patches for MODELLO-284 and MODELLO-285
|
||||
|
||||
* Mon Jan 27 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.8.1-2
|
||||
- Use Maven 3.x APIs
|
||||
|
||||
* Mon Aug 19 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.8.1-1
|
||||
- Update to upstream version 1.8.1
|
||||
|
||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.7-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Fri Apr 19 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.7-2
|
||||
- Build with xmvn
|
||||
- Use better description
|
||||
- Simplify build-requires
|
||||
- Update to current packaging guidelines
|
||||
|
||||
* Thu Feb 21 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.7-1
|
||||
- Update to upstream version 1.7
|
||||
|
||||
* Mon Feb 18 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.6-1
|
||||
- Update to upstream version 1.6
|
||||
|
||||
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.5-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 0:1.5-6
|
||||
- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
|
||||
- Replace maven BuildRequires with maven-local
|
||||
|
||||
* Thu Nov 15 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.5-5
|
||||
- Add JPP depmap for maven-project to override versionless depmap
|
||||
- Add missing BR/R: maven-project
|
||||
- Remove unneeded BR: jpa_api
|
||||
|
||||
* Thu Nov 15 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.5-4
|
||||
- Fix license tag
|
||||
- Install text of Apache license
|
||||
|
||||
* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.5-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.5-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Mon Aug 8 2011 Alexander Kurtakov <akurtako@redhat.com> 0:1.5-1
|
||||
- Update to upstream 1.5.
|
||||
|
||||
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.4.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
* Wed Jan 26 2011 Alexander Kurtakov <akurtako@redhat.com> 0:1.4.1-1
|
||||
- Update to upstream 1.4.1.
|
||||
|
||||
* Wed Dec 1 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.4-3
|
||||
- Fix pom filenames (remove poms of integration tests) Resolves rhbz#655818
|
||||
- Use jpackage_script macro to generate script
|
||||
|
||||
* Thu Aug 26 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.4-2
|
||||
- Remove dtdparser BR/R
|
||||
|
||||
* Tue Jul 20 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.4-1
|
||||
- Update to latest upstream version
|
||||
- Re-enable javadoc generation
|
||||
- Remove old workarounds/patches
|
||||
|
||||
* Mon May 24 2010 Yong Yang <yyang@redhat.com> 1.1-2
|
||||
- Fix JPP pom name
|
||||
- Disable javadoc:javadoc due to the failure of maven-doxia
|
||||
|
||||
* Mon May 24 2010 Yong Yang <yyang@redhat.com> 1.1-1
|
||||
- Upgrade to 1.1
|
||||
|
||||
* Fri May 21 2010 Yong Yang <yyang@redhat.com> 1.0.1-1
|
||||
- Upgrade to 1.0.1
|
||||
|
||||
* Thu Aug 20 2009 Andrew Overholt <overholt@redhat.com> 1.0-0.4.a15.0.1
|
||||
- Update to alpha 15 courtesy Deepak Bhole
|
||||
|
||||
* Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.0-0.3.a8.4.4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
||||
|
||||
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.0-0.2.a8.4.4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
||||
|
||||
* Wed Jul 9 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0:1.0-0.1.a8.4.4
|
||||
- drop repotag
|
||||
|
||||
* Tue Mar 20 2007 Matt Wringe <wringe@redhat.com> 0:1.0-0.1.a8.4jpp.3
|
||||
- disable gcj support
|
||||
|
||||
* Tue Mar 13 2007 Matt Wringe <mwringe@redhat.com> 0:1.0-0.1.a8.4jpp.2
|
||||
- Change license to MIT to reflex the actual license specified in the
|
||||
source headers.
|
||||
- fix various rpmlint issues
|
||||
|
||||
* Mon Feb 26 2007 Tania Bento <tbento@redhat.com> 0:1.0-0.1.a8.4jpp.1
|
||||
- Fixed %%Release.
|
||||
- Fixed %%License.
|
||||
- Fixed %%BuildRoot.
|
||||
- Removed %%Vendor.
|
||||
- Removed %%Distribution.
|
||||
- Defined _with_gcj_support and gcj_support.
|
||||
- Fixed instructions on how to generate the source drop.
|
||||
|
||||
* Fri Dec 01 2006 Deepak Bhole <dbhole@redhat.com> 1.0-0.a8.4jpp
|
||||
- Added an obsoletes for older versions of the plugin
|
||||
|
||||
* Thu Oct 19 2006 Deepak Bhole <dbhole@redhat.com> 1.0-0.a8.3jpp
|
||||
- Update for maven2 9jpp
|
||||
- Merge maven-plugin subpackage into the main one
|
||||
|
||||
* Mon Sep 11 2006 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.a8.2jpp
|
||||
- Add gcj_support option
|
||||
- Add post/postun Requires for javadoc
|
||||
- Don't omit maven-plugin upload
|
||||
|
||||
* Fri Jun 23 2006 Deepak Bhole <dbhole@redhat.com> - 0:1.0-0.a8.1jpp
|
||||
- Upgrade to 1.0-alpha-8
|
||||
- Remove ant build, add maven2 build
|
||||
|
||||
* Thu Jun 01 2006 Fernando Nasser <fnasser@redhat.com> - 0:1.0-0.a4.2jpp
|
||||
- First JPP 1.7 build
|
||||
|
||||
* Mon Nov 07 2005 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.a4.1jpp
|
||||
- First JPackage build
|
||||
1
ci.fmf
1
ci.fmf
|
|
@ -1 +0,0 @@
|
|||
resultsdb-testcase: separate
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
--- !Policy
|
||||
product_versions:
|
||||
- fedora-*
|
||||
decision_contexts:
|
||||
- bodhi_update_push_testing
|
||||
- bodhi_update_push_stable
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/smoke.functional}
|
||||
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional}
|
||||
38
modello-jpp-depmap.xml
Normal file
38
modello-jpp-depmap.xml
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
<dependencies>
|
||||
<dependency>
|
||||
<maven>
|
||||
<groupId>javax.xml.bind</groupId>
|
||||
<artifactId>jaxb-api</artifactId>
|
||||
<version>2.1</version>
|
||||
</maven>
|
||||
<jpp>
|
||||
<groupId>JPP/jaxme</groupId>
|
||||
<artifactId>jaxme2</artifactId>
|
||||
<version>0.5.1</version>
|
||||
</jpp>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<maven>
|
||||
<groupId>org.codehaus.woodstox</groupId>
|
||||
<artifactId>wstx-asl</artifactId>
|
||||
<version>3.2.0</version>
|
||||
</maven>
|
||||
</dependency>
|
||||
|
||||
<!--
|
||||
! Override versionless depmap provided by maven2-common-poms.
|
||||
-->
|
||||
<dependency>
|
||||
<maven>
|
||||
<groupId>org.apache.maven</groupId>
|
||||
<artifactId>maven-project</artifactId>
|
||||
<version>2.0.7</version>
|
||||
</maven>
|
||||
<jpp>
|
||||
<groupId>JPP/maven</groupId>
|
||||
<artifactId>maven-project</artifactId>
|
||||
<version>2.0.7</version>
|
||||
</jpp>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
306
modello.spec
306
modello.spec
|
|
@ -1,88 +1,262 @@
|
|||
%bcond_with bootstrap
|
||||
# Copyright (c) 2000-2005, JPackage Project
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions
|
||||
# are met:
|
||||
#
|
||||
# 1. Redistributions of source code must retain the above copyright
|
||||
# notice, this list of conditions and the following disclaimer.
|
||||
# 2. Redistributions in binary form must reproduce the above copyright
|
||||
# notice, this list of conditions and the following disclaimer in the
|
||||
# documentation and/or other materials provided with the
|
||||
# distribution.
|
||||
# 3. Neither the name of the JPackage Project nor the names of its
|
||||
# contributors may be used to endorse or promote products derived
|
||||
# from this software without specific prior written permission.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
#
|
||||
|
||||
Name: modello
|
||||
Version: 2.1.2
|
||||
Release: %autorelease
|
||||
Version: 1.5
|
||||
Release: 5%{?dist}
|
||||
Epoch: 0
|
||||
Summary: Modello Data Model toolkit
|
||||
# The majority of files are under MIT license, but some of them are ASL 2.0.
|
||||
# Some parts of the project are derived from the Exolab project,
|
||||
# and are licensed under a 5-clause BSD license (Plexus in SPDX).
|
||||
License: MIT AND Apache-2.0 AND Plexus
|
||||
URL: https://codehaus-plexus.github.io/modello
|
||||
License: ASL 2.0 and BSD and MIT
|
||||
Group: Development/Libraries
|
||||
URL: http://modello.codehaus.org/
|
||||
Source0: http://repo2.maven.org/maven2/org/codehaus/%{name}/%{name}/%{version}/%{name}-%{version}-source-release.zip
|
||||
Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
|
||||
Source2: %{name}-jpp-depmap.xml
|
||||
|
||||
|
||||
BuildArch: noarch
|
||||
ExclusiveArch: %{java_arches} noarch
|
||||
|
||||
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
|
||||
BuildRequires: ant >= 0:1.6
|
||||
BuildRequires: jpackage-utils >= 0:1.7.2
|
||||
BuildRequires: maven
|
||||
BuildRequires: maven-assembly-plugin
|
||||
BuildRequires: maven-compiler-plugin
|
||||
BuildRequires: maven-install-plugin
|
||||
BuildRequires: maven-jar-plugin
|
||||
BuildRequires: maven-javadoc-plugin
|
||||
BuildRequires: maven-project
|
||||
BuildRequires: maven-resources-plugin
|
||||
BuildRequires: maven-surefire-plugin
|
||||
BuildRequires: maven-site-plugin
|
||||
BuildRequires: maven-surefire-provider-junit
|
||||
BuildRequires: maven-dependency-plugin
|
||||
BuildRequires: maven-plugin-plugin
|
||||
BuildRequires: maven-shared-reporting-impl
|
||||
BuildRequires: maven-shared-invoker
|
||||
BuildRequires: classworlds >= 0:1.1
|
||||
BuildRequires: plexus-container-default
|
||||
BuildRequires: plexus-utils
|
||||
BuildRequires: plexus-velocity
|
||||
BuildRequires: velocity
|
||||
BuildRequires: maven-doxia
|
||||
BuildRequires: maven-doxia-sitetools
|
||||
BuildRequires: maven-doxia-tools
|
||||
BuildRequires: plexus-build-api
|
||||
BuildRequires: ws-jaxme
|
||||
BuildRequires: xmlunit
|
||||
BuildRequires: geronimo-parent-poms
|
||||
|
||||
Patch: 0001-Revert-Switch-to-codehaus-plexus-build-api-1.2.0-345.patch
|
||||
Requires: classworlds >= 0:1.1
|
||||
Requires: maven
|
||||
Requires: maven-project
|
||||
Requires: plexus-containers-container-default
|
||||
Requires: plexus-build-api
|
||||
Requires: plexus-utils
|
||||
Requires: plexus-velocity
|
||||
Requires: velocity
|
||||
Requires: guava
|
||||
Requires: xbean
|
||||
Requires: jpackage-utils
|
||||
|
||||
%if %{with bootstrap}
|
||||
BuildRequires: javapackages-bootstrap
|
||||
%else
|
||||
BuildRequires: maven-local-openjdk25
|
||||
BuildRequires: mvn(com.google.inject:guice)
|
||||
BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin)
|
||||
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.apache.velocity:velocity-engine-core)
|
||||
BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations)
|
||||
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.eclipse.sisu:org.eclipse.sisu.plexus)
|
||||
BuildRequires: mvn(org.jsoup:jsoup)
|
||||
BuildRequires: mvn(org.sonatype.plexus:plexus-build-api)
|
||||
%endif
|
||||
# TODO Remove in Fedora 46
|
||||
Obsoletes: %{name}-javadoc < 2.1.2-23
|
||||
Provides: modello-maven-plugin = %{epoch}:%{version}-%{release}
|
||||
Obsoletes: modello-maven-plugin < 0:1.0-0.a8.3jpp
|
||||
|
||||
%description
|
||||
Modello is a Data Model toolkit in use by the Apache Maven Project.
|
||||
Modello is a Data Model toolkit in use by the
|
||||
http://maven.apache.org/maven2.
|
||||
It all starts with the Data Model. Once a data model is defined,
|
||||
the toolkit can be used to generate any of the following at compile
|
||||
time.
|
||||
Java POJOs of the model.
|
||||
Java POJOs to XML Writer (provided via xpp3 or dom4j).
|
||||
XML to Java Pojos Reader (provided via xpp3 or dom4j).
|
||||
XDoc documentation of the data model.
|
||||
Java model to [Prevayler|http://www.prevayler.org/] Store.
|
||||
Java model to [JPOX|http://www.jpox.org/] Store.
|
||||
Java model to [JPOX|http://www.jpox.org/] Mapping.
|
||||
|
||||
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: Documentation
|
||||
Requires: jpackage-utils
|
||||
|
||||
%description javadoc
|
||||
API documentation for %{name}.
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -C
|
||||
%setup -q
|
||||
cp -p %{SOURCE1} LICENSE
|
||||
# We don't generate site; don't pull extra dependencies.
|
||||
%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_remove_dep :modello-plugin-jackson modello-maven-plugin
|
||||
%pom_remove_dep :modello-plugin-jsonschema modello-maven-plugin
|
||||
|
||||
%pom_disable_module modello-plugin-snakeyaml modello-plugins
|
||||
%pom_remove_dep :modello-plugin-snakeyaml modello-maven-plugin
|
||||
|
||||
%pom_disable_module modello-test
|
||||
|
||||
%build
|
||||
|
||||
# skip tests because we have too old xmlunit in Fedora now (1.0.8)
|
||||
%mvn_build -j -f
|
||||
mvn-rpmbuild \
|
||||
-Dmaven.local.depmap.file=%{SOURCE2} \
|
||||
-Dmaven.test.skip=true \
|
||||
install javadoc:aggregate
|
||||
|
||||
%install
|
||||
%mvn_install
|
||||
# poms and depmap fragments
|
||||
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
|
||||
for i in `find . -name pom.xml -not -path ./pom.xml -not -path "*src/it/*"`; do
|
||||
# i is in format ..../artifactid/pom.xml
|
||||
cp -p $i $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.`basename \`dirname $i\``.pom
|
||||
|
||||
%jpackage_script org.codehaus.modello.ModelloCli "" "" modello:sisu/org.eclipse.sisu.plexus:sisu/org.eclipse.sisu.inject:google-guice:aopalliance:atinject:plexus-containers/plexus-component-annotations:plexus/classworlds:plexus/utils:plexus/plexus-build-api0:guava:velocity/velocity-engine-core %{name} true
|
||||
artifactname=`basename \`dirname $i\` | sed -e s:^modello-::g`
|
||||
%add_to_maven_depmap org.codehaus.modello modello-$artifactname %{version} JPP/%{name} $artifactname
|
||||
done
|
||||
|
||||
%files -f .mfiles
|
||||
%license LICENSE
|
||||
%{_bindir}/modello
|
||||
cp -p pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.modello-modello.pom
|
||||
%add_maven_depmap JPP.modello-modello.pom
|
||||
|
||||
# script
|
||||
install -d -m 755 $RPM_BUILD_ROOT%{_bindir}
|
||||
%jpackage_script org.codehaus.modello.ModelloCli "" "" "modello/core:modello/plugin-xpp3:modello/plugin-xml:guava:xbean:plexus/containers-container-default:plexus/utils:plexus/classworlds)" %{name} true
|
||||
|
||||
# jars
|
||||
|
||||
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
|
||||
for jar in $(find -type f -name "*-%{version}.jar" | grep -E target/.*.jar); do
|
||||
install -m 644 $jar $RPM_BUILD_ROOT%{_javadir}/%{name}/`basename $jar |sed -e s:modello-::g|sed -e s:-%{version}::g`
|
||||
done
|
||||
|
||||
# javadoc
|
||||
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
|
||||
cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
|
||||
|
||||
%files
|
||||
%doc LICENSE
|
||||
%{_mavenpomdir}/*
|
||||
%{_javadir}/%{name}
|
||||
%{_bindir}/*
|
||||
%{_mavendepmapfragdir}/*
|
||||
|
||||
%files javadoc
|
||||
%doc LICENSE
|
||||
%{_javadocdir}/%{name}
|
||||
|
||||
%changelog
|
||||
%autochangelog
|
||||
* Thu Nov 15 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.5-5
|
||||
- Add JPP depmap for maven-project to override versionless depmap
|
||||
- Add missing BR/R: maven-project
|
||||
- Remove unneeded BR: jpa_api
|
||||
|
||||
* Thu Nov 15 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.5-4
|
||||
- Fix license tag
|
||||
- Install text of Apache license
|
||||
|
||||
* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.5-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.5-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Mon Aug 8 2011 Alexander Kurtakov <akurtako@redhat.com> 0:1.5-1
|
||||
- Update to upstream 1.5.
|
||||
|
||||
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.4.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
* Wed Jan 26 2011 Alexander Kurtakov <akurtako@redhat.com> 0:1.4.1-1
|
||||
- Update to upstream 1.4.1.
|
||||
|
||||
* Wed Dec 1 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.4-3
|
||||
- Fix pom filenames (remove poms of integration tests) Resolves rhbz#655818
|
||||
- Use jpackage_script macro to generate script
|
||||
|
||||
* Thu Aug 26 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.4-2
|
||||
- Remove dtdparser BR/R
|
||||
|
||||
* Tue Jul 20 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.4-1
|
||||
- Update to latest upstream version
|
||||
- Re-enable javadoc generation
|
||||
- Remove old workarounds/patches
|
||||
|
||||
* Mon May 24 2010 Yong Yang <yyang@redhat.com> 1.1-2
|
||||
- Fix JPP pom name
|
||||
- Disable javadoc:javadoc due to the failure of maven-doxia
|
||||
|
||||
* Mon May 24 2010 Yong Yang <yyang@redhat.com> 1.1-1
|
||||
- Upgrade to 1.1
|
||||
|
||||
* Fri May 21 2010 Yong Yang <yyang@redhat.com> 1.0.1-1
|
||||
- Upgrade to 1.0.1
|
||||
|
||||
* Thu Aug 20 2009 Andrew Overholt <overholt@redhat.com> 1.0-0.4.a15.0.1
|
||||
- Update to alpha 15 courtesy Deepak Bhole
|
||||
|
||||
* Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.0-0.3.a8.4.4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
||||
|
||||
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.0-0.2.a8.4.4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
||||
|
||||
* Wed Jul 9 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0:1.0-0.1.a8.4.4
|
||||
- drop repotag
|
||||
|
||||
* Tue Mar 20 2007 Matt Wringe <wringe@redhat.com> 0:1.0-0.1.a8.4jpp.3
|
||||
- disable gcj support
|
||||
|
||||
* Tue Mar 13 2007 Matt Wringe <mwringe@redhat.com> 0:1.0-0.1.a8.4jpp.2
|
||||
- Change license to MIT to reflex the actual license specified in the
|
||||
source headers.
|
||||
- fix various rpmlint issues
|
||||
|
||||
* Mon Feb 26 2007 Tania Bento <tbento@redhat.com> 0:1.0-0.1.a8.4jpp.1
|
||||
- Fixed %%Release.
|
||||
- Fixed %%License.
|
||||
- Fixed %%BuildRoot.
|
||||
- Removed %%Vendor.
|
||||
- Removed %%Distribution.
|
||||
- Defined _with_gcj_support and gcj_support.
|
||||
- Fixed instructions on how to generate the source drop.
|
||||
|
||||
* Fri Dec 01 2006 Deepak Bhole <dbhole@redhat.com> 1.0-0.a8.4jpp
|
||||
- Added an obsoletes for older versions of the plugin
|
||||
|
||||
* Thu Oct 19 2006 Deepak Bhole <dbhole@redhat.com> 1.0-0.a8.3jpp
|
||||
- Update for maven2 9jpp
|
||||
- Merge maven-plugin subpackage into the main one
|
||||
|
||||
* Mon Sep 11 2006 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.a8.2jpp
|
||||
- Add gcj_support option
|
||||
- Add post/postun Requires for javadoc
|
||||
- Don't omit maven-plugin upload
|
||||
|
||||
* Fri Jun 23 2006 Deepak Bhole <dbhole@redhat.com> - 0:1.0-0.a8.1jpp
|
||||
- Upgrade to 1.0-alpha-8
|
||||
- Remove ant build, add maven2 build
|
||||
|
||||
* Thu Jun 01 2006 Fernando Nasser <fnasser@redhat.com> - 0:1.0-0.a4.2jpp
|
||||
- First JPP 1.7 build
|
||||
|
||||
* Mon Nov 07 2005 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.a4.1jpp
|
||||
- First JPackage build
|
||||
|
|
|
|||
|
|
@ -1,7 +0,0 @@
|
|||
summary: Run javapackages-specific tests
|
||||
discover:
|
||||
how: fmf
|
||||
url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git
|
||||
ref: f43
|
||||
execute:
|
||||
how: tmt
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
summary: Basic smoke test
|
||||
discover:
|
||||
how: fmf
|
||||
execute:
|
||||
how: tmt
|
||||
4
sources
4
sources
|
|
@ -1,2 +1,2 @@
|
|||
SHA512 (modello-2.1.2-source-release.zip) = 2824bcd3fbf8244fbec527e06f1be9aa17a176e4fd4159c228b576f62f94592c19fd39581fa4cd211c4ddc07b86d3595c992cf0a7405e341513bdd74261f4ecd
|
||||
SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8
|
||||
3743d1c44419f78c761d9e2d6898ac1d modello-1.5-source-release.zip
|
||||
3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt
|
||||
|
|
|
|||
|
|
@ -1,6 +0,0 @@
|
|||
summary: modello smoke test
|
||||
description: |
|
||||
Test basic functionality of modello.
|
||||
require:
|
||||
- modello
|
||||
- java-21-openjdk-devel
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
#!/bin/bash
|
||||
# Author: Mikolaj Izdebski <mizdebsk@redhat.com>
|
||||
. /usr/share/beakerlib/beakerlib.sh
|
||||
|
||||
rlJournalStart
|
||||
|
||||
PATH=/usr/lib/jvm/java-21-openjdk/bin:${PATH}
|
||||
|
||||
rlPhaseStartTest "check for presence of modello command"
|
||||
rlAssertRpm modello
|
||||
rlAssertBinaryOrigin modello modello
|
||||
rlPhaseEnd
|
||||
|
||||
rlPhaseStartTest "display modello usage"
|
||||
rlRun -s "modello" 1
|
||||
rlAssertGrep "Usage: modello" $rlRun_LOG
|
||||
rlPhaseEnd
|
||||
|
||||
rlPhaseStartTest "generate STAX reader"
|
||||
rlRun "modello smoke.mdo java test-src 1.0.0 foo 8"
|
||||
rlRun "javac -d test-bin test-src/smoke/*"
|
||||
rlAssertExists test-bin/smoke/SomeBean.class
|
||||
rlRun "modello smoke.mdo stax-reader test-src 1.0.0 foo 8"
|
||||
rlRun "javac -d test-bin -cp test-bin test-src/smoke/io/stax/*"
|
||||
rlAssertExists test-bin/smoke/io/stax/SmokeStaxReader.class
|
||||
rlPhaseEnd
|
||||
|
||||
rlJournalEnd
|
||||
rlJournalPrintText
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
<model>
|
||||
<id>smoke</id>
|
||||
<name>Smoke</name>
|
||||
<description>Smoke test</description>
|
||||
<defaults>
|
||||
<default>
|
||||
<key>package</key>
|
||||
<value>smoke</value>
|
||||
</default>
|
||||
</defaults>
|
||||
<classes>
|
||||
<class java.clone="deep" xml.tagName="foo" rootElement="true">
|
||||
<name>SomeBean</name>
|
||||
<version>1.0.0+</version>
|
||||
<description>Ordinary bean</description>
|
||||
<fields>
|
||||
<field>
|
||||
<name>f</name>
|
||||
<version>1.0.0+</version>
|
||||
<description>A boolean field</description>
|
||||
<type>Boolean</type>
|
||||
</field>
|
||||
</fields>
|
||||
</class>
|
||||
</classes>
|
||||
</model>
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
contact: Mikolaj Izdebski <mizdebsk@redhat.com>
|
||||
framework: beakerlib
|
||||
test: ./runtest.sh
|
||||
tier: 0
|
||||
Loading…
Add table
Add a link
Reference in a new issue