Update to upstream 1.0.1 release.

This commit is contained in:
Alexander Kurtakov 2016-06-16 09:18:25 +03:00
parent 182d38a087
commit 37c9169697
4 changed files with 22 additions and 46 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
/xml-maven-plugin-1.0-source-release.zip
/xml-maven-plugin-1.0.1-source-release.zip

View File

@ -1,27 +0,0 @@
--- src/test/java/org/codehaus/mojo/xml/test/TransformMojoTest.java.old 2012-02-21 11:39:04.824470906 -0500
+++ src/test/java/org/codehaus/mojo/xml/test/TransformMojoTest.java 2012-02-21 11:39:29.195166230 -0500
@@ -185,24 +185,6 @@
return sw.toString();
}
- /**
- * Builds the it7 test project.
- */
- public void testIt8() throws Exception
- {
- if ( !java1_6_Aware() )
- {
- System.out.println( " skip test due to non compliance jvm version need 1.6" );
- return;
- }
- final String dir = "src/test/it8";
- runTest( dir );
- Document doc1 = parse( new File( dir, "target/generated-resources/xml/xslt/doc1.xml" ) );
-
- assertEquals("SAXON 8.7 from Saxonica", eval( doc1, "/root/vendor" ) );
- assertEquals("http://www.saxonica.com/", eval( doc1, "/root/vendor-url" ) );
- assertEquals("2.0", eval( doc1, "/root/version" ) );
- }
/**
* Builds the it10 test project.

View File

@ -1 +1 @@
9c1ebea50fb8076421864b062a34bf21 xml-maven-plugin-1.0-source-release.zip
8db63f5ec8224472d0c4e687b193b28c xml-maven-plugin-1.0.1-source-release.zip

View File

@ -1,19 +1,24 @@
Name: xml-maven-plugin
Version: 1.0
Release: 13%{?dist}
Version: 1.0.1
Release: 1%{?dist}
Summary: Maven XML Plugin
License: ASL 2.0
Url: http://mojo.codehaus.org/xml-maven-plugin/
Source0: http://repo2.maven.org/maven2/org/codehaus/mojo/xml-maven-plugin/1.0/xml-maven-plugin-1.0-source-release.zip
URL: http://www.mojohaus.org/xml-maven-plugin/
Source0: http://repo2.maven.org/maven2/org/codehaus/mojo/xml-maven-plugin/%{version}/xml-maven-plugin-%{version}-source-release.zip
BuildRequires: mojo-parent
BuildRequires: apache-rat-plugin
BuildRequires: maven-local
BuildRequires: maven-checkstyle-plugin
BuildRequires: maven-enforcer-plugin
BuildRequires: maven-invoker-plugin
BuildRequires: maven-plugin-testing-harness
BuildRequires: maven-local
BuildRequires: mvn(org.apache.maven:maven-core)
BuildRequires: mvn(org.apache.maven:maven-plugin-api)
BuildRequires: mvn(org.apache.maven.plugins:maven-invoker-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin)
BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
BuildRequires: mvn(org.codehaus.mojo:mojo-parent:pom:)
BuildRequires: mvn(org.codehaus.plexus:plexus-io)
BuildRequires: mvn(org.codehaus.plexus:plexus-resources)
BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
BuildRequires: mvn(xerces:xercesImpl)
BuildRequires: mvn(xml-apis:xml-apis)
BuildRequires: mvn(xml-resolver:xml-resolver)
BuildArch: noarch
@ -34,15 +39,9 @@ for d in LICENSE NOTICE ; do
sed -i 's/\r//' $d.txt
done
rm -rf src/it/mojo-1438-validate
# Add the version
sed -i 's|stylesheet |stylesheet version="1.0" |' src/it/it8/src/main/xsl/it8.xsl
# In maven 3, the functionality we need has been moved to maven-core
%pom_remove_dep org.apache.maven:maven-project
%pom_add_dep org.apache.maven:maven-core
%build
%mvn_build -f
@ -56,6 +55,9 @@ sed -i 's|stylesheet |stylesheet version="1.0" |' src/it/it8/src/main/xsl/it8.x
%doc LICENSE.txt NOTICE.txt
%changelog
* Thu Jun 16 2016 Alexander Kurtakov <akurtako@redhat.com> 1.0.1-1
- Update to upstream 1.0.1 release.
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild