diff --git a/_service b/_service
new file mode 100644
index 0000000..362c5ad
--- /dev/null
+++ b/_service
@@ -0,0 +1,13 @@
+
+
+ git
+ https://github.com/mojohaus/javacc-maven-plugin.git
+ 3.1.0
+ @PARENT_TAG@
+
+
+ *.tar
+ xz
+
+
+
diff --git a/javacc-maven-plugin-2.6.tar.bz2 b/javacc-maven-plugin-2.6.tar.bz2
deleted file mode 100644
index 8e3a624..0000000
--- a/javacc-maven-plugin-2.6.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3af65c978b4a196d51ff0a035859fd62c4655fc7cc878e613d57a4d275b8db8b
-size 50107
diff --git a/javacc-maven-plugin-3.1.0.tar.xz b/javacc-maven-plugin-3.1.0.tar.xz
new file mode 100644
index 0000000..a3e610c
--- /dev/null
+++ b/javacc-maven-plugin-3.1.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d296f162967ccd28e45292ecf3cc1ba14475ef8ff293b9ab6922a47542dd0711
+size 49920
diff --git a/javacc-maven-plugin-pom.patch b/javacc-maven-plugin-pom.patch
deleted file mode 100644
index 04e3de6..0000000
--- a/javacc-maven-plugin-pom.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- 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.
- 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.changes b/javacc-maven-plugin.changes
index 55201e2..393069f 100644
--- a/javacc-maven-plugin.changes
+++ b/javacc-maven-plugin.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Wed Oct 2 18:04:14 UTC 2024 - Fridrich Strba
+
+- Upgrade to upstream version 3.1.0
+ * Changes
+ + Require Maven 3.6.3+
+ + Enable spotless for code formatting
+ + Do not overwrite javacc defaults
+ + move to annotations, use a prefix javacc. for all properties
+- Fetch source code from github using source service
+- Removed patch:
+ * javacc-maven-plugin-pom.patch
+ + not needed since the jtb is now packaged and we depend on it
+
-------------------------------------------------------------------
Wed Feb 21 10:45:39 UTC 2024 - Gus Kenion
diff --git a/javacc-maven-plugin.spec b/javacc-maven-plugin.spec
index 2e7da12..c4dfa48 100644
--- a/javacc-maven-plugin.spec
+++ b/javacc-maven-plugin.spec
@@ -17,31 +17,32 @@
Name: javacc-maven-plugin
-Version: 2.6
+Version: 3.1.0
Release: 0
Summary: Maven Plugin for processing JavaCC grammar files
License: Apache-2.0
Group: Development/Libraries/Java
URL: http://mojo.codehaus.org/javacc-maven-plugin/
-#svn export http://svn.codehaus.org/mojo/tags/javacc-maven-plugin-2.6
-#tar cjf javacc-maven-plugin-2.6.tar.bz2 javacc-maven-plugin-2.6
-Source0: javacc-maven-plugin-2.6.tar.bz2
+Source0: %{name}-%{version}.tar.xz
Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
-Patch0: javacc-maven-plugin-pom.patch
BuildRequires: fdupes
BuildRequires: java-devel >= 1.8
BuildRequires: maven-local
+BuildRequires: mvn(edu.ucla.cs.compilers:jtb)
BuildRequires: mvn(net.java.dev.javacc:javacc)
BuildRequires: mvn(org.apache.maven.doxia:doxia-sink-api)
BuildRequires: mvn(org.apache.maven.doxia:doxia-site-renderer)
+BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin)
BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-api)
BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-impl)
+BuildRequires: mvn(org.apache.maven:maven-artifact)
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.mojo:mojo-parent:pom:)
BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
+BuildRequires: mvn(org.codehaus.plexus:plexus-xml)
BuildArch: noarch
%description
@@ -56,12 +57,12 @@ API documentation for %{name}.
%prep
%setup -q
-%patch -P 0 -b .sav
cp -p %{SOURCE1} .
-# migrate to maven 3
-%pom_xpath_set pom:prerequisites/pom:maven 3.8.6
-%pom_change_dep :maven-project :maven-core
+# Only used for integration tests
+%pom_remove_plugin :maven-invoker-plugin
+
+%mvn_alias :javacc-maven-plugin org.javacc.plugin:
%build
%{mvn_build} -f -- \