From 40d80d630a54f263722d1f9ffd199530ce600159 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Tue, 14 Jun 2016 13:44:17 +0200
Subject: [PATCH 1/3] Port build script to Maven 3

---
 project.xml | 49 +++++++++++++++++++++++++++++++------------------
 1 file changed, 31 insertions(+), 18 deletions(-)

diff --git a/project.xml b/project.xml
index 155b2b7..b32e4d1 100644
--- a/project.xml
+++ b/project.xml
@@ -16,41 +16,54 @@
  limitations under the License.
 -->
 <project>
-    <extend>${basedir}/../project-common.xml</extend>
+    <modelVersion>4.0.0</modelVersion>
 
     <name>Avalon Logkit</name>
-    <id>avalon-logkit</id>
+    <groupId>avalon-logkit</groupId>
+    <artifactId>avalon-logkit</artifactId>
+    <version>2.1</version>
 
     <inceptionYear>1997</inceptionYear>
-    <shortDescription>Excalibur's Logkit package</shortDescription>
     <description>
 Log4j-like logging toolkit.
     </description>
 
     <dependencies>
       <dependency>
-        <id>log4j</id>
+        <groupId>log4j</groupId>
+        <artifactId>log4j</artifactId>
         <version>1.2.11</version>
+        <optional>true</optional>
       </dependency>
       <dependency>
-        <id>servletapi</id>
-        <version>2.3</version>
+        <groupId>javax.servlet</groupId>
+        <artifactId>servlet-api</artifactId>
+        <version>2.5</version>
+        <optional>true</optional>
       </dependency>
       <dependency>
-        <groupId>geronimo-spec</groupId>
-        <artifactId>geronimo-spec-javamail</artifactId>
-        <version>1.3.1-rc3</version>
-        <properties note="Placeholder.  Systems using mail features should use an actual implementation.  Sun for example.">
-            <build>true</build>
-        </properties>
+        <groupId>javax.mail</groupId>
+        <artifactId>mail</artifactId>
+        <version>1.4.3</version>
+        <scope>provided</scope>
       </dependency>  
       <dependency>
-        <groupId>geronimo-spec</groupId>
-        <artifactId>geronimo-spec-jms</artifactId>
-        <version>1.1-rc4</version>
-        <properties note="Placeholder.  Systems using JMS features should use an actual implementation.  Sun for example.">
-            <build>true</build>
-        </properties>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jms_1.1_spec</artifactId>
+        <version>1.1.1</version>
+        <scope>provided</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>4.12</version>
+        <scope>test</scope>
       </dependency>
     </dependencies>
+
+    <build>
+      <sourceDirectory>src/java</sourceDirectory>
+      <testSourceDirectory>src/test</testSourceDirectory>
+    </build>
 </project>
-- 
2.5.5