.gitignore

@@ -1 +1 @@
-SOURCES/javacc-maven-plugin-3.0.1.tar.gz
+SOURCES/javacc-maven-plugin-2.6.tar.bz2

.javacc-maven-plugin.metadata

@@ -1 +1 @@
-e1c8b9e8b142ad8ff9b35c8d0878e31b4df720e8 SOURCES/javacc-maven-plugin-3.0.1.tar.gz
+a4a1ca433b3bd043d89d4316e9bb12bca0fc451c SOURCES/javacc-maven-plugin-2.6.tar.bz2

SOURCES/javacc-maven-plugin-pom.patch

@@ -0,0 +1,79 @@
+--- pom.xml.sav	2009-09-30 01:25:34.000000000 +0300
++++ pom.xml	2010-03-23 23:37:07.136383912 +0200
+@@ -85,15 +85,6 @@ under the License.
+       <version>1.5.6</version>
+     </dependency>
+     <dependency>
+-      <groupId>edu.ucla.cs.compilers</groupId>
+-      <artifactId>jtb</artifactId>
+-      <version>1.3.2</version>
+-      <!--
+-      NOTE: Only reflectively accessed to avoid dependency on Java 1.5 for compilation.
+-      -->
+-      <scope>runtime</scope>
+-    </dependency>
+-    <dependency>
+       <groupId>org.apache.maven.reporting</groupId>
+       <artifactId>maven-reporting-api</artifactId>
+       <version>2.0.4</version>
+@@ -127,60 +118,5 @@ under the License.
+     </dependency>
+   </dependencies>
+ 
+-  <profiles>
+-    <profile>
+-      <id>run-its</id>
+-      <activation>
+-        <property>
+-          <name>maven.test.skip</name>
+-          <value>!true</value>
+-        </property>
+-      </activation>
+-      <properties>
+-        <sitePluginVersion>2.0.1</sitePluginVersion>
+-      </properties>
+-      <build>
+-        <plugins>
+-          <plugin>
+-            <groupId>org.apache.maven.plugins</groupId>
+-            <artifactId>maven-invoker-plugin</artifactId>
+-            <version>1.4</version>
+-            <configuration>
+-              <projectsDirectory>src/it</projectsDirectory>
+-              <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+-              <pomIncludes>
+-                <pomInclude>*/pom.xml</pomInclude>
+-              </pomIncludes>
+-              <postBuildHookScript>verify.bsh</postBuildHookScript>
+-              <settingsFile>src/it/settings.xml</settingsFile>
+-              <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+-              <debug>true</debug>
+-            </configuration>
+-            <executions>
+-              <execution>
+-                <id>integration-test</id>
+-                <goals>
+-                  <goal>install</goal>
+-                  <goal>run</goal>
+-                </goals>
+-              </execution>
+-            </executions>
+-          </plugin>
+-        </plugins>
+-      </build>
+-    </profile>
+-    <profile>
+-      <id>maven-3</id>
+-      <activation>
+-        <file>
+-          <!-- This employs that the basedir expression is only recognized by Maven 3.x (see MNG-2363) -->
+-          <exists>${basedir}</exists>
+-        </file>
+-      </activation>
+-      <properties>
+-        <sitePluginVersion>3.0-beta-1-SNAPSHOT</sitePluginVersion>
+-      </properties>
+-    </profile>
+-  </profiles>
+   
+ </project>

SPECS/javacc-maven-plugin.spec

@@ -1,75 +1,46 @@
-# Break dependency loops in a bootstrap situation
-%bcond_with bootstrap
-
-# Disable Maven reporting in bootstrap mode and in RHEL
-%if %{with bootstrap} || 0%{?rhel}
-%bcond_with maven_reporting
-%else
-%bcond_without maven_reporting
-%endif
-
 Name:           javacc-maven-plugin
-Version:        3.0.1
+Version:        2.6
-Release:        9%{?dist}
+Release:        25%{?dist}
 Summary:        JavaCC Maven Plugin
-
+License:        ASL 2.0
-License:        Apache-2.0
+URL:            http://mojo.codehaus.org/javacc-maven-plugin/ 
 BuildArch:      noarch
-ExclusiveArch:  %{java_arches} noarch
+
-URL:            https://github.com/mojohaus/javacc-maven-plugin
+#svn export http://svn.codehaus.org/mojo/tags/javacc-maven-plugin-2.6
-Source0:        %{url}/archive/%{name}-%{version}.tar.gz
+#tar cjf javacc-maven-plugin-2.6.tar.bz2 javacc-maven-plugin-2.6
-Source1:        https://www.apache.org/licenses/LICENSE-2.0.txt
+Source0:        javacc-maven-plugin-2.6.tar.bz2
-
+Source1:        http://www.apache.org/licenses/LICENSE-2.0.txt
-%if %{with bootstrap}
+
-BuildRequires:  javapackages-bootstrap
+Patch0:         javacc-maven-plugin-pom.patch
-%else
+
 BuildRequires:  maven-local
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(net.java.dev.javacc:javacc)
-BuildRequires:  mvn(org.apache.maven:maven-model)
-BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
-BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
-BuildRequires:  mvn(org.apache.maven.plugins:maven-plugin-plugin)
-BuildRequires:  mvn(org.codehaus.mojo:mojo-parent:pom:)
-BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
-%endif
-
-%if %{with maven_reporting}
 BuildRequires:  mvn(org.apache.maven.doxia:doxia-sink-api)
 BuildRequires:  mvn(org.apache.maven.doxia:doxia-site-renderer)
+BuildRequires:  mvn(org.apache.maven:maven-model)
+BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
+BuildRequires:  mvn(org.apache.maven:maven-project)
 BuildRequires:  mvn(org.apache.maven.reporting:maven-reporting-api)
 BuildRequires:  mvn(org.apache.maven.reporting:maven-reporting-impl)
-%endif
+BuildRequires:  mvn(org.codehaus.mojo:mojo-parent:pom:)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-plugin-plugin)
 
 %description
 Maven Plugin for processing JavaCC grammar files.
 
-%javadoc_package
+%package javadoc
+Summary:        Javadoc for %{name}
+
+%description javadoc
+API documentation for %{name}.
 
 %prep
-%autosetup -n %{name}-%{name}-%{version}
+%setup -q 
+%patch0 -b .sav
 cp -p %{SOURCE1} .
 
-# Do not use jtb, which is unmaintained.  It is accessed only via reflection to
-# avoid depending on Java 1.5 for compilation.
-%pom_remove_dep edu.ucla.cs.compilers:jtb
-
-# Disable integration tests
-%pom_remove_plugin org.apache.maven.plugins:maven-invoker-plugin
-rm -fr src/it
-
-# Disable building the web site
-rm -fr src/site
-
-# In bootstrap mode, disable documentation and reporting
-# Add in a formerly transitive dependency that is still needed
-%if %{without maven_reporting}
-%pom_remove_dep org.apache.maven.doxia:
-%pom_remove_dep org.apache.maven.reporting:
-rm src/main/java/org/codehaus/mojo/javacc/JJDocMojo.java
-%pom_add_dep org.apache.maven:maven-core:3.8.6
-%endif
-
 %build
 %mvn_build
 
@@ -77,80 +48,12 @@ rm src/main/java/org/codehaus/mojo/javacc/JJDocMojo.java
 %mvn_install
 
 %files -f .mfiles
-%license LICENSE-2.0.txt src/main/resources/NOTICE
+%doc LICENSE-2.0.txt src/main/resources/NOTICE
-
-%changelog
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 3.0.1-9
-- Bump release for October 2024 mass rebuild:
-  Resolves: RHEL-64018
-
-* Thu Aug 01 2024 Troy Dawson <tdawson@redhat.com> - 3.0.1-8
-- Bump release for Aug 2024 java mass rebuild
-
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 3.0.1-7
-- Bump release for June 2024 mass rebuild
-
-* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.1-4
-- Rebuild
-
-* Sat Aug 26 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.1-3
-- Bootstrap using javapackages-bootstrap
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Wed Jul 19 2023 Jerry James <loganjerry@gmail.com> - 3.0.1-1
-- Add bootstrap mode to break a dependency loop
-
-* Wed Mar 29 2023 Jerry James <loganjerry@gmail.com> - 3.0.1-1
-- Version 3.0.1
-- Convert License tag to SPDX
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-38
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-37
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 
-* Fri Jul 08 2022 Jiri Vanek <jvanek@redhat.com> - 2.6-36
+%files javadoc -f .mfiles-javadoc
-- Rebuilt for Drop i686 JDKs
+%doc LICENSE-2.0.txt src/main/resources/NOTICE
-
-* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 2.6-35
-- Rebuilt for java-17-openjdk as system jdk
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-34
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-33
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-32
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-31
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 2.6-30
-- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-29
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-28
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-27
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-26
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
+%changelog
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-25
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild