94 lines
2.8 KiB
Diff
94 lines
2.8 KiB
Diff
From ed172e270bfdde65e3ba303b13bb44141b0392a9 Mon Sep 17 00:00:00 2001
|
|
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
|
|
Date: Wed, 25 Sep 2013 17:37:15 +0200
|
|
Subject: [PATCH 3/3] [test] Update data for singleton packaging
|
|
|
|
---
|
|
test/data/build_all1_00004.xml | 5 +++--
|
|
test/data/build_all1_00005.xml | 15 +++++++++++++++
|
|
test/data/build_singleton1_00001.xml | 5 +++--
|
|
test/data/build_singleton1_00002.xml | 15 +++++++++++++++
|
|
4 files changed, 36 insertions(+), 4 deletions(-)
|
|
create mode 100644 test/data/build_all1_00005.xml
|
|
create mode 100644 test/data/build_singleton1_00002.xml
|
|
|
|
diff --git a/test/data/build_all1_00004.xml b/test/data/build_all1_00004.xml
|
|
index f12fd68..1dd3da6 100644
|
|
--- a/test/data/build_all1_00004.xml
|
|
+++ b/test/data/build_all1_00004.xml
|
|
@@ -7,9 +7,10 @@
|
|
<artifactManagement>
|
|
<rule>
|
|
<artifactGlob>
|
|
- <artifactId>{*}</artifactId>
|
|
+ <classifier>*?</classifier>
|
|
</artifactGlob>
|
|
- <targetPackage>@1</targetPackage>
|
|
+ <optional>true</optional>
|
|
+ <targetPackage>__noinstall</targetPackage>
|
|
</rule>
|
|
</artifactManagement>
|
|
</configuration>
|
|
diff --git a/test/data/build_all1_00005.xml b/test/data/build_all1_00005.xml
|
|
new file mode 100644
|
|
index 0000000..f12fd68
|
|
--- /dev/null
|
|
+++ b/test/data/build_all1_00005.xml
|
|
@@ -0,0 +1,15 @@
|
|
+<?xml version="1.0" ?>
|
|
+<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>{*}</artifactId>
|
|
+ </artifactGlob>
|
|
+ <targetPackage>@1</targetPackage>
|
|
+ </rule>
|
|
+ </artifactManagement>
|
|
+</configuration>
|
|
diff --git a/test/data/build_singleton1_00001.xml b/test/data/build_singleton1_00001.xml
|
|
index f12fd68..1dd3da6 100644
|
|
--- a/test/data/build_singleton1_00001.xml
|
|
+++ b/test/data/build_singleton1_00001.xml
|
|
@@ -7,9 +7,10 @@
|
|
<artifactManagement>
|
|
<rule>
|
|
<artifactGlob>
|
|
- <artifactId>{*}</artifactId>
|
|
+ <classifier>*?</classifier>
|
|
</artifactGlob>
|
|
- <targetPackage>@1</targetPackage>
|
|
+ <optional>true</optional>
|
|
+ <targetPackage>__noinstall</targetPackage>
|
|
</rule>
|
|
</artifactManagement>
|
|
</configuration>
|
|
diff --git a/test/data/build_singleton1_00002.xml b/test/data/build_singleton1_00002.xml
|
|
new file mode 100644
|
|
index 0000000..f12fd68
|
|
--- /dev/null
|
|
+++ b/test/data/build_singleton1_00002.xml
|
|
@@ -0,0 +1,15 @@
|
|
+<?xml version="1.0" ?>
|
|
+<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>{*}</artifactId>
|
|
+ </artifactGlob>
|
|
+ <targetPackage>@1</targetPackage>
|
|
+ </rule>
|
|
+ </artifactManagement>
|
|
+</configuration>
|
|
--
|
|
1.8.3.1
|
|
|