Upgraded versions and dependencies, both in ant and maven.

fbacchella · Nov 23, 2018 · 57d7625 · 57d7625
1 parent a402409
commit 57d7625
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/ivy.xml b/ivy.xml
@@ -19,15 +19,16 @@
         <dependency org="org.dojotoolkit" name="dojo" rev="1.10.4" conf="lib->default">
             <artifact name="dojo" type="zip"/>
         </dependency>
-        <dependency org="org.snmp4j" name="snmp4j" rev="2.3.4" conf="lib->default"/>
-        <dependency org="org.snmp4j" name="snmp4j-agent" rev="2.1.3" conf="libtest->default">
+        <dependency org="org.snmp4j" name="snmp4j" rev="2.6.3" conf="lib->default"/>
+        <dependency org="org.snmp4j" name="snmp4j-agent" rev="2.6.3" conf="libtest->default">
             <exclude module="log4j"/>
             <exclude module="snmp4j"/>
         </dependency>
         <dependency org="org.json" name="json" rev="20140107" conf="lib->default"/>
         <dependency org="org.eclipse.jetty" name="jetty-server" rev="9.2.26.v20180806" conf="libjetty->default"/>
         <dependency org="org.eclipse.jetty" name="jetty-webapp" rev="9.2.26.v20180806" conf="libjetty->default"/>
         <dependency org="org.eclipse.jetty" name="jetty-jmx" rev="9.2.26.v20180806" conf="libjetty->default"/>
+        <dependency org="org.eclipse.jetty" name="jetty-http" rev="9.2.26.v20180806" conf="libtest->default"/>
         <dependency org="org.slf4j" name="slf4j-api" rev="1.7.13" conf="libjetty->default"/>
         <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.7.13" conf="libjetty->default"/>
         <dependency org="commons-net" name="commons-net" rev="3.3" conf="lib->default"/>

diff --git a/ivysettings.xml b/ivysettings.xml
@@ -1,5 +1,11 @@
 <ivysettings>
     <resolvers>
+        <url name="central" m2compatible="true">
+            <artifact pattern="https://repo.maven.apache.org/maven2/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]" />
+        </url>
+        <url name="sonaytpe" m2compatible="true">
+            <artifact pattern="https://oss.sonatype.org/content/repositories/snapshots/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]" />
+        </url>
         <url name="ivyrepo" m2compatible="true">
             <ivy pattern="http://jrds.fr/maven2/[organisation]/[module]/ivys/ivy-[revision].xml" />
             <artifact
@@ -13,7 +19,12 @@
             <artifact pattern="${buildir}/maven/[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"/>
         </filesystem>
     </resolvers>
-    <settings defaultResolver="ivyrepo" />
+    <settings defaultResolver="central" />
+    <modules>
+        <module organisation="org.dojotoolkit" name="*" resolver="ivyrepo"/>
+        <module organisation="fr.jrds.verax" name="*" resolver="ivyrepo"/>
+        <module organisation="fr.jrds" name="SmiExtensions" resolver="ivyrepo"/>
+    </modules>
     <include url="${ivy.default.settings.dir}/ivysettings-public.xml" />
     <include url="${ivy.default.settings.dir}/ivysettings-shared.xml" />
     <include url="${ivy.default.settings.dir}/ivysettings-local.xml" />

diff --git a/pom.xml b/pom.xml
@@ -38,12 +38,12 @@
         <dependency>
             <groupId>org.snmp4j</groupId>
             <artifactId>snmp4j</artifactId>
-            <version>2.3.4</version>
+            <version>2.6.3</version>
         </dependency>
         <dependency>
             <groupId>org.snmp4j</groupId>
             <artifactId>snmp4j-agent</artifactId>
-            <version>2.1.3</version>
+            <version>2.6.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -127,6 +127,12 @@
             <version>${jetty}</version>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-http</artifactId>
+            <version>${jetty}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>