[javapackages] Revert "Move macros.fjava to javapackages-local"
by Michael Šimáček
commit 692ceb08f69cd57e04a2179d608b44c87f501dca
Author: Michael Simacek <msimacek(a)redhat.com>
Date: Fri May 15 10:52:21 2015 +0200
Revert "Move macros.fjava to javapackages-local"
The move breaks most of the packages that use add_maven_depmap.
This reverts commit 166389fe07c87e15104c2ea9c5d75d10b061ac7b.
Conflicts:
install
install | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
---
diff --git a/install b/install
index 9b3cdf5..3a3bcf4 100755
--- a/install
+++ b/install
@@ -128,6 +128,7 @@ inst_data java-utils/pom_editor.py "${javadir}-utils"
inst_data java-utils/request-artifact.py "${javadir}-utils"
inst_data target/macros.jpackage "${rpmconfigdir}/macros.d"
+inst_data target/macros.fjava "${rpmconfigdir}/macros.d"
inst_data target/build-classpath.1 "${mandir}/man1"
inst_data target/build-jar-repository.1 "${mandir}/man1"
@@ -170,8 +171,6 @@ link "${m2home}/configuration.xml" "${m2home}/configuration-21.xml"
inst_config etc/javapackages-config.json "${javaconfdir}"
exec >files-local
-inst_data target/macros.fjava "${rpmconfigdir}/macros.d"
-
inst_data java-utils/mvn_alias.py "${javadir}-utils"
inst_data java-utils/mvn_artifact.py "${javadir}-utils"
inst_data java-utils/mvn_compat_version.py "${javadir}-utils"
9 years
Broken dependencies: maven-wagon
by Fedora Koji Build System
maven-wagon has broken dependencies in the F-22 tree:
On x86_64:
maven-wagon-webdav-jackrabbit-2.8-1.fc22.noarch requires mvn(org.apache.jackrabbit:jackrabbit-webdav)
On i386:
maven-wagon-webdav-jackrabbit-2.8-1.fc22.noarch requires mvn(org.apache.jackrabbit:jackrabbit-webdav)
On armhfp:
maven-wagon-webdav-jackrabbit-2.8-1.fc22.noarch requires mvn(org.apache.jackrabbit:jackrabbit-webdav)
Please resolve this as soon as possible.
9 years
Broken dependencies: maven-wagon
by Fedora Koji Build System
maven-wagon has broken dependencies in the F-22 tree:
On x86_64:
maven-wagon-webdav-jackrabbit-2.8-1.fc22.noarch requires mvn(org.apache.jackrabbit:jackrabbit-webdav)
On i386:
maven-wagon-webdav-jackrabbit-2.8-1.fc22.noarch requires mvn(org.apache.jackrabbit:jackrabbit-webdav)
On armhfp:
maven-wagon-webdav-jackrabbit-2.8-1.fc22.noarch requires mvn(org.apache.jackrabbit:jackrabbit-webdav)
Please resolve this as soon as possible.
9 years
[javapackages] Deal with classifiers in pom_editor
by Michael Šimáček
commit a749fe89a16d46cd926d82e848451397d94bbcc9
Author: Michael Simacek <msimacek(a)redhat.com>
Date: Wed May 13 14:34:49 2015 +0200
Deal with classifiers in pom_editor
java-utils/pom_editor.py | 2 +-
test/data/pom_editor/classifier.xml | 33 +++++++++++++++++++++
test/data/pom_editor/want/keep_classifier.xml | 33 +++++++++++++++++++++
test/data/pom_editor/want/minimal_pom_add_cls.xml | 22 ++++++++++++++
test/pom_editor_artifact_test.py | 14 +++++++++
5 files changed, 103 insertions(+), 1 deletions(-)
---
diff --git a/java-utils/pom_editor.py b/java-utils/pom_editor.py
index 3f8db58..0e7bdcd 100644
--- a/java-utils/pom_editor.py
+++ b/java-utils/pom_editor.py
@@ -392,7 +392,7 @@ class Pom(XmlFile):
version='any',
groupId='org.apache.maven.plugins')
else:
- pom_dependency_spec = 'groupId:artifactId:version:scope'
+ pom_dependency_spec = 'groupId:artifactId:version:scope:classifier'
ArtifactClass = MetaArtifact(pom_dependency_spec,
namespace=cls.NSMAP['pom'],
version='any')
diff --git a/test/data/pom_editor/classifier.xml b/test/data/pom_editor/classifier.xml
new file mode 100644
index 0000000..3e8c6fd
--- /dev/null
+++ b/test/data/pom_editor/classifier.xml
@@ -0,0 +1,33 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-parent</artifactId>
+ <version>17</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.6</version>
+ <name>Commons Lang</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.2</version>
+ <classifier>foo</classifier>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-ioX</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.2</version>
+ </dependency>
+ </dependencies>
+
+</project>
diff --git a/test/data/pom_editor/want/keep_classifier.xml b/test/data/pom_editor/want/keep_classifier.xml
new file mode 100644
index 0000000..5d29b50
--- /dev/null
+++ b/test/data/pom_editor/want/keep_classifier.xml
@@ -0,0 +1,33 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-parent</artifactId>
+ <version>17</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.6</version>
+ <name>Commons Lang</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.commons.commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.2</version>
+ <classifier>foo</classifier>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-ioX</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.2</version>
+ </dependency>
+ </dependencies>
+
+</project>
diff --git a/test/data/pom_editor/want/minimal_pom_add_cls.xml b/test/data/pom_editor/want/minimal_pom_add_cls.xml
new file mode 100644
index 0000000..a5c6234
--- /dev/null
+++ b/test/data/pom_editor/want/minimal_pom_add_cls.xml
@@ -0,0 +1,22 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-parent</artifactId>
+ <version>any</version>
+ <classifier>cls</classifier>
+ </dependency>
+ </dependencies>
+
+ <parent>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-parent</artifactId>
+ <version>17</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.6</version>
+ <name>Commons Lang</name>
+
+</project>
diff --git a/test/pom_editor_artifact_test.py b/test/pom_editor_artifact_test.py
index a85db81..5bf9d8a 100644
--- a/test/pom_editor_artifact_test.py
+++ b/test/pom_editor_artifact_test.py
@@ -44,6 +44,13 @@ class TestPomArtifact(WorkdirTestCase):
self.assertEqual(0, return_value, stderr)
self.assertEqual('', report, report)
+ def test_classifier(self):
+ return_value, stderr, report = exec_pom_macro_simple(\
+ "%pom_add_dep org.apache.ant:ant-parent:::cls",
+ 'minimal_pom.xml', 'minimal_pom_add_cls.xml')
+ self.assertEqual(0, return_value, stderr)
+ self.assertEqual('', report, report)
+
class TestPomChange(WorkdirTestCase):
def test_change_simple(self):
return_value, stderr, report = exec_pom_macro_simple(\
@@ -80,5 +87,12 @@ class TestPomChange(WorkdirTestCase):
self.assertEqual(0, return_value, stderr)
self.assertEqual('', report, report)
+ def test_keep_classifier(self):
+ return_value, stderr, report = exec_pom_macro_simple(\
+ "%pom_change_dep commons-io org.apache.commons.commons-io:",
+ 'classifier.xml', 'keep_classifier.xml')
+ self.assertEqual(0, return_value, stderr)
+ self.assertEqual('', report, report)
+
if __name__ == '__main__':
unittest.main()
9 years
[javapackages] Update get_rpm_str invocation in mock module
by Michael Šimáček
commit fa191d54daafc0120222b9d31a4c332719ab57ae
Author: Michael Simacek <msimacek(a)redhat.com>
Date: Wed May 13 14:26:52 2015 +0200
Update get_rpm_str invocation in mock module
python/javapackages/common/mock.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/python/javapackages/common/mock.py b/python/javapackages/common/mock.py
index e115c46..189add9 100644
--- a/python/javapackages/common/mock.py
+++ b/python/javapackages/common/mock.py
@@ -70,7 +70,7 @@ def install_artifact(dep):
def install_maven_artifact(artifact_spec):
artifact = Artifact.from_mvn_str(artifact_spec)
try:
- install_artifact(artifact.get_rpm_str(compat=artifact.version))
+ install_artifact(artifact.get_rpm_str(compat_ver=artifact.version))
except InstallationException:
if not artifact.version:
raise
9 years
