Author: pawelz Date: Thu May 6 11:22:50 2010 GMT
Module: packages Tag: JPACKAGE
---- Log message:
- PLDized classworlds dep
- temporarily disabled easymock (is it really required?)
---- Files affected:
packages/maven:
maven.spec (1.18.2.20 -> 1.18.2.21)
---- Diffs:
================================================================
Index: packages/maven/maven.spec
diff -u packages/maven/maven.spec:1.18.2.20 packages/maven/maven.spec:1.18.2.21
--- packages/maven/maven.spec:1.18.2.20 Wed May 5 02:01:01 2010
+++ packages/maven/maven.spec Thu May 6 13:22:44 2010
@@ -101,6 +101,9 @@
Patch19: %{name}-plugins-disableenforcer.patch
Patch20: %{name}-commons-cli-1.1.patch
+# Patches added by PLD
+Patch100: %{name}-no-easymock.patch
+
### PLDIZED DEPENDENCIES {{{
### BRs {{{
BuildRequires: ant >= 1.6.5
@@ -108,6 +111,7 @@
BuildRequires: antlr >= 2.7.4
BuildRequires: ant-nodeps
BuildRequires: java-bsh >= 1.3.0
+BuildRequires: java-classworlds >= 1.1
BuildRequires: java-commons-beanutils >= 1.7.0
BuildRequires: java-commons-cli >= 1.0
BuildRequires: java-commons-collections >= 3.1
@@ -147,6 +151,7 @@
Requires: ant >= 1.6.5
Requires: antlr >= 2.7.4
Requires: java-bsh >= 1.3.0
+Requires: java-classworlds >= 1.
Requires: java-commons-beanutils >= 1.7.0
Requires: java-commons-cli >= 1.0
Requires: java-commons-collections >= 3.1
@@ -170,6 +175,7 @@
Requires: java-xmlunit
Requires: java-xom
Requires: maven-common-poms
+Requires(post): java-classworlds >= 1.1
Requires(post): java-commons-cli >= 1.0
Requires(post): java-commons-lang >= 2.1
Requires(post): java-commons-logging >= 1.0.4
@@ -205,7 +211,6 @@
#BuildRequires: cglib >= 2.1.0
BuildRequires: checkstyle4 >= 4.1
BuildRequires: checkstyle4-optional >= 4.1
-BuildRequires: classworlds >= 1.1
#BuildRequires: jmock >= 1.0.1
BuildRequires: jline >= 0.8.1
BuildRequires: maven-jxr >= 1.0-2
@@ -275,8 +280,6 @@
Requires: aqute-bndlib
#Requires: cglib >= 2.1.0
Requires: checkstyle4 >= 4.1
-Requires: classworlds >= 1.
-Requires(post): classworlds >= 1.1
#Requires: tomcat5-parent
Requires: jaxen >= 1.1
#Requires: jmock >= 1.0.1
@@ -1040,6 +1043,10 @@
mkdir -p m2_repo/repository/JPP/maven2/default_poms
cp -p %{SOURCE13}
m2_repo/repository/JPP/maven2/default_poms/JPP.maven-empty-dep.pom
cp -p %{SOURCE14} m2_repo/repository/JPP/maven2/empty-dep.jar
+
+# Patches added by PLD
+find -name pom.xml -o -name '*.pom' | xargs sed -i
's#<version>1\.2_Java1\.3</version>#<version>1.2</version>#g'
+%patch100 -p1
### }}}
### build {{{
@@ -1729,6 +1736,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.18.2.21 2010/05/06 11:22:44 pawelz
+- PLDized classworlds dep
+- temporarily disabled easymock (is it really required?)
+
Revision 1.18.2.20 2010/05/05 00:01:01 pawelz
- pldized maven-common-poms dependency. It starts to compile now.
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/maven/maven.spec?r1=1.18.2.20&r2=1.18.2.21&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
