:

mgorovoy · May 3, 2011 · 2d64580 · 2d64580
1 parent 3adab8b
commit 2d64580
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 51 deletions.
diff --git a/applet/pom.xml b/applet/pom.xml
@@ -28,17 +28,6 @@
       <version>1.1.5-SNAPSHOT</version>
     </dependency>
 
-    <dependency>
-      <groupId>applet-dev</groupId>
-      <artifactId>sun</artifactId>
-      <version>1.0</version>
-    </dependency>
-
-    <dependency>
-      <groupId>applet-dev</groupId>
-      <artifactId>ms</artifactId>
-      <version>1.0</version>
-    </dependency>
   </dependencies>
 
 </project>
diff --git a/core/pom.xml b/core/pom.xml
@@ -56,11 +56,25 @@
      <groupId>log4j</groupId>
      <artifactId>log4j</artifactId>
      <version>1.2.15</version>
+     <exclusions>
+		<exclusion>
+            <groupId>javax.jms</groupId>
+            <artifactId>jms</artifactId>
+        </exclusion>
+        <exclusion>
+            <groupId>com.sun.jmx</groupId>
+            <artifactId>jmxri</artifactId>
+        </exclusion>
+        <exclusion>
+            <groupId>com.sun.jdmk</groupId>
+            <artifactId>jmxtools</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>
-      <groupId>org.gnu</groupId>
-      <artifactId>java-getopt</artifactId>
+      <groupId>gnu-getopt</groupId>
+      <artifactId>getopt</artifactId>
       <version>1.0.13</version>
     </dependency>
 

diff --git a/extended/pom.xml b/extended/pom.xml
@@ -28,12 +28,6 @@
       <version>1.1.5-SNAPSHOT</version>
     </dependency>
 
-    <dependency>
-      <groupId>ipdr</groupId>
-      <artifactId>ipdrbase</artifactId>
-      <version>2.0.0</version>
-    </dependency>
-
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcprov-jdk15</artifactId>

diff --git a/extras/pom.xml b/extras/pom.xml
@@ -22,12 +22,6 @@
       <version>1.1.5-SNAPSHOT</version>
     </dependency>
 
-    <dependency>
-      <groupId>ipdr</groupId>
-      <artifactId>ipdrbase</artifactId>
-      <version>2.0.0</version>
-    </dependency>
-
   </dependencies>
 
   <build>

diff --git a/freeradius/dict/dictionary.dhcp b/freeradius/dict/dictionary.dhcp
@@ -44,7 +44,7 @@ ATTRIBUTE	DHCP-Server-IP-Address			265	ipaddr
 ATTRIBUTE	DHCP-Gateway-IP-Address			266	ipaddr
 ATTRIBUTE	DHCP-Client-Hardware-Address		267	ether	  # 16 octets
 ATTRIBUTE	DHCP-Server-Host-Name			268	string	  # 64 octets
-ATTRIBUTE	DHCP-Boot-Filename			269	string	  # 128 octets
+# ATTRIBUTE	DHCP-Boot-Filename			269	string	  # 128 octets
 
 ATTRIBUTE	DHCP-Relay-To-IP-Address		270	ipaddr
 

diff --git a/pom.xml b/pom.xml
@@ -66,14 +66,14 @@
 	</configuration>
       </plugin>
     </plugins>
-
+<!--
     <extensions>
       <extension>
         <groupId>org.apache.maven.wagon</groupId>
         <artifactId>wagon-ssh-external</artifactId>
-        <version>1.0-alpha-5</version>
       </extension>
     </extensions>
+-->
     <defaultGoal>install</defaultGoal>
   </build>
 
@@ -134,46 +134,37 @@
     <module>client</module>
     <module>applet</module>
 <!--
-    <module>ssl</module>
 -->
+    <module>ssl</module>
     <module>server</module>
   </modules>
 
   <repositories>
     <repository>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
       <id>central</id>
       <name>Maven Repository Switchboard</name>
       <url>http://repo1.maven.org/maven2</url>
     </repository>
     <repository>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
       <id>ibiblio</id>
       <name>ibiblio Repository Switchboard</name>
-      <url>http://www.ibiblio.org/maven</url>
+      <url>http://mirrors.ibiblio.org/pub/mirrors/maven2</url>
     </repository>
-<!--
     <repository>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <id>springframework</id>
-      <name>Spring Repository</name>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
+      <id>jboss</id>
+      <name>JBoss Repository</name>
+      <url>http://repository.jboss.org/nexus/content/groups/public-jboss/</url>
     </repository>
     <repository>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <id>coova</id>
-      <name>Coova Repository</name>
-      <url>http://coova-dev.s3.amazonaws.com/mvn</url>
+      <id>java.net</id>
+      <name>java.net Repository</name>
+      <url>http://download.java.net/maven/2/</url>
+    </repository>
+    <repository>
+      <id>opennms</id>
+      <name>openmms Repository</name>
+      <url>http://repo.opennms.org/maven2/</url>
     </repository>
--->
   </repositories>
 
   <reporting>

diff --git a/ssl/pom.xml b/ssl/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>net.jradius</groupId>
     <artifactId>jradius</artifactId>
-    <version>1.1.3-SNAPSHOT</version>
+    <version>1.1.5-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>