[javapackages/new-metadata-experiment: 2/5] [test] new metadata related fixes
by Michal Srb
commit 6d48da3b956edb7cf39a2dcf9e6e1757c4e1e4f7
Author: Michal Srb <msrb(a)redhat.com>
Date: Fri Apr 11 14:52:25 2014 +0200
[test] new metadata related fixes
.../depmap_new_versioned_compressed.xml.gz | Bin 461 -> 489 bytes
python/test/depmap_test.py | 6 +++---
2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/python/test/data/metadata/depmap_new_versioned_compressed.xml.gz b/python/test/data/metadata/depmap_new_versioned_compressed.xml.gz
index 30314ae..4ca09c6 100644
Binary files a/python/test/data/metadata/depmap_new_versioned_compressed.xml.gz and b/python/test/data/metadata/depmap_new_versioned_compressed.xml.gz differ
diff --git a/python/test/depmap_test.py b/python/test/depmap_test.py
index 78d74a5..a5b46b7 100644
--- a/python/test/depmap_test.py
+++ b/python/test/depmap_test.py
@@ -31,12 +31,12 @@ class TestDepmap(unittest.TestCase):
@depmapfile("depmap_java_devel.xml")
def test_java_devel_requires(self, d):
- self.assertEqual(d.get_java_requires(), None)
+ self.assertEqual(d.get_java_requires(Artifact("org.apache.maven.plugins:maven-idea-plugin:2.2")), None)
self.assertEqual(d.get_java_devel_requires(), "1.5")
@depmapfile("depmap_compat_new.xml")
def test_single_provides(self, d):
- self.assertEqual(len(d.get_provided_artifacts()), 1)
+ self.assertEqual(len(d.get_provided_artifacts()), 2)
@depmapfile("depmap_new_versioned.xml")
def test_provided_mappings(self, d):
@@ -133,7 +133,7 @@ class TestDepmap(unittest.TestCase):
def test_multiple_namespaces(self, d):
prov = d.get_provided_artifacts()
- self.assertEqual(len(prov), 3)
+ self.assertEqual(len(prov), 6)
self.assertEqual(prov[0].namespace, "codehaus-plexus")
self.assertEqual(prov[1].namespace, "plexus")
self.assertEqual(prov[2].namespace, "codehaus")
10 years, 1 month
[javapackages/new-metadata-experiment: 1/5] [test] Fix metadata for depmap tests
by Michal Srb
commit 31f380c0d4a234c1e0ff63e46e60c98a0105d594
Author: Michal Srb <msrb(a)redhat.com>
Date: Fri Apr 11 12:51:53 2014 +0200
[test] Fix metadata for depmap tests
python/test/data/metadata/depmap_compat_new.xml | 4 +---
.../data/metadata/depmap_incorrect_provides.xml | 2 +-
python/test/data/metadata/depmap_invalid_nover.xml | 4 +---
python/test/data/metadata/depmap_java_devel.xml | 2 +-
.../data/metadata/depmap_multiple_namespaces.xml | 2 +-
python/test/data/metadata/depmap_namespace.xml | 4 +---
.../data/metadata/depmap_namespace_requires.xml | 4 +---
python/test/data/metadata/depmap_new_versioned.xml | 4 +---
8 files changed, 8 insertions(+), 18 deletions(-)
---
diff --git a/python/test/data/metadata/depmap_compat_new.xml b/python/test/data/metadata/depmap_compat_new.xml
index b6aba69..26d6917 100644
--- a/python/test/data/metadata/depmap_compat_new.xml
+++ b/python/test/data/metadata/depmap_compat_new.xml
@@ -1,4 +1,4 @@
-<metadata>
+<metadata xmlns="http://fedorahosted.org/xmvn/CONFIG/2.0.0">
<uuid>43948329</uuid>
<artifacts>
<artifact>
@@ -27,7 +27,6 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-7</version>
<requestedVersion>12</requestedVersion>
</dependency>
<dependency>
@@ -62,7 +61,6 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-7</version>
<requestedVersion>12</requestedVersion>
</dependency>
<dependency>
diff --git a/python/test/data/metadata/depmap_incorrect_provides.xml b/python/test/data/metadata/depmap_incorrect_provides.xml
index 9aeeb12..9b48c50 100644
--- a/python/test/data/metadata/depmap_incorrect_provides.xml
+++ b/python/test/data/metadata/depmap_incorrect_provides.xml
@@ -1,4 +1,4 @@
-<metadata>
+<metadata xmlns="http://fedorahosted.org/xmvn/CONFIG/2.0.0">
<uuid>43948329</uuid>
<artifacts>
<artifact>
diff --git a/python/test/data/metadata/depmap_invalid_nover.xml b/python/test/data/metadata/depmap_invalid_nover.xml
index fc2e6cc..eb70cca 100644
--- a/python/test/data/metadata/depmap_invalid_nover.xml
+++ b/python/test/data/metadata/depmap_invalid_nover.xml
@@ -1,4 +1,4 @@
-<metadata>
+<metadata xmlns="http://fedorahosted.org/xmvn/CONFIG/2.0.0">
<uuid>4394f4ds8329</uuid>
<artifacts>
<artifact>
@@ -23,7 +23,6 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-7</version>
<requestedVersion>12</requestedVersion>
</dependency>
<dependency>
@@ -54,7 +53,6 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-7</version>
<requestedVersion>12</requestedVersion>
</dependency>
<dependency>
diff --git a/python/test/data/metadata/depmap_java_devel.xml b/python/test/data/metadata/depmap_java_devel.xml
index 71d0ed1..0ada90b 100644
--- a/python/test/data/metadata/depmap_java_devel.xml
+++ b/python/test/data/metadata/depmap_java_devel.xml
@@ -1,4 +1,4 @@
-<metadata>
+<metadata xmlns="http://fedorahosted.org/xmvn/CONFIG/2.0.0">
<uuid>43948343229</uuid>
<artifacts>
<artifact>
diff --git a/python/test/data/metadata/depmap_multiple_namespaces.xml b/python/test/data/metadata/depmap_multiple_namespaces.xml
index 65f2fe9..ab6c5fd 100644
--- a/python/test/data/metadata/depmap_multiple_namespaces.xml
+++ b/python/test/data/metadata/depmap_multiple_namespaces.xml
@@ -1,4 +1,4 @@
-<metadata>
+<metadata xmlns="http://fedorahosted.org/xmvn/CONFIG/2.0.0">
<uuid>43948329</uuid>
<artifacts>
<artifact>
diff --git a/python/test/data/metadata/depmap_namespace.xml b/python/test/data/metadata/depmap_namespace.xml
index 780b87c..3dda5c2 100644
--- a/python/test/data/metadata/depmap_namespace.xml
+++ b/python/test/data/metadata/depmap_namespace.xml
@@ -1,4 +1,4 @@
-<metadata>
+<metadata xmlns="http://fedorahosted.org/xmvn/CONFIG/2.0.0">
<uuid>43948329</uuid>
<artifacts>
<artifact>
@@ -28,7 +28,6 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-7</version>
<requestedVersion>12</requestedVersion>
</dependency>
<dependency>
@@ -64,7 +63,6 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-7</version>
<requestedVersion>12</requestedVersion>
</dependency>
<dependency>
diff --git a/python/test/data/metadata/depmap_namespace_requires.xml b/python/test/data/metadata/depmap_namespace_requires.xml
index 5682156..416e9b6 100644
--- a/python/test/data/metadata/depmap_namespace_requires.xml
+++ b/python/test/data/metadata/depmap_namespace_requires.xml
@@ -1,4 +1,4 @@
-<metadata>
+<metadata xmlns="http://fedorahosted.org/xmvn/CONFIG/2.0.0">
<uuid>43948329</uuid>
<artifacts>
<artifact>
@@ -27,7 +27,6 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-7</version>
<requestedVersion>12</requestedVersion>
</dependency>
<dependency>
@@ -76,7 +75,6 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-7</version>
<requestedVersion>12</requestedVersion>
</dependency>
<dependency>
diff --git a/python/test/data/metadata/depmap_new_versioned.xml b/python/test/data/metadata/depmap_new_versioned.xml
index 0ac9f99..ce9db53 100644
--- a/python/test/data/metadata/depmap_new_versioned.xml
+++ b/python/test/data/metadata/depmap_new_versioned.xml
@@ -1,4 +1,4 @@
-<metadata>
+<metadata xmlns="http://fedorahosted.org/xmvn/CONFIG/2.0.0">
<uuid>4394fds8329</uuid>
<artifacts>
<artifact>
@@ -24,7 +24,6 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-7</version>
<requestedVersion>12</requestedVersion>
</dependency>
<dependency>
@@ -56,7 +55,6 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-7</version>
<requestedVersion>12</requestedVersion>
</dependency>
<dependency>
10 years, 1 month
[javapackages] (5 commits) Created branch new-metadata-experiment
by Michal Srb
The branch 'new-metadata-experiment' was created.
Summary of new commits:
31f380c... [test] Fix metadata for depmap tests
6d48da3... [test] new metadata related fixes
eb407ad... [depmap] new metadata related changes
b4e23f6... [prov] new metadata experiment #1
97091ff... [artifact] new metadata related changes
10 years, 1 month
[jetty] Remove jetty-runner subpackage.
by Michael Šimáček
commit 11c6cb70bea63d3636185e267fdc5eb7df294dad
Author: Michael Simacek <msimacek(a)redhat.com>
Date: Fri Apr 11 12:38:48 2014 +0200
Remove jetty-runner subpackage.
jetty.spec | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
---
diff --git a/jetty.spec b/jetty.spec
index 2224fc7..861543e 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -172,6 +172,7 @@ Obsoletes: %{name}-nested < %{version}-%{release}
Obsoletes: %{name}-overlay-deployer < %{version}-%{release}
Obsoletes: %{name}-policy < %{version}-%{release}
Obsoletes: %{name}-websocket-mux-extension < %{version}-%{release}
+Obsoletes: %{name}-runner < %{version}-%{release}
%description
%global desc \
@@ -323,12 +324,6 @@ Summary: rewrite module for Jetty
%description rewrite
%{extdesc} %{summary}.
-%package runner
-Summary: runner module for Jetty
-
-%description runner
-%{extdesc} %{summary}.
-
%package security
Summary: security module for Jetty
@@ -630,6 +625,7 @@ rm LICENSE-CONTRIBUTOR/CDDLv1.0.txt
%mvn_package :jetty-project project
%mvn_package :fcgi-parent __noinstall
+%mvn_package :jetty-runner __noinstall
# we don't have all necessary dependencies to run tests
# missing test dep: org.eclipse.jetty.toolchain:jetty-test-helper
@@ -704,7 +700,7 @@ jetty-continuation jetty-server jetty-xml jetty-security jetty-servlet \
jetty-webapp jetty-websocket jetty-servlets jetty-util-ajax jetty-maven-plugin \
jetty-jspc-maven-plugin jetty-deploy jetty-start jetty-plus jetty-annotations \
jetty-jndi jetty-jsp jetty-jaas jetty-spring jetty-client jetty-proxy \
-jetty-jaspi jetty-osgi jetty-rewrite jetty-nosql jetty-runner jetty-monitor \
+jetty-jaspi jetty-osgi jetty-rewrite jetty-nosql jetty-monitor \
jetty-http-spi; do
ln -s %{_javadir}/%{name}/$module.jar \
%{buildroot}%{homedir}/lib/$module-%{version}.%{addver}.jar
@@ -830,7 +826,6 @@ exit 0
%files plus -f .mfiles-jetty-plus
%files proxy -f .mfiles-jetty-proxy
%files rewrite -f .mfiles-jetty-rewrite
-%files runner -f .mfiles-jetty-runner
%files security -f .mfiles-jetty-security
%files server -f .mfiles-jetty-server
%files servlet -f .mfiles-jetty-servlet
@@ -873,7 +868,7 @@ exit 0
%changelog
* Fri Apr 11 2014 Michael Simacek <msimacek(a)redhat.com> - 9.1.4-3
-- Remove bundled dependencies from jetty-runner
+- Remove jetty-runner subpackage
* Thu Apr 10 2014 Michael Simacek <msimacek(a)redhat.com> - 9.1.4-2
- Install startup script into correct directory
10 years, 1 month
[jetty] Remove bundled dependencies from jetty-runner
by Michael Šimáček
commit f2ea1d1c78d5d5400a20d282af571deea854c99b
Author: Michael Simacek <msimacek(a)redhat.com>
Date: Fri Apr 11 11:19:19 2014 +0200
Remove bundled dependencies from jetty-runner
jetty.spec | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/jetty.spec b/jetty.spec
index 12caf21..2224fc7 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -55,7 +55,7 @@
Name: jetty
Version: 9.1.4
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Java Webserver and Servlet Container
# Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt
@@ -529,6 +529,9 @@ find . -name "*.class" -exec rm {} \;
%pom_remove_plugin ":clirr-maven-plugin" jetty-websocket
%pom_remove_plugin ":maven-eclipse-plugin" jetty-osgi
+# jetty-runner bundles its dependencies
+%pom_remove_plugin ":maven-dependency-plugin" jetty-runner
+
# it tries to execute start.jar, but can't find its config that wasn't
# installed yet
%pom_remove_plugin ":exec-maven-plugin" jetty-distribution
@@ -869,6 +872,9 @@ exit 0
%doc NOTICE.txt LICENSE*
%changelog
+* Fri Apr 11 2014 Michael Simacek <msimacek(a)redhat.com> - 9.1.4-3
+- Remove bundled dependencies from jetty-runner
+
* Thu Apr 10 2014 Michael Simacek <msimacek(a)redhat.com> - 9.1.4-2
- Install startup script into correct directory
- Add a notice about httpd_execmem into the startup script
10 years, 1 month
[jetty/f20] Simplify jetty startup script and use systemd features
by Michael Šimáček
commit c20d8f23d8a85a2039a86d6d6256aa9b03947750
Author: Michael Simacek <msimacek(a)redhat.com>
Date: Tue Apr 1 19:29:55 2014 +0200
Simplify jetty startup script and use systemd features
djetty.script | 30 -----------
jetty.service | 7 ++-
jetty.sh | 150 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
jetty.spec | 31 ++++++++----
4 files changed, 174 insertions(+), 44 deletions(-)
---
diff --git a/jetty.service b/jetty.service
index 97652c1..ae69ebf 100644
--- a/jetty.service
+++ b/jetty.service
@@ -9,9 +9,10 @@ Description=Jetty Web Application Server
After=syslog.target network.target
[Service]
-Type=forking
-ExecStart=/usr/bin/jetty start
-ExecStop=/usr/bin/jetty stop
+Type=simple
+ExecStart=/usr/share/jetty/bin/jetty.sh
+User=jetty
+Group=jetty
[Install]
WantedBy=multi-user.target
diff --git a/jetty.sh b/jetty.sh
new file mode 100644
index 0000000..0feddde
--- /dev/null
+++ b/jetty.sh
@@ -0,0 +1,150 @@
+#!/usr/bin/env bash
+# Configuration files
+#
+# /etc/default/jetty
+# If it exists, this is read at the start of script. It may perform any
+# sequence of shell commands, like setting relevant environment variables.
+#
+# /etc/jetty.conf
+# If found, and no configurations were given on the command line,
+# the file will be used as this script's configuration.
+# Each line in the file may contain:
+# - A comment denoted by the pound (#) sign as first non-blank character.
+# - The path to a regular file, which will be passed to jetty as a
+# config.xml file.
+# - The path to a directory. Each *.xml file in the directory will be
+# passed to jetty as a config.xml file.
+# - All other lines will be passed, as-is to the start.jar
+#
+# The files will be checked for existence before being passed to jetty.
+#
+# Configuration variables
+#
+# JAVA
+# Command to invoke Java. If not set, java (from the PATH) will be used.
+#
+# JAVA_OPTIONS
+# Extra options to pass to the JVM
+#
+# JETTY_HOME
+# Where Jetty is installed. If not set, the script will try go
+# guess it by first looking at the invocation path for the script,
+# and then by looking in standard locations as $HOME/opt/jetty
+# and /opt/jetty. The java system property "jetty.home" will be
+# set to this value for use by configure.xml files, f.e.:
+#
+# <Arg><Property name="jetty.home" default="."/>/webapps/jetty.war</Arg>
+#
+# JETTY_BASE
+# Where your Jetty base directory is. If not set, the value from
+# $JETTY_HOME will be used.
+#
+# JETTY_ARGS
+# The default arguments to pass to jetty.
+# For example
+# JETTY_ARGS=jetty.port=8080 jetty.spdy.port=8443 jetty.secure.port=443
+#
+
+set -e -C
+trap "exit 0" 15
+
+readConfig()
+{
+ echo "Reading $1.."
+ source "$1"
+}
+
+CONFIGS=()
+
+if [ -f /etc/default/jetty ]; then
+ readConfig /etc/default/jetty
+fi
+
+if [ -z "$JETTY_HOME" ]; then
+ JETTY_HOME=/usr/share/jetty
+fi
+
+if [ -z "$JETTY_BASE" ]; then
+ JETTY_BASE="$JETTY_HOME"
+fi
+
+cd "$JETTY_BASE"
+JETTY_BASE="$PWD"
+
+if [ -z "$JETTY_CONF" ]
+then
+ JETTY_CONF=/etc/jetty.conf
+fi
+
+if [ -f "$JETTY_CONF" ] && [ -r "$JETTY_CONF" ]
+then
+ while read -r CONF
+ do
+ if expr "$CONF" : '#' >/dev/null ; then
+ continue
+ fi
+
+ if [ -d "$CONF" ]
+ then
+ # assume it's a directory with configure.xml files
+ # for example: /etc/jetty.d/
+ # sort the files before adding them to the list of JETTY_ARGS
+ for XMLFILE in "$CONF/"*.xml
+ do
+ if [ -r "$XMLFILE" ] && [ -f "$XMLFILE" ]
+ then
+ JETTY_ARGS+=("$XMLFILE")
+ else
+ echo "** WARNING: Cannot read '$XMLFILE' specified in '$JETTY_CONF'"
+ fi
+ done
+ else
+ # assume it's a command line parameter (let start.jar deal with its validity)
+ JETTY_ARGS+=("$CONF")
+ fi
+ done < "$JETTY_CONF"
+fi
+
+if [ -z "$JAVA" ]
+then
+ . /usr/share/java-utils/java-functions
+ set_jvm
+ set_javacmd
+ JAVA="$JAVACMD"
+fi
+
+if [ -z "$JETTY_LOGS" ] && [ -d $JETTY_BASE/logs ]
+then
+ JETTY_LOGS=/var/log/jetty/logs
+fi
+JAVA_OPTIONS+=("-Djetty.logs=$JETTY_LOGS")
+
+JAVA_OPTIONS+=("-Djetty.home=$JETTY_HOME" "-Djetty.base=$JETTY_BASE")
+
+JETTY_START="$JETTY_HOME/start.jar"
+START_INI="$JETTY_BASE/start.ini"
+if [ ! -f "$START_INI" ]
+then
+ echo "Cannot find a start.ini in your JETTY_BASE directory: $JETTY_BASE" 2>&2
+ exit 1
+fi
+
+RUN_ARGS=(${JAVA_OPTIONS[@]} -jar "$JETTY_START" ${JETTY_ARGS[*]})
+RUN_CMD=("$JAVA" ${RUN_ARGS[@]})
+
+echo -n "Starting Jetty: "
+set +e
+${RUN_CMD[*]}
+
+RET="$?"
+if [ "$RET" -ne 0 ]; then
+cat << EOF
+If jvm exited with Out of Memory Error it is quite likely that your SELinux
+policy doesn't allow execmem access for the JVM. To solve this problem, use:
+setsebool -P httpd_execmem 1
+to allow execmem acces for processes in the httpd domain. Please bear in mind
+that this might affect other processess. For more information see
+httpd_selinux(8).
+EOF
+exit "$RET"
+fi
diff --git a/jetty.spec b/jetty.spec
index dd44003..35947ef 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -55,14 +55,14 @@
Name: jetty
Version: 9.0.5
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Java Webserver and Servlet Container
# Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt
License: ASL 2.0 or EPL
URL: http://www.eclipse.org/jetty/
Source0: http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/snapshot/jet...
-Source1: djetty.script
+Source1: jetty.sh
Source3: jetty.logrotate
Source5: %{name}.service
# MIT license text taken from Utf8Appendable.java
@@ -523,6 +523,9 @@ find . -name "*.class" -exec rm {} \;
# ReportDocumentRender". Investigate proper fix some other time?
%pom_remove_plugin :maven-pmd-plugin
+# not needed
+%pom_remove_plugin ":maven-eclipse-plugin" jetty-osgi
+
# License plugin may be useful for upstream, but it has no use in
# Fedora.
%pom_remove_plugin :maven-license-plugin
@@ -562,16 +565,18 @@ find . -name "*.class" -exec rm {} \;
%pom_remove_dep :org.eclipse.jdt.core jetty-jsp
-cp %{SOURCE1} djetty
cp %{SOURCE6} .
+# the default location is not allowed by SELinux
+sed -i '/<SystemProperty name="jetty.state"/d' \
+ jetty-distribution/src/main/resources/etc/jetty-started.xml
+
+
# Looks like all CDDL licensed content in tarball has been replaced,
# we don't need to install this license
rm LICENSE-CONTRIBUTOR/CDDLv1.0.txt
%build
-sed -i -e "s|/usr/share|%{_datadir}|g" djetty
-
%mvn_package :jetty-distribution __noinstall
# Separate package for main POM file
%mvn_package :jetty-project project
@@ -615,10 +620,6 @@ rm -f %{buildroot}%{homedir}/bin/*cygwin*
# copy previously extracted configuration
cp jetty-distribution/target/distribution/etc/* %{buildroot}%{homedir}/etc/
-chmod +x %{buildroot}%{homedir}/bin/jetty-xinetd.sh
-chmod +x djetty
-mv djetty %{buildroot}%{_bindir}/djetty
-ln -s %{homedir}/bin/jetty.sh %{buildroot}%{_bindir}/%{name}
install -pm 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
echo '# Placeholder configuration file. No default is provided.' > \
%{buildroot}%{confdir}/jetty.conf
@@ -670,7 +671,6 @@ JETTY_HOME=%{homedir}
JETTY_CONSOLE=%{logdir}/jetty-console.log
JETTY_PORT=8080
JETTY_RUN=%{_localstatedir}/run/%{name}
-JETTY_PID=\$JETTY_RUN/jetty.pid
EO_RC
) > %{buildroot}%{homedir}/.jettyrc
@@ -704,6 +704,11 @@ for cdir in contexts contexts-available resources;do
ln -sf %{homedir}/$cdir %{buildroot}/%{confdir}/$cdir
done
+# remove demo configuration (rhbz#1083088)
+rm %{buildroot}%{homedir}/start.d/900-demo.ini
+
+# replace the startup script with ours
+cp -p %{SOURCE1} %{buildroot}%{homedir}/bin/jetty.sh
%pre
# Add the "jetty" user and group
@@ -737,11 +742,11 @@ getent passwd %username &>/dev/null || useradd -r -u %jtuid -g %username \
%if %{with service}
%config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf
%config(noreplace) %attr(644, root, root) %{_sysconfdir}/logrotate.d/%{name}
-%{_bindir}/*
%config(noreplace) %{confdir}
%dir %{jettylibdir}
%dir %{jettycachedir}
%{homedir}
+%attr(744, jetty, jetty) %{homedir}/bin/jetty.sh
%attr(755, jetty, jetty) %{logdir}
%attr(755, jetty, jetty) %{tempdir}
%ghost %dir %attr(755, jetty, jetty) %{rundir}
@@ -814,6 +819,10 @@ getent passwd %username &>/dev/null || useradd -r -u %jtuid -g %username \
%doc NOTICE.txt LICENSE*
%changelog
+* Thu Apr 10 2014 Michael Simacek <msimacek(a)redhat.com> - 9.0.5-2
+- Simplify jetty startup script and use systemd features
+- Remove demo configuration (rhbz#1083088)
+
* Thu Aug 22 2013 Michal Srb <msrb(a)redhat.com> - 9.0.5-1
- Update to upstream version 9.0.5
10 years, 1 month
[javapackages] [test] Remove tests for "old" depmaps
by Michal Srb
commit d8ccc47cccf669d727601d8bd23921a95d922f11
Author: Michal Srb <msrb(a)redhat.com>
Date: Fri Apr 11 07:58:51 2014 +0200
[test] Remove tests for "old" depmaps
python/test/data/depmap_compat_old | 68 ------------------------------------
python/test/depmap_test.py | 28 ---------------
2 files changed, 0 insertions(+), 96 deletions(-)
---
diff --git a/python/test/depmap_test.py b/python/test/depmap_test.py
index 749d96a..78d74a5 100644
--- a/python/test/depmap_test.py
+++ b/python/test/depmap_test.py
@@ -21,18 +21,10 @@ class TestDepmap(unittest.TestCase):
def test_nonexisting_depmap(self, d):
self.assertTrue(False, "IOError was expected!")
- @depmapfile("depmap_compat_old")
- def test_compat_old(self, d):
- self.assertTrue(d.is_compat())
-
@depmapfile("depmap_compat_new.xml")
def test_compat_new(self, d):
self.assertTrue(d.is_compat())
- @depmapfile("depmap_compat_old")
- def test_missing_java_requires(self, d):
- self.assertEqual(d.get_java_requires(), None)
-
@depmapfile("depmap_compat_new.xml")
def test_java_requires(self, d):
self.assertEqual(d.get_java_requires(), "1.5")
@@ -46,20 +38,6 @@ class TestDepmap(unittest.TestCase):
def test_single_provides(self, d):
self.assertEqual(len(d.get_provided_artifacts()), 1)
- @depmapfile("depmap_compat_old")
- def test_multiple_provides(self, d):
- self.assertTrue(d.is_compat())
- prov = d.get_provided_artifacts()
- self.assertEqual(len(prov), 5)
- for p in prov:
- self.assertEqual(p.groupId, "org.apache.maven")
- self.assertEqual(p.artifactId, "maven-artifact")
- self.assertEqual(prov[0].version, "2.2.1")
- self.assertEqual(prov[1].version, "2.0.2")
- self.assertEqual(prov[2].version, "2.0.6")
- self.assertEqual(prov[3].version, "2.0.7")
- self.assertEqual(prov[4].version, "2.0.8")
-
@depmapfile("depmap_new_versioned.xml")
def test_provided_mappings(self, d):
self.assertFalse(d.is_compat())
@@ -112,12 +90,6 @@ class TestDepmap(unittest.TestCase):
def test_no_maven_version_mappings(self, d):
d.get_provided_mappings()
- @depmapfile("depmap_compat_old")
- def test_no_requires(self, d):
- reqs = d.get_required_artifacts()
- self.assertTrue(type(reqs) == list)
- self.assertEqual(len(reqs), 0)
-
@depmapfile("depmap_compat_new.xml")
def test_multiple_requires(self, d):
reqs = d.get_required_artifacts()
10 years, 1 month
[javapackages] [test] Point to the right directory
by Michal Srb
commit 0338c4855d8ac624cda2eeb6e90456182ca37718
Author: Michal Srb <msrb(a)redhat.com>
Date: Fri Apr 11 07:55:41 2014 +0200
[test] Point to the right directory
python/test/depmap_test.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/python/test/depmap_test.py b/python/test/depmap_test.py
index a3402f1..749d96a 100644
--- a/python/test/depmap_test.py
+++ b/python/test/depmap_test.py
@@ -9,7 +9,7 @@ def depmapfile(fname):
def test_decorator(fn):
def test_decorated(self, *args, **kwargs):
main_dir = os.path.dirname(os.path.realpath(__file__))
- fn(self, Depmap(os.path.join(main_dir, "data", fname)))
+ fn(self, Depmap(os.path.join(main_dir, "data/metadata", fname)))
return test_decorated
return test_decorator
10 years, 1 month
[javapackages] [test] Add metadata in new format for depmap_test
by Michal Srb
commit ecac9ee388b507badb41c7bc412b30d7fb217a72
Author: Michal Srb <msrb(a)redhat.com>
Date: Thu Apr 10 17:10:58 2014 +0200
[test] Add metadata in new format for depmap_test
python/test/data/metadata/depmap_compat_new.xml | 77 +++++++
.../data/metadata/depmap_incorrect_provides.xml | 23 ++
python/test/data/metadata/depmap_invalid_nover.xml | 70 +++++++
python/test/data/metadata/depmap_java_devel.xml | 22 ++
.../data/metadata/depmap_multiple_namespaces.xml | 215 ++++++++++++++++++++
python/test/data/metadata/depmap_namespace.xml | 80 ++++++++
.../data/metadata/depmap_namespace_requires.xml | 105 ++++++++++
python/test/data/metadata/depmap_new_versioned.xml | 72 +++++++
.../depmap_new_versioned_compressed.xml.gz | Bin 0 -> 461 bytes
9 files changed, 664 insertions(+), 0 deletions(-)
---
diff --git a/python/test/data/metadata/depmap_compat_new.xml b/python/test/data/metadata/depmap_compat_new.xml
new file mode 100644
index 0000000..b6aba69
--- /dev/null
+++ b/python/test/data/metadata/depmap_compat_new.xml
@@ -0,0 +1,77 @@
+<metadata>
+ <uuid>43948329</uuid>
+ <artifacts>
+ <artifact>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-idea-plugin</artifactId>
+ <version>2.2</version>
+ <path>/usr/share/java/maven-idea-plugin/maven-idea-plugin-2.2.jar</path>
+ <properties>
+ <requiresJava>1.5</requiresJava>
+ </properties>
+ <compatVersions>
+ <version>2.2</version>
+ </compatVersions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-provider-api</artifactId>
+ <classifier>test-jar</classifier>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ <version>1.0-alpha-7</version>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <extension>war</extension>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ </dependencies>
+ </artifact>
+ <artifact>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-idea-plugin</artifactId>
+ <version>2.2</version>
+ <extension>pom</extension>
+ <path>/usr/share/maven-poms/JPP.maven-idea-plugin-maven-idea-plugin-2.2.pom</path>
+ <compatVersions>
+ <version>2.2</version>
+ </compatVersions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-provider-api</artifactId>
+ <classifier>test-jar</classifier>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ <version>1.0-alpha-7</version>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <extension>war</extension>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ </dependencies>
+ </artifact>
+ </artifacts>
+</metadata>
diff --git a/python/test/data/metadata/depmap_incorrect_provides.xml b/python/test/data/metadata/depmap_incorrect_provides.xml
new file mode 100644
index 0000000..9aeeb12
--- /dev/null
+++ b/python/test/data/metadata/depmap_incorrect_provides.xml
@@ -0,0 +1,23 @@
+<metadata>
+ <uuid>43948329</uuid>
+ <artifacts>
+ <artifact>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-idea-plugin</artifactId>
+ <version>2.2</version>
+ <path>/usr/share/java/maven-idea-plugin/maven-idea-plugin-2.2.jar</path>
+ <properties>
+ <requiresJava>1.5</requiresJava>
+ </properties>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-idea-plugin</artifactId>
+ <version>2.2</version>
+ <extension>pom</extension>
+ <path>/usr/share/maven-poms/JPP.maven-idea-plugin-maven-idea-plugin-2.2.pom</path>
+ <compatVersions>
+ <version>2.2</version>
+ </compatVersions>
+ </artifact>
+ </artifacts>
+</metadata>
+
diff --git a/python/test/data/metadata/depmap_invalid_nover.xml b/python/test/data/metadata/depmap_invalid_nover.xml
new file mode 100644
index 0000000..fc2e6cc
--- /dev/null
+++ b/python/test/data/metadata/depmap_invalid_nover.xml
@@ -0,0 +1,70 @@
+<metadata>
+ <uuid>4394f4ds8329</uuid>
+ <artifacts>
+ <artifact>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-idea-plugin</artifactId>
+ <path>/usr/share/java/maven-idea-plugin/maven-idea-plugin.jar</path>
+ <properties>
+ <requiresJava>1.5</requiresJava>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-provider-api</artifactId>
+ <classifier>test-jar</classifier>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ <version>1.0-alpha-7</version>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <extension>war</extension>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ </dependencies>
+ </artifact>
+ <artifact>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-idea-plugin</artifactId>
+ <extension>pom</extension>
+ <path>/usr/share/maven-poms/JPP.maven-idea-plugin-maven-idea-plugin.pom</path>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-provider-api</artifactId>
+ <classifier>test-jar</classifier>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ <version>1.0-alpha-7</version>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <extension>war</extension>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ </dependencies>
+ </artifact>
+ </artifacts>
+</metadata>
+
diff --git a/python/test/data/metadata/depmap_java_devel.xml b/python/test/data/metadata/depmap_java_devel.xml
new file mode 100644
index 0000000..71d0ed1
--- /dev/null
+++ b/python/test/data/metadata/depmap_java_devel.xml
@@ -0,0 +1,22 @@
+<metadata>
+ <uuid>43948343229</uuid>
+ <artifacts>
+ <artifact>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-idea-plugin</artifactId>
+ <version>2.2</version>
+ <path>/usr/share/java/maven-idea-plugin/maven-idea-plugin.jar</path>
+ <properties>
+ <requiresJavaDevel>1.5</requiresJavaDevel>
+ </properties>
+ </artifact>
+ <artifact>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-idea-plugin</artifactId>
+ <version>2.2</version>
+ <extension>pom</extension>
+ <path>/usr/share/maven-poms/JPP.maven-idea-plugin-maven-idea-plugin.pom</path>
+ </artifact>
+ </artifacts>
+</metadata>
+
diff --git a/python/test/data/metadata/depmap_multiple_namespaces.xml b/python/test/data/metadata/depmap_multiple_namespaces.xml
new file mode 100644
index 0000000..65f2fe9
--- /dev/null
+++ b/python/test/data/metadata/depmap_multiple_namespaces.xml
@@ -0,0 +1,215 @@
+<metadata>
+ <uuid>43948329</uuid>
+ <artifacts>
+ <artifact>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>3.0</version>
+ <namespace>codehaus-plexus</namespace>
+ <path>/usr/share/java/plexus-utils/plexus-utils.jar</path>
+ <properties>
+ <requiresJava>1.5</requiresJava>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-provider-api</artifactId>
+ <classifier>test-jar</classifier>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ <requestedVersion>12</requestedVersion>
+ <resolvedVersion>1.0-alpha-7</resolvedVersion>
+ </dependency>
+ </dependencies>
+ </artifact>
+ <artifact>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>3.0</version>
+ <extension>pom</extension>
+ <namespace>codehaus-plexus</namespace>
+ <path>/usr/share/maven-poms/JPP.plexus-utils-plexus-utils.pom</path>
+ <properties>
+ <requiresJava>1.5</requiresJava>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-provider-api</artifactId>
+ <classifier>test-jar</classifier>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ <requestedVersion>12</requestedVersion>
+ <resolvedVersion>1.0-alpha-7</resolvedVersion>
+ </dependency>
+ </dependencies>
+ </artifact>
+
+ <artifact>
+ <groupId>plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>1.2</version>
+ <namespace>plexus</namespace>
+ <path>/usr/share/java/plexus-utils/plexus-utils.jar</path>
+ <properties>
+ <requiresJava>1.5</requiresJava>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-provider-api</artifactId>
+ <classifier>test-jar</classifier>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ <requestedVersion>12</requestedVersion>
+ <resolvedVersion>1.0-alpha-7</resolvedVersion>
+ </dependency>
+ </dependencies>
+ </artifact>
+ <artifact>
+ <groupId>plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>1.2</version>
+ <extension>pom</extension>
+ <namespace>plexus</namespace>
+ <path>/usr/share/maven-poms/JPP.plexus-utils-plexus-utils.pom</path>
+ <properties>
+ <requiresJava>1.5</requiresJava>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-provider-api</artifactId>
+ <classifier>test-jar</classifier>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ <requestedVersion>12</requestedVersion>
+ <resolvedVersion>1.0-alpha-7</resolvedVersion>
+ </dependency>
+ </dependencies>
+ </artifact>
+
+ <artifact>
+ <groupId>codehaus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>1.2</version>
+ <namespace>codehaus</namespace>
+ <path>/usr/share/java/plexus-utils/plexus-utils.jar</path>
+ <properties>
+ <requiresJava>1.5</requiresJava>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-provider-api</artifactId>
+ <classifier>test-jar</classifier>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ <requestedVersion>12</requestedVersion>
+ <resolvedVersion>1.0-alpha-7</resolvedVersion>
+ </dependency>
+ </dependencies>
+ </artifact>
+ <artifact>
+ <groupId>codehaus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>1.2</version>
+ <extension>pom</extension>
+ <namespace>codehaus</namespace>
+ <path>/usr/share/maven-poms/JPP.plexus-utils-plexus-utils.pom</path>
+ <properties>
+ <requiresJava>1.5</requiresJava>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-provider-api</artifactId>
+ <classifier>test-jar</classifier>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ <requestedVersion>12</requestedVersion>
+ <resolvedVersion>1.0-alpha-7</resolvedVersion>
+ </dependency>
+ </dependencies>
+ </artifact>
+ </artifacts>
+</metadata>
+
diff --git a/python/test/data/metadata/depmap_namespace.xml b/python/test/data/metadata/depmap_namespace.xml
new file mode 100644
index 0000000..780b87c
--- /dev/null
+++ b/python/test/data/metadata/depmap_namespace.xml
@@ -0,0 +1,80 @@
+<metadata>
+ <uuid>43948329</uuid>
+ <artifacts>
+ <artifact>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-idea-plugin</artifactId>
+ <version>2.2</version>
+ <namespace>ns</namespace>
+ <path>/usr/share/java/maven-idea-plugin/maven-idea-plugin-2.2.jar</path>
+ <properties>
+ <requiresJava>1.5</requiresJava>
+ </properties>
+ <compatVersions>
+ <version>2.2</version>
+ </compatVersions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-provider-api</artifactId>
+ <classifier>test-jar</classifier>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ <version>1.0-alpha-7</version>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <extension>war</extension>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ </dependencies>
+ </artifact>
+ <artifact>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-idea-plugin</artifactId>
+ <version>2.2</version>
+ <extension>pom</extension>
+ <namespace>ns</namespace>
+ <path>/usr/share/maven-poms/JPP.maven-idea-plugin-maven-idea-plugin-2.2.pom</path>
+ <compatVersions>
+ <version>2.2</version>
+ </compatVersions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-provider-api</artifactId>
+ <classifier>test-jar</classifier>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ <version>1.0-alpha-7</version>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <extension>war</extension>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ </dependencies>
+ </artifact>
+ </artifacts>
+</metadata>
+
diff --git a/python/test/data/metadata/depmap_namespace_requires.xml b/python/test/data/metadata/depmap_namespace_requires.xml
new file mode 100644
index 0000000..5682156
--- /dev/null
+++ b/python/test/data/metadata/depmap_namespace_requires.xml
@@ -0,0 +1,105 @@
+<metadata>
+ <uuid>43948329</uuid>
+ <artifacts>
+ <artifact>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-idea-plugin</artifactId>
+ <version>2.2</version>
+ <path>/usr/share/java/maven-idea-plugin/maven-idea-plugin-2.2.jar</path>
+ <properties>
+ <requiresJava>1.5</requiresJava>
+ </properties>
+ <compatVersions>
+ <version>2.2</version>
+ </compatVersions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-provider-api</artifactId>
+ <classifier>test-jar</classifier>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ <version>1.0-alpha-7</version>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <namespace>plexus</namespace>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <extension>war</extension>
+ <namespace>codehaus</namespace>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <namespace>test</namespace>
+ <requestedVersion>12</requestedVersion>
+ <resolvedVersion>0.9</resolvedVersion>
+ </dependency>
+ </dependencies>
+ </artifact>
+ <artifact>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-idea-plugin</artifactId>
+ <version>2.2</version>
+ <extension>pom</extension>
+ <path>/usr/share/maven-poms/JPP.maven-idea-plugin-maven-idea-plugin-2.2.pom</path>
+ <compatVersions>
+ <version>2.2</version>
+ </compatVersions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-provider-api</artifactId>
+ <classifier>test-jar</classifier>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ <version>1.0-alpha-7</version>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <namespace>plexus</namespace>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <extension>war</extension>
+ <namespace>codehaus</namespace>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <namespace>test</namespace>
+ <requestedVersion>12</requestedVersion>
+ <resolvedVersion>0.9</resolvedVersion>
+ </dependency>
+ </dependencies>
+ </artifact>
+ </artifacts>
+</metadata>
diff --git a/python/test/data/metadata/depmap_new_versioned.xml b/python/test/data/metadata/depmap_new_versioned.xml
new file mode 100644
index 0000000..0ac9f99
--- /dev/null
+++ b/python/test/data/metadata/depmap_new_versioned.xml
@@ -0,0 +1,72 @@
+<metadata>
+ <uuid>4394fds8329</uuid>
+ <artifacts>
+ <artifact>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-idea-plugin</artifactId>
+ <version>2.2</version>
+ <path>/usr/share/java/maven-idea-plugin/maven-idea-plugin.jar</path>
+ <properties>
+ <requiresJava>1.5</requiresJava>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-provider-api</artifactId>
+ <classifier>test-jar</classifier>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ <version>1.0-alpha-7</version>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <extension>war</extension>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ </dependencies>
+ </artifact>
+ <artifact>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-idea-plugin</artifactId>
+ <version>2.2</version>
+ <extension>pom</extension>
+ <path>/usr/share/maven-poms/JPP.maven-idea-plugin-maven-idea-plugin.pom</path>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-provider-api</artifactId>
+ <classifier>test-jar</classifier>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ <version>1.0-alpha-7</version>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <extension>war</extension>
+ <requestedVersion>12</requestedVersion>
+ </dependency>
+ </dependencies>
+ </artifact>
+ </artifacts>
+</metadata>
+
diff --git a/python/test/data/metadata/depmap_new_versioned_compressed.xml.gz b/python/test/data/metadata/depmap_new_versioned_compressed.xml.gz
new file mode 100644
index 0000000..30314ae
Binary files /dev/null and b/python/test/data/metadata/depmap_new_versioned_compressed.xml.gz differ
10 years, 1 month