Accepting request 1205317 from Java:packages

3.1.0

OBS-URL: https://build.opensuse.org/request/show/1205317
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/javacc-maven-plugin?expand=0&rev=5

_service

@@ -0,0 +1,13 @@
+<services>
+	<service name="tar_scm" mode="disabled">
+		<param name="scm">git</param>
+		<param name="url">https://github.com/mojohaus/javacc-maven-plugin.git</param>
+		<param name="revision">3.1.0</param>
+		<param name="versionformat">@PARENT_TAG@</param>
+	</service>
+	<service name="recompress" mode="disabled">
+		<param name="file">*.tar</param>
+		<param name="compression">xz</param>
+	</service>
+	<service name="set_version" mode="disabled"/>
+</services>

javacc-maven-plugin-2.6.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3af65c978b4a196d51ff0a035859fd62c4655fc7cc878e613d57a4d275b8db8b
-size 50107

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

javacc-maven-plugin-pom.patch

@@ -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.
-       <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>

javacc-maven-plugin.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Wed Oct  2 18:04:14 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- 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 <gus.kenion@suse.com>
 

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 -- \