diff --git a/javacc-maven-plugin-2.6.tar.gz b/javacc-maven-plugin-2.6.tar.gz deleted file mode 100644 index 03cfcc1..0000000 Binary files a/javacc-maven-plugin-2.6.tar.gz and /dev/null differ diff --git a/javacc-maven-plugin-3.0.1.tar.gz b/javacc-maven-plugin-3.0.1.tar.gz new file mode 100644 index 0000000..2a8cc8d Binary files /dev/null and b/javacc-maven-plugin-3.0.1.tar.gz differ diff --git a/javacc-maven-plugin-pom.patch b/javacc-maven-plugin-pom.patch deleted file mode 100644 index d50e88b..0000000 --- a/javacc-maven-plugin-pom.patch +++ /dev/null @@ -1,79 +0,0 @@ ---- old/pom.xml.sav 2009-09-30 01:25:34.000000000 +0300 -+++ new/pom.xml 2010-03-23 23:37:07.136383912 +0200 -@@ -85,15 +85,6 @@ under the License. - 1.5.6 - - -- edu.ucla.cs.compilers -- jtb -- 1.3.2 -- -- runtime -- -- - org.apache.maven.reporting - maven-reporting-api - 2.0.4 -@@ -127,60 +118,5 @@ under the License. - - - -- -- -- run-its -- -- -- maven.test.skip -- !true -- -- -- -- 2.0.1 -- -- -- -- -- org.apache.maven.plugins -- maven-invoker-plugin -- 1.4 -- -- src/it -- ${project.build.directory}/it -- -- */pom.xml -- -- verify.bsh -- src/it/settings.xml -- ${project.build.directory}/local-repo -- true -- -- -- -- integration-test -- -- install -- run -- -- -- -- -- -- -- -- -- maven-3 -- -- -- -- ${basedir} -- -- -- -- 3.0-beta-1-SNAPSHOT -- -- -- - - diff --git a/javacc-maven-plugin.spec b/javacc-maven-plugin.spec index a782c30..e98ef5e 100644 --- a/javacc-maven-plugin.spec +++ b/javacc-maven-plugin.spec @@ -1,20 +1,19 @@ Name: javacc-maven-plugin -Version: 2.6 -Release: 27 +Version: 3.0.1 +Release: 1 Summary: Maven Plugin for processing JavaCC grammar files License: ASL 2.0 URL: https://www.mojohaus.org/ BuildArch: noarch -Source0: https://github.com/mojohaus/javacc-maven-plugin/archive/javacc-maven-plugin-2.6.tar.gz +Source0: https://github.com/mojohaus/javacc-maven-plugin/archive/javacc-maven-plugin-%{version}.tar.gz Source1: http://www.apache.org/licenses/LICENSE-2.0.txt -#Fix build error where maven-invoker-plugin does not exist -Patch0001: javacc-maven-plugin-pom.patch BuildRequires: maven-local mvn(junit:junit) mvn(net.java.dev.javacc:javacc) BuildRequires: mvn(org.apache.maven.doxia:doxia-sink-api) mvn(org.apache.maven.doxia:doxia-site-renderer) BuildRequires: mvn(org.apache.maven:maven-model) mvn(org.apache.maven:maven-plugin-api) BuildRequires: mvn(org.apache.maven:maven-project) mvn(org.apache.maven.reporting:maven-reporting-api) BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-impl) mvn(org.codehaus.mojo:mojo-parent:pom:) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) mvn(org.apache.maven.plugins:maven-plugin-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-invoker-plugin) %description Process JavaCC grammars. @@ -31,6 +30,10 @@ Help documentation for %{name}. %autosetup -n %{name}-javacc-maven-plugin-%{version} -p1 cp -p %{SOURCE1} . +%pom_remove_dep edu.ucla.cs.compilers:jtb +rm -fr src/it +rm -fr src/site + %build %mvn_build @@ -44,5 +47,8 @@ cp -p %{SOURCE1} . %doc src/main/resources/NOTICE %changelog +* Thu Jul 27 2023 yaoxin - 3.0.1-1 +- Update to 3.0.1 + * Tue Mar 3 2020 shijian - 2.6-27 -- Package init \ No newline at end of file +- Package init