Update packaging and Maven POM after library update

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@489 3d1905a2-6b24-0410-a738-b14d5a86fcbd
14 years ago · ca83bda669
parent 4fe7ea1026
commit ca83bda669
5 changed files with 84 additions and 47 deletions
--- a/build.xml
+++ b/build.xml
@ -151,7 +151,8 @@
            <fileset dir="lib">
                <include name="*.jar"/>
                <exclude name="nsisant*.jar"/>
-                <exclude name="jsmoothgen-ant.jar"/>
+                <exclude name="jsmoothgen-ant-*.jar"/>
+                <exclude name="jarbundler-*.jar"/>
                <exclude name="servlet-api.jar"/>
                <exclude name="ant-deb-*.jar"/>
            </fileset>
--- a/davmail-setup.nsi
+++ b/davmail-setup.nsi
@ -85,16 +85,22 @@ Section "MainSection" SEC01
  File "dist\davmailconsole.exe"
  SetOutPath "$INSTDIR\lib"
  File "dist\lib\activation-1.0.2.jar"
-  File "dist\lib\commons-httpclient-2.0.2.jar"
+  File "dist\lib\commons-codec-1.3.jar"
+  File "dist\lib\commons-collections-3.1.jar"
+  File "dist\lib\commons-httpclient-3.1.jar"
  File "dist\lib\commons-logging-1.0.4.jar"
+  File "dist\lib\htmlcleaner-2.1.jar"
+  File "dist\lib\jackrabbit-webdav-1.4.jar"
  File "dist\lib\jdom-1.0.jar"
  File "dist\lib\log4j-1.2.8.jar"
  File "dist\lib\mail-1.3.2.jar"
-  File "dist\lib\slide-webdavlib-2.1.jar"
-  File "dist\lib\htmlcleaner-2.1.jar"
+  File "dist\lib\slf4j-api-1.3.1.jar"
+  File "dist\lib\slf4j-log4j12-1.3.1.jar"
  File "dist\lib\stax-api-1.0.1.jar"
-  File "dist\lib\wstx-asl-3.2.7.jar"
  File "dist\lib\swt-3.4-win32-x86.jar"
+  File "dist\lib\wstx-asl-3.2.7.jar"
+  File "dist\lib\xercesImpl-2.8.1.jar"
+
  WriteRegStr HKEY_CURRENT_USER "Software\Microsoft\Windows\CurrentVersion\Run" "DavMail" "$INSTDIR\davmail.exe"
 SectionEnd

@ -147,17 +153,24 @@ BailOut:
 no_quest:
  Delete "$INSTDIR\${PRODUCT_NAME}.url"
  Delete "$INSTDIR\uninst.exe"
-  Delete "$INSTDIR\lib\swt-3.4-win32-x86.jar"
-  Delete "$INSTDIR\lib\wstx-asl-3.2.7.jar"
-  Delete "$INSTDIR\lib\stax-api-1.0.1.jar"
+  
+  Delete "$INSTDIR\lib\activation-1.0.2.jar"
+  Delete "$INSTDIR\lib\commons-codec-1.3.jar"
+  Delete "$INSTDIR\lib\commons-collections-3.1.jar"
+  Delete "$INSTDIR\lib\commons-httpclient-3.1.jar"
+  Delete "$INSTDIR\lib\commons-logging-1.0.4.jar"
  Delete "$INSTDIR\lib\htmlcleaner-2.1.jar"
-  Delete "$INSTDIR\lib\slide-webdavlib-2.1.jar"
-  Delete "$INSTDIR\lib\mail-1.3.2.jar"
-  Delete "$INSTDIR\lib\log4j-1.2.8.jar"
+  Delete "$INSTDIR\lib\jackrabbit-webdav-1.4.jar"
  Delete "$INSTDIR\lib\jdom-1.0.jar"
-  Delete "$INSTDIR\lib\commons-logging-1.0.4.jar"
-  Delete "$INSTDIR\lib\commons-httpclient-2.0.2.jar"
-  Delete "$INSTDIR\lib\activation-1.0.2.jar"
+  Delete "$INSTDIR\lib\log4j-1.2.8.jar"
+  Delete "$INSTDIR\lib\mail-1.3.2.jar"
+  Delete "$INSTDIR\lib\slf4j-api-1.3.1.jar"
+  Delete "$INSTDIR\lib\slf4j-log4j12-1.3.1.jar"
+  Delete "$INSTDIR\lib\stax-api-1.0.1.jar"
+  Delete "$INSTDIR\lib\swt-3.4-win32-x86.jar"
+  Delete "$INSTDIR\lib\wstx-asl-3.2.7.jar"
+  Delete "$INSTDIR\lib\xercesImpl-2.8.1.jar"
+
  Delete "$INSTDIR\davmailconsole.exe"
  Delete "$INSTDIR\davmail.log"
  Delete "$INSTDIR\davmail.jar"
--- a/davmail.jsmooth
+++ b/davmail.jsmooth
@ -8,20 +8,22 @@
 <JVMSearchPath>jview</JVMSearchPath>
 <arguments></arguments>
 <classPath>dist\davmail.jar</classPath>
-<classPath>dist\lib\activation-1.0.2.jar</classPath>
-<classPath>dist\lib\commons-httpclient-2.0.2.jar</classPath>
-<classPath>dist\lib\commons-logging-1.0.4.jar</classPath>
-<classPath>dist\lib\jaxen-1.0-FCS-full.jar</classPath>
-<classPath>dist\lib\jdom-1.0.jar</classPath>
-<classPath>dist\lib\jtidy-4aug2000r7-dev.jar</classPath>
-<classPath>dist\lib\log4j-1.2.8.jar</classPath>
-<classPath>dist\lib\mail-1.3.2.jar</classPath>
-<classPath>dist\lib\saxpath-1.0-FCS.jar</classPath>
-<classPath>dist\lib\slide-webdavlib-2.1.jar</classPath>
-<classPath>dist\lib\swt-3.4-win32-x86.jar</classPath>
-<classPath>dist\lib\htmlcleaner-2.1.jar</classPath>
-<classPath>dist\lib\stax-api-1.0.1.jar</classPath>
-<classPath>dist\lib\wstx-asl-3.2.7.jar</classPath>
+<classPath>dist\lib\activation-1.0.2.jar</classPath>
+<classPath>dist\lib\commons-codec-1.3.jar</classPath>
+<classPath>dist\lib\commons-collections-3.1.jar</classPath>
+<classPath>dist\lib\commons-httpclient-3.1.jar</classPath>
+<classPath>dist\lib\commons-logging-1.0.4.jar</classPath>
+<classPath>dist\lib\htmlcleaner-2.1.jar</classPath>
+<classPath>dist\lib\jackrabbit-webdav-1.4.jar</classPath>
+<classPath>dist\lib\jdom-1.0.jar</classPath>
+<classPath>dist\lib\log4j-1.2.8.jar</classPath>
+<classPath>dist\lib\mail-1.3.2.jar</classPath>
+<classPath>dist\lib\slf4j-api-1.3.1.jar</classPath>
+<classPath>dist\lib\slf4j-log4j12-1.3.1.jar</classPath>
+<classPath>dist\lib\stax-api-1.0.1.jar</classPath>
+<classPath>dist\lib\swt-3.4-win32-x86.jar</classPath>
+<classPath>dist\lib\wstx-asl-3.2.7.jar</classPath>
+<classPath>dist\lib\xercesImpl-2.8.1.jar</classPath>
 <embeddedJar>false</embeddedJar>
 <executableName>dist\davmail.exe</executableName>
 <iconLocation>src\java\tray32.png</iconLocation>
--- a/davmailconsole.jsmooth
+++ b/davmailconsole.jsmooth
@ -8,20 +8,22 @@
 <JVMSearchPath>jview</JVMSearchPath>
 <arguments></arguments>
 <classPath>dist\davmail.jar</classPath>
-<classPath>dist\lib\activation-1.0.2.jar</classPath>
-<classPath>dist\lib\commons-httpclient-2.0.2.jar</classPath>
-<classPath>dist\lib\commons-logging-1.0.4.jar</classPath>
-<classPath>dist\lib\jaxen-1.0-FCS-full.jar</classPath>
-<classPath>dist\lib\jdom-1.0.jar</classPath>
-<classPath>dist\lib\jtidy-4aug2000r7-dev.jar</classPath>
-<classPath>dist\lib\log4j-1.2.8.jar</classPath>
-<classPath>dist\lib\mail-1.3.2.jar</classPath>
-<classPath>dist\lib\saxpath-1.0-FCS.jar</classPath>
-<classPath>dist\lib\slide-webdavlib-2.1.jar</classPath>
-<classPath>dist\lib\swt-3.4-win32-x86.jar</classPath>
-<classPath>dist\lib\htmlcleaner-2.1.jar</classPath>
-<classPath>dist\lib\stax-api-1.0.1.jar</classPath>
-<classPath>dist\lib\wstx-asl-3.2.7.jar</classPath>
+<classPath>dist\lib\activation-1.0.2.jar</classPath>
+<classPath>dist\lib\commons-codec-1.3.jar</classPath>
+<classPath>dist\lib\commons-collections-3.1.jar</classPath>
+<classPath>dist\lib\commons-httpclient-3.1.jar</classPath>
+<classPath>dist\lib\commons-logging-1.0.4.jar</classPath>
+<classPath>dist\lib\htmlcleaner-2.1.jar</classPath>
+<classPath>dist\lib\jackrabbit-webdav-1.4.jar</classPath>
+<classPath>dist\lib\jdom-1.0.jar</classPath>
+<classPath>dist\lib\log4j-1.2.8.jar</classPath>
+<classPath>dist\lib\mail-1.3.2.jar</classPath>
+<classPath>dist\lib\slf4j-api-1.3.1.jar</classPath>
+<classPath>dist\lib\slf4j-log4j12-1.3.1.jar</classPath>
+<classPath>dist\lib\stax-api-1.0.1.jar</classPath>
+<classPath>dist\lib\swt-3.4-win32-x86.jar</classPath>
+<classPath>dist\lib\wstx-asl-3.2.7.jar</classPath>
+<classPath>dist\lib\xercesImpl-2.8.1.jar</classPath>
 <embeddedJar>false</embeddedJar>
 <executableName>dist\davmailconsole.exe</executableName>
 <iconLocation>src\java\tray32.png</iconLocation>
--- a/pom.xml
+++ b/pom.xml
@ -125,16 +125,35 @@
            <scope>test</scope>
        </dependency>
        <dependency>
-            <groupId>slide</groupId>
-            <artifactId>slide-webdavlib</artifactId>
-            <version>2.1</version>
+            <groupId>org.apache.jackrabbit</groupId>
+            <artifactId>jackrabbit-webdav</artifactId>
+            <version>1.4</version>
            <exclusions>
                <exclusion>
-                    <groupId>de.zeigermann.xml</groupId>
-                    <artifactId>xml-im-exporter</artifactId>
+                    <groupId>org.apache.jackrabbit</groupId>
+                    <artifactId>jackrabbit-jcr-commons</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>xml-apis</groupId>
+                    <artifactId>xml-apis</artifactId>
                </exclusion>
            </exclusions>
        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+              <artifactId>slf4j-log4j12</artifactId>
+            <version>1.3.1</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-httpclient</groupId>
+            <artifactId>commons-httpclient</artifactId>
+            <version>3.1</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.3</version>
+        </dependency>
        <dependency>
            <groupId>log4j</groupId>
            <artifactId>log4j</artifactId>