Broken dependencies: joda-time
by Fedora Koji Build System
joda-time has broken dependencies in the epel-5 tree:
On ppc:
joda-time-1.5.2-7.tzdata2008d.el5.noarch requires java > 0:1.5.0
Please resolve this as soon as possible.
11 years, 6 months
[maven/f18] (7 commits) ...Add support for custom jar/pom/fragment directories
by Stanislav Ochotnicky
Summary of changes:
a44a678... Add a few bash completion goals (*)
c9e849a... Don't exho in maven-script (*)
b35ff7a... Add aopalliance to classpath (*)
31522b3... Add objectweb-asm to classpath (*)
f81e79a... Add aopalliance and cglib to maven-model-builder test depen (*)
0ae689d... Remove all slf4j providers except nop from maven realm (*)
19395ab... Add support for custom jar/pom/fragment directories (*)
(*) This commit already existed in another branch; no separate mail sent
11 years, 6 months
[maven] Add support for custom jar/pom/fragment directories
by Stanislav Ochotnicky
commit 19395ab0e3139a5d4f7b850d0a1a01c88c412654
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Fri Nov 9 13:26:13 2012 +0100
Add support for custom jar/pom/fragment directories
JavadirWorkspaceReader.java | 46 +++++++++++++++++++++++++++++--------------
MavenJPackageDepmap.java | 13 ++++++++++++
maven.spec | 5 +++-
3 files changed, 48 insertions(+), 16 deletions(-)
---
diff --git a/JavadirWorkspaceReader.java b/JavadirWorkspaceReader.java
index 2c1e9df..a62953a 100644
--- a/JavadirWorkspaceReader.java
+++ b/JavadirWorkspaceReader.java
@@ -2,6 +2,7 @@ package org.apache.maven.artifact.resolver;
import java.io.File;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Hashtable;
import java.util.LinkedList;
import java.util.List;
@@ -114,27 +115,33 @@ public class JavadirWorkspaceReader implements WorkspaceReader {
return ret;
}
} else {
- String repos[] = { "/usr/share/maven/repository/",
- "/usr/share/maven/repository-java-jni/",
- "/usr/share/maven/repository-jni/" };
+ ArrayList<String> repos = new ArrayList<String>();
+ String custom_paths = System.getProperty(
+ "maven.local.jar.paths", null);
+ if (custom_paths != null) {
+ repos.addAll(Arrays.asList(custom_paths.split(":")));
+ }
+ repos.add("/usr/share/maven/repository/");
+ repos.add("/usr/share/maven/repository-java-jni/");
+ repos.add("/usr/share/maven/repository-jni/");
+
String verRelativeArtifactPath = groupId + "/" + artifactId
+ "-" + wantedVersion + "." + artifact.getExtension();
String relativeArtifactPath = groupId + "/" + artifactId + "."
+ artifact.getExtension();
for (String repo : repos) {
- path = new StringBuffer(repo + verRelativeArtifactPath);
- ret = new File(path.toString());
+
+ ret = new File(repo, verRelativeArtifactPath);
+ MavenJPackageDepmap.debug("Looking for " + ret.getPath());
if (ret.isFile()) {
- MavenJPackageDepmap.debug("Returning " + repo
- + verRelativeArtifactPath);
+ MavenJPackageDepmap.debug("Returning " + ret.getPath());
return ret;
}
- path = new StringBuffer(repo + relativeArtifactPath);
- ret = new File(path.toString());
+ ret = new File(repo, relativeArtifactPath);
+ MavenJPackageDepmap.debug("Looking for " + ret.getPath());
if (ret.isFile()) {
- MavenJPackageDepmap.debug("Returning " + repo
- + relativeArtifactPath);
+ MavenJPackageDepmap.debug("Returning " + ret.getPath());
return ret;
}
}
@@ -161,16 +168,25 @@ public class JavadirWorkspaceReader implements WorkspaceReader {
String verfName = groupId.replace(PATH_SEPARATOR, GROUP_SEPARATOR)
+ "-" + artifactId + "-" + version + ".pom";
File f;
- String[] pomRepos = { "/usr/share/maven2/poms/",
- "/usr/share/maven/poms/", "/usr/share/maven-poms/" };
+ String custom_paths = System.getProperty("maven.local.pom.paths", null);
+
+ ArrayList<String> pomRepos = new ArrayList<String>();
+ if (custom_paths != null) {
+ pomRepos.addAll(Arrays.asList(custom_paths.split(":")));
+ }
+ pomRepos.add("/usr/share/maven2/poms/");
+ pomRepos.add("/usr/share/maven/poms/");
+ pomRepos.add("/usr/share/maven-poms/");
for (String pomRepo : pomRepos) {
- f = new File(pomRepo + verfName);
+ f = new File(pomRepo, verfName);
+ MavenJPackageDepmap.debug("Looking for " + f.getPath());
if (f.exists()) {
return new StringBuffer(f.getPath());
}
- f = new File(pomRepo + fName);
+ f = new File(pomRepo, fName);
+ MavenJPackageDepmap.debug("Looking for " + f.getPath());
if (f.exists()) {
return new StringBuffer(f.getPath());
}
diff --git a/MavenJPackageDepmap.java b/MavenJPackageDepmap.java
index 5004255..8fa1b3b 100644
--- a/MavenJPackageDepmap.java
+++ b/MavenJPackageDepmap.java
@@ -181,6 +181,19 @@ public class MavenJPackageDepmap {
processDepmapFile("/usr/share/maven-fragments/" + fragFilename);
}
+ String customDepmapDir = System.getProperty("maven.local.depmap.dir",
+ null);
+ if (customDepmapDir != null) {
+ fragmentDir = new File(customDepmapDir);
+ flist = fragmentDir.list();
+ if (flist != null) {
+ java.util.Arrays.sort(flist);
+ for (String fragFilename : flist)
+ processDepmapFile(customDepmapDir + File.separator
+ + fragFilename);
+ }
+ }
+
String customFileName = System.getProperty("maven.local.depmap.file",
null);
if (customFileName != null) {
diff --git a/maven.spec b/maven.spec
index 549a6b4..1cd4dae 100644
--- a/maven.spec
+++ b/maven.spec
@@ -2,7 +2,7 @@
Name: maven
Version: 3.0.4
-Release: 20%{?dist}
+Release: 21%{?dist}
Summary: Java project management and project comprehension tool
Group: Development/Tools
@@ -385,6 +385,9 @@ ln -sf `rpm --eval '%%{_jnidir}'` %{_datadir}/%{name}/repository-jni/JPP
%changelog
+* Thu Nov 08 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 3.0.4-21
+- Add support for custom jar/pom/fragment directories
+
* Thu Nov 8 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.0.4-20
- Remove all slf4j providers except nop from maven realm
11 years, 6 months
[apache-commons-jxpath] Don't build-require maven2
by Mikolaj Izdebski
commit c6b3438f94d4b6eb35230b641f73a8c9c795c1dd
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Fri Nov 9 12:51:24 2012 +0100
Don't build-require maven2
apache-commons-jxpath.spec | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/apache-commons-jxpath.spec b/apache-commons-jxpath.spec
index 8c91938..d2d8d63 100644
--- a/apache-commons-jxpath.spec
+++ b/apache-commons-jxpath.spec
@@ -3,7 +3,7 @@
Name: apache-%{short_name}
Version: 1.3
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Simple XPath interpreter
Group: Development/Libraries
@@ -17,7 +17,7 @@ BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils
-BuildRequires: maven2 >= 2.2.1
+BuildRequires: maven
BuildRequires: maven-antrun-plugin
BuildRequires: maven-assembly-plugin
BuildRequires: maven-compiler-plugin
@@ -105,6 +105,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%{_javadocdir}/%{name}
%changelog
+* Fri Nov 9 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.3-10
+- Don't build-require maven2
+
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.3-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
11 years, 6 months
[plexus-ant-factory/f18] Install ASL 2.0 license file
by Mikolaj Izdebski
commit e2624f4fa6224b06e780f01339d55b4ebed88703
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Fri Nov 9 12:40:29 2012 +0100
Install ASL 2.0 license file
plexus-ant-factory.spec | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/plexus-ant-factory.spec b/plexus-ant-factory.spec
index b99565c..e63c417 100644
--- a/plexus-ant-factory.spec
+++ b/plexus-ant-factory.spec
@@ -33,10 +33,11 @@
Name: %{parent}-%{subname}
Version: 1.0
-Release: 0.8.a2.1.2%{?dist}
+Release: 0.8.a2.1.3%{?dist}
Epoch: 0
Summary: Plexus Ant component factory
# Email from copyright holder confirms license.
+# See plexus-ant-factory_license_and_copyright.txt
License: ASL 2.0
Group: Development/Tools
URL: http://plexus.codehaus.org/
@@ -44,7 +45,7 @@ Source0: %{name}-src.tar.bz2
# svn export http://svn.codehaus.org/plexus/tags/plexus-ant-factory-1.0-alpha-2.1/ plexus-ant-factory/
# tar cjf plexus-ant-factory-src.tar.bz2 plexus-ant-factory/
Source1: %{name}-jpp-depmap.xml
-Source2: plexus-ant-factory_license_and_copyright.txt
+Source2: http://www.apache.org/licenses/LICENSE-2.0.txt
BuildArch: noarch
@@ -83,7 +84,7 @@ Javadoc for %{name}.
%prep
%setup -q -n %{name}
-cp %{SOURCE2} .
+cp %{SOURCE2} LICENSE
%build
@@ -112,18 +113,21 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%files
-%doc plexus-ant-factory_license_and_copyright.txt
+%doc LICENSE
%dir %{_javadir}/plexus
%{_javadir}/%{parent}/%{subname}.jar
%{_mavenpomdir}/JPP.%{parent}-%{subname}.pom
%{_mavendepmapfragdir}/%{name}
%files javadoc
-%doc plexus-ant-factory_license_and_copyright.txt
+%doc LICENSE
%doc %{_javadocdir}/*
%changelog
+* Fri Nov 9 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0:1.0-0.8.a2.1.3
+- Install ASL 2.0 license file
+
* Fri Jul 27 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0:1.0-0.8.a2.1.2
- Update to maven 3
- Replace nonstandard groups names with standard ones
11 years, 6 months
[hibernate] fixed changelog.
by gil
commit 45065c3f7cfc84ec6a8973498e98d6afb0b63975
Author: gil <puntogil(a)libero.it>
Date: Thu Nov 8 17:51:51 2012 +0100
fixed changelog.
hibernate.spec | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/hibernate.spec b/hibernate.spec
index 4755c1a..43d55e9 100644
--- a/hibernate.spec
+++ b/hibernate.spec
@@ -416,8 +416,8 @@ cp -rp release/target/documentation/javadocs/* %{buildroot}%{_javadocdir}/%{name
%doc lgpl.txt LICENSE-2.0.txt
%changelog
-* Thu Nov 08 2012 gil <puntogil(a)libero.it> - 4.1.7-5
-- rebuilt
+* Thu Nov 08 2012 gil cattaneo <puntogil(a)libero.it> 4.1.7-5
+- fixed changelog
* Mon Oct 29 2012 gil cattaneo <puntogil(a)libero.it> 4.1.7-4
- fix license field
11 years, 6 months
[hibernate] fixed changelog.
by gil
commit 9d28526e492eb04ed55954440c300fa35e83aa68
Author: gil <puntogil(a)libero.it>
Date: Thu Nov 8 17:50:33 2012 +0100
fixed changelog.
hibernate.spec | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/hibernate.spec b/hibernate.spec
index 51c731b..4755c1a 100644
--- a/hibernate.spec
+++ b/hibernate.spec
@@ -3,7 +3,7 @@
Name: hibernate
Version: 4.1.7
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Relational persistence and query service
Group: Development/Libraries
License: LGPLv2+ and ASL 2.0
@@ -416,7 +416,10 @@ cp -rp release/target/documentation/javadocs/* %{buildroot}%{_javadocdir}/%{name
%doc lgpl.txt LICENSE-2.0.txt
%changelog
-* Mon Oct 29 2012 gil cattaneo <puntogil(a)libero.it> 4.1.7-3
+* Thu Nov 08 2012 gil <puntogil(a)libero.it> - 4.1.7-5
+- rebuilt
+
+* Mon Oct 29 2012 gil cattaneo <puntogil(a)libero.it> 4.1.7-4
- fix license field
- added ASL license txt file
- renamed the "hibernate-core" package as "hibernate"
11 years, 6 months
