Merge pull request #50 from dizzzz/bugfix/remove_jetty_jars

Move monex' jar files into main repository

build.properties

@@ -4,7 +4,7 @@
 #
 
 project.name=monex
-project.version=0.9.11
+project.version=0.9.12
 
 # Path to $EXIST_HOME
 exist.dir=../../exist/Devel/

build.xml

@@ -8,8 +8,6 @@
     <property name="libs" value="./lib"/>
     <property name="content" value="./content"/>
 
-    <available file="${libs}/ivy-${ivy.version}.jar" property="ivy.available"/>
-
     <path id="classpath">
         <fileset dir="${libs}">
             <include name="*.jar"/>
@@ -34,7 +32,7 @@
         <mkdir dir="${libs}"/>
     </target>
 
-    <target name="compile" depends="ivy.download,prepare">
+    <target name="compile" depends="prepare">
         <javac srcdir="${java.src}" destdir="${java.classes}" optimize="true" debug="true" target="1.8" source="1.8">
             <classpath>
                 <path refid="classpath"/>
@@ -86,18 +84,4 @@
         <delete file="expath-pkg.xml"/>
     </target>
 
-    <target name="ivy.setup" description="Download the Ivy dependency manager" unless="ivy.available">
-        <echo>${ivy_url}</echo>
-        <get src="${ivy_url}" dest="${libs}"/>
-    </target>
-
-    <target name="ivy.download" depends="prepare,ivy.setup"
-            description="Download eXist JAR files required for deployment" xmlns:ivy="antlib:org.apache.ivy.ant">
-        <!-- Setup IVY download manager -->
-        <path id="ivy.lib.path">
-            <fileset dir="${libs}" includes="ivy*.jar" erroronmissingdir="false"/>
-        </path>
-        <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
-        <ivy:retrieve type="jar" sync="true" pattern="${libs}/[artifact]-[revision](-[classifier]).[ext]"/>
-    </target>
 </project>

exist.xml

@@ -4,10 +4,5 @@
         <namespace>http://exist-db.org/xquery/console</namespace>
         <class>org.exist.console.xquery.ConsoleModule</class>
     </java>
-    <jar>exist-monex-0.9.11.jar</jar>
-    <jar>jetty-util-ajax-9.4.6.v20170531.jar</jar>
-    <jar>websocket-common-9.4.6.v20170531.jar</jar>
-    <jar>websocket-servlet-9.4.6.v20170531.jar</jar>
-    <jar>websocket-api-9.4.6.v20170531.jar</jar>
-    <jar>websocket-server-9.4.6.v20170531.jar</jar>
+    <jar>exist-monex-0.9.12.jar</jar>
 </package>

expath-pkg.xml.tmpl

@@ -3,5 +3,5 @@
          spec="1.0">
     <title>Monitoring and Profiling for eXist (Monex)</title>
     <dependency package="http://exist-db.org/apps/shared"/>
-    <dependency processor="http://exist-db.org" semver-min="3.4.99"/>
+    <dependency processor="http://exist-db.org" semver-min="3.7.0-SNAPSHOT"/>
 </package>

repo.xml

@@ -69,5 +69,10 @@
                 <li>Updated: Links to monex's GitHub repository - <a href="https://github.com/eXist-db/monex/issues/39">#39</a></li>
             </ul>
         </change>
+        <change version="0.9.12">
+            <ul xmlns="http://www.w3.org/1999/xhtml">
+                <li>Move jetty jars to eXist-db to prevent version conflicts</li>
+            </ul>
+        </change>
     </changelog>
 </meta>