rpms/maven-eclipse-plugin/devel import.log, NONE, 1.1 maven-eclipse-plugin-depmap.xml, NONE, 1.1 maven-eclipse-plugin-install-plugin-mojo.patch, NONE, 1.1 maven-eclipse-plugin-pom.patch, NONE, 1.1 maven-eclipse-plugin.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Weinan Li
weli at fedoraproject.org
Mon Jun 21 04:40:35 UTC 2010
Author: weli
Update of /cvs/pkgs/rpms/maven-eclipse-plugin/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv12344/devel
Modified Files:
.cvsignore sources
Added Files:
import.log maven-eclipse-plugin-depmap.xml
maven-eclipse-plugin-install-plugin-mojo.patch
maven-eclipse-plugin-pom.patch maven-eclipse-plugin.spec
Log Message:
%changelog
* Fri Jun 11 2010 Weinan Li <weli at redhat.com> - 2.8-1
- Initial Package
--- NEW FILE import.log ---
maven-eclipse-plugin-2_8-1_fc14:HEAD:maven-eclipse-plugin-2.8-1.fc14.src.rpm:1277095166
--- NEW FILE maven-eclipse-plugin-depmap.xml ---
<dependencies>
<!-- Below are entries for packages in Brew that still don't have POMs.
This will be fixed with time by the Third-Party project. -->
<dependency>
<maven>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-resources</artifactId>
<version>1.0-alpha-7</version>
</maven>
<jpp>
<groupId>JPP/plexus</groupId>
<artifactId>resources</artifactId>
<version>1.0</version>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>bsf</groupId>
<artifactId>bsf</artifactId>
<version>2.4.0</version>
</maven>
<jpp>
<groupId>JPP</groupId>
<artifactId>bsf</artifactId>
<version>2.4.0</version>
</jpp>
</dependency>
<!-- <dependency>
<maven>
<groupId>org.eclipse.core</groupId>
<artifactId>resources</artifactId>
<version>3.3.0-v20070604</version>
</maven>
<jpp>
<groupId>JPP/org.eclipse.core</groupId>
<artifactId>resources</artifactId>
<version>3.5.2</version>
</jpp>
</dependency>
-->
</dependencies>
maven-eclipse-plugin-install-plugin-mojo.patch:
InstallPluginsMojo.java | 4 ----
1 file changed, 4 deletions(-)
--- NEW FILE maven-eclipse-plugin-install-plugin-mojo.patch ---
--- src/main/java/org/apache/maven/plugin/eclipse/InstallPluginsMojo.java.orig 2010-06-11 11:21:24.000000000 +0800
+++ src/main/java/org/apache/maven/plugin/eclipse/InstallPluginsMojo.java 2010-06-11 11:21:43.000000000 +0800
@@ -407,10 +407,6 @@
{
throw new MojoExecutionException( "Could not extract: " + artifactFile, e );
}
- catch ( IOException e )
- {
- throw new MojoExecutionException( "Could not extract: " + artifactFile, e );
- }
}
}
maven-eclipse-plugin-pom.patch:
pom.xml | 57 +--------------------------------------------------------
1 file changed, 1 insertion(+), 56 deletions(-)
--- NEW FILE maven-eclipse-plugin-pom.patch ---
--- pom.xml.orig 2010-06-10 23:55:01.000000000 +0800
+++ pom.xml 2010-06-11 13:42:46.000000000 +0800
@@ -120,7 +120,7 @@
<dependency>
<groupId>org.eclipse.core</groupId>
<artifactId>resources</artifactId>
- <version>3.3.0-v20070604</version>
+ <version>3.5.2-v201004121342</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.ant</groupId>
@@ -220,61 +220,6 @@
<version>2.4.3</version>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>verify-integration-tests-checks</id>
- <phase>post-integration-test</phase>
- <configuration>
- <tasks>
- <property name="script" location="verify-integration-tests-checks.bsh" />
- <script language="beanshell" src="${script}" />
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-nodeps</artifactId>
- <version>1.7.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-apache-bsf</artifactId>
- <version>1.7.1</version>
- </dependency>
- <dependency>
- <groupId>org.beanshell</groupId>
- <artifactId>bsh</artifactId>
- <version>2.0b4</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>require-maven-2.0.9</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireMavenVersion>
- <!-- The tests check file encoding and class path ordering which depends on fixes in latest Maven -->
- <version>[2.0.9,)</version>
- </requireMavenVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<includes>
--- NEW FILE maven-eclipse-plugin.spec ---
Name: maven-eclipse-plugin
Version: 2.8
Release: 1%{?dist}
Summary: Maven Eclipse Plugin
Group: Development/Libraries
License: ASL 2.0
URL: http://maven.apache.org/plugins/maven-eclipse-plugin/
# svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-eclipse-plugin-2.8 maven-eclipse-plugin
# tar czf maven-eclipse-plugin-2.8.tgz maven-eclipse-plugin
Source0: maven-eclipse-plugin-2.8.tgz
Source1: %{name}-depmap.xml
# NOTE: Patch0 is used for three purposes:
# 1. Bypass maven version check
# 2. Bypass the post-integration-test goal
# 3. Use the newer eclipse resources version that we have in rawhide.
# 1 and 2 should be fixed in the future
# FIXME: It needs maven > 2.0.9 for unit testing, because we don't have it yet,
# so we should patch the pom to bypass enforcer firstly. The should be removed
# when the maven 2.2 bootstrap is done in rawhide
Patch0: %{name}-pom.patch
# FIXME: The highest version of plexus-resources is a4, but we need a7.
# In a7, the same API throw an extra IOException, the patch is tested to be
# safe. But it should be removed when a7 is ready.
Patch1: %{name}-install-plugin-mojo.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
# Basic stuff
BuildRequires: jpackage-utils
BuildRequires: java-devel >= 1:1.6.0
# Maven and its dependencies
BuildRequires: maven2
BuildRequires: maven-plugin-plugin
BuildRequires: maven-resources-plugin
BuildRequires: maven-compiler-plugin
BuildRequires: maven-install-plugin
BuildRequires: maven-javadoc-plugin
BuildRequires: maven-jar-plugin
BuildRequires: maven-doxia
BuildRequires: maven-doxia-tools
BuildRequires: maven-doxia-sitetools
BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-surefire-maven-plugin
BuildRequires: maven-plugin-cobertura
BuildRequires: maven-archiver
BuildRequires: maven-shared-osgi
BuildRequires: maven-antrun-plugin
BuildRequires: maven-idea-plugin
BuildRequires: maven-invoker-plugin
# The following maven packages haven't updated yet
BuildRequires: maven2-plugin-changes
BuildRequires: maven2-plugin-enforcer
# Others
BuildRequires: apache-commons-io
BuildRequires: aqute-bndlib
BuildRequires: easymock
BuildRequires: xmlunit
BuildRequires: eclipse-platform = 1:3.5.2
BuildRequires: plexus-resources
BuildRequires: bsf
Requires: java
Requires: maven2
Requires: apache-commons-io
Requires: aqute-bndlib
Requires: plexus-resources
Requires: jpackage-utils
Requires(post): jpackage-utils
Requires(postun): jpackage-utils
Provides: maven2-plugin-eclipse = 0:%{version}-%{release}
Obsoletes: maven2-plugin-eclipse <= 0:2.0.8
%description
The Eclipse Plugin is used to generate Eclipse IDE files (.project, .classpath
and the .settings folder) from a POM.
%package javadoc
Group: Documentation
Summary: Javadoc for %{name}
Requires: jpackage-utils
%description javadoc
API documentation for %{name}.
%prep
%setup -q -n %{name}
%patch0
%patch1
%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
# The depmap is used by the mvn-jpp command to convert dependencies
# to the locations and versions that are available (if needed)
cp %{SOURCE1} %{name}-depmap.xml
export MAVEN_DEPMAP=$(pwd)/%{name}-depmap.xml
# Install necessary package to maven repository
mvn-jpp \
-e \
-Dmaven2.jpp.mode=true \
-Dmaven2.jpp.depmap.file=${MAVEN_DEPMAP} \
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
install:install-file \
-DgroupId=org.eclipse.core \
-DartifactId=resources \
-Dversion=3.5.2-v201004121342 \
-Dpackaging=jar \
-Dfile=/usr/lib/eclipse/plugins/org.eclipse.core.resources_3.5.2.201004121342.jar
mvn-jpp \
-e \
-Dmaven.test.skip=true \
-Dmaven2.jpp.mode=true \
-Dmaven2.jpp.depmap.file=${MAVEN_DEPMAP} \
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
install javadoc:javadoc
%install
rm -rf %{buildroot}
# jars
install -d -m 0755 %{buildroot}%{_javadir}
install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; \
do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
%add_to_maven_depmap org.apache.maven.plugins maven-eclipse-plugin %{version} JPP maven-eclipse-plugin
# poms
install -d -m 755 %{buildroot}%{_mavenpomdir}
install -pm 644 pom.xml \
%{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
# javadoc
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
rm -rf target/site/api*
%post
%update_maven_depmap
%postun
%update_maven_depmap
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%{_javadir}/*
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%changelog
* Fri Jun 11 2010 Weinan Li <weli at redhat.com> - 2.8-1
- Initial Package
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maven-eclipse-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore 21 Jun 2010 02:37:25 -0000 1.1
+++ .cvsignore 21 Jun 2010 04:40:35 -0000 1.2
@@ -0,0 +1 @@
+maven-eclipse-plugin-2.8.tgz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maven-eclipse-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources 21 Jun 2010 02:37:25 -0000 1.1
+++ sources 21 Jun 2010 04:40:35 -0000 1.2
@@ -0,0 +1 @@
+dd055eeca34e45dd961193c5e6940c97 maven-eclipse-plugin-2.8.tgz
More information about the scm-commits
mailing list