packages/stax-ex
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!6 Upgrade to 1.8 version

Browse Source 
Merge pull request !6 from houyingchao/openEuler-22.03-LTS-Next
This commit is contained in:
openeuler-ci-bot 2022-01-18 06:47:03 +00:00 committed by Gitee
commit faca968e72
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
5 changed files with 245 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

186
0001-fix-maven-compiler-plugin-release-flag.patch Normal file
View File

@ -0,0 +1,186 @@
From 92ae7610d3af4e9a4785b4009a86e852b462f3d0 Mon Sep 17 00:00:00 2001
From: wang--ge <wang__ge@126.com>
Date: Fri, 31 Dec 2021 17:45:51 +0800
Subject: [PATCH] fix maven compiler plugin release flag
---
stax-ex/pom.xml | 121 +++++++++---------------------------------------
1 file changed, 21 insertions(+), 100 deletions(-)
diff --git a/stax-ex/pom.xml b/stax-ex/pom.xml
index 7d59984..b6a91ac 100644
--- a/stax-ex/pom.xml
+++ b/stax-ex/pom.xml
@@ -127,30 +127,11 @@
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.0</version>
</plugin>
- <plugin>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>3.0.5</version>
- </plugin>
- <plugin>
- <groupId>org.glassfish.copyright</groupId>
- <artifactId>glassfish-copyright-maven-plugin</artifactId>
- <version>1.49</version>
- </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>2.7</version>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>buildnumber-maven-plugin</artifactId>
- <version>1.4</version>
- </plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
@@ -190,7 +171,9 @@
<!--compile all as JPMS module-->
<id>default-compile</id>
<configuration>
- <release>9</release>
+ <source>1.7</source>
+ <target>1.7</target>
+ <encoding>UTF-8</encoding>
</configuration>
</execution>
<execution>
@@ -200,60 +183,33 @@
<goal>compile</goal>
</goals>
<configuration>
- <release>7</release>
- <excludes>
- <exclude>module-info.java</exclude>
- </excludes>
+ <source>1.7</source>
+ <target>1.7</target>
+ <encoding>UTF-8</encoding>
</configuration>
</execution>
</executions>
<configuration>
- <release>7</release>
+ <source>1.7</source>
+ <target>1.7</target>
+ <encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <additionalparam>-Xdoclint:none</additionalparam>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <configuration>
- <skip>${findbugs.skip}</skip>
- <threshold>${findbugs.threshold}</threshold>
- <findbugsXmlWithMessages>true</findbugsXmlWithMessages>
- <excludeFilterFile>
- exclude-common.xml,${findbugs.exclude}
- </excludeFilterFile>
- <fork>true</fork>
- <jvmArgs>-Xms64m -Xmx256m</jvmArgs>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.glassfish.findbugs</groupId>
- <artifactId>findbugs</artifactId>
- <version>1.7</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <groupId>org.glassfish.copyright</groupId>
- <artifactId>glassfish-copyright-maven-plugin</artifactId>
- <configuration>
- <templateFile>${project.basedir}/copyright.txt</templateFile>
- <excludeFile>${project.basedir}/copyright-exclude</excludeFile>
- <!-- skip files not under SCM-->
- <scmOnly>true</scmOnly>
- <!-- turn off warnings -->
- <warn>true</warn>
- <!-- for use with repair -->
- <update>false</update>
- <!-- check that year is correct -->
- <ignoreYear>false</ignoreYear>
- </configuration>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <additionalJOption>-Xdoclint:none</additionalJOption>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -269,34 +225,6 @@
</check>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>buildnumber-maven-plugin</artifactId>
- <configuration>
- <getRevisionOnlyOnce>true</getRevisionOnlyOnce>
- <timestampFormat>{0,date,yyyy-MM-dd'T'HH:mm:ssZ}</timestampFormat>
- <providerImplementations>
- <svn>javasvn</svn>
- </providerImplementations>
- <getRevisionOnlyOnce>true</getRevisionOnlyOnce>
- <revisionOnScmFailure>false</revisionOnScmFailure>
- </configuration>
- <executions>
- <execution>
- <phase>validate</phase>
- <goals>
- <goal>create</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.tmatesoft.svnkit</groupId>
- <artifactId>svnkit</artifactId>
- <version>1.7.4-v1</version>
- </dependency>
- </dependencies>
- </plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
@@ -324,13 +252,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <retryFailedDeploymentCount>10</retryFailedDeploymentCount>
- </configuration>
- </plugin>
</plugins>
</build>
--
2.30.0

BIN
1.8.tar.gz Normal file
View File

Binary file not shown.

BIN
stax-ex-1.7.7.tar.gz
View File

Binary file not shown.

50
stax-ex.spec
View File

@ -1,13 +1,14 @@
Name: stax-ex
Version: 1.7.7
Release: 11
Version: 1.8
Release: 1
Summary: StAX API extensions
License: CDDL or GPLv2
Url: https://stax-ex.dev.java.net
Source0: https://github.com/javaee/metro-stax-ex/archive/stax-ex-%{version}.tar.gz
BuildRequires: dos2unix maven-local mvn(javax.xml.stream:stax-api) mvn(junit:junit)
BuildRequires: mvn(net.java:jvnet-parent:pom:) mvn(org.apache.felix:maven-bundle-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) git
Source0: https://github.com/javaee/metro-stax-ex/archive/%{version}.tar.gz
Source1: xmvn-reactor
Patch0: 0001-fix-maven-compiler-plugin-release-flag.patch
BuildRequires: maven java-1.8.0-openjdk-devel dos2unix maven-local git
Requires: javapackages-tools java-1.8.0-openjdk
BuildArch: noarch
%description
@ -25,30 +26,45 @@ Obsoletes: stax-ex-javadoc < %{version}-%{release}
The package provides javadoc for stax-ex.
%prep
%autosetup -n metro-stax-ex-stax-ex-%{version} -p1 -S git
%pom_remove_dep javax.activation:activation
%pom_remove_plugin org.codehaus.mojo:buildnumber-maven-plugin
%pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin
%pom_remove_plugin org.glassfish.copyright:glassfish-copyright-maven-plugin
%pom_remove_plugin org.apache.maven.plugins:maven-deploy-plugin
%autosetup -n metro-stax-ex-%{version} -p1 -S git
find . -name '*.jar' -print -delete
find . -name '*.class' -print -delete
pushd %{name}
cp %{SOURCE1} ./.xmvn-reactor
echo `pwd` > absolute_prefix.log
sed -i 's/\//\\\//g' absolute_prefix.log
absolute_prefix=`head -n 1 absolute_prefix.log`
sed -i 's/absolute-prefix/'"$absolute_prefix"'/g' .xmvn-reactor
rm -rf src/java/module-info.java
mv LICENSE.txt LICENSE.txt.tmp
iconv -f ISO-8859-1 -t UTF-8 LICENSE.txt.tmp > LICENSE.txt
dos2unix LICENSE.txt
%mvn_file :stax-ex stax-ex
popd
%build
%mvn_build -- -Dproject.build.sourceEncoding=UTF-8
pushd %{name}
mvn -Dproject.build.sourceEncoding=UTF-8 -DskipTests -DskipIT package
popd
%install
pushd %{name}
%mvn_install
popd
install -d -m 0755 %{buildroot}/%{_javadocdir}/%{name}
install -m 0755 %{name}/target/stax-ex-1.8-javadoc.jar %{buildroot}/%{_javadocdir}/%{name}
%files -f .mfiles
%license LICENSE.txt
%files -f %{name}/.mfiles
%license LICENSE
%files help -f .mfiles-javadoc
%license LICENSE.txt
%files help
%license LICENSE
%{_javadocdir}/%{name}
%changelog
* Fri Dec 31 2021 houyingchao <houyingchao@huawei.com> - 1.8-1
- Update to version 1.8
* Mon May 31 2021 huanghaitao <huanghaitao8@huawei.com> - 1.7.7-11
- Completing build dependencies to fix git commands missing error

26
xmvn-reactor Normal file
View File

@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
<artifacts>
<artifact>
<groupId>org.jvnet.staxex</groupId>
<artifactId>stax-ex</artifactId>
<version>1.8</version>
<path>absolute-prefix/target/stax-ex-1.8.jar</path>
<properties>
<type>jar</type>
<requiresJava>1.6</requiresJava>
</properties>
</artifact>
<artifact>
<groupId>org.jvnet.staxex</groupId>
<artifactId>stax-ex</artifactId>
<extension>pom</extension>
<version>1.8</version>
<path>absolute-prefix/pom.xml</path>
<properties>
<type>jar</type>
<requiresJava>1.6</requiresJava>
</properties>
</artifact>
</artifacts>
</metadata>