[openjpa] fix BR list
gil
gil at fedoraproject.org
Fri Jun 20 08:50:41 UTC 2014
commit 7186b1f7ebe061c994cbce412840272522027c7d
Author: gil <puntogil at libero.it>
Date: Fri Jun 20 10:50:24 2014 +0200
fix BR list
openjpa.spec | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/openjpa.spec b/openjpa.spec
index 0009fab..b483cb1 100644
--- a/openjpa.spec
+++ b/openjpa.spec
@@ -27,7 +27,7 @@ BuildRequires: maven-invoker-plugin
BuildRequires: maven-plugin-plugin
BuildRequires: maven-remote-resources-plugin
BuildRequires: maven-site-plugin
-BuildRequires: maven-surefire-provider-junit4
+BuildRequires: maven-surefire-provider-junit
BuildRequires: mvn(org.apache.maven.wagon:wagon-providers)
BuildRequires: mvn(org.apache.maven.wagon:wagon-ssh)
@@ -50,7 +50,7 @@ BuildRequires: glassfish-jaxb
BuildRequires: glassfish-jaxb-api
BuildRequires: hibernate-jpa-2.0-api
BuildRequires: hsqldb1
-BuildRequires: log4j
+BuildRequires: log4j12
BuildRequires: mvn(org.apache.maven:maven-plugin-api)
BuildRequires: mvn(org.apache.maven:maven-project)
BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
@@ -73,6 +73,9 @@ BuildRequires: mysql-connector-java
BuildRequires: regexp
BuildRequires: simple-jndi
+# used by openjpa-maven-plugin and openjpa-lib
+Requires: log4j12
+
BuildArch: noarch
%description
@@ -233,6 +236,11 @@ sed -i 's|<hsqldb.version>1.8.0.10</hsqldb.version>|<hsqldb.version>1</hsqldb.ve
%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:groupId='asm']/pom:version" 3 %{name}-kernel
+# use proper log4j version
+%pom_xpath_set "pom:dependencyManagement/pom:dependencies/pom:dependency[pom:groupId='log4j']/pom:version" 1.2.17
+%pom_xpath_set "pom:dependencies/pom:dependency[pom:groupId='log4j']/pom:version" 1.2.17 openjpa-tools/openjpa-maven-plugin
+%pom_xpath_inject "pom:dependencies/pom:dependency[pom:groupId='log4j']/pom:version" "<version>1.2.17</version>" openjpa-lib
+
%build
%mvn_package ":%{name}-tools" tools
%mvn_package ":%{name}-maven-plugin" tools
More information about the scm-commits
mailing list