Compare commits

...

No commits in common. "c8-stream-201902" and "c8-stream-201801" have entirely different histories.

3 changed files with 12 additions and 20 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/maven-script-interpreter-1.2-source-release.zip
SOURCES/maven-script-interpreter-1.1-source-release.zip

View File

@ -1 +1 @@
cfed0e29d42e10a8fd2c4bb04d22fcf17f54d24a SOURCES/maven-script-interpreter-1.2-source-release.zip
7c7cd0b5b7ad23b07061cf6bad99934874ea9a3a SOURCES/maven-script-interpreter-1.1-source-release.zip

View File

@ -1,6 +1,8 @@
%bcond_without groovy
Name: maven-script-interpreter
Version: 1.2
Release: 3%{?dist}
Version: 1.1
Release: 11%{?dist}
Summary: Maven Script Interpreter
License: ASL 2.0
URL: http://maven.apache.org/shared/maven-script-interpreter/
@ -13,10 +15,13 @@ BuildRequires: mvn(junit:junit)
BuildRequires: mvn(org.apache.ant:ant)
BuildRequires: mvn(org.apache.maven:maven-plugin-api)
BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:)
BuildRequires: mvn(org.apache.maven.shared:maven-shared-utils)
BuildRequires: mvn(org.beanshell:bsh)
%if %{with groovy}
BuildRequires: mvn(org.codehaus.groovy:groovy)
%endif
BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations)
BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata)
BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
%description
@ -34,11 +39,13 @@ API documentation for %{name}.
%prep
%setup -q
%if %{without groovy}
%pom_remove_dep :groovy
rm src/main/java/org/apache/maven/shared/scriptinterpreter/GroovyScriptInterpreter.java
rm src/test/java/org/apache/maven/shared/scriptinterpreter/GroovyScriptInterpreterTest.java
rm src/test/java/org/apache/maven/shared/scriptinterpreter/ScriptRunnerTest.java
sed -i /GroovyScriptInterpreter/d src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptRunner.java
%endif
%build
%mvn_build
@ -54,21 +61,6 @@ sed -i /GroovyScriptInterpreter/d src/main/java/org/apache/maven/shared/scriptin
%changelog
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-3
- Mass rebuild for javapackages-tools 201902
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-2
- Mass rebuild for javapackages-tools 201901
* Tue Oct 30 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-1
- Add missig build-dependency on maven-shared-utils
* Tue Oct 30 2018 Marian Koncek <mkoncek@redhat.com> - 1.2-1
- Update to upstream version 1.2
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild