Joakim Erdfelt c2e81f5584 Merge branch jetty-9.4.x into jetty-10.0.x
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	jetty-infinispan/infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/WebAppMarshaller.java
#	jetty-infinispan/pom.xml
#	jetty-server/src/main/java/org/eclipse/jetty/server/MultiParts.java
#	jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java
2019-04-18 08:24:10 -05:00

27 lines
932 B
XML

<?xml version="1.0" encoding="UTF-8"?>
<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.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
<version>10.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jetty</groupId>
<artifactId>infinispan-parent</artifactId>
<packaging>pom</packaging>
<name>Jetty :: Infinispan</name>
<properties>
<bundle-symbolic-name>${project.groupId}.infinispan</bundle-symbolic-name>
</properties>
<modules>
<module>infinispan-common</module>
<module>infinispan-embedded</module>
<module>infinispan-remote</module>
<module>infinispan-embedded-query</module>
<module>infinispan-remote-query</module>
</modules>
</project>