[tika/f20] enable parsers and xpm modules, rhbz#1019650
by gil
commit 0dfaa5e63f25379379e8f9608f8bce6a373a1b78
Author: gil <puntogil(a)libero.it>
Date: Sat Nov 23 10:42:22 2013 +0100
enable parsers and xpm modules, rhbz#1019650
tika.spec | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/tika.spec b/tika.spec
index 24f0761..593988c 100644
--- a/tika.spec
+++ b/tika.spec
@@ -75,7 +75,7 @@ BuildRequires: maven-failsafe-plugin
BuildRequires: maven-plugin-bundle
BuildRequires: maven-remote-resources-plugin
BuildRequires: maven-site-plugin
-BuildRequires: mvn(org.apache.ivy:ivy)
+#BuildRequires: mvn(org.apache.ivy:ivy)
BuildArch: noarch
%description
10 years, 5 months
[tika/f20] enable parsers and xpm modules
by gil
commit 95a4ba5c149729806e4ba961306c36602c0587b2
Author: gil <puntogil(a)libero.it>
Date: Sat Nov 23 10:33:06 2013 +0100
enable parsers and xpm modules
tika.spec | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/tika.spec b/tika.spec
index 0dd9ea1..24f0761 100644
--- a/tika.spec
+++ b/tika.spec
@@ -75,7 +75,7 @@ BuildRequires: maven-failsafe-plugin
BuildRequires: maven-plugin-bundle
BuildRequires: maven-remote-resources-plugin
BuildRequires: maven-site-plugin
-
+BuildRequires: mvn(org.apache.ivy:ivy)
BuildArch: noarch
%description
10 years, 5 months
[tika/f20] enable parsers and xpm modules
by gil
commit d5bfb493ccf1114e0ca617e8bde2be703da6152f
Author: gil <puntogil(a)libero.it>
Date: Sat Nov 23 10:24:27 2013 +0100
enable parsers and xpm modules
tika.spec | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/tika.spec b/tika.spec
index 38636c2..0dd9ea1 100644
--- a/tika.spec
+++ b/tika.spec
@@ -7,7 +7,7 @@
Name: tika
Version: 1.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A content analysis toolkit
License: ASL 2.0
Url: http://tika.apache.org/
@@ -28,7 +28,7 @@ BuildRequires: mvn(org.osgi:org.osgi.core)
BuildRequires: mvn(org.gagravarr:vorbis-java-tika)
%endif
-%if %{with tika_parsers}
+%if %{without tika_parsers}
BuildRequires: mvn(com.adobe.xmp:xmpcore)
BuildRequires: mvn(com.drewnoakes:metadata-extractor:2)
BuildRequires: mvn(org.gagravarr:vorbis-java-core)
@@ -83,7 +83,7 @@ The Apache Tika toolkit detects and extracts meta-data and
structured text content from various documents using existing
parser libraries.
-%if %{with tika_parsers}
+%if %{without tika_parsers}
%package parsers
Summary: Apache Tika parsers
@@ -147,7 +147,7 @@ find . -name '*.zip' -delete
%pom_remove_dep :vorbis-java-tika %{name}-parsers
%endif
-%if %{without tika_parsers}
+%if %{with tika_parsers}
%pom_disable_module %{name}-parsers
%pom_disable_module %{name}-xmp
%endif
@@ -196,7 +196,7 @@ rm -r %{name}-parsers/src/test/java/org/apache/tika/parser/microsoft/ProjectPars
%dir %{_javadir}/%{name}
%doc CHANGES.txt HEADER.txt KEYS LICENSE.txt NOTICE.txt README.txt
-%if %{with tika_parsers}
+%if %{without tika_parsers}
%files parsers -f .mfiles-%{name}-parsers
%doc LICENSE.txt NOTICE.txt
@@ -208,6 +208,9 @@ rm -r %{name}-parsers/src/test/java/org/apache/tika/parser/microsoft/ProjectPars
%doc LICENSE.txt NOTICE.txt
%changelog
+* Mon Oct 21 2013 gil cattaneo <puntogil(a)libero.it> 1.4-2
+- enable parsers and xpm modules
+
* Thu Aug 29 2013 gil cattaneo <puntogil(a)libero.it> 1.4-1
- update to 1.4
10 years, 5 months
Broken dependencies: maven-doxia
by Fedora Koji Build System
maven-doxia has broken dependencies in the rawhide tree:
On x86_64:
maven-doxia-module-itext-1.4-4.fc21.noarch requires mvn(com.lowagie:itext:2.1.7)
On i386:
maven-doxia-module-itext-1.4-4.fc21.noarch requires mvn(com.lowagie:itext:2.1.7)
On armhfp:
maven-doxia-module-itext-1.4-4.fc21.noarch requires mvn(com.lowagie:itext:2.1.7)
Please resolve this as soon as possible.
10 years, 5 months
[tycho] Return expected reactor cache location when XMvn resolution fails.
by Roland Grunberg
commit 12f97c02d9938e6dc825baf538b614f5b8e975bb
Author: Roland Grunberg <rgrunber(a)redhat.com>
Date: Thu Nov 21 11:32:21 2013 -0500
Return expected reactor cache location when XMvn resolution fails.
tycho-use-custom-resolver.patch | 15 +++++++++------
tycho.spec | 5 ++++-
2 files changed, 13 insertions(+), 7 deletions(-)
---
diff --git a/tycho-use-custom-resolver.patch b/tycho-use-custom-resolver.patch
index 3290a5a..ff87c8f 100644
--- a/tycho-use-custom-resolver.patch
+++ b/tycho-use-custom-resolver.patch
@@ -1,4 +1,4 @@
-From 8cd8f81a6716b84acc5daf5ff9362db1b317f5cf Mon Sep 17 00:00:00 2001
+From 15024de04671196ba229183993a50c3d0e5de0ad Mon Sep 17 00:00:00 2001
From: Roland Grunberg <rgrunber(a)redhat.com>
Date: Tue, 12 Jun 2012 10:38:51 -0400
Subject: [PATCH] Implement a custom resolver for Tycho in local mode.
@@ -30,7 +30,7 @@ Change-Id: Ia1ece07ece2412bc4a88901631f3f651ad2b634b
.../tycho/p2/target/TargetDefinitionResolver.java | 11 +++--
.../p2/target/TargetPlatformBundlePublisher.java | 15 ++-----
.../tycho/p2/target/TargetPlatformFactoryImpl.java | 50 +++++++++++++++++++---
- .../tycho/p2/repository/LocalRepositoryReader.java | 31 +++++++++++++-
+ .../tycho/p2/repository/LocalRepositoryReader.java | 34 ++++++++++++++-
.../facade/TargetPlatformConfigurationStub.java | 5 ++-
tycho-core/pom.xml | 5 +++
.../eclipse/tycho/core/locking/FileLockerImpl.java | 26 ++++++++---
@@ -40,7 +40,7 @@ Change-Id: Ia1ece07ece2412bc4a88901631f3f651ad2b634b
.../DefaultTargetPlatformConfigurationReader.java | 6 ++-
.../osgi/runtime/TychoOsgiRuntimeLocator.java | 17 ++++++++
.../p2/resolver/P2TargetPlatformResolver.java | 10 +++++
- 13 files changed, 228 insertions(+), 30 deletions(-)
+ 13 files changed, 231 insertions(+), 30 deletions(-)
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetDefinitionResolver.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetDefinitionResolver.java
index b008768..77c1443 100644
@@ -181,7 +181,7 @@ index 4677798..4ee3fb5 100644
if (includeLocalMavenRepo && logger.isDebugEnabled()) {
IQueryResult<IInstallableUnit> locallyInstalledIUs = localMetadataRepository.query(QueryUtil.ALL_UNITS,
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryReader.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryReader.java
-index 8d36462..4c8c582 100644
+index 8d36462..be9172c 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryReader.java
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryReader.java
@@ -11,6 +11,8 @@
@@ -193,7 +193,7 @@ index 8d36462..4c8c582 100644
public class LocalRepositoryReader implements RepositoryReader {
-@@ -21,7 +23,32 @@ public class LocalRepositoryReader implements RepositoryReader {
+@@ -21,7 +23,35 @@ public class LocalRepositoryReader implements RepositoryReader {
}
public File getLocalArtifactLocation(GAV gav, String classifier, String extension) {
@@ -219,7 +219,10 @@ index 8d36462..4c8c582 100644
+ // Invoke "findArtifact" method of the workspace reader on the artifact
+ Method mfindArtifact = reader.getClass().getMethod("findArtifact", iartclazz);
-+ file = (File) mfindArtifact.invoke(reader, artifact);
++ File newFile = (File) mfindArtifact.invoke(reader, artifact);
++ if (newFile != null) {
++ file = newFile;
++ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
diff --git a/tycho.spec b/tycho.spec
index eabcdd5..a9c291d 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -9,7 +9,7 @@
Name: tycho
Version: 0.19.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
Group: Development/Libraries
@@ -308,6 +308,9 @@ sed -i 's|<maven>|&<extension>zip</extension>|' \
%{_javadocdir}/%{name}
%changelog
+* Thu Nov 21 2013 Roland Grunberg <rgrunber(a)redhat.com> - 0.19.0-4
+- Return expected reactor cache location when XMvn resolution fails.
+
* Wed Nov 20 2013 Roland Grunberg <rgrunber(a)redhat.com> - 0.19.0-3
- Bump release for rebuild (Bug 1031769).
10 years, 5 months
[Bug 1023116] xmvn_file seems to be installing the symlink in the wrong location
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=1023116
--- Comment #8 from Stanislav Ochotnicky <sochotni(a)redhat.com> ---
Removing the absolute path (_jnidir} from mvn_file creates this:
[INFO] ===============================================
[INFO] SOURCE ARTIFACT:
[INFO] groupId: org.apache.hadoop
[INFO] artifactId: hadoop-common
[INFO] extension: jar
[INFO] classifier:
[INFO] version: 2.2.0
[INFO] stereotype: native
[INFO] namespace:
[INFO] file:
/builddir/build/BUILD/hadoop-common-2e01e27e5ba4ece19650484f646fac42596250ce/hadoop-common-project/hadoop-common/target/hadoop-common-2.2.0.jar
[INFO] -----------------------------------------------
[INFO] TARGET ARTIFACT:
[INFO] groupId: JPP
[INFO] artifactId: hadoop-common
[INFO] extension: jar
[INFO] classifier:
[INFO] version: SYSTEM
[INFO] stereotype: native
[INFO] namespace:
[INFO] file: usr/lib/java/hadoop-common.jar
[INFO] -----------------------------------------------
[INFO] TARGET ARTIFACT:
[INFO] groupId: JPP/../hadoop/common
[INFO] artifactId: hadoop-common
[INFO] extension: jar
[INFO] classifier:
[INFO] version: SYSTEM
[INFO] stereotype: native
[INFO] namespace:
[INFO] file: usr/lib/java/../hadoop/common/hadoop-common.jar
[INFO] ===============================================
i.e. XMvn correctly places hadoop-common.jar into _jnidir, but the second part
has incorrect path that has usr/lib/java prefix and then relative path against
usr/share/java. Configuration generated in this case by mvn_file is:
<?xml version="1.0" encoding="UTF-8"?>
<configuration xmlns="http://fedorahosted.org/xmvn/CONFIG/0.6.0">
<!--XMvn configuration file generated by javapackages.xmvn_config (part of
javapackages-tools)-->
<artifactManagement>
<rule>
<artifactGlob>
<artifactId>hadoop-common</artifactId>
<classifier>{}</classifier>
</artifactGlob>
<files>
<file>hadoop-common</file>
<file>../hadoop/common/hadoop-common</file>
</files>
</rule>
</artifactManagement>
</configuration
--
You are receiving this mail because:
You are on the CC list for the bug.
Unsubscribe from this bug https://bugzilla.redhat.com/token.cgi?t=cIV7SFinOF&a=cc_unsubscribe
10 years, 5 months
[Bug 1023116] xmvn_file seems to be installing the symlink in the wrong location
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=1023116
Stanislav Ochotnicky <sochotni(a)redhat.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
CC| |java-sig-commits(a)lists.fedo
| |raproject.org
Component|xmvn |javapackages-tools
Assignee|mizdebsk(a)redhat.com |sochotni(a)redhat.com
--- Comment #7 from Stanislav Ochotnicky <sochotni(a)redhat.com> ---
This is the configuration for XMvn generated by %mvn_file macro call:
<?xml version='1.0' encoding='UTF-8'?>
<configuration xmlns="http://fedorahosted.org/xmvn/CONFIG/0.6.0">
<!--XMvn configuration file generated by javapackages.xmvn_config (part of
javapackages-tools)-->
<artifactManagement>
<rule>
<artifactGlob>
<artifactId>hadoop-common</artifactId>
<classifier>{}</classifier>
</artifactGlob>
<files>
<file>../../lib/java/hadoop-common</file>
<file>../hadoop/common/hadoop-common</file>
</files>
</rule>
</artifactManagement>
</configuration>
While the first file is correct (relative to _javadir). Second file should be
relative to the first file, not relative to _javadir. Reassigning to
javapackages-tools
--
You are receiving this mail because:
You are on the CC list for the bug.
Unsubscribe from this bug https://bugzilla.redhat.com/token.cgi?t=pdkfBoLQWS&a=cc_unsubscribe
10 years, 5 months
Broken dependencies: maven-doxia
by Fedora Koji Build System
maven-doxia has broken dependencies in the rawhide tree:
On x86_64:
maven-doxia-module-itext-1.4-4.fc21.noarch requires mvn(com.lowagie:itext:2.1.7)
On i386:
maven-doxia-module-itext-1.4-4.fc21.noarch requires mvn(com.lowagie:itext:2.1.7)
On armhfp:
maven-doxia-module-itext-1.4-4.fc21.noarch requires mvn(com.lowagie:itext:2.1.7)
Please resolve this as soon as possible.
10 years, 5 months