mirror of
				https://github.com/apache/cloudstack.git
				synced 2025-10-26 08:42:29 +01:00 
			
		
		
		
	CLOUDSTACK-8011: Upgrade maven dependencies
Changes; - Upgrades maven-war plugin to 4.5 (faster war packaging) - Upgrade spring framework to latest minor release - Upgrade ehcache, jasypt, httpclient, httpcore and other core dependencies - Upgrade to latest ipv6 library, fix unit test NetUtilsTest - httpcore and httpclient are sharing same version variable - commons-httpclient is different that httpclient, the fix gives it a separate var - Apidocs failed to generate and get stuck with new reflections version, for now we will continue using 0.9.8 Newer dependencies can be listed using: mvn versions:display-dependency-updates -Dnoredist -Dsimulator -P developer,systemvm Testing; - Tested using Maven 3.2.1 - Local noredist build with unit tests succeeds - CloudStack mgmt server started, basic business layer tests work - Observed 10-15% build time improvement using new maven-war plugin Branch: bugfix/4.5-8011 (commits are squashed in favour of a linear history) Pull request: https://github.com/apache/cloudstack/pull/50 This closes #50 TravisCI build summary: https://travis-ci.org/shapeblue/cloudstack/builds/42902172 - Build passes with unit tests - Apidocs generates successfully - Most integration tests pass, some fail due to timeout errors, second re-run passes some of them Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
		
							parent
							
								
									8cb11f407f
								
							
						
					
					
						commit
						fac7bfc5d5
					
				| @ -388,7 +388,7 @@ | |||||||
|       <plugin> |       <plugin> | ||||||
|         <groupId>org.apache.maven.plugins</groupId> |         <groupId>org.apache.maven.plugins</groupId> | ||||||
|         <artifactId>maven-war-plugin</artifactId> |         <artifactId>maven-war-plugin</artifactId> | ||||||
|         <version>2.3</version> |         <version>2.5</version> | ||||||
|         <configuration> |         <configuration> | ||||||
|           <webXml>./target/generated-webapp/WEB-INF/web.xml</webXml> |           <webXml>./target/generated-webapp/WEB-INF/web.xml</webXml> | ||||||
|           <warSourceDirectory>./target/generated-webapp</warSourceDirectory> |           <warSourceDirectory>./target/generated-webapp</warSourceDirectory> | ||||||
| @ -744,7 +744,7 @@ | |||||||
|           <plugin> |           <plugin> | ||||||
|             <groupId>org.apache.maven.plugins</groupId> |             <groupId>org.apache.maven.plugins</groupId> | ||||||
|             <artifactId>maven-war-plugin</artifactId> |             <artifactId>maven-war-plugin</artifactId> | ||||||
|             <version>2.3</version> |             <version>2.5</version> | ||||||
|             <configuration> |             <configuration> | ||||||
|               <webappDirectory>target/client</webappDirectory> |               <webappDirectory>target/client</webappDirectory> | ||||||
|               <webXml>./target/generated-webapp/WEB-INF/web.xml</webXml> |               <webXml>./target/generated-webapp/WEB-INF/web.xml</webXml> | ||||||
|  | |||||||
| @ -38,7 +38,7 @@ | |||||||
|     <dependency> |     <dependency> | ||||||
|       <groupId>org.apache.cxf</groupId> |       <groupId>org.apache.cxf</groupId> | ||||||
|       <artifactId>cxf-bundle-jaxrs</artifactId> |       <artifactId>cxf-bundle-jaxrs</artifactId> | ||||||
|       <version>2.7.0</version> |       <version>2.7.13</version> | ||||||
|       <exclusions> |       <exclusions> | ||||||
|         <exclusion> |         <exclusion> | ||||||
|           <groupId>org.eclipse.jetty</groupId> |           <groupId>org.eclipse.jetty</groupId> | ||||||
|  | |||||||
| @ -63,7 +63,7 @@ | |||||||
|     <dependency> |     <dependency> | ||||||
|       <groupId>org.apache.cxf</groupId> |       <groupId>org.apache.cxf</groupId> | ||||||
|       <artifactId>cxf-bundle-jaxrs</artifactId> |       <artifactId>cxf-bundle-jaxrs</artifactId> | ||||||
|       <version>2.7.0</version> |       <version>2.7.13</version> | ||||||
|       <exclusions> |       <exclusions> | ||||||
|         <exclusion> |         <exclusion> | ||||||
|           <groupId>org.eclipse.jetty</groupId> |           <groupId>org.eclipse.jetty</groupId> | ||||||
|  | |||||||
| @ -33,32 +33,32 @@ | |||||||
|     <dependency> |     <dependency> | ||||||
|       <groupId>com.fasterxml.jackson.module</groupId> |       <groupId>com.fasterxml.jackson.module</groupId> | ||||||
|       <artifactId>jackson-module-jaxb-annotations</artifactId> |       <artifactId>jackson-module-jaxb-annotations</artifactId> | ||||||
|       <version>2.1.1</version> |       <version>2.4.4</version> | ||||||
|     </dependency> |     </dependency> | ||||||
|     <dependency> |     <dependency> | ||||||
|       <groupId>com.fasterxml.jackson.core</groupId> |       <groupId>com.fasterxml.jackson.core</groupId> | ||||||
|       <artifactId>jackson-annotations</artifactId> |       <artifactId>jackson-annotations</artifactId> | ||||||
|       <version>2.1.1</version> |       <version>2.4.4</version> | ||||||
|     </dependency> |     </dependency> | ||||||
|     <dependency> |     <dependency> | ||||||
|       <groupId>com.fasterxml.jackson.core</groupId> |       <groupId>com.fasterxml.jackson.core</groupId> | ||||||
|       <artifactId>jackson-core</artifactId> |       <artifactId>jackson-core</artifactId> | ||||||
|       <version>2.1.1</version> |       <version>2.4.4</version> | ||||||
|     </dependency> |     </dependency> | ||||||
|     <dependency> |     <dependency> | ||||||
|       <groupId>com.fasterxml.jackson.core</groupId> |       <groupId>com.fasterxml.jackson.core</groupId> | ||||||
|       <artifactId>jackson-databind</artifactId> |       <artifactId>jackson-databind</artifactId> | ||||||
|       <version>2.1.1</version> |       <version>2.4.4</version> | ||||||
|     </dependency> |     </dependency> | ||||||
|     <dependency> |     <dependency> | ||||||
|       <groupId>com.fasterxml.jackson.jaxrs</groupId> |       <groupId>com.fasterxml.jackson.jaxrs</groupId> | ||||||
|       <artifactId>jackson-jaxrs-json-provider</artifactId> |       <artifactId>jackson-jaxrs-json-provider</artifactId> | ||||||
|       <version>2.1.1</version> |       <version>2.4.4</version> | ||||||
|     </dependency> |     </dependency> | ||||||
|     <dependency> |     <dependency> | ||||||
|       <groupId>org.apache.cxf</groupId> |       <groupId>org.apache.cxf</groupId> | ||||||
|       <artifactId>cxf-bundle-jaxrs</artifactId> |       <artifactId>cxf-bundle-jaxrs</artifactId> | ||||||
|       <version>2.7.0</version> |       <version>2.7.13</version> | ||||||
|       <exclusions> |       <exclusions> | ||||||
|         <exclusion> |         <exclusion> | ||||||
|           <groupId>org.eclipse.jetty</groupId> |           <groupId>org.eclipse.jetty</groupId> | ||||||
|  | |||||||
| @ -31,7 +31,7 @@ | |||||||
|     <dependency> |     <dependency> | ||||||
|     <groupId>com.rabbitmq</groupId> |     <groupId>com.rabbitmq</groupId> | ||||||
|       <artifactId>amqp-client</artifactId> |       <artifactId>amqp-client</artifactId> | ||||||
|         <version>3.4.1</version> |         <version>3.4.2</version> | ||||||
|     </dependency> |     </dependency> | ||||||
|     <dependency> |     <dependency> | ||||||
|     <groupId>org.apache.cloudstack</groupId> |     <groupId>org.apache.cloudstack</groupId> | ||||||
|  | |||||||
| @ -104,7 +104,7 @@ | |||||||
|     <dependency> |     <dependency> | ||||||
|         <groupId>org.apache.commons</groupId> |         <groupId>org.apache.commons</groupId> | ||||||
|         <artifactId>commons-exec</artifactId> |         <artifactId>commons-exec</artifactId> | ||||||
|         <version>1.1</version> |         <version>1.3</version> | ||||||
|     </dependency> |     </dependency> | ||||||
|     <dependency> |     <dependency> | ||||||
|         <groupId>org.mockito</groupId> |         <groupId>org.mockito</groupId> | ||||||
|  | |||||||
| @ -47,13 +47,13 @@ | |||||||
|     <dependency> |     <dependency> | ||||||
|         <groupId>org.codehaus.jackson</groupId> |         <groupId>org.codehaus.jackson</groupId> | ||||||
|         <artifactId>jackson-core-asl</artifactId> |         <artifactId>jackson-core-asl</artifactId> | ||||||
|         <version>1.9.3</version> |         <version>1.9.11</version> | ||||||
|         <scope>runtime</scope> |         <scope>runtime</scope> | ||||||
|     </dependency> |     </dependency> | ||||||
|     <dependency> |     <dependency> | ||||||
|         <groupId>org.codehaus.jackson</groupId> |         <groupId>org.codehaus.jackson</groupId> | ||||||
|         <artifactId>jackson-mapper-asl</artifactId> |         <artifactId>jackson-mapper-asl</artifactId> | ||||||
|         <version>1.9.3</version> |         <version>1.9.11</version> | ||||||
|         <scope>runtime</scope> |         <scope>runtime</scope> | ||||||
|     </dependency> |     </dependency> | ||||||
|   </dependencies> |   </dependencies> | ||||||
|  | |||||||
| @ -54,7 +54,7 @@ | |||||||
|     <dependency> |     <dependency> | ||||||
| 	<groupId>com.sun.jersey</groupId> | 	<groupId>com.sun.jersey</groupId> | ||||||
| 	<artifactId>jersey-bundle</artifactId> | 	<artifactId>jersey-bundle</artifactId> | ||||||
| 	<version>1.17.1</version> | 	<version>1.18.3</version> | ||||||
| </dependency> | </dependency> | ||||||
|   </dependencies> |   </dependencies> | ||||||
|   <build> |   <build> | ||||||
|  | |||||||
							
								
								
									
										63
									
								
								pom.xml
									
									
									
									
									
								
							
							
						
						
									
										63
									
								
								pom.xml
									
									
									
									
									
								
							| @ -38,13 +38,13 @@ | |||||||
|     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> |     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> | ||||||
|     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> |     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> | ||||||
| 
 | 
 | ||||||
|     <cs.log4j.version>1.2.16</cs.log4j.version> |     <cs.log4j.version>1.2.17</cs.log4j.version> | ||||||
|     <cs.log4j.extras.version>1.1</cs.log4j.extras.version> |     <cs.log4j.extras.version>1.2.17</cs.log4j.extras.version> | ||||||
|     <cs.cglib.version>2.2.2</cs.cglib.version> |     <cs.cglib.version>3.1</cs.cglib.version> | ||||||
|     <cs.dbcp.version>1.4</cs.dbcp.version> |     <cs.dbcp.version>1.4</cs.dbcp.version> | ||||||
|     <cs.pool.version>1.6</cs.pool.version> |     <cs.pool.version>1.6</cs.pool.version> | ||||||
|     <cs.codec.version>1.6</cs.codec.version> |     <cs.codec.version>1.10</cs.codec.version> | ||||||
|     <cs.configuration.version>1.8</cs.configuration.version> |     <cs.configuration.version>1.10</cs.configuration.version> | ||||||
|     <cs.collections.version>3.2.1</cs.collections.version> |     <cs.collections.version>3.2.1</cs.collections.version> | ||||||
|     <cs.logging.version>1.1.1</cs.logging.version> |     <cs.logging.version>1.1.1</cs.logging.version> | ||||||
|     <cs.discovery.version>0.5</cs.discovery.version> |     <cs.discovery.version>0.5</cs.discovery.version> | ||||||
| @ -53,43 +53,44 @@ | |||||||
|     <cs.junit.version>4.11</cs.junit.version> |     <cs.junit.version>4.11</cs.junit.version> | ||||||
|     <cs.hamcrest.version>1.3</cs.hamcrest.version> |     <cs.hamcrest.version>1.3</cs.hamcrest.version> | ||||||
|     <cs.bcprov.version>1.46</cs.bcprov.version> |     <cs.bcprov.version>1.46</cs.bcprov.version> | ||||||
|     <cs.jsch.version>0.1.42</cs.jsch.version> |     <cs.jsch.version>0.1.51</cs.jsch.version> | ||||||
|     <cs.jpa.version>2.0.0</cs.jpa.version> |     <cs.jpa.version>2.1.0</cs.jpa.version> | ||||||
|     <cs.jasypt.version>1.9.0</cs.jasypt.version> |     <cs.jasypt.version>1.9.2</cs.jasypt.version> | ||||||
|     <cs.trilead.version>build213-svnkit-1.3-patch</cs.trilead.version> |     <cs.trilead.version>1.0.0-build217</cs.trilead.version> | ||||||
|     <cs.ehcache.version>2.6.6</cs.ehcache.version> |     <cs.ehcache.version>2.6.9</cs.ehcache.version> | ||||||
|     <cs.gson.version>1.7.2</cs.gson.version> |     <cs.gson.version>1.7.2</cs.gson.version> | ||||||
|     <cs.guava.version>14.0-rc1</cs.guava.version> |     <cs.guava.version>18.0</cs.guava.version> | ||||||
|     <cs.xapi.version>6.2.0-3.1</cs.xapi.version> |     <cs.xapi.version>6.2.0-3.1</cs.xapi.version> | ||||||
|     <cs.httpclient.version>3.1</cs.httpclient.version> |     <cs.httpclient.version>4.3.6</cs.httpclient.version> | ||||||
|     <cs.httpcore.version>4.2.1</cs.httpcore.version> |     <cs.httpcore.version>4.3.3</cs.httpcore.version> | ||||||
|     <cs.mysql.version>5.1.21</cs.mysql.version> |     <cs.commons-httpclient.version>3.1</cs.commons-httpclient.version> | ||||||
|     <cs.xstream.version>1.3.1</cs.xstream.version> |     <cs.mysql.version>5.1.34</cs.mysql.version> | ||||||
|  |     <cs.xstream.version>1.4.7</cs.xstream.version> | ||||||
|     <cs.xmlrpc.version>3.1.3</cs.xmlrpc.version> |     <cs.xmlrpc.version>3.1.3</cs.xmlrpc.version> | ||||||
|     <cs.mail.version>1.4</cs.mail.version> |     <cs.mail.version>1.4.7</cs.mail.version> | ||||||
|     <cs.axis.version>1.4</cs.axis.version> |     <cs.axis.version>1.4</cs.axis.version> | ||||||
|     <cs.axis2.version>1.5.6</cs.axis2.version> |     <cs.axis2.version>1.5.6</cs.axis2.version> | ||||||
|     <cs.rampart.version>1.5.1</cs.rampart.version> |     <cs.rampart.version>1.5.1</cs.rampart.version> | ||||||
|     <cs.axiom.version>1.2.8</cs.axiom.version> |     <cs.axiom.version>1.2.8</cs.axiom.version> | ||||||
|     <cs.neethi.version>2.0.4</cs.neethi.version> |     <cs.neethi.version>2.0.4</cs.neethi.version> | ||||||
|     <cs.servlet.version>2.4</cs.servlet.version> |     <cs.servlet.version>2.5</cs.servlet.version> | ||||||
|     <cs.jstl.version>1.2</cs.jstl.version> |     <cs.jstl.version>1.2</cs.jstl.version> | ||||||
|     <cs.selenium.server.version>1.0-20081010.060147</cs.selenium.server.version> |     <cs.selenium.server.version>1.0-20081010.060147</cs.selenium.server.version> | ||||||
|     <cs.vmware.api.version>5.1</cs.vmware.api.version> |     <cs.vmware.api.version>5.1</cs.vmware.api.version> | ||||||
|     <org.springframework.version>3.2.4.RELEASE</org.springframework.version> |     <org.springframework.version>3.2.12.RELEASE</org.springframework.version> | ||||||
|     <cs.mockito.version>1.9.5</cs.mockito.version> |     <cs.mockito.version>1.9.5</cs.mockito.version> | ||||||
|     <cs.powermock.version>1.5.3</cs.powermock.version> |     <cs.powermock.version>1.5.3</cs.powermock.version> | ||||||
|     <cs.aws.sdk.version>1.3.22</cs.aws.sdk.version> |     <cs.aws.sdk.version>1.9.8</cs.aws.sdk.version> | ||||||
|     <cs.lang.version>2.6</cs.lang.version> |     <cs.lang.version>2.6</cs.lang.version> | ||||||
|     <cs.commons-io.version>1.4</cs.commons-io.version> |     <cs.commons-io.version>2.4</cs.commons-io.version> | ||||||
|     <cs.commons-validator.version>1.4.0</cs.commons-validator.version> |     <cs.commons-validator.version>1.4.0</cs.commons-validator.version> | ||||||
|     <cs.reflections.version>0.9.8</cs.reflections.version> |     <cs.reflections.version>0.9.8</cs.reflections.version> | ||||||
|     <cs.java-ipv6.version>0.10</cs.java-ipv6.version> |     <cs.java-ipv6.version>0.15</cs.java-ipv6.version> | ||||||
|     <cs.replace.properties>build/replace.properties</cs.replace.properties> |     <cs.replace.properties>build/replace.properties</cs.replace.properties> | ||||||
|     <cs.libvirt-java.version>0.5.1</cs.libvirt-java.version> |     <cs.libvirt-java.version>0.5.1</cs.libvirt-java.version> | ||||||
|     <cs.rados-java.version>0.1.4</cs.rados-java.version> |     <cs.rados-java.version>0.1.4</cs.rados-java.version> | ||||||
|     <cs.target.dir>target</cs.target.dir> |     <cs.target.dir>target</cs.target.dir> | ||||||
|     <cs.daemon.version>1.0.10</cs.daemon.version> |     <cs.daemon.version>1.0.15</cs.daemon.version> | ||||||
|     <cs.jna.version>4.0.0</cs.jna.version> |     <cs.jna.version>4.0.0</cs.jna.version> | ||||||
|     <cs.checkstyle.version>2.11</cs.checkstyle.version> |     <cs.checkstyle.version>2.11</cs.checkstyle.version> | ||||||
|     <cs.mycila.license.version>2.5</cs.mycila.license.version> |     <cs.mycila.license.version>2.5</cs.mycila.license.version> | ||||||
| @ -304,7 +305,7 @@ | |||||||
|       <dependency> |       <dependency> | ||||||
|         <groupId>org.owasp.esapi</groupId> |         <groupId>org.owasp.esapi</groupId> | ||||||
|         <artifactId>esapi</artifactId> |         <artifactId>esapi</artifactId> | ||||||
|         <version>2.0.1</version> |         <version>2.1.0</version> | ||||||
|       </dependency> |       </dependency> | ||||||
|       <dependency> |       <dependency> | ||||||
|         <groupId>org.eclipse.persistence</groupId> |         <groupId>org.eclipse.persistence</groupId> | ||||||
| @ -329,7 +330,7 @@ | |||||||
|       <dependency> |       <dependency> | ||||||
|         <groupId>org.apache.httpcomponents</groupId> |         <groupId>org.apache.httpcomponents</groupId> | ||||||
|         <artifactId>httpclient</artifactId> |         <artifactId>httpclient</artifactId> | ||||||
|         <version>${cs.httpcore.version}</version> |         <version>${cs.httpclient.version}</version> | ||||||
|       </dependency> |       </dependency> | ||||||
|       <dependency> |       <dependency> | ||||||
|         <groupId>com.thoughtworks.xstream</groupId> |         <groupId>com.thoughtworks.xstream</groupId> | ||||||
| @ -369,17 +370,17 @@ | |||||||
|       <dependency> |       <dependency> | ||||||
|         <groupId>org.apache.servicemix.bundles</groupId> |         <groupId>org.apache.servicemix.bundles</groupId> | ||||||
|         <artifactId>org.apache.servicemix.bundles.snmp4j</artifactId> |         <artifactId>org.apache.servicemix.bundles.snmp4j</artifactId> | ||||||
|         <version>2.1.0_1</version> |         <version>2.3.1_1</version> | ||||||
|       </dependency> |       </dependency> | ||||||
|       <dependency> |       <dependency> | ||||||
|         <groupId>org.aspectj</groupId> |         <groupId>org.aspectj</groupId> | ||||||
|         <artifactId>aspectjtools</artifactId> |         <artifactId>aspectjtools</artifactId> | ||||||
|         <version>1.7.0</version> |         <version>1.8.4</version> | ||||||
|       </dependency> |       </dependency> | ||||||
|       <dependency> |       <dependency> | ||||||
|         <groupId>org.aspectj</groupId> |         <groupId>org.aspectj</groupId> | ||||||
|         <artifactId>aspectjweaver</artifactId> |         <artifactId>aspectjweaver</artifactId> | ||||||
|         <version>1.7.0</version> |         <version>1.8.4</version> | ||||||
|       </dependency> |       </dependency> | ||||||
|       <dependency> |       <dependency> | ||||||
|         <groupId>org.apache.axis</groupId> |         <groupId>org.apache.axis</groupId> | ||||||
| @ -399,17 +400,17 @@ | |||||||
|       <dependency> |       <dependency> | ||||||
|         <groupId>wsdl4j</groupId> |         <groupId>wsdl4j</groupId> | ||||||
|         <artifactId>wsdl4j</artifactId> |         <artifactId>wsdl4j</artifactId> | ||||||
|         <version>1.4</version> |         <version>1.6.3</version> | ||||||
|       </dependency> |       </dependency> | ||||||
|       <dependency> |       <dependency> | ||||||
|         <groupId>org.slf4j</groupId> |         <groupId>org.slf4j</groupId> | ||||||
|         <artifactId>slf4j-api</artifactId> |         <artifactId>slf4j-api</artifactId> | ||||||
|         <version>1.7.5</version> |         <version>1.7.7</version> | ||||||
|       </dependency> |       </dependency> | ||||||
|       <dependency> |       <dependency> | ||||||
|         <groupId>org.slf4j</groupId> |         <groupId>org.slf4j</groupId> | ||||||
|         <artifactId>slf4j-log4j12</artifactId> |         <artifactId>slf4j-log4j12</artifactId> | ||||||
|         <version>1.7.5</version> |         <version>1.7.7</version> | ||||||
|       </dependency> |       </dependency> | ||||||
|     </dependencies> |     </dependencies> | ||||||
|   </dependencyManagement> |   </dependencyManagement> | ||||||
| @ -430,7 +431,7 @@ | |||||||
|     <dependency> |     <dependency> | ||||||
|       <groupId>org.mockito</groupId> |       <groupId>org.mockito</groupId> | ||||||
|       <artifactId>mockito-all</artifactId> |       <artifactId>mockito-all</artifactId> | ||||||
|       <version>1.9.5</version> |       <version>${cs.mockito.version}</version> | ||||||
|       <scope>test</scope> |       <scope>test</scope> | ||||||
|     </dependency> |     </dependency> | ||||||
|     <dependency> |     <dependency> | ||||||
|  | |||||||
| @ -66,7 +66,7 @@ | |||||||
|     <dependency> |     <dependency> | ||||||
|       <groupId>org.apache.tomcat.embed</groupId> |       <groupId>org.apache.tomcat.embed</groupId> | ||||||
|       <artifactId>tomcat-embed-core</artifactId> |       <artifactId>tomcat-embed-core</artifactId> | ||||||
|       <version>7.0.30</version> |       <version>8.0.15</version> | ||||||
|     </dependency> |     </dependency> | ||||||
|     <!-- Another implementation of SSL protocol. Does not work with broken MS RDP SSL too. --> |     <!-- Another implementation of SSL protocol. Does not work with broken MS RDP SSL too. --> | ||||||
|     <dependency> |     <dependency> | ||||||
|  | |||||||
| @ -67,7 +67,7 @@ | |||||||
|         <dependency> |         <dependency> | ||||||
|             <groupId>commons-httpclient</groupId> |             <groupId>commons-httpclient</groupId> | ||||||
|             <artifactId>commons-httpclient</artifactId> |             <artifactId>commons-httpclient</artifactId> | ||||||
|             <version>${cs.httpclient.version}</version> |             <version>${cs.commons-httpclient.version}</version> | ||||||
|         </dependency> |         </dependency> | ||||||
|     </dependencies> |     </dependencies> | ||||||
|     <build> |     <build> | ||||||
|  | |||||||
| @ -214,8 +214,8 @@ public class NetUtilsTest { | |||||||
| 
 | 
 | ||||||
|     @Test |     @Test | ||||||
|     public void testStandardizeIp6Address() { |     public void testStandardizeIp6Address() { | ||||||
|         assertEquals(NetUtils.standardizeIp6Address("1234:0000:0000:5678:0000:000:ABCD:0001"), "1234::5678:0:0:abcd:1"); |         assertEquals(NetUtils.standardizeIp6Address("1234:0000:0000:5678:0000:0000:ABCD:0001"), "1234::5678:0:0:abcd:1"); | ||||||
|         assertEquals(NetUtils.standardizeIp6Cidr("1234:0000:0000:5678:0000:000:ABCD:0001/64"), "1234::5678:0:0:0:0/64"); |         assertEquals(NetUtils.standardizeIp6Cidr("1234:0000:0000:5678:0000:0000:ABCD:0001/64"), "1234:0:0:5678::/64"); | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     @Test |     @Test | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user