[maven-ant-tasks] Initial import

Orion Poplawski orion at fedoraproject.org
Wed Sep 1 19:54:27 UTC 2010


commit f61f9a336cbe213626dded183d10eda9899beeae
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Wed Sep 1 13:54:24 2010 -0600

    Initial import

 .gitignore                               |    1 +
 maven-ant-tasks-2.1.1-ant-launcher.patch |   16 +++
 maven-ant-tasks.depmap                   |   14 +++
 maven-ant-tasks.spec                     |  147 ++++++++++++++++++++++++++++++
 sources                                  |    1 +
 5 files changed, 179 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..d6eea3f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/maven-ant-tasks-2.1.1-src.zip
diff --git a/maven-ant-tasks-2.1.1-ant-launcher.patch b/maven-ant-tasks-2.1.1-ant-launcher.patch
new file mode 100644
index 0000000..dc97d3f
--- /dev/null
+++ b/maven-ant-tasks-2.1.1-ant-launcher.patch
@@ -0,0 +1,16 @@
+--- maven-ant-tasks-2.1.1/src/it/ant-tasks-in-ant-run-plugin/pom.xml.ant-launcher	2010-07-19 22:36:30.000000000 -0600
++++ maven-ant-tasks-2.1.1/src/it/ant-tasks-in-ant-run-plugin/pom.xml	2010-08-27 10:31:57.686613821 -0600
+@@ -44,6 +44,13 @@
+             </configuration>
+           </execution>
+         </executions>
++        <dependencies>
++          <dependency>
++            <groupId>ant</groupId>
++            <artifactId>ant-launcher</artifactId>
++            <version>1.8.0</version>
++          </dependency>
++        </dependencies>
+       </plugin>
+     </plugins>
+   </build>
diff --git a/maven-ant-tasks.depmap b/maven-ant-tasks.depmap
new file mode 100644
index 0000000..1b66755
--- /dev/null
+++ b/maven-ant-tasks.depmap
@@ -0,0 +1,14 @@
+<dependencies>
+    <dependency>
+        <maven>
+            <groupId>org.codehaus.plexus</groupId>
+            <artifactId>plexus-container-default</artifactId>
+            <version>1</version>
+        </maven>
+        <jpp>
+            <groupId>JPP/plexus</groupId>
+            <artifactId>container-default</artifactId>
+            <version>1</version>
+        </jpp>
+    </dependency>
+</dependencies>
diff --git a/maven-ant-tasks.spec b/maven-ant-tasks.spec
new file mode 100644
index 0000000..b6b327c
--- /dev/null
+++ b/maven-ant-tasks.spec
@@ -0,0 +1,147 @@
+Name:           maven-ant-tasks
+Version:        2.1.1
+Release:        4%{?dist}
+Summary:        Allow Maven artifact handling features to be used from within an Ant build
+
+Group:          Development/Libraries
+License:        ASL 2.0
+URL:            http://maven.apache.org/ant-tasks/index.html
+#The ant-tasks-in-ant-run-plugin test needs a dependency on ant-launcher
+Source0:        http://www.apache.org/dist/maven/source/maven-ant-tasks-%{version}-src.zip
+Source1:        %{name}.depmap
+Patch0:         maven-ant-tasks-2.1.1-ant-launcher.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:      noarch
+
+BuildRequires:  jpackage-utils
+BuildRequires:  java-devel
+BuildRequires:  ant >= 1.8.0
+BuildRequires:  maven2
+BuildRequires:  maven-antrun-plugin
+BuildRequires:  maven-compiler-plugin
+BuildRequires:  maven-install-plugin
+BuildRequires:  maven-invoker-plugin
+BuildRequires:  maven-jar-plugin
+BuildRequires:  maven-javadoc-plugin
+BuildRequires:  maven-resources-plugin
+BuildRequires:  maven-shade-plugin
+BuildRequires:  maven-surefire-maven-plugin
+BuildRequires:  objectweb-asm
+BuildRequires:  plexus-interpolation
+
+Requires:       jpackage-utils
+
+Requires(post):       jpackage-utils
+Requires(postun):     jpackage-utils
+
+Requires:       java
+
+%description
+Maven Ant Tasks allow several of Maven's artifact handling features to be
+used from within an Ant build. These include:
+
+* Dependency management - including transitive dependencies, scope recognition
+  and SNAPSHOT handling
+* Artifact deployment - deployment to a Maven repository (file integrated,
+  other with extensions)
+* POM processing - for reading and writing a Maven 2 pom.xml file
+
+
+%package javadoc
+Summary:        Javadocs for %{name}
+Group:          Documentation
+Requires:       jpackage-utils
+
+%description javadoc
+This package contains the API documentation for %{name}.
+
+
+%prep
+%setup -q
+%patch0 -p1 -b .ant-launcher
+#Need to tell maven invoker to run in jpp mode, write test.properties files
+for f in src/it/*/invoker.properties
+do
+   tp=${f/invoker/test}
+   cat >> $tp <<EOF 
+maven2.jpp.mode=1
+EOF
+done
+
+
+%build
+#We need to use their local repo becase we can't override it
+export MAVEN_REPO_LOCAL=$(pwd)/target/local-repo
+mkdir -p $MAVEN_REPO_LOCAL
+
+mvn-jpp -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+        -Dmaven2.jpp.depmap.file="%{SOURCE1}" \
+        install javadoc:javadoc
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+mkdir -p $RPM_BUILD_ROOT%{_javadir}
+cp -p target/%{name}-%{version}.jar \
+      $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}
+cp -rp target/site/apidocs \
+       $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+install -pm 644 pom.xml \
+$RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+
+%add_to_maven_depmap org.apache.maven %{name} %{version} JPP %{name}
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%post
+%update_maven_depmap
+
+%postun
+%update_maven_depmap
+
+
+%files
+%defattr(-,root,root,-)
+%doc DEPENDENCIES LICENSE NOTICE README.txt
+%{_mavenpomdir}/*
+%{_mavendepmapfragdir}/*
+%{_javadir}/*
+
+%files javadoc
+%defattr(-,root,root,-)
+%doc LICENSE
+%{_javadocdir}/%{name}
+%{_javadocdir}/%{name}-%{version}
+
+
+%changelog
+* Wed Sep 1 2010 Orion Poplawski <orion at cora.nwra.com> 2.1.1-4
+- Re-order defattr/doc
+- Use _mavenpomdir everywhere
+- Use depmap
+
+* Mon Aug 30 2010 Orion Poplawski <orion at cora.nwra.com> 2.1.1-3
+- Fix description typo
+- Fix javadoc package group
+- Add license to javadoc package
+- Make javadoc dir versioned with link
+- Own maven files, not the dirs
+- Use new maven names in BRs
+
+* Fri Aug 27 2010 Orion Poplawski <orion at cora.nwra.com> 2.1.1-2
+- Add patch to fix integration test
+
+* Wed Aug 11 2010 Orion Poplawski <orion at cora.nwra.com> 2.1.1-1
+- Update to 2.1.1
+
+* Mon Jun 28 2010 Orion Poplawski <orion at cora.nwra.com> 2.1.0-1
+- Initial Fedora package
diff --git a/sources b/sources
index e69de29..73d400c 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+c37d7f6105f27fd87818045f5a0ae33a  maven-ant-tasks-2.1.1-src.zip


More information about the scm-commits mailing list