!2 Update to 3.0.1

From: @starlet-dx 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
This commit is contained in:
openeuler-ci-bot 2023-07-31 06:46:52 +00:00 committed by Gitee
commit 71f2d6ab4e
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 12 additions and 85 deletions

Binary file not shown.

Binary file not shown.

View File

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

View File

@ -1,20 +1,19 @@
Name: javacc-maven-plugin Name: javacc-maven-plugin
Version: 2.6 Version: 3.0.1
Release: 27 Release: 1
Summary: Maven Plugin for processing JavaCC grammar files Summary: Maven Plugin for processing JavaCC grammar files
License: ASL 2.0 License: ASL 2.0
URL: https://www.mojohaus.org/ URL: https://www.mojohaus.org/
BuildArch: noarch 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 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: 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.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-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: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.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.codehaus.plexus:plexus-utils) mvn(org.apache.maven.plugins:maven-plugin-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-invoker-plugin)
%description %description
Process JavaCC grammars. Process JavaCC grammars.
@ -31,6 +30,10 @@ Help documentation for %{name}.
%autosetup -n %{name}-javacc-maven-plugin-%{version} -p1 %autosetup -n %{name}-javacc-maven-plugin-%{version} -p1
cp -p %{SOURCE1} . cp -p %{SOURCE1} .
%pom_remove_dep edu.ucla.cs.compilers:jtb
rm -fr src/it
rm -fr src/site
%build %build
%mvn_build %mvn_build
@ -44,5 +47,8 @@ cp -p %{SOURCE1} .
%doc src/main/resources/NOTICE %doc src/main/resources/NOTICE
%changelog %changelog
* Thu Jul 27 2023 yaoxin <yao_xin001@hoperun.com> - 3.0.1-1
- Update to 3.0.1
* Tue Mar 3 2020 shijian <shijian16@huawei.com> - 2.6-27 * Tue Mar 3 2020 shijian <shijian16@huawei.com> - 2.6-27
- Package init - Package init