From d274ea78379d612c86231f06319992797a554eb1 Mon Sep 17 00:00:00 2001
From: Christian Ortlepp <christian.ortlepp@hypergene.com>
Date: Sat, 22 Mar 2025 13:06:17 +0100
Subject: [PATCH 1/4] refactor: migrate systemProperties to
 systemPropertyVariables

---
 modules/clustering/pom.xml        | 14 +++------
 modules/fastinfoset/pom.xml       |  9 ++----
 modules/integration/pom.xml       | 19 +++---------
 modules/jaxws-integration/pom.xml | 44 ++++++--------------------
 modules/jaxws/pom.xml             | 51 ++++++++-----------------------
 modules/metadata/pom.xml          |  9 ++----
 modules/saaj/pom.xml              |  9 ++----
 pom.xml                           | 28 +++++------------
 8 files changed, 49 insertions(+), 134 deletions(-)

diff --git a/modules/clustering/pom.xml b/modules/clustering/pom.xml
index ff67711027..d05d76b36a 100644
--- a/modules/clustering/pom.xml
+++ b/modules/clustering/pom.xml
@@ -125,16 +125,10 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <inherited>true</inherited>
                 <configuration>
-                    <systemProperties>
-                        <property>
-                            <name>maven.test.haltafterfailure</name>
-                            <value>false</value>
-                        </property>
-                        <property>
-                            <name>run.clustering.tests</name>
-                            <value>${run.clustering.tests}</value>
-                        </property>
-                    </systemProperties>
+                    <systemPropertyVariables>
+                        <maven.test.haltafterfailure>false</maven.test.haltafterfailure>
+                        <run.clustering.tests>${run.clustering.tests}</run.clustering.tests>
+                    </systemPropertyVariables>
                     <excludes>
                         <exclude>**/UpdateStateTest.java</exclude>
                         <exclude>**/ConfigurationManagerTest.java</exclude>
diff --git a/modules/fastinfoset/pom.xml b/modules/fastinfoset/pom.xml
index f4fb63e928..99b68a9dac 100644
--- a/modules/fastinfoset/pom.xml
+++ b/modules/fastinfoset/pom.xml
@@ -259,12 +259,9 @@
                     <includes>
                         <include>**/*Test.java</include>
                     </includes>
-                    <systemProperties>
-                        <property>
-                            <name>build.repository</name>
-                            <value>./target/test-classes</value>
-                        </property>
-                    </systemProperties>
+                    <systemPropertyVariables>
+                        <build.repository>./target/test-classes</build.repository>
+                    </systemPropertyVariables>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml
index a983cc56b9..1cc83e66c5 100644
--- a/modules/integration/pom.xml
+++ b/modules/integration/pom.xml
@@ -578,21 +578,12 @@
                         <exclude>**/ComplexDataTypesDocLitBareTest.java</exclude>
                         <exclude>**/ComplexDataTypesTest.java</exclude>
                     </excludes>
-                    <systemProperties>
-                        <property>
-                            <name>build.repository</name>
-                            <value>./target/test-classes</value>
-                        </property>
+                    <systemPropertyVariables>
+                        <build.repository>./target/test-classes</build.repository>
                         <!-- Prevent Mac OS X from showing an icon in the dock during the test run -->
-                        <property>
-                            <name>java.awt.headless</name>
-                            <value>true</value>
-                        </property>
-                        <property>
-                            <name>org.apache.axis2.transport.http.server.fastShutdown</name>
-                            <value>true</value>
-                        </property>
-                    </systemProperties>
+                        <java.awt.headless>true</java.awt.headless>
+                        <org.apache.axis2.transport.http.server.fastShutdown>true</org.apache.axis2.transport.http.server.fastShutdown>
+                    </systemPropertyVariables>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/modules/jaxws-integration/pom.xml b/modules/jaxws-integration/pom.xml
index bf1dc19826..6b2b9b74c1 100644
--- a/modules/jaxws-integration/pom.xml
+++ b/modules/jaxws-integration/pom.xml
@@ -1387,41 +1387,17 @@
                         <include>**/*Test.java</include>
                         <include>**/*Tests.java</include>
                     </includes>
-                    <systemProperties>
-                        <property>
-                            <name>javax.xml.accessExternalSchema</name>
-                            <value>all</value>
-                        </property>
-                        <property>
-                            <name>OASISCatalogManager.catalog.debug.level</name>
-                            <value>0</value>
-                        </property>
-                        <property>
-                            <name>jakarta.xml.soap.MessageFactory</name>
-                            <value>org.apache.axis2.saaj.MessageFactoryImpl</value>
-                        </property>
-                        <property>
-                            <name>jakarta.xml.soap.SOAPFactory</name>
-                            <value>org.apache.axis2.saaj.SOAPFactoryImpl</value>
-                        </property>
-                        <property>
-                            <name>jakarta.xml.soap.SOAPConnectionFactory</name>
-                            <value>org.apache.axis2.saaj.SOAPConnectionFactoryImpl</value>
-                        </property>
-                        <property>
-                            <name>jakarta.xml.soap.MetaFactory</name>
-                            <value>org.apache.axis2.saaj.SAAJMetaFactoryImpl</value>
-                        </property>
+                    <systemPropertyVariables>
+                        <javax.xml.accessExternalSchema>all</javax.xml.accessExternalSchema>
+                        <OASISCatalogManager.catalog.debug.level>0</OASISCatalogManager.catalog.debug.level>
+                        <jakarta.xml.soap.MessageFactory>org.apache.axis2.saaj.MessageFactoryImpl</jakarta.xml.soap.MessageFactory>
+                        <jakarta.xml.soap.SOAPFactory>org.apache.axis2.saaj.SOAPFactoryImpl</jakarta.xml.soap.SOAPFactory>
+                        <jakarta.xml.soap.SOAPConnectionFactory>org.apache.axis2.saaj.SOAPConnectionFactoryImpl</jakarta.xml.soap.SOAPConnectionFactory>
+                        <jakarta.xml.soap.MetaFactory>org.apache.axis2.saaj.SAAJMetaFactoryImpl</jakarta.xml.soap.MetaFactory>
                         <!-- Prevent Mac OS X from showing an icon in the dock during the test run -->
-                        <property>
-                            <name>java.awt.headless</name>
-                            <value>true</value>
-                        </property>
-                        <property>
-                            <name>org.apache.axis2.transport.http.server.fastShutdown</name>
-                            <value>true</value>
-                        </property>
-                    </systemProperties>
+                        <java.awt.headless>true</java.awt.headless>
+                        <org.apache.axis2.transport.http.server.fastShutdown>true</org.apache.axis2.transport.http.server.fastShutdown>
+                    </systemPropertyVariables>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/modules/jaxws/pom.xml b/modules/jaxws/pom.xml
index c274fe6aaa..252b8da24f 100644
--- a/modules/jaxws/pom.xml
+++ b/modules/jaxws/pom.xml
@@ -350,46 +350,21 @@
                         <include>**/*Test.java</include>
                         <include>**/*Tests.java</include>
                     </includes>
-                    <systemProperties>
-                        <!--<property>
-                            <name>OASISCatalogManager.catalog.debug.level</name>
-                            <value>9999</value>
-                        </property>-->
-                        <property>
-                            <name>build.repository</name>
-                            <value>./target/test-classes</value>
-                        </property>
-                        <property>
-                            <name>jakarta.xml.soap.MessageFactory</name>
-                            <value>org.apache.axis2.saaj.MessageFactoryImpl</value>
-                        </property>
-                        <property>
-                            <name>jakarta.xml.soap.SOAPFactory</name>
-                            <value>org.apache.axis2.saaj.SOAPFactoryImpl</value>
-                        </property>
-                        <property>
-                            <name>jakarta.xml.soap.SOAPConnectionFactory</name>
-                            <value>org.apache.axis2.saaj.SOAPConnectionFactoryImpl</value>
-                        </property>
-                        <property>
-                            <name>jakarta.xml.soap.MetaFactory</name>
-                            <value>org.apache.axis2.saaj.SAAJMetaFactoryImpl</value>
-                        </property>
+                    <systemPropertyVariables>
+                        <!--
+                            <OASISCatalogManager.catalog.debug.level>9999</OASISCatalogManager.catalog.debug.level>
+                        -->
+                        <build.repository>./target/test-classes</build.repository>
+                        <jakarta.xml.soap.MessageFactory>org.apache.axis2.saaj.MessageFactoryImpl</jakarta.xml.soap.MessageFactory>
+                        <jakarta.xml.soap.SOAPFactory>org.apache.axis2.saaj.SOAPFactoryImpl</jakarta.xml.soap.SOAPFactory>
+                        <jakarta.xml.soap.SOAPConnectionFactory>org.apache.axis2.saaj.SOAPConnectionFactoryImpl</jakarta.xml.soap.SOAPConnectionFactory>
+                        <jakarta.xml.soap.MetaFactory>org.apache.axis2.saaj.SAAJMetaFactoryImpl</jakarta.xml.soap.MetaFactory>
                         <!-- Need this for the client side to pickup an axis2.xml to configure SoapMessageMUProviderChecker -->
-                        <property>
-                            <name>org.apache.axis2.jaxws.config.path</name>
-                            <value>./target/test-classes/axis2.xml</value>
-                        </property>
-                        <property>
-                            <name>org.apache.axis2.jaxws.repo.path</name>
-                            <value>./target/repository</value>
-                        </property>
+                        <org.apache.axis2.jaxws.config.path>./target/test-classes/axis2.xml</org.apache.axis2.jaxws.config.path>
+                        <org.apache.axis2.jaxws.repo.path>./target/repository</org.apache.axis2.jaxws.repo.path>
                         <!-- Prevent Mac OS X from showing an icon in the dock during the test run -->
-                        <property>
-                            <name>java.awt.headless</name>
-                            <value>true</value>
-                        </property>
-                    </systemProperties>
+                        <java.awt.headless>true</java.awt.headless>
+                    </systemPropertyVariables>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/modules/metadata/pom.xml b/modules/metadata/pom.xml
index 11df978e8d..ad2b09b08d 100755
--- a/modules/metadata/pom.xml
+++ b/modules/metadata/pom.xml
@@ -222,12 +222,9 @@
                     <includes>
                         <include>**/*Tests.java</include>
                     </includes>
-                    <systemProperties>
-                        <property>
-                            <name>org.apache.axis2.jaxws.repo.path</name>
-                            <value>./target/repository</value>
-                        </property>
-                    </systemProperties>
+                    <systemPropertyVariables>
+                        <org.apache.axis2.jaxws.repo.path>./target/repository</org.apache.axis2.jaxws.repo.path>
+                    </systemPropertyVariables>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/modules/saaj/pom.xml b/modules/saaj/pom.xml
index 5d8fa6238a..f86c1f9a1f 100644
--- a/modules/saaj/pom.xml
+++ b/modules/saaj/pom.xml
@@ -196,13 +196,10 @@
                       * Please leave this on a single line. Adding a newline between the two
                         options causes a build failure. -->
                     <argLine>${argLine} -Dcom.sun.org.apache.xerces.internal.xni.parser.XMLParserConfiguration=com.sun.org.apache.xerces.internal.parsers.XIncludeParserConfiguration</argLine>
-                    <systemProperties>
+                    <systemPropertyVariables>
                         <!-- Prevent Mac OS X from showing an icon in the dock during the test run -->
-                        <property>
-                            <name>java.awt.headless</name>
-                            <value>true</value>
-                        </property>
-                    </systemProperties>
+                        <java.awt.headless>true</java.awt.headless>
+                    </systemPropertyVariables>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/pom.xml b/pom.xml
index 2f6e0e178b..d4aa926662 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1373,32 +1373,20 @@
                     <runOrder>alphabetical</runOrder>
                     <redirectTestOutputToFile>true</redirectTestOutputToFile>
                     <trimStackTrace>false</trimStackTrace>
-                    <systemProperties>
-                        <property>
-                            <name>java.io.tmpdir</name>
-                            <value>${project.build.directory}/tmp</value>
-                        </property>
-                        <property>
-                            <name>user.home</name>
-                            <value>${project.build.directory}/tmp</value>
-                        </property>
-                    </systemProperties>
+                    <systemPropertyVariables>
+                        <java.io.tmpdir>${project.build.directory}/tmp</java.io.tmpdir>
+                        <user.home>${project.build.directory}/tmp</user.home>
+                    </systemPropertyVariables>
                 </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-failsafe-plugin</artifactId>
                 <configuration>
                     <redirectTestOutputToFile>true</redirectTestOutputToFile>
-                    <systemProperties>
-                        <property>
-                            <name>java.io.tmpdir</name>
-                            <value>${project.build.directory}/tmp</value>
-                        </property>
-                        <property>
-                            <name>user.home</name>
-                            <value>${project.build.directory}/tmp</value>
-                        </property>
-                    </systemProperties>
+                    <systemPropertyVariables>
+                        <java.io.tmpdir>${project.build.directory}/tmp</java.io.tmpdir>
+                        <user.home>${project.build.directory}/tmp</user.home>
+                    </systemPropertyVariables>
                 </configuration>
             </plugin>
             <plugin>

From 8cf76befded5886e44c4b788aa1c85609a7baa3e Mon Sep 17 00:00:00 2001
From: Christian Ortlepp <christian.ortlepp@hypergene.com>
Date: Sat, 22 Mar 2025 13:48:53 +0100
Subject: [PATCH 2/4] refactor: remove unused configuration property forkMode

---
 modules/jaxbri-codegen/pom.xml | 1 -
 modules/jaxws/pom.xml          | 1 -
 modules/saaj/pom.xml           | 1 -
 3 files changed, 3 deletions(-)

diff --git a/modules/jaxbri-codegen/pom.xml b/modules/jaxbri-codegen/pom.xml
index eb626431b2..0370d8f223 100644
--- a/modules/jaxbri-codegen/pom.xml
+++ b/modules/jaxbri-codegen/pom.xml
@@ -175,7 +175,6 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <inherited>true</inherited>
                 <configuration>
-                    <forkMode>once</forkMode>
                     <includes>
                         <include>**/*Test.java</include>
                     </includes>
diff --git a/modules/jaxws/pom.xml b/modules/jaxws/pom.xml
index 252b8da24f..25206ab667 100644
--- a/modules/jaxws/pom.xml
+++ b/modules/jaxws/pom.xml
@@ -342,7 +342,6 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <inherited>true</inherited>
                 <configuration>
-                    <forkMode>once</forkMode>
                     <argLine>${argLine} -Xms256m -Xmx512m --add-opens java.base/java.net=ALL-UNNAMED</argLine>
                     <!-- Enable the next 2 lines if you want to attach a debugger
                     <argLine>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006</argLine>-->
diff --git a/modules/saaj/pom.xml b/modules/saaj/pom.xml
index f86c1f9a1f..f56421b73a 100644
--- a/modules/saaj/pom.xml
+++ b/modules/saaj/pom.xml
@@ -189,7 +189,6 @@
                     <includes>
                         <include>**/*Test.java</include>
                     </includes>
-                    <forkMode>once</forkMode>
                     <!-- Notes:
                       * The Xerces related property fixes an issue on Sun JDKs caused by the
                         presence of jaxp-ri on the classpath.

From d2d631400d8a52a32898b8be46d034afb93af8ab Mon Sep 17 00:00:00 2001
From: Christian Ortlepp <christian.ortlepp@hypergene.com>
Date: Sat, 22 Mar 2025 13:49:18 +0100
Subject: [PATCH 3/4] refactor: use updated xml namespace

---
 .../proxy/doclitnonwrapped/META-INF/proxy_doclit_unwr.wsdl      | 2 +-
 .../jaxws/proxy/doclitwrapped/META-INF/ProxyDocLitWrapped.wsdl  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/proxy/doclitnonwrapped/META-INF/proxy_doclit_unwr.wsdl b/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/proxy/doclitnonwrapped/META-INF/proxy_doclit_unwr.wsdl
index 6e00c95c89..0ed6312152 100644
--- a/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/proxy/doclitnonwrapped/META-INF/proxy_doclit_unwr.wsdl
+++ b/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/proxy/doclitnonwrapped/META-INF/proxy_doclit_unwr.wsdl
@@ -69,7 +69,7 @@
 	</wsdl:message>	
 	
 	<wsdl:portType name="DocLitnonWrappedProxy">
-	    <jaxws:bindings xmlns:jaxws="http://java.sun.com/xml/ns/jaxws">
+	    <jaxws:bindings xmlns:jaxws="https://jakarta.ee/xml/ns/jaxws">
 	        <jaxws:enableWrapperStyle>false</jaxws:enableWrapperStyle>
 	        <jaxws:enableAsyncMapping>true</jaxws:enableAsyncMapping>
 	    </jaxws:bindings>
diff --git a/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/proxy/doclitwrapped/META-INF/ProxyDocLitWrapped.wsdl b/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/proxy/doclitwrapped/META-INF/ProxyDocLitWrapped.wsdl
index edc8ddd2d9..d16c8eec98 100644
--- a/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/proxy/doclitwrapped/META-INF/ProxyDocLitWrapped.wsdl
+++ b/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/proxy/doclitwrapped/META-INF/ProxyDocLitWrapped.wsdl
@@ -189,7 +189,7 @@
 	</wsdl:message>
 
 	<wsdl:portType name="DocLitWrappedProxy">
-        <jaxws:bindings xmlns:jaxws="http://java.sun.com/xml/ns/jaxws">
+        <jaxws:bindings xmlns:jaxws="https://jakarta.ee/xml/ns/jaxws">
             <jaxws:enableAsyncMapping>true</jaxws:enableAsyncMapping>
         </jaxws:bindings>
 

From 5beaaad67b374c96246625dd26daa32369000ec1 Mon Sep 17 00:00:00 2001
From: Christian Ortlepp <christian.ortlepp@hypergene.com>
Date: Sat, 22 Mar 2025 13:56:25 +0100
Subject: [PATCH 4/4] fix: compilation warnings in kernel

---
 .../axis2/addressing/EndpointReference.java   |  7 --
 .../org/apache/axis2/builder/BuilderUtil.java |  5 ++
 .../apache/axis2/context/AbstractContext.java |  1 +
 .../apache/axis2/context/MessageContext.java  | 66 ++++++++++---------
 .../axis2/description/AxisDescription.java    |  2 +
 .../apache/axis2/description/AxisService.java |  2 +
 .../axis2/description/PolicyInclude.java      |  5 ++
 .../org/apache/axis2/i18n/MessageBundle.java  |  2 +-
 .../axis2/kernel/http/HTTPConstants.java      |  4 +-
 9 files changed, 51 insertions(+), 43 deletions(-)

diff --git a/modules/kernel/src/org/apache/axis2/addressing/EndpointReference.java b/modules/kernel/src/org/apache/axis2/addressing/EndpointReference.java
index f648b24cdd..494d1bd5c7 100644
--- a/modules/kernel/src/org/apache/axis2/addressing/EndpointReference.java
+++ b/modules/kernel/src/org/apache/axis2/addressing/EndpointReference.java
@@ -320,17 +320,10 @@ public void addMetaData(OMNode metaData) {
 
     }
 
-    /**
-     * @deprecated
-     */
     public String getName() {
         return name;
     }
 
-    /**
-     * @param name
-     * @deprecated
-     */
     public void setName(String name) {
         this.name = name;
     }
diff --git a/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java b/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
index e8334d9b74..0f3f1cacda 100644
--- a/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
+++ b/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
@@ -77,6 +77,7 @@ public class BuilderUtil {
     /**
      * @deprecated
      */
+    @Deprecated
     public static final int BOM_SIZE = 4;
 
     public static SOAPEnvelope buildsoapMessage(MessageContext messageContext,
@@ -275,6 +276,7 @@ public static OMXMLParserWrapper createPOXBuilder(InputStream in, String encodin
      *             directly to the XML parser. If the stream is not XML, you shouldn't be using this
      *             method anyway.
      */
+    @Deprecated
     public static Reader getReader(final InputStream is, final String charSetEncoding)
             throws IOException {
         final PushbackInputStream is2 = getPushbackInputStream(is);
@@ -298,6 +300,7 @@ public Object run() throws UnsupportedEncodingException {
      * @deprecated If you need a {@link PushbackInputStream} just construct one (with the
      *             appropriate size).
      */
+    @Deprecated
     public static PushbackInputStream getPushbackInputStream(InputStream is) {
         return new PushbackInputStream(is, BOM_SIZE);
     }
@@ -309,6 +312,7 @@ public static PushbackInputStream getPushbackInputStream(InputStream is) {
      *             probably you are using a {@link Reader} where you should use an
      *             {@link InputStream}.
      */
+    @Deprecated
     public static String getCharSetEncoding(PushbackInputStream is2, String defaultEncoding)
             throws IOException {
         String encoding;
@@ -584,6 +588,7 @@ public static SOAPModelBuilder createSOAPModelBuilder(InputStream in, String enc
     /**
      * @deprecated Use {@link MessageProcessorSelector#getMessageBuilder(String, MessageContext)}.
      */
+    @Deprecated
     public static Builder getBuilderFromSelector(String type, MessageContext msgContext)
             throws AxisFault {
         return MessageProcessorSelector.getMessageBuilder(type, msgContext);
diff --git a/modules/kernel/src/org/apache/axis2/context/AbstractContext.java b/modules/kernel/src/org/apache/axis2/context/AbstractContext.java
index 0ec0f0dd4c..ad376fdee5 100644
--- a/modules/kernel/src/org/apache/axis2/context/AbstractContext.java
+++ b/modules/kernel/src/org/apache/axis2/context/AbstractContext.java
@@ -95,6 +95,7 @@ public boolean isAncestor(AbstractContext context) {
      * @deprecated Use {@link #getPropertyNames()}, {@link #getProperty(String)},
      *             {@link #setProperty(String, Object)} & {@link #removeProperty(String)}instead.
      */
+    @Deprecated
     public Map<String, Object> getProperties() {
         initPropertiesMap();
         return properties;
diff --git a/modules/kernel/src/org/apache/axis2/context/MessageContext.java b/modules/kernel/src/org/apache/axis2/context/MessageContext.java
index eff766707e..80f981b477 100644
--- a/modules/kernel/src/org/apache/axis2/context/MessageContext.java
+++ b/modules/kernel/src/org/apache/axis2/context/MessageContext.java
@@ -155,10 +155,10 @@ public class MessageContext extends AbstractContext
     /**
      * A place to store the current MessageContext
      */
-    public static ThreadLocal<MessageContext> currentMessageContext = new ThreadLocal<MessageContext>();
+    public static ThreadLocal<MessageContext> currentMessageContext = new ThreadLocal<>();
 
     public static MessageContext getCurrentMessageContext() {
-        return (MessageContext) currentMessageContext.get();
+        return currentMessageContext.get();
     }
 
     public static void destroyCurrentMessageContext() {
@@ -655,7 +655,7 @@ public ArrayList<Handler> getExecutionChain() {
      */
     public void addExecutedPhase(Handler phase) {
         if (executedPhases == null) {
-            executedPhases = new LinkedList<Handler>();
+            executedPhases = new LinkedList<>();
         }
         executedPhases.addFirst(phase);
     }
@@ -679,7 +679,7 @@ public Iterator<Handler> getExecutedPhases() {
             checkActivateWarning("getExecutedPhases");
         }
         if (executedPhases == null) {
-            executedPhases = new LinkedList<Handler>();
+            executedPhases = new LinkedList<>();
         }
         return executedPhases.iterator();
     }
@@ -692,7 +692,7 @@ public Iterator<Handler> getExecutedPhases() {
      */
     public void resetExecutedPhases() {
         executedPhasesReset = true;
-        executedPhases = new LinkedList<Handler>();
+        executedPhases = new LinkedList<>();
     }
 
     /**
@@ -1013,8 +1013,9 @@ public boolean isPropertyTrue(String name, boolean defaultVal) {
      * @return An unmodifiable map containing the combination of all available
      *         properties or an empty map.
      */
+    @Deprecated
     public Map<String, Object> getProperties() {
-        final Map<String, Object> resultMap = new HashMap<String, Object>();
+        final Map<String, Object> resultMap = new HashMap<>();
 
         // My own context hierarchy may not all be present. So look for whatever
         // nearest level is present and add the properties
@@ -1610,7 +1611,7 @@ public Policy getEffectivePolicy() {
         		return axisMessage.getEffectivePolicy();
         } else {
             if (axisService != null){
-                Collection<PolicyComponent> policyList = new ArrayList<PolicyComponent>();
+                Collection<PolicyComponent> policyList = new ArrayList<>();
                 policyList.addAll(axisService.getPolicySubject().getAttachedPolicyComponents());
                 AxisConfiguration axisConfiguration = axisService.getAxisConfiguration();
                 policyList.addAll(axisConfiguration.getPolicySubject().getAttachedPolicyComponents());
@@ -1729,6 +1730,7 @@ public boolean isEngaged(String moduleName) {
      * @return boolean
      * @deprecated The bonus you used to get from this is now built in to SOAPEnvelope.getHeader()
      */
+    @Deprecated
     public boolean isHeaderPresent() {
         // If there's no envelope there can't be a header.
         if (this.envelope == null) {
@@ -1849,9 +1851,9 @@ public void removeAttachment(String contentID) {
      * @param key   The key
      * @return A string key
      */
-    private String generateSelfManagedDataKey(Class clazz, Object key) {
+    private String generateSelfManagedDataKey(Class<?> clazz, Object key) {
         return clazz.getName() + selfManagedDataDelimiter + key.toString() +
-                selfManagedDataDelimiter + Integer.toString(key.hashCode());
+                selfManagedDataDelimiter + key.hashCode();
     }
 
     /**
@@ -1865,9 +1867,9 @@ private String generateSelfManagedDataKey(Class clazz, Object key) {
      * @param key   The key for this data object
      * @param value The data object
      */
-    public void setSelfManagedData(Class clazz, Object key, Object value) {
+    public void setSelfManagedData(Class<?> clazz, Object key, Object value) {
         if (selfManagedDataMap == null) {
-            selfManagedDataMap = new LinkedHashMap<String, Object>();
+            selfManagedDataMap = new LinkedHashMap<>();
         }
 
         // make sure we have a unique key and a delimiter so we can
@@ -1882,7 +1884,7 @@ public void setSelfManagedData(Class clazz, Object key, Object value) {
      * @param key   The key for the data
      * @return The data object associated with the key, or NULL if not found
      */
-    public Object getSelfManagedData(Class clazz, Object key) {
+    public Object getSelfManagedData(Class<?> clazz, Object key) {
         if (selfManagedDataMap != null) {
             return selfManagedDataMap.get(generateSelfManagedDataKey(clazz, key));
         }
@@ -1896,7 +1898,7 @@ public Object getSelfManagedData(Class clazz, Object key) {
      * @param key   The key to look for
      * @return TRUE if the key exists, FALSE otherwise
      */
-    public boolean containsSelfManagedDataKey(Class clazz, Object key) {
+    public boolean containsSelfManagedDataKey(Class<?> clazz, Object key) {
         if (selfManagedDataMap == null) {
             return false;
         }
@@ -1910,7 +1912,7 @@ public boolean containsSelfManagedDataKey(Class clazz, Object key) {
      * @param clazz The class of the caller that owns the key-value pair
      * @param key   The key of the object to be removed
      */
-    public void removeSelfManagedData(Class clazz, Object key) {
+    public void removeSelfManagedData(Class<?> clazz, Object key) {
         if (selfManagedDataMap != null) {
             selfManagedDataMap.remove(generateSelfManagedDataKey(clazz, key));
         }
@@ -1926,12 +1928,12 @@ public void removeSelfManagedData(Class clazz, Object key) {
     private ArrayList<Handler> flattenPhaseListToHandlers(ArrayList<Handler> list, LinkedHashMap<String, Handler> map) {
 
         if (map == null) {
-            map = new LinkedHashMap<String, Handler>();
+            map = new LinkedHashMap<>();
         }
 
         Iterator<Handler> it = list.iterator();
         while (it.hasNext()) {
-            Handler handler = (Handler) it.next();
+            Handler handler = it.next();
 
             String key = null;
             if (handler != null) {
@@ -1952,7 +1954,7 @@ private ArrayList<Handler> flattenPhaseListToHandlers(ArrayList<Handler> list, L
             Iterator<String> it2 = map.keySet().iterator();
             while (it2.hasNext()) {
                 Object key = it2.next();
-                Handler value = (Handler) map.get(key);
+                Handler value = map.get(key);
                 String name = value.getName();
                 log.trace(getLogIDString() + ":flattenPhaseListToHandlers():  key [" + key +
                         "]    handler name [" + name + "]");
@@ -1960,7 +1962,7 @@ private ArrayList<Handler> flattenPhaseListToHandlers(ArrayList<Handler> list, L
         }
 
 
-        return new ArrayList<Handler>(map.values());
+        return new ArrayList<>(map.values());
     }
 
 
@@ -1975,12 +1977,12 @@ private ArrayList<Handler> flattenPhaseListToHandlers(ArrayList<Handler> list, L
     private ArrayList<Handler> flattenHandlerList(List<Handler> list, LinkedHashMap<String, Handler> map) {
 
         if (map == null) {
-            map = new LinkedHashMap<String, Handler>();
+            map = new LinkedHashMap<>();
         }
 
         Iterator<Handler> it = list.iterator();
         while (it.hasNext()) {
-            Handler handler = (Handler) it.next();
+            Handler handler = it.next();
 
             String key = null;
             if (handler != null) {
@@ -2000,7 +2002,7 @@ private ArrayList<Handler> flattenHandlerList(List<Handler> list, LinkedHashMap<
             }
         }
 
-        return new ArrayList<Handler>(map.values());
+        return new ArrayList<>(map.values());
     }
 
 
@@ -2076,12 +2078,12 @@ private void serializeSelfManagedData(ObjectOutput out) {
      * @return ArrayList
      */
     private ArrayList<SelfManagedDataHolder> serializeSelfManagedDataHelper(ArrayList<Handler> handlers) {
-        ArrayList<SelfManagedDataHolder> selfManagedDataHolderList = new ArrayList<SelfManagedDataHolder>();
+        ArrayList<SelfManagedDataHolder> selfManagedDataHolderList = new ArrayList<>();
         Iterator<Handler> it = handlers.iterator();
 
         try {
             while (it.hasNext()) {
-                Handler handler = (Handler) it.next();
+                Handler handler = it.next();
 
                 //if (handler instanceof Phase)
                 //{
@@ -2156,7 +2158,7 @@ private SelfManagedDataManager deserialize_getHandlerFromExecutionChain(Iterator
 
         try {
             while ((it.hasNext()) && (handler_toreturn == null)) {
-                Handler handler = (Handler) it.next();
+                Handler handler = it.next();
 
                 if (handler instanceof Phase) {
                     handler_toreturn = deserialize_getHandlerFromExecutionChain(
@@ -3410,7 +3412,7 @@ public void readExternal(ObjectInput inObject) throws IOException, ClassNotFound
             log.trace(getLogIDString() +
                       ": readExternal(): About to read properties, marker is: " + marker);
         }
-        properties = in.readMap(new HashMap());
+        properties = in.readMap(new HashMap<>());
 
 
         //---------------------------------------------------------
@@ -3687,7 +3689,7 @@ public void activate(ConfigurationContext cc) {
         }
 
         if (executedPhases == null) {
-            executedPhases = new LinkedList<Handler>();
+            executedPhases = new LinkedList<>();
         }
 
 
@@ -3915,7 +3917,7 @@ public void activateWithOperationContext(OperationContext operationCtx) {
         }
 
         if (executedPhases == null) {
-            executedPhases = new LinkedList<Handler>();
+            executedPhases = new LinkedList<>();
         }
 
         //-------------------------------------------------------
@@ -3936,7 +3938,7 @@ public void activateWithOperationContext(OperationContext operationCtx) {
     private ArrayList<Handler> restoreHandlerList(ArrayList<MetaDataEntry> metaDataEntries) {
         AxisConfiguration axisConfig = configurationContext.getAxisConfiguration();
 
-        List<Handler> existingHandlers = new ArrayList<Handler>();
+        List<Handler> existingHandlers = new ArrayList<>();
 
         // TODO: I'm using clone for the ArrayList returned from axisConfig object.
         //     Does it do a deep clone of the Handlers held there?  Does it matter?
@@ -3960,11 +3962,11 @@ private ArrayList<Handler> restoreHandlerList(ArrayList<MetaDataEntry> metaDataE
 
         existingHandlers = flattenHandlerList(existingHandlers, null);
 
-        ArrayList<Handler> handlerListToReturn = new ArrayList<Handler>();
+        ArrayList<Handler> handlerListToReturn = new ArrayList<>();
 
         for (int i = 0; i < metaDataEntries.size(); i++) {
             Handler handler = (Handler) ActivateUtils
-                    .findHandler(existingHandlers, (MetaDataEntry) metaDataEntries.get(i));
+                    .findHandler(existingHandlers, metaDataEntries.get(i));
 
             if (handler != null) {
                 handlerListToReturn.add(handler);
@@ -3992,7 +3994,7 @@ private LinkedList<Handler> restoreExecutedList(LinkedList<Handler> base, Linked
 
         // get a list of existing handler/phase objects for the restored objects
 
-        ArrayList<MetaDataEntry> tmpMetaDataList = new ArrayList<MetaDataEntry>(metaDataEntries);
+        ArrayList<MetaDataEntry> tmpMetaDataList = new ArrayList<>(metaDataEntries);
 
         ArrayList<Handler> existingList = restoreHandlerList(tmpMetaDataList);
 
@@ -4002,7 +4004,7 @@ private LinkedList<Handler> restoreExecutedList(LinkedList<Handler> base, Linked
 
         // set up a list to return
 
-        LinkedList<Handler> returnedList = new LinkedList<Handler>();
+        LinkedList<Handler> returnedList = new LinkedList<>();
 
         if (base != null) {
             returnedList.addAll(base);
diff --git a/modules/kernel/src/org/apache/axis2/description/AxisDescription.java b/modules/kernel/src/org/apache/axis2/description/AxisDescription.java
index 913aaf69fa..08bdf618ea 100644
--- a/modules/kernel/src/org/apache/axis2/description/AxisDescription.java
+++ b/modules/kernel/src/org/apache/axis2/description/AxisDescription.java
@@ -228,6 +228,7 @@ public AxisDescription getParent() {
      * @deprecated As of release 1.4, if you want to access the policy cache of a particular
      *             AxisDescription object use {@link #getPolicySubject()} instead.
      */
+    @Deprecated
     public void setPolicyInclude(PolicyInclude policyInclude) {
         this.policyInclude = policyInclude;
     }
@@ -238,6 +239,7 @@ public void setPolicyInclude(PolicyInclude policyInclude) {
      * @see org.apache.axis2.description.AxisDescription#getPolicySubject()
      * @deprecated As of release 1.4, replaced by {@link #getPolicySubject()}
      */
+    @Deprecated
     public PolicyInclude getPolicyInclude() {
         if (policyInclude == null) {
             policyInclude = new PolicyInclude(this);
diff --git a/modules/kernel/src/org/apache/axis2/description/AxisService.java b/modules/kernel/src/org/apache/axis2/description/AxisService.java
index 671d402d25..d45214eac4 100644
--- a/modules/kernel/src/org/apache/axis2/description/AxisService.java
+++ b/modules/kernel/src/org/apache/axis2/description/AxisService.java
@@ -3346,6 +3346,7 @@ public void addMessageElementQNameToOperationMapping(
     /**
      * @deprecated use {@link AxisEndpoint#getEndpointURL()}
      */
+    @Deprecated
     public String getEndpointURL() {
         return endpointURL;
     }
@@ -3353,6 +3354,7 @@ public String getEndpointURL() {
     /**
      * @deprecated use {@link AxisEndpoint#setEndpointURL(String)}
      */
+    @Deprecated
     public void setEndpointURL(String endpointURL) {
         this.endpointURL = endpointURL;
     }
diff --git a/modules/kernel/src/org/apache/axis2/description/PolicyInclude.java b/modules/kernel/src/org/apache/axis2/description/PolicyInclude.java
index b0c54bb1fb..c92916b85f 100644
--- a/modules/kernel/src/org/apache/axis2/description/PolicyInclude.java
+++ b/modules/kernel/src/org/apache/axis2/description/PolicyInclude.java
@@ -114,6 +114,7 @@ public PolicyRegistry getPolicyRegistry() {
 	 *             {@link AxisDescription} has to be set as the argument.
 	 * 
 	 */
+    @Deprecated
     public void setPolicy(Policy policy) {
         wrapperElements.clear();
 
@@ -144,6 +145,7 @@ public void setPolicy(Policy policy) {
 	 *             {@link PolicySubject #attachPolicy(Policy)} accordingly.
 	 * 
 	 */
+    @Deprecated
     public void setEffectivePolicy(Policy effectivePolicy) {
         this.effectivePolicy = effectivePolicy;
         
@@ -228,6 +230,7 @@ private void calculateEffectivePolicy() {
 	 *             {@link AxisDescription}, use
 	 *             {@link PolicySubject #getAttachedPolicyComponents() and {@link org.PolicyUtil #getMergedPolicy(List, AxisDescription)}}
 	 */
+    @Deprecated
     public Policy getPolicy() {
     	if (description != null) {
 			ArrayList<PolicyComponent> policyList = new ArrayList<PolicyComponent>(description.getPolicySubject()
@@ -245,6 +248,7 @@ public Policy getPolicy() {
 	 *             {@link AxisBindingMessage #getEffectivePolicy()} when
 	 *             applicable.
 	 */
+    @Deprecated
     public Policy getEffectivePolicy() {
     	if (description != null) {
 			if (description instanceof AxisMessage) {
@@ -265,6 +269,7 @@ public Policy getEffectivePolicy() {
 	 *             {@link PolicySubject #getAttachedPolicyComponents()} on
 	 *             appropriate description object.
 	 */
+    @Deprecated
     public ArrayList getPolicyElements(int type) {
         ArrayList policyElementList = new ArrayList();
         Iterator<Wrapper> wrapperElementIterator = wrapperElements.values().iterator();
diff --git a/modules/kernel/src/org/apache/axis2/i18n/MessageBundle.java b/modules/kernel/src/org/apache/axis2/i18n/MessageBundle.java
index 7fb44b35ee..ef2d807eb8 100644
--- a/modules/kernel/src/org/apache/axis2/i18n/MessageBundle.java
+++ b/modules/kernel/src/org/apache/axis2/i18n/MessageBundle.java
@@ -201,6 +201,6 @@ public String getMessage(String key, String[] array) throws MissingResourceExcep
                                                getResourceBundle().getResourceName(), key);
         }
 
-        return MessageFormat.format(msg, array);
+        return MessageFormat.format(msg, (Object[]) array);
     }
 }
diff --git a/modules/kernel/src/org/apache/axis2/kernel/http/HTTPConstants.java b/modules/kernel/src/org/apache/axis2/kernel/http/HTTPConstants.java
index 9a11dc4677..ca8fbbdd9c 100644
--- a/modules/kernel/src/org/apache/axis2/kernel/http/HTTPConstants.java
+++ b/modules/kernel/src/org/apache/axis2/kernel/http/HTTPConstants.java
@@ -393,9 +393,7 @@ public class HTTPConstants {
     public static final String PROXY = "PROXY";
     public static final String AUTHENTICATE = "_NTLM_DIGEST_BASIC_AUTHENTICATION_";
 
-    /**
-     * @deprecated
-     */
+    @Deprecated
     public static final String MTOM_RECEIVED_CONTENT_TYPE = "MTOM_RECEIVED";
 
     /**