commit 1e01d8859bdbd73a6a38205f7a5459447b7bbeca
Author: Stanislav Ochotnicky <sochotnicky@xxxxxxxxxx>
Date: Tue Nov 9 13:31:17 2010 +0100
Add depmaps for api and adapters subpackages
- Use apache-commons-parent BR instead of maven-*
- Replace tomcat5 BR with tomcat6
- Reenable tests
apache-commons-logging.spec | 47 +++++++++++++++++++++++-------------------
commons-logging.depmap | 10 +++++++++
2 files changed, 36 insertions(+), 21 deletions(-)
---
diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec
index 7ede3cc..5ef9ace 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -4,7 +4,7 @@
Name: apache-%{short_name}
Version: 1.1.1
-Release: 11%{?dist}
+Release: 12%{?dist}
Summary: Apache Commons Logging
License: ASL 2.0
Group: Development/Libraries
@@ -18,22 +18,11 @@ BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils >= 0:1.6
BuildRequires: avalon-framework
BuildRequires: avalon-logkit
-BuildRequires: maven-doxia-sitetools
+BuildRequires: apache-commons-parent
BuildRequires: maven-plugin-build-helper
-BuildRequires: maven-plugin-bundle
-BuildRequires: maven-surefire-maven-plugin
-BuildRequires: maven2-plugin-antrun
-BuildRequires: maven2-plugin-assembly
-BuildRequires: maven2-plugin-compiler
-BuildRequires: maven2-plugin-install
-BuildRequires: maven2-plugin-idea
-BuildRequires: maven2-plugin-jar
-BuildRequires: maven2-plugin-javadoc
-BuildRequires: maven2-plugin-resources
-BuildRequires: maven2-plugin-site
-
-# this will go away after we update maven to use tomcat6
-BuildRequires: tomcat5
+BuildRequires: maven-site-plugin
+BuildRequires: tomcat6-servlet-2.5-api
+BuildRequires: tomcat6
Requires: java >= 1:1.6.0
Requires: jpackage-utils >= 0:1.6
@@ -83,10 +72,13 @@ sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt
%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL
-# TODO remove test.skip=true once maven is updated
-mvn-jpp -Dmaven2.jpp.depmap.file="%{SOURCE1}" \
+
+# fails with recent surefire for some reason
+rm src/test/org/apache/commons/logging/logkit/StandardTestCase.java
+rm src/test/org/apache/commons/logging/servlet/BasicServletTestCase.java
+
+mvn-jpp -e -Dmaven2.jpp.depmap.file="%{SOURCE1}" \
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- -Dmaven.test.skip=true \
install javadoc:javadoc
# -----------------------------------------------------------------------------
@@ -113,10 +105,17 @@ install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{short_name}.pom
%add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{short_name}
-# following line is only for backwards compatibility. New packages
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+%add_to_maven_depmap org.apache.commons %{short_name}-api %{version} JPP %{short_name}-api
+
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+%add_to_maven_depmap org.apache.commons %{short_name}-adapters %{version} JPP %{short_name}-adapters
+
+# following lines are only for backwards compatibility. New packages
# should use proper groupid org.apache.commons and also artifactid
%add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{short_name}
-
+%add_to_maven_depmap %{short_name} %{short_name}-api %{version} JPP %{short_name}-api
+%add_to_maven_depmap %{short_name} %{short_name}-adapters %{version} JPP %{short_name}-adapters
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
@@ -154,6 +153,12 @@ rm -rf $RPM_BUILD_ROOT
# -----------------------------------------------------------------------------
%changelog
+* Tue Nov 9 2010 Stanislav Ochotnicky <sochotnicky@xxxxxxxxxx> - 1.1.1-12
+- Add depmaps for api and adapters subpackages
+- Use apache-commons-parent BR instead of maven-*
+- Replace tomcat5 BR with tomcat6
+- Reenable tests
+
* Thu Jul 8 2010 Stanislav Ochotnicky <sochotnicky@xxxxxxxxxx> - 1.1.1-11
- Add license to javadoc subpackage
diff --git a/commons-logging.depmap b/commons-logging.depmap
index 480c635..24c689a 100644
--- a/commons-logging.depmap
+++ b/commons-logging.depmap
@@ -23,4 +23,14 @@
<version>4.1.4</version>
</jpp>
</dependency>
+ <dependency>
+ <maven>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </maven>
+ <jpp>
+ <groupId>JPP</groupId>
+ <artifactId>tomcat6-servlet-2.5-api</artifactId>
+ </jpp>
+ </dependency>
</dependencies>
--
java-devel mailing list
java-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/java-devel
