diff --git a/pom.xml b/pom.xml
index e27790b7..394d9a10 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,40 +1,31 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <groupId>org.javassist</groupId>
   <artifactId>javassist</artifactId>
+  <version>3.30.1-GA</version>
   <packaging>bundle</packaging>
+  <name>Javassist</name>
   <description>
-  	Javassist (JAVA programming ASSISTant) makes Java bytecode manipulation
-    simple.  It is a class library for editing bytecodes in Java.
+    Javassist (JAVA programming ASSISTant) makes Java bytecode manipulation
+    simple. It is a class library for editing bytecodes in Java.
   </description>
-  <version>3.30.1-GA</version>
-  <name>Javassist</name>
-  <url>http://www.javassist.org/</url>
+  <url>https://www.javassist.org/</url>
 
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-  <organization>
-    <name>Shigeru Chiba, www.javassist.org</name>
-  </organization>
-
-  <issueManagement>
-    <system>JIRA</system>
-    <url>https://jira.jboss.org/jira/browse/JASSIST/</url>
-  </issueManagement>
   <licenses>
     <!-- this is the license under which javassist is usually distributed
       -->
     <license>
       <name>MPL 1.1</name>
-      <url>http://www.mozilla.org/MPL/MPL-1.1.html</url>
+      <url>https://www.mozilla.org/en-US/MPL/1.1/</url>
     </license>
     <!-- this is the license under which javassist is distributed when
-	 it is bundled with JBoss
+         it is bundled with JBoss
       -->
     <license>
       <name>LGPL 2.1</name>
-      <url>http://www.gnu.org/licenses/lgpl-2.1.html</url>
+      <url>https://www.gnu.org/licenses/lgpl-2.1.html</url>
     </license>
     <!-- this is the license under which javassist can be distributed.
       -->
@@ -44,6 +35,13 @@
     </license>
   </licenses>
 
+  <organization>
+    <name>Shigeru Chiba, www.javassist.org</name>
+  </organization>
+  <issueManagement>
+    <system>JIRA</system>
+    <url>https://jira.jboss.org/jira/browse/JASSIST/</url>
+  </issueManagement>
   <scm>
     <connection>scm:git:git@github.com:jboss-javassist/javassist.git</connection>
     <developerConnection>scm:git:git@github.com:jboss-javassist/javassist.git</developerConnection>
@@ -56,7 +54,7 @@
       <name>Shigeru Chiba</name>
       <email>chiba@javassist.org</email>
       <organization>The Javassist Project</organization>
-      <organizationUrl>http://www.javassist.org/</organizationUrl>
+      <organizationUrl>https://www.javassist.org/</organizationUrl>
       <roles>
         <role>project lead</role>
       </roles>
@@ -68,7 +66,7 @@
       <name>Andrew Dinn</name>
       <email>adinn@redhat.com</email>
       <organization>JBoss</organization>
-      <organizationUrl>http://www.jboss.org/</organizationUrl>
+      <organizationUrl>https://www.jboss.org/</organizationUrl>
       <roles>
         <role>contributing developer</role>
       </roles>
@@ -80,30 +78,28 @@
       <name>Kabir Khan</name>
       <email>kabir.khan@jboss.com</email>
       <organization>JBoss</organization>
-      <organizationUrl>http://www.jboss.org/</organizationUrl>
+      <organizationUrl>https://www.jboss.org/</organizationUrl>
       <roles>
         <role>contributing developer</role>
       </roles>
       <timezone>0</timezone>
     </developer>
-    
+
     <developer>
       <id>scottmarlow</id>
       <name>Scott Marlow</name>
       <email>smarlow@redhat.com</email>
       <organization>JBoss</organization>
-      <organizationUrl>http://www.jboss.org/</organizationUrl>
+      <organizationUrl>https://www.jboss.org/</organizationUrl>
       <roles>
         <role>contributing developer</role>
       </roles>
       <timezone>-5</timezone>
     </developer>
-
-
   </developers>
 
   <distributionManagement>
-  <!--  
+  <!--
       You need entries in your .m2/settings.xml like this:
    <servers>
     <server>
@@ -117,9 +113,9 @@
        <password>password</password>
     </server>
   </servers>
-  
+
   To deploy a snapshot, you need to run
-  
+
   mvn deploy -Dversion=3.x.y-SNAPSHOT
 
   To deploy a release you need to change the version to 3.x.y-GA and run
@@ -137,6 +133,26 @@
       <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
     </snapshotRepository>
   </distributionManagement>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>[4.13.1,)</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-all</artifactId>
+      <version>1.3</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
   <build>
     <sourceDirectory>src/main/</sourceDirectory>
     <testSourceDirectory>src/test/</testSourceDirectory>
@@ -204,8 +220,8 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
         <version>3.2.0</version>
-	<configuration>
-	  <attach>true</attach>
+        <configuration>
+          <attach>true</attach>
           <excludePackageNames>javassist.compiler:javassist.convert:javassist.scopedpool:javassist.bytecode.stackmap</excludePackageNames>
           <bottom><![CDATA[<i>Javassist, a Java-bytecode translator toolkit.<br>
 Copyright (C) 1999- Shigeru Chiba. All Rights Reserved.</i>]]></bottom>
@@ -213,7 +229,7 @@ Copyright (C) 1999- Shigeru Chiba. All Rights Reserved.</i>]]></bottom>
           <nohelp>true</nohelp>
           <doclint>none</doclint>
           <source>8</source>
-	</configuration>
+        </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.felix</groupId>
@@ -237,7 +253,7 @@ Copyright (C) 1999- Shigeru Chiba. All Rights Reserved.</i>]]></bottom>
           <instructions>
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
             <Bundle-Version>${project.version}</Bundle-Version>
-            <Import-Package>!com.sun.jdi.*</Import-Package>	
+            <Import-Package>!com.sun.jdi.*</Import-Package>
             <Export-Package>!com.sun.jdi.*,javassist.*;version="${project.version}"</Export-Package>
           </instructions>
         </configuration>
@@ -247,17 +263,17 @@ Copyright (C) 1999- Shigeru Chiba. All Rights Reserved.</i>]]></bottom>
   </build>
   <profiles>
     <!-- profile for releasing to sonatype repo
-	 exercise with mvn -PcentralRelease
+         exercise with mvn -PcentralRelease
       -->
     <profile>
       <id>centralRelease</id>
       <!-- obviously we need to use the Sonatype staging repo for upload -->
       <distributionManagement>
-	<repository>
-	  <id>sonatype-releases-repository</id>
-	  <name>Sonatype Releases Repository</name>
-	  <url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
-	</repository>
+        <repository>
+          <id>sonatype-releases-repository</id>
+          <name>Sonatype Releases Repository</name>
+          <url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
+        </repository>
       </distributionManagement>
       <!-- we need to be able to sign the jars we install -->
       <build>
@@ -283,8 +299,8 @@ Copyright (C) 1999- Shigeru Chiba. All Rights Reserved.</i>]]></bottom>
       </build>
     </profile>
     <!-- profiles to add tools jar containing com.sun.jdi code
-	 needed by sample code
-	 -->
+         needed by sample code
+         -->
     <profile>
       <id>default-tools</id>
       <activation>
@@ -318,19 +334,4 @@ Copyright (C) 1999- Shigeru Chiba. All Rights Reserved.</i>]]></bottom>
       </dependencies>
     </profile>
   </profiles>
-  <dependencies>
-    <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <version>[4.13.1,)</version>
-        <scope>test</scope>
-    </dependency>
-    <dependency>
-        <groupId>org.hamcrest</groupId>
-        <artifactId>hamcrest-all</artifactId>
-        <version>1.3</version>
-        <scope>test</scope>
-    </dependency>
-  </dependencies>
 </project>
-