[maven-pmd-plugin] New sources.
by Alexander Kurtakov
commit fd14258fa369519ee19f7a67d4e49b95adafeea8
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Tue Apr 26 13:35:15 2011 +0300
New sources.
.gitignore | 1 +
sources | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 596d45a..6477378 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
maven-pmd-plugin-2.5.tar.xz
+/maven-pmd-plugin-2.5-source-release.zip
diff --git a/sources b/sources
index 3d3f724..e1da7e4 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
ce2441d333284be879fb8efeb56bc5fa maven-pmd-plugin-2.5.tar.xz
+8af1a9a23b126a982a42105341d579e0 maven-pmd-plugin-2.5-source-release.zip
12 years, 11 months
[maven-pmd-plugin] Update to current guidelines.
by Alexander Kurtakov
commit 5a1dc81da4e844d3785051e9f09c28a0ccd7b2a3
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Tue Apr 26 13:33:43 2011 +0300
Update to current guidelines.
Use upstream source.
maven-pmd-plugin-depmap.xml | 25 --------------------
maven-pmd-plugin.spec | 52 +++++++++++++++----------------------------
2 files changed, 18 insertions(+), 59 deletions(-)
---
diff --git a/maven-pmd-plugin-depmap.xml b/maven-pmd-plugin-depmap.xml
index bc2ad44..a24ee7c 100644
--- a/maven-pmd-plugin-depmap.xml
+++ b/maven-pmd-plugin-depmap.xml
@@ -11,30 +11,5 @@
<version>4.2.5</version>
</jpp>
</dependency>
- <dependency>
- <maven>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- <version>3.1</version>
- </maven>
- <jpp>
- <groupId>JPP/objectweb-asm</groupId>
- <artifactId>asm</artifactId>
- <version>3.2</version>
- </jpp>
- </dependency>
- <dependency>
- <maven>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-plugin-testing-harness</artifactId>
- <version>1.1</version>
- </maven>
- <jpp>
- <groupId>JPP/maven-plugin-testing</groupId>
- <artifactId>maven-plugin-testing-harness</artifactId>
- <version>1.1</version>
- </jpp>
- </dependency>
-
</dependencies>
diff --git a/maven-pmd-plugin.spec b/maven-pmd-plugin.spec
index 6b0c219..3fb58c7 100644
--- a/maven-pmd-plugin.spec
+++ b/maven-pmd-plugin.spec
@@ -1,26 +1,23 @@
Name: maven-pmd-plugin
Version: 2.5
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Maven PMD Plugin
Group: Development/Libraries
License: ASL 2.0
URL: http://maven.apache.org/plugins/maven-pmd-plugin/
-#svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-pmd-plugin-2.5 maven-pmd-plugin-2.5
-#tar caf maven-pmd-plugin-2.5.tar.xz maven-pmd-plugin-2.5/
-Source0: %{name}-%{version}.tar.xz
+Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}...
Source1: maven-pmd-plugin-depmap.xml
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: pmd
BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: maven2
-BuildRequires: maven2-plugin-plugin
-BuildRequires: maven2-plugin-jar
-BuildRequires: maven2-plugin-install
-BuildRequires: maven2-plugin-resources
+BuildRequires: maven
+BuildRequires: maven-plugin-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-resources-plugin
BuildRequires: maven-compiler-plugin
BuildRequires: maven-javadoc-plugin
BuildRequires: maven-surefire-maven-plugin
@@ -33,7 +30,7 @@ BuildRequires: apache-commons-lang
BuildRequires: plexus-resources
BuildRequires: plexus-utils
BuildRequires: junit
-Requires: maven2
+Requires: maven
Requires: plexus-utils
Requires: maven-plugin-testing-harness
Requires: pmd
@@ -62,29 +59,18 @@ API documentation for %{name}.
%prep
-%setup -q #You may need to update this according to your Source0
+%setup -q
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
-mvn-jpp \
- -e \
- -Dmaven2.jpp.mode=true \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- -Dmaven2.jpp.depmap.file=%{SOURCE1} \
+mvn-rpmbuild \
+ -Dmaven.local.depmap.file=%{SOURCE1} \
-Dmaven.test.failure.ignore=true \
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)
+install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
%add_to_maven_depmap org.apache.maven.plugins maven-pmd-plugin %{version} JPP maven-pmd-plugin
@@ -94,10 +80,8 @@ 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*
+install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%post
%update_maven_depmap
@@ -105,9 +89,6 @@ rm -rf target/site/api*
%postun
%update_maven_depmap
-%clean
-rm -rf %{buildroot}
-
%files
%defattr(-,root,root,-)
%{_javadir}/*
@@ -116,10 +97,13 @@ rm -rf %{buildroot}
%files javadoc
%defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%changelog
+* Tue Apr 26 2011 Alexander Kurtakov <akurtako(a)redhat.com> 2.5-3
+- Update to current guidelines.
+- Use upstream source.
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
12 years, 11 months
[apache-commons-logging] Build with maven 3
by Stanislav Ochotnicky
commit e6f0c5a53bfd370dbea15ac3e1ceb97a76c8df26
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Thu Apr 21 14:07:33 2011 +0200
Build with maven 3
- Fix build for avalon-framework
apache-commons-logging.spec | 30 +++++++++++++++++++-----------
commons-logging-avalon-update.patch | 29 +++++++++++++++++++++++++++++
commons-logging.depmap | 30 ++++++++++++++----------------
3 files changed, 62 insertions(+), 27 deletions(-)
---
diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec
index e126282..d9c8baa 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -4,7 +4,7 @@
Name: apache-%{short_name}
Version: 1.1.1
-Release: 15%{?dist}
+Release: 16%{?dist}
Summary: Apache Commons Logging
License: ASL 2.0
Group: Development/Libraries
@@ -12,15 +12,19 @@ URL: http://commons.apache.org/%{base_name}
Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{ve...
Source1: %{short_name}.depmap
Source2: http://mirrors.ibiblio.org/pub/mirrors/maven2/%{short_name}/%{short_name}...
+# Sent upstream https://issues.apache.org/jira/browse/LOGGING-143
+Patch0: %{short_name}-avalon-update.patch
+
Patch1: %{short_name}-eclipse-manifest.patch
-Patch0: %{short_name}-maven-release-plugin.patch
BuildArch: noarch
+BuildRequires: maven
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils >= 0:1.6
-BuildRequires: avalon-framework
+BuildRequires: avalon-framework >= 4.3
BuildRequires: avalon-logkit
BuildRequires: apache-commons-parent
BuildRequires: maven-plugin-build-helper
+BuildRequires: maven-release-plugin
BuildRequires: maven-site-plugin
BuildRequires: servlet25
@@ -59,7 +63,7 @@ Obsoletes: jakarta-%{short_name}-javadoc <= 0:1.0.4
%prep
%setup -q -n %{short_name}-%{version}-src
-%patch0 -p1 -b .rhbug_588142
+%patch0 -p1
%patch1
sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt
@@ -67,16 +71,16 @@ sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt
# -----------------------------------------------------------------------------
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
# 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 \
- install javadoc:javadoc
+# These files have names suggesting they are test cases but they are not.
+# They should probably be renamed/excluded from surefire run properly
+rm src/test/org/apache/commons/logging/log4j/log4j12/*StandardTestCase.java
+
+mvn-rpmbuild -X -Dmaven.local.depmap.file="%{SOURCE1}" \
+ install javadoc:aggregate
# -----------------------------------------------------------------------------
@@ -91,7 +95,7 @@ pushd $RPM_BUILD_ROOT%{_javadir}
for jar in %{name}*; do
ln -sf ${jar} `echo $jar| sed "s|apache-||g"`
done
-popd
+popd
# pom
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
@@ -145,6 +149,10 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
# -----------------------------------------------------------------------------
%changelog
+* Thu Apr 21 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.1.1-16
+- Build with maven 3
+- Fix build for avalon-framework
+
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.1.1-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/commons-logging-avalon-update.patch b/commons-logging-avalon-update.patch
new file mode 100644
index 0000000..aadaaa7
--- /dev/null
+++ b/commons-logging-avalon-update.patch
@@ -0,0 +1,29 @@
+diff --git a/pom.xml b/pom.xml
+index 8efaf6d..24dc9fb 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -472,8 +472,15 @@ under the License.
+ </dependency>
+ <dependency>
+ <groupId>avalon-framework</groupId>
+- <artifactId>avalon-framework</artifactId>
+- <version>4.1.3</version>
++ <artifactId>avalon-framework-api</artifactId>
++ <version>4.3</version>
++ <optional>true</optional>
++ </dependency>
++ <dependency>
++ <groupId>avalon-framework</groupId>
++ <artifactId>avalon-framework-impl</artifactId>
++ <version>4.3</version>
++ <scope>test</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+@@ -520,4 +527,4 @@ under the License.
+ <maven.compile.source>1.2</maven.compile.source>
+ <maven.compile.target>1.1</maven.compile.target>
+ </properties>
+-</project>
+\ No newline at end of file
++</project>
diff --git a/commons-logging.depmap b/commons-logging.depmap
index 24c689a..1059072 100644
--- a/commons-logging.depmap
+++ b/commons-logging.depmap
@@ -1,36 +1,34 @@
<dependencies>
<dependency>
<maven>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- <version>1.0.1</version>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
</maven>
<jpp>
<groupId>JPP</groupId>
- <artifactId>avalon-logkit</artifactId>
- <version>1.0.8</version>
+ <artifactId>tomcat6-servlet-2.5-api</artifactId>
</jpp>
</dependency>
<dependency>
<maven>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- <version>4.1.3</version>
+ <groupId>servletapi</groupId>
+ <artifactId>servletapi</artifactId>
</maven>
<jpp>
<groupId>JPP</groupId>
- <artifactId>avalon-framework</artifactId>
- <version>4.1.4</version>
+ <artifactId>tomcat6-servlet-2.5-api</artifactId>
</jpp>
</dependency>
<dependency>
<maven>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-javamail</artifactId>
+ </maven>
+ </dependency>
+ <dependency>
+ <maven>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-jms</artifactId>
</maven>
- <jpp>
- <groupId>JPP</groupId>
- <artifactId>tomcat6-servlet-2.5-api</artifactId>
- </jpp>
</dependency>
</dependencies>
12 years, 11 months
[maven-surefire] Update to latest upstream version (2.8.1)
by Stanislav Ochotnicky
commit fa7a6045a99d8ec72de5119ed1490bce5463f588
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Mon Apr 18 15:17:44 2011 +0200
Update to latest upstream version (2.8.1)
.gitignore | 1 +
0001-Remove-mockito-dependency.patch | 6 +++---
0002-Remove-htmlunit-dependency.patch | 32 +++++++++++++++++++++++++-------
maven-surefire.spec | 5 ++++-
sources | 2 +-
5 files changed, 34 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c0ab6b8..20ce40d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ maven-surefire-2.3-src.tar.gz
surefire-2.7.1-source-release.zip
/surefire-2.7.2-source-release.zip
/surefire-2.8-source-release.zip
+/surefire-2.8.1-source-release.zip
diff --git a/0001-Remove-mockito-dependency.patch b/0001-Remove-mockito-dependency.patch
index ee61db0..3eb0a24 100644
--- a/0001-Remove-mockito-dependency.patch
+++ b/0001-Remove-mockito-dependency.patch
@@ -1,4 +1,4 @@
-From e8c67feb59487de9665aea6f8d7bc2948f5f818a Mon Sep 17 00:00:00 2001
+From 1432e34bd406b9c9c507f5d02373ff2ef44c97b1 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue, 29 Mar 2011 14:44:37 +0200
Subject: [PATCH 1/2] Remove mockito dependency
@@ -8,7 +8,7 @@ Subject: [PATCH 1/2] Remove mockito dependency
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/surefire-providers/surefire-junit47/pom.xml b/surefire-providers/surefire-junit47/pom.xml
-index 52545bc..54a242d 100644
+index 604847a..ee11a40 100644
--- a/surefire-providers/surefire-junit47/pom.xml
+++ b/surefire-providers/surefire-junit47/pom.xml
@@ -43,12 +43,6 @@
@@ -25,5 +25,5 @@ index 52545bc..54a242d 100644
<artifactId>common-junit4</artifactId>
<version>${project.version}</version>
--
-1.7.4
+1.7.4.4
diff --git a/0002-Remove-htmlunit-dependency.patch b/0002-Remove-htmlunit-dependency.patch
index c6d44b3..2a2f497 100644
--- a/0002-Remove-htmlunit-dependency.patch
+++ b/0002-Remove-htmlunit-dependency.patch
@@ -1,17 +1,35 @@
-From 979b7e928ab6f0ce4210dafdafb19e5478ba501f Mon Sep 17 00:00:00 2001
+From 2fbf5b756733d623079d9764bb9371742b6bc42b Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
-Date: Tue, 29 Mar 2011 14:32:13 +0200
+Date: Mon, 18 Apr 2011 15:06:00 +0200
Subject: [PATCH 2/2] Remove htmlunit dependency
---
- surefire-integration-tests/pom.xml | 6 ------
- 1 files changed, 0 insertions(+), 6 deletions(-)
+ surefire-integration-tests/pom.xml | 6 ------
+ surefire-setup-integration-tests/pom.xml | 6 ------
+ 2 files changed, 0 insertions(+), 12 deletions(-)
diff --git a/surefire-integration-tests/pom.xml b/surefire-integration-tests/pom.xml
-index 24de080..8077f2b 100644
+index 594c0dc..79b299e 100644
--- a/surefire-integration-tests/pom.xml
+++ b/surefire-integration-tests/pom.xml
-@@ -91,12 +91,6 @@
+@@ -51,12 +51,6 @@
+ <scope>test</scope>
+ </dependency -->
+ <dependency>
+- <groupId>net.sourceforge.htmlunit</groupId>
+- <artifactId>htmlunit</artifactId>
+- <version>2.8</version>
+- <scope>test</scope>
+- </dependency>
+- <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.0.1</version>
+diff --git a/surefire-setup-integration-tests/pom.xml b/surefire-setup-integration-tests/pom.xml
+index 6face0e..fec0de6 100644
+--- a/surefire-setup-integration-tests/pom.xml
++++ b/surefire-setup-integration-tests/pom.xml
+@@ -90,12 +90,6 @@
<scope>test</scope>
</dependency>
<dependency>
@@ -25,5 +43,5 @@ index 24de080..8077f2b 100644
<artifactId>commons-io</artifactId>
<version>2.0.1</version>
--
-1.7.4
+1.7.4.4
diff --git a/maven-surefire.spec b/maven-surefire.spec
index 9428d68..02d029f 100644
--- a/maven-surefire.spec
+++ b/maven-surefire.spec
@@ -1,5 +1,5 @@
Name: maven-surefire
-Version: 2.8
+Version: 2.8.1
Release: 1%{?dist}
Epoch: 0
Summary: Test framework project
@@ -294,6 +294,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%doc %{_javadocdir}/*
%changelog
+* Mon Apr 18 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:2.8.1-1
+- Update to latest upstream version (2.8.1)
+
* Tue Mar 29 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:2.8-1
- Update to latest upstream version (2.8)
diff --git a/sources b/sources
index be62938..7b04a29 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0a60ffd58153d2291b318ece3e3b6294 surefire-2.8-source-release.zip
+d45fb94ea990279dd5901ea2baed0b5a surefire-2.8.1-source-release.zip
12 years, 11 months