[javapackages-tools] Add more verbose changelog
by Mikolaj Izdebski
commit 68246e2431ae626a057adca765c6c829f59b3a84
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Jun 5 16:20:54 2013 +0200
Add more verbose changelog
javapackages-tools.spec | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index 8257299..4d955a5 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -124,6 +124,9 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/mvn-{local,rpmbuild}
%changelog
* Wed Jun 5 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.15.0-1
- Update to upstream version 0.15.0
+- Added depmap for tools.jar
+- Added support for versioned autorequires
+- New plugin metadata from Maven Central
* Tue Jun 4 2013 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0.14.1-2
- Add several maven plugins to maven-local requires
10 years, 11 months
[javapackages-tools] Update to upstream version 0.15.0
by Mikolaj Izdebski
commit 4719c49cdb15fd38076c418e86fb423f3d9fc0d8
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Jun 5 16:03:54 2013 +0200
Update to upstream version 0.15.0
.gitignore | 1 +
javapackages-tools.spec | 11 +++++++++--
sources | 2 +-
3 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 08394a0..9c85c5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,4 @@
/javapackages-0.13.7.tar.xz
/javapackages-0.14.0.tar.xz
/javapackages-0.14.1.tar.xz
+/javapackages-0.15.0.tar.xz
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index 7dff527..8257299 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -1,6 +1,6 @@
Name: javapackages-tools
-Version: 0.14.1
-Release: 2%{?dist}
+Version: 0.15.0
+Release: 1%{?dist}
Summary: Macros and scripts for Java packaging support
License: BSD
@@ -69,6 +69,7 @@ install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/maven
install -d -m 755 $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven-effective-poms
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/xmvn
+install -d -m 755 $RPM_BUILD_ROOT%{_mavendepmapfragdir}
install -p -m 755 depgenerators/maven.prov $RPM_BUILD_ROOT%{_rpmconfigdir}
install -p -m 755 depgenerators/maven.req $RPM_BUILD_ROOT%{_rpmconfigdir}
@@ -90,6 +91,8 @@ install -p -m 755 scripts/mvn-* $RPM_BUILD_ROOT%{_bindir}
install -p -m 644 configs/configuration*.xml $RPM_BUILD_ROOT%{_datadir}/xmvn
ln -sf %{_datadir}/xmvn/configuration-19.xml $RPM_BUILD_ROOT%{_datadir}/xmvn/configuration.xml
+install -p -m 755 depmap.xml $RPM_BUILD_ROOT%{_mavendepmapfragdir}/%{name}-depmap.xml
+
# On Fedora 18 we don't want to install mvn-local and mvn-rpmbuild
# scripts as they are already provided by maven package.
%if 0%{?fedora} == 18
@@ -108,6 +111,7 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/mvn-{local,rpmbuild}
%{_javadir}-utils/maven_depmap.py*
%{_javadir}-utils/pom_editor.sh
%{_sysconfdir}/rpm/macros.fjava
+%{_mavendepmapfragdir}/*
%files -n maven-local
%{_javadir}-utils/xmvn_config_editor.sh
@@ -118,6 +122,9 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/mvn-{local,rpmbuild}
%changelog
+* Wed Jun 5 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.15.0-1
+- Update to upstream version 0.15.0
+
* Tue Jun 4 2013 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0.14.1-2
- Add several maven plugins to maven-local requires
diff --git a/sources b/sources
index f8ac4dc..4a13a09 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-46036780c74f8df7dcb1bc3465677072 javapackages-0.14.1.tar.xz
+966efa0d5e09058cae9c5fbaba6842ff javapackages-0.15.0.tar.xz
10 years, 11 months
[javapackages] Add depmap.xml
by Mikolaj Izdebski
commit 88bc4d094958292012ef343412f39c8200b45a08
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Jun 5 16:00:24 2013 +0200
Add depmap.xml
This adds dependency map for com.sun:tools so that packages using
tools.jar don't need to use system scope and specify systemPath.
depmap.xml | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
---
diff --git a/depmap.xml b/depmap.xml
new file mode 100644
index 0000000..86b85c4
--- /dev/null
+++ b/depmap.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="US-ASCII"?>
+<!-- Dependency map for com.sun:tools so that packages don't
+ need to use system scope and provide systemPath. -->
+<dependencyMap>
+ <dependency>
+ <maven>
+ <groupId>com.sun</groupId>
+ <artifactId>tools</artifactId>
+ <version>SYSTEM</version>
+ </maven>
+ <jpp>
+ <groupId>JAVA_HOME</groupId>
+ <artifactId>../lib/tools</artifactId>
+ <version>SYSTEM</version>
+ </jpp>
+ </dependency>
+</dependencyMap>
10 years, 11 months
[javapackages] Download new metadata from Maven Central
by Mikolaj Izdebski
commit 135a4632e368389ae192c89b3cf6fae728a23172
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Jun 5 15:54:00 2013 +0200
Download new metadata from Maven Central
The new metadata includes templating-maven-plugin.
metadata/metadata-org-codehaus-mojo.xml | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --git a/metadata/metadata-org-codehaus-mojo.xml b/metadata/metadata-org-codehaus-mojo.xml
index cd7e3af..62f94fb 100644
--- a/metadata/metadata-org-codehaus-mojo.xml
+++ b/metadata/metadata-org-codehaus-mojo.xml
@@ -602,6 +602,11 @@
<artifactId>taglist-maven-plugin</artifactId>
</plugin>
<plugin>
+ <name>Templating Maven Plugin</name>
+ <prefix>templating</prefix>
+ <artifactId>templating-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
<name>Tomcat Maven Plugin</name>
<prefix>tomcat</prefix>
<artifactId>tomcat-maven-plugin</artifactId>
10 years, 11 months
[javapackages] Implement support for versioned autorequires
by Mikolaj Izdebski
commit bc2b94e94c79e5ff6d400ad5e97d026fbcfa7604
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Fri May 31 15:01:23 2013 +0200
Implement support for versioned autorequires
If artifact was resolved from compat package then autogenerated
requires should include GAV triple.
depgenerators/maven.req | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/depgenerators/maven.req b/depgenerators/maven.req
index 5be9701..cbee7de 100755
--- a/depgenerators/maven.req
+++ b/depgenerators/maven.req
@@ -83,13 +83,17 @@ class TagBuilder:
for mpart in doc.findall('.//autoRequires'):
groupId = mpart.find('groupId').text
artifactId = mpart.find('artifactId').text
+ version = mpart.find('version')
for g, a, v in provided:
if g == groupId and a == artifactId:
# generate versioned requires for our subpackages
print("mvn(%s:%s) = %s" %(groupId, artifactId, v))
break # skip the else branch
else:
- print("mvn(%s:%s)" %(groupId, artifactId))
+ if version:
+ print("mvn(%s:%s:%s)" %(groupId, artifactId, version.text))
+ else:
+ print("mvn(%s:%s)" %(groupId, artifactId))
jreq = doc.find('.//requiresJava')
if jreq is not None:
10 years, 11 months
[apache-commons-net] Enable tests
by Michal Srb
Summary of changes:
9b69a7f... Enable tests (*)
(*) This commit already existed in another branch; no separate mail sent
10 years, 11 months
[apache-commons-net/f19] Enable tests
by Michal Srb
commit 9b69a7f334bf61a1c36b1cba026d2ec613ee0ddd
Author: Michal Srb <msrb(a)redhat.com>
Date: Wed Jun 5 14:16:58 2013 +0200
Enable tests
- Install README, RELEASE-NOTES.txt files
- Fix BR
apache-commons-net.spec | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
---
diff --git a/apache-commons-net.spec b/apache-commons-net.spec
index 124acd8..bef9468 100644
--- a/apache-commons-net.spec
+++ b/apache-commons-net.spec
@@ -4,7 +4,7 @@
Name: apache-%{short_name}
Version: 3.2
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Internet protocol suite Java library
License: ASL 2.0
Group: Development/Libraries
@@ -13,13 +13,10 @@ Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_n
BuildArch: noarch
BuildRequires: maven-local
-BuildRequires: java-devel
-BuildRequires: jpackage-utils
-BuildRequires: maven-doxia-sitetools
-BuildRequires: maven-surefire-provider-junit
-BuildRequires: maven-surefire-provider-junit4
BuildRequires: maven-plugin-build-helper
BuildRequires: apache-commons-parent
+# Test dependency
+BuildRequires: junit
Provides: jakarta-%{short_name} = 0:%{version}-%{release}
Obsoletes: jakarta-%{short_name} < 0:2.0-3
@@ -45,28 +42,33 @@ Obsoletes: jakarta-%{short_name}-javadoc < 0:2.0-3
%prep
%setup -q -n %{short_name}-%{version}-src
-sed -i 's/\r//' NOTICE.txt LICENSE.txt
+sed -i 's/\r//' NOTICE.txt LICENSE.txt README RELEASE-NOTES.txt
+# This test fails with "Connection timed out"
+rm src/test/java/org/apache/commons/net/time/TimeTCPClientTest.java
-%build
%mvn_file : %{short_name} %{name}
%mvn_alias : org.apache.commons:%{short_name}
-# test.failure.ignore added because package would not build on koji
-# with TimeTCPClientTest failing
-%mvn_build -f
+%build
+%mvn_build
%install
%mvn_install
%files -f .mfiles
-%doc LICENSE.txt NOTICE.txt
+%doc LICENSE.txt NOTICE.txt README RELEASE-NOTES.txt
%files javadoc -f .mfiles-javadoc
%doc LICENSE.txt NOTICE.txt
%changelog
+* Wed Jun 05 2013 Michal Srb <msrb(a)redhat.com> - 3.2-5
+- Enable tests
+- Install README, RELEASE-NOTES.txt files
+- Fix BR
+
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
10 years, 11 months