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 @@
maven-surefire-plugin
true
-
-
- maven.test.haltafterfailure
- false
-
-
- run.clustering.tests
- ${run.clustering.tests}
-
-
+
+ false
+ ${run.clustering.tests}
+
**/UpdateStateTest.java
**/ConfigurationManagerTest.java
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 @@
**/*Test.java
-
-
- build.repository
- ./target/test-classes
-
-
+
+ ./target/test-classes
+
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 @@
**/ComplexDataTypesDocLitBareTest.java
**/ComplexDataTypesTest.java
-
-
- build.repository
- ./target/test-classes
-
+
+ ./target/test-classes
-
- java.awt.headless
- true
-
-
- org.apache.axis2.transport.http.server.fastShutdown
- true
-
-
+ true
+ true
+
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 @@
maven-surefire-plugin
true
- once
**/*Test.java
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 @@
**/*Test.java
**/*Tests.java
-
-
- javax.xml.accessExternalSchema
- all
-
-
- OASISCatalogManager.catalog.debug.level
- 0
-
-
- jakarta.xml.soap.MessageFactory
- org.apache.axis2.saaj.MessageFactoryImpl
-
-
- jakarta.xml.soap.SOAPFactory
- org.apache.axis2.saaj.SOAPFactoryImpl
-
-
- jakarta.xml.soap.SOAPConnectionFactory
- org.apache.axis2.saaj.SOAPConnectionFactoryImpl
-
-
- jakarta.xml.soap.MetaFactory
- org.apache.axis2.saaj.SAAJMetaFactoryImpl
-
+
+ all
+ 0
+ org.apache.axis2.saaj.MessageFactoryImpl
+ org.apache.axis2.saaj.SOAPFactoryImpl
+ org.apache.axis2.saaj.SOAPConnectionFactoryImpl
+ org.apache.axis2.saaj.SAAJMetaFactoryImpl
-
- java.awt.headless
- true
-
-
- org.apache.axis2.transport.http.server.fastShutdown
- true
-
-
+ true
+ true
+
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 @@
-
+
false
true
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 @@
-
+
true
diff --git a/modules/jaxws/pom.xml b/modules/jaxws/pom.xml
index c274fe6aaa..25206ab667 100644
--- a/modules/jaxws/pom.xml
+++ b/modules/jaxws/pom.xml
@@ -342,7 +342,6 @@
maven-surefire-plugin
true
- once
${argLine} -Xms256m -Xmx512m --add-opens java.base/java.net=ALL-UNNAMED
@@ -350,46 +349,21 @@
**/*Test.java
**/*Tests.java
-
-
-
- build.repository
- ./target/test-classes
-
-
- jakarta.xml.soap.MessageFactory
- org.apache.axis2.saaj.MessageFactoryImpl
-
-
- jakarta.xml.soap.SOAPFactory
- org.apache.axis2.saaj.SOAPFactoryImpl
-
-
- jakarta.xml.soap.SOAPConnectionFactory
- org.apache.axis2.saaj.SOAPConnectionFactoryImpl
-
-
- jakarta.xml.soap.MetaFactory
- org.apache.axis2.saaj.SAAJMetaFactoryImpl
-
+
+
+ ./target/test-classes
+ org.apache.axis2.saaj.MessageFactoryImpl
+ org.apache.axis2.saaj.SOAPFactoryImpl
+ org.apache.axis2.saaj.SOAPConnectionFactoryImpl
+ org.apache.axis2.saaj.SAAJMetaFactoryImpl
-
- org.apache.axis2.jaxws.config.path
- ./target/test-classes/axis2.xml
-
-
- org.apache.axis2.jaxws.repo.path
- ./target/repository
-
+ ./target/test-classes/axis2.xml
+ ./target/repository
-
- java.awt.headless
- true
-
-
+ true
+
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 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 currentMessageContext = new ThreadLocal();
+ public static ThreadLocal currentMessageContext = new ThreadLocal<>();
public static MessageContext getCurrentMessageContext() {
- return (MessageContext) currentMessageContext.get();
+ return currentMessageContext.get();
}
public static void destroyCurrentMessageContext() {
@@ -655,7 +655,7 @@ public ArrayList getExecutionChain() {
*/
public void addExecutedPhase(Handler phase) {
if (executedPhases == null) {
- executedPhases = new LinkedList();
+ executedPhases = new LinkedList<>();
}
executedPhases.addFirst(phase);
}
@@ -679,7 +679,7 @@ public Iterator getExecutedPhases() {
checkActivateWarning("getExecutedPhases");
}
if (executedPhases == null) {
- executedPhases = new LinkedList();
+ executedPhases = new LinkedList<>();
}
return executedPhases.iterator();
}
@@ -692,7 +692,7 @@ public Iterator getExecutedPhases() {
*/
public void resetExecutedPhases() {
executedPhasesReset = true;
- executedPhases = new LinkedList();
+ 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 getProperties() {
- final Map resultMap = new HashMap();
+ final Map 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 policyList = new ArrayList();
+ Collection 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();
+ 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 flattenPhaseListToHandlers(ArrayList list, LinkedHashMap map) {
if (map == null) {
- map = new LinkedHashMap();
+ map = new LinkedHashMap<>();
}
Iterator 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 flattenPhaseListToHandlers(ArrayList list, L
Iterator 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 flattenPhaseListToHandlers(ArrayList list, L
}
- return new ArrayList(map.values());
+ return new ArrayList<>(map.values());
}
@@ -1975,12 +1977,12 @@ private ArrayList flattenPhaseListToHandlers(ArrayList list, L
private ArrayList flattenHandlerList(List list, LinkedHashMap map) {
if (map == null) {
- map = new LinkedHashMap();
+ map = new LinkedHashMap<>();
}
Iterator 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 flattenHandlerList(List list, LinkedHashMap<
}
}
- return new ArrayList(map.values());
+ return new ArrayList<>(map.values());
}
@@ -2076,12 +2078,12 @@ private void serializeSelfManagedData(ObjectOutput out) {
* @return ArrayList
*/
private ArrayList serializeSelfManagedDataHelper(ArrayList handlers) {
- ArrayList selfManagedDataHolderList = new ArrayList();
+ ArrayList selfManagedDataHolderList = new ArrayList<>();
Iterator 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();
+ executedPhases = new LinkedList<>();
}
@@ -3915,7 +3917,7 @@ public void activateWithOperationContext(OperationContext operationCtx) {
}
if (executedPhases == null) {
- executedPhases = new LinkedList();
+ executedPhases = new LinkedList<>();
}
//-------------------------------------------------------
@@ -3936,7 +3938,7 @@ public void activateWithOperationContext(OperationContext operationCtx) {
private ArrayList restoreHandlerList(ArrayList metaDataEntries) {
AxisConfiguration axisConfig = configurationContext.getAxisConfiguration();
- List existingHandlers = new ArrayList();
+ List 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 restoreHandlerList(ArrayList metaDataE
existingHandlers = flattenHandlerList(existingHandlers, null);
- ArrayList handlerListToReturn = new ArrayList();
+ ArrayList 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 restoreExecutedList(LinkedList base, Linked
// get a list of existing handler/phase objects for the restored objects
- ArrayList tmpMetaDataList = new ArrayList(metaDataEntries);
+ ArrayList tmpMetaDataList = new ArrayList<>(metaDataEntries);
ArrayList existingList = restoreHandlerList(tmpMetaDataList);
@@ -4002,7 +4004,7 @@ private LinkedList restoreExecutedList(LinkedList base, Linked
// set up a list to return
- LinkedList returnedList = new LinkedList();
+ LinkedList 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 policyList = new ArrayList(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 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";
/**
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 @@
**/*Tests.java
-
-
- org.apache.axis2.jaxws.repo.path
- ./target/repository
-
-
+
+ ./target/repository
+
diff --git a/modules/saaj/pom.xml b/modules/saaj/pom.xml
index 5d8fa6238a..f56421b73a 100644
--- a/modules/saaj/pom.xml
+++ b/modules/saaj/pom.xml
@@ -189,20 +189,16 @@
**/*Test.java
- once
${argLine} -Dcom.sun.org.apache.xerces.internal.xni.parser.XMLParserConfiguration=com.sun.org.apache.xerces.internal.parsers.XIncludeParserConfiguration
-
+
-
- java.awt.headless
- true
-
-
+ true
+
diff --git a/pom.xml b/pom.xml
index 2f6e0e178b..d4aa926662 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1373,32 +1373,20 @@
alphabetical
true
false
-
-
- java.io.tmpdir
- ${project.build.directory}/tmp
-
-
- user.home
- ${project.build.directory}/tmp
-
-
+
+ ${project.build.directory}/tmp
+ ${project.build.directory}/tmp
+
maven-failsafe-plugin
true
-
-
- java.io.tmpdir
- ${project.build.directory}/tmp
-
-
- user.home
- ${project.build.directory}/tmp
-
-
+
+ ${project.build.directory}/tmp
+ ${project.build.directory}/tmp
+