You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2015/12/21 14:35:29 UTC

svn commit: r1721153 [1/2] - in /axis/axis2/java/core/branches/1_6: ./ modules/adb-codegen/ modules/adb/ modules/addressing/ modules/all/ modules/clustering/ modules/codegen/ modules/corba/ modules/distribution/ modules/fastinfoset/ modules/integration...

Author: veithen
Date: Mon Dec 21 13:35:28 2015
New Revision: 1721153

URL: http://svn.apache.org/viewvc?rev=1721153&view=rev
Log:
Make the root POM the parent POM.

Removed:
    axis/axis2/java/core/branches/1_6/modules/parent/
Modified:
    axis/axis2/java/core/branches/1_6/   (props changed)
    axis/axis2/java/core/branches/1_6/modules/adb-codegen/pom.xml
    axis/axis2/java/core/branches/1_6/modules/adb/pom.xml
    axis/axis2/java/core/branches/1_6/modules/addressing/pom.xml
    axis/axis2/java/core/branches/1_6/modules/all/pom.xml
    axis/axis2/java/core/branches/1_6/modules/clustering/pom.xml
    axis/axis2/java/core/branches/1_6/modules/codegen/pom.xml
    axis/axis2/java/core/branches/1_6/modules/corba/pom.xml
    axis/axis2/java/core/branches/1_6/modules/distribution/pom.xml
    axis/axis2/java/core/branches/1_6/modules/fastinfoset/pom.xml
    axis/axis2/java/core/branches/1_6/modules/integration/pom.xml
    axis/axis2/java/core/branches/1_6/modules/java2wsdl/pom.xml
    axis/axis2/java/core/branches/1_6/modules/jaxbri/pom.xml
    axis/axis2/java/core/branches/1_6/modules/jaxws/   (props changed)
    axis/axis2/java/core/branches/1_6/modules/jaxws-integration/pom.xml
    axis/axis2/java/core/branches/1_6/modules/jaxws-mar/pom.xml
    axis/axis2/java/core/branches/1_6/modules/jaxws/pom.xml
    axis/axis2/java/core/branches/1_6/modules/jibx/pom.xml
    axis/axis2/java/core/branches/1_6/modules/json/pom.xml
    axis/axis2/java/core/branches/1_6/modules/kernel/pom.xml
    axis/axis2/java/core/branches/1_6/modules/metadata/pom.xml
    axis/axis2/java/core/branches/1_6/modules/mex/pom.xml
    axis/axis2/java/core/branches/1_6/modules/mtompolicy-mar/pom.xml
    axis/axis2/java/core/branches/1_6/modules/mtompolicy/pom.xml
    axis/axis2/java/core/branches/1_6/modules/osgi-tests/pom.xml
    axis/axis2/java/core/branches/1_6/modules/osgi/pom.xml
    axis/axis2/java/core/branches/1_6/modules/ping/pom.xml
    axis/axis2/java/core/branches/1_6/modules/resource-bundle/pom.xml
    axis/axis2/java/core/branches/1_6/modules/saaj/   (props changed)
    axis/axis2/java/core/branches/1_6/modules/saaj/pom.xml
    axis/axis2/java/core/branches/1_6/modules/samples/pom.xml
    axis/axis2/java/core/branches/1_6/modules/samples/version/pom.xml
    axis/axis2/java/core/branches/1_6/modules/scripting/pom.xml
    axis/axis2/java/core/branches/1_6/modules/soapmonitor/module/pom.xml
    axis/axis2/java/core/branches/1_6/modules/soapmonitor/servlet/pom.xml
    axis/axis2/java/core/branches/1_6/modules/spring/pom.xml
    axis/axis2/java/core/branches/1_6/modules/testutils/pom.xml
    axis/axis2/java/core/branches/1_6/modules/tool/axis2-aar-maven-plugin/pom.xml
    axis/axis2/java/core/branches/1_6/modules/tool/axis2-ant-plugin/pom.xml
    axis/axis2/java/core/branches/1_6/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
    axis/axis2/java/core/branches/1_6/modules/tool/axis2-eclipse-service-plugin/pom.xml
    axis/axis2/java/core/branches/1_6/modules/tool/axis2-idea-plugin/pom.xml
    axis/axis2/java/core/branches/1_6/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml
    axis/axis2/java/core/branches/1_6/modules/tool/axis2-mar-maven-plugin/pom.xml
    axis/axis2/java/core/branches/1_6/modules/tool/axis2-repo-maven-plugin/pom.xml
    axis/axis2/java/core/branches/1_6/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml
    axis/axis2/java/core/branches/1_6/modules/transport/base/pom.xml
    axis/axis2/java/core/branches/1_6/modules/transport/http/pom.xml
    axis/axis2/java/core/branches/1_6/modules/transport/jms/pom.xml
    axis/axis2/java/core/branches/1_6/modules/transport/local/pom.xml
    axis/axis2/java/core/branches/1_6/modules/transport/mail/pom.xml
    axis/axis2/java/core/branches/1_6/modules/transport/tcp/pom.xml
    axis/axis2/java/core/branches/1_6/modules/transport/testkit/   (props changed)
    axis/axis2/java/core/branches/1_6/modules/transport/testkit/pom.xml
    axis/axis2/java/core/branches/1_6/modules/transport/udp/pom.xml
    axis/axis2/java/core/branches/1_6/modules/transport/xmpp/pom.xml
    axis/axis2/java/core/branches/1_6/modules/webapp/   (props changed)
    axis/axis2/java/core/branches/1_6/modules/webapp/pom.xml
    axis/axis2/java/core/branches/1_6/modules/xmlbeans/pom.xml
    axis/axis2/java/core/branches/1_6/pom.xml

Propchange: axis/axis2/java/core/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 21 13:35:28 2015
@@ -1 +1 @@
-/axis/axis2/java/core/trunk:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096134,1096136,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1127327,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1147485,1149224,1149491,1149578,1150055,1153072,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1157767,1162649,1163389,1166038,1166040,1166132,1167045,1173869,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,1202867,1203424,1
 205716,1205939,1208901,1209034,1213180,1213639,1214118,1220630,1220888,1221716,1222510,1225161,1231465,1231470,1241031,1242238,1242249,1242511,1243469,1243831,1290999,1291158,1294991,1295084,1295479,1296159,1297132,1297344,1297348,1297744,1297765,1298550,1298688,1299356,1299392,1299645,1299667,1300358,1305728,1307410,1326968,1327005,1328228,1328733,1328921,1329084,1331616,1332362,1332402,1332545,1332587,1337975,1340970,1341090,1341780,1341805,1343353,1343543,1348340,1351218,1352413,1352423,1352428,1354438,1354834,1355706,1355710,1356080,1358413,1358494,1358508,1358691,1359499,1359504,1360573,1362377,1364536,1372622,1373416,1382245,1383043,1384482,1409145,1409389,1410313,1410499,1410577,1426464,1426467,1426469,1434104,1435330,1438985,1441907,1442712,1443222,1479068,1479351,1480969,1509409,1509438,1510122,1576937,1577055,1577119,1577125,1577191,1577342-1577345,1577347-1577348,1593690,1593765,1594378,1594701,1601455,1608843,1609578,1609866,1621171-1621172,1626559,1631608,1649688,167743
 2,1683827,1683831,1686316,1686321,1686538,1686544,1686553,1686630,1686643,1686742,1687894-1687895,1687902,1687961,1689172,1693147,1693802,1693808,1694744-1694745,1697181,1697205,1697514,1701352,1701354,1702667,1702678,1709481,1715061,1715078-1715079,1715120,1716056,1716061,1716316,1720279,1720477,1720650,1720653,1720675,1720683,1720700,1721025,1721062,1721075
+/axis/axis2/java/core/trunk:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096134,1096136,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1127327,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1147485,1149224,1149491,1149578,1150055,1153072,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1157767,1162649,1163389,1166038,1166040,1166132,1167045,1173869,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,1202867,1203424,1
 205716,1205939,1208901,1209034,1213180,1213639,1214118,1220630,1220888,1221716,1222510,1225161,1231465,1231470,1241031,1242238,1242249,1242511,1243469,1243831,1290999,1291158,1294991,1295084,1295479,1296159,1297132,1297344,1297348,1297744,1297765,1298550,1298688,1299356,1299392,1299645,1299667,1300358,1305728,1307410,1326968,1327005,1328228,1328733,1328921,1329084,1331616,1332362,1332402,1332545,1332587,1337975,1340970,1341090,1341780,1341805,1343353,1343543,1348340,1351218,1352413,1352423,1352428,1354438,1354834,1355706,1355710,1356080,1358413,1358494,1358508,1358691,1359499,1359504,1360573,1362377,1364536,1372622,1373416,1382245,1383043,1384482,1409145,1409389,1410313,1410499,1410577,1426464,1426467,1426469,1434104,1435330,1438985,1441907,1442712,1443222,1479068,1479351,1480969,1509409,1509438,1510122,1576937,1577055,1577119,1577125,1577191,1577342-1577345,1577347-1577348,1593690,1593765,1594378,1594701,1601455,1608843,1609578,1609866,1621171-1621172,1626559,1631608,1649688,167743
 2,1683827,1683831,1686316,1686321,1686538,1686544,1686553,1686630,1686643,1686742,1687894-1687895,1687902,1687961,1689172,1693147,1693802,1693808,1694744-1694745,1697181,1697205,1697514,1701352,1701354,1702667,1702678,1709481,1715061,1715078-1715079,1715120,1716056,1716061,1716316,1720279,1720477,1720650,1720653,1720675,1720683,1720700,1721025,1721062,1721075,1721145

Modified: axis/axis2/java/core/branches/1_6/modules/adb-codegen/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb-codegen/pom.xml?rev=1721153&r1=1721152&r2=1721153&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb-codegen/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb-codegen/pom.xml Mon Dec 21 13:35:28 2015
@@ -23,9 +23,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-parent</artifactId>
+        <artifactId>axis2</artifactId>
         <version>1.6.4-SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>axis2-adb-codegen</artifactId>
     <name>Apache Axis2 - ADB Codegen</name>

Modified: axis/axis2/java/core/branches/1_6/modules/adb/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/pom.xml?rev=1721153&r1=1721152&r2=1721153&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb/pom.xml Mon Dec 21 13:35:28 2015
@@ -23,9 +23,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-parent</artifactId>
+        <artifactId>axis2</artifactId>
         <version>1.6.4-SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>axis2-adb</artifactId>

Modified: axis/axis2/java/core/branches/1_6/modules/addressing/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/addressing/pom.xml?rev=1721153&r1=1721152&r2=1721153&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/addressing/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/addressing/pom.xml Mon Dec 21 13:35:28 2015
@@ -23,9 +23,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-parent</artifactId>
+        <artifactId>axis2</artifactId>
         <version>1.6.4-SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>addressing</artifactId>
     <packaging>mar</packaging>

Modified: axis/axis2/java/core/branches/1_6/modules/all/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/all/pom.xml?rev=1721153&r1=1721152&r2=1721153&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/all/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/all/pom.xml Mon Dec 21 13:35:28 2015
@@ -4,9 +4,9 @@
 
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-parent</artifactId>
+        <artifactId>axis2</artifactId>
         <version>1.6.0-SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

Modified: axis/axis2/java/core/branches/1_6/modules/clustering/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/clustering/pom.xml?rev=1721153&r1=1721152&r2=1721153&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/clustering/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/clustering/pom.xml Mon Dec 21 13:35:28 2015
@@ -23,9 +23,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-parent</artifactId>
+        <artifactId>axis2</artifactId>
         <version>1.6.4-SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>axis2-clustering</artifactId>
     <name>Apache Axis2 - Clustering</name>

Modified: axis/axis2/java/core/branches/1_6/modules/codegen/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/codegen/pom.xml?rev=1721153&r1=1721152&r2=1721153&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/codegen/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/codegen/pom.xml Mon Dec 21 13:35:28 2015
@@ -23,9 +23,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-parent</artifactId>
+        <artifactId>axis2</artifactId>
         <version>1.6.4-SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>axis2-codegen</artifactId>
     <name>Apache Axis2 - Code Generation</name>

Modified: axis/axis2/java/core/branches/1_6/modules/corba/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/corba/pom.xml?rev=1721153&r1=1721152&r2=1721153&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/corba/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/corba/pom.xml Mon Dec 21 13:35:28 2015
@@ -23,9 +23,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-parent</artifactId>
+        <artifactId>axis2</artifactId>
         <version>1.6.4-SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>axis2-corba</artifactId>
     <name>Apache Axis2 - CORBA</name>

Modified: axis/axis2/java/core/branches/1_6/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/distribution/pom.xml?rev=1721153&r1=1721152&r2=1721153&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/distribution/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/distribution/pom.xml Mon Dec 21 13:35:28 2015
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-parent</artifactId>
+        <artifactId>axis2</artifactId>
         <version>1.6.4-SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.axis2</groupId>

Modified: axis/axis2/java/core/branches/1_6/modules/fastinfoset/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/fastinfoset/pom.xml?rev=1721153&r1=1721152&r2=1721153&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/fastinfoset/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/fastinfoset/pom.xml Mon Dec 21 13:35:28 2015
@@ -23,9 +23,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-parent</artifactId>
+        <artifactId>axis2</artifactId>
         <version>1.6.4-SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>axis2-fastinfoset</artifactId>
     <name>Apache Axis2 - Fast Infoset</name>

Modified: axis/axis2/java/core/branches/1_6/modules/integration/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/integration/pom.xml?rev=1721153&r1=1721152&r2=1721153&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/integration/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/integration/pom.xml Mon Dec 21 13:35:28 2015
@@ -23,9 +23,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-parent</artifactId>
+        <artifactId>axis2</artifactId>
         <version>1.6.4-SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>axis2-integration</artifactId>
     <name>Apache Axis2 - Integration</name>

Modified: axis/axis2/java/core/branches/1_6/modules/java2wsdl/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/java2wsdl/pom.xml?rev=1721153&r1=1721152&r2=1721153&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/java2wsdl/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/java2wsdl/pom.xml Mon Dec 21 13:35:28 2015
@@ -23,9 +23,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-parent</artifactId>
+        <artifactId>axis2</artifactId>
         <version>1.6.4-SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>axis2-java2wsdl</artifactId>
     <name>Apache Axis2 - Java2WSDL</name>

Modified: axis/axis2/java/core/branches/1_6/modules/jaxbri/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/jaxbri/pom.xml?rev=1721153&r1=1721152&r2=1721153&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/jaxbri/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/jaxbri/pom.xml Mon Dec 21 13:35:28 2015
@@ -23,9 +23,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-parent</artifactId>
+        <artifactId>axis2</artifactId>
         <version>1.6.4-SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>axis2-jaxbri</artifactId>
     <name>Apache Axis2 - JAXB-RI Data Binding</name>

Propchange: axis/axis2/java/core/branches/1_6/modules/jaxws/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 21 13:35:28 2015
@@ -1 +1 @@
-/axis/axis2/java/core/trunk/modules/jaxws:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096134,1096136,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1127327,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1147485,1149224,1149491,1149578,1150055,1153072,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1157767,1162649,1163389,1166038,1166040,1166132,1167045,1173869,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,120
 2867,1203424,1205716,1205939,1208901,1209034,1213180,1213639,1214118,1220630,1220888,1221716,1222510,1225161,1231465,1231470,1241031,1242238,1242249,1242511,1243469,1243831,1290999,1291158,1294991,1295084,1295479,1296159,1297132,1297344,1297348,1297744,1297765,1298550,1298688,1299356,1299392,1299645,1299667,1300358,1305728,1307410,1326968,1327005,1328228,1328733,1328921,1329084,1331616,1332362,1332402,1332545,1332587,1337975,1340970,1341090,1341780,1341805,1343353,1343543,1348340,1351218,1352413,1352423,1354438,1354834,1355706,1355710,1356080,1358413,1358494,1358508,1358691,1359499,1359504,1360573,1362377,1364536,1372622,1382245,1383043,1384482,1409145,1409389,1410313,1410499,1410577,1426464,1426467,1426469,1434104,1435330,1438985,1441907,1442712,1479068,1479351,1480969,1509409,1509438,1510122,1576937,1577055,1577119,1577125,1577191,1577342-1577345,1577347-1577348,1593690,1593765,1594378,1594701,1601455-1601456,1608843,1609578,1609866,1649688,1683827,1683831,1686316,1701352,1701354,
 1715078-1715079,1715120,1716056,1716061,1716316
+/axis/axis2/java/core/trunk/modules/jaxws:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096134,1096136,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1127327,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1147485,1149224,1149491,1149578,1150055,1153072,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1157767,1162649,1163389,1166038,1166040,1166132,1167045,1173869,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,120
 2867,1203424,1205716,1205939,1208901,1209034,1213180,1213639,1214118,1220630,1220888,1221716,1222510,1225161,1231465,1231470,1241031,1242238,1242249,1242511,1243469,1243831,1290999,1291158,1294991,1295084,1295479,1296159,1297132,1297344,1297348,1297744,1297765,1298550,1298688,1299356,1299392,1299645,1299667,1300358,1305728,1307410,1326968,1327005,1328228,1328733,1328921,1329084,1331616,1332362,1332402,1332545,1332587,1337975,1340970,1341090,1341780,1341805,1343353,1343543,1348340,1351218,1352413,1352423,1354438,1354834,1355706,1355710,1356080,1358413,1358494,1358508,1358691,1359499,1359504,1360573,1362377,1364536,1372622,1382245,1383043,1384482,1409145,1409389,1410313,1410499,1410577,1426464,1426467,1426469,1434104,1435330,1438985,1441907,1442712,1479068,1479351,1480969,1509409,1509438,1510122,1576937,1577055,1577119,1577125,1577191,1577342-1577345,1577347-1577348,1593690,1593765,1594378,1594701,1601455-1601456,1608843,1609578,1609866,1649688,1683827,1683831,1686316,1701352,1701354,
 1715078-1715079,1715120,1716056,1716061,1716316,1721145

Modified: axis/axis2/java/core/branches/1_6/modules/jaxws-integration/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/jaxws-integration/pom.xml?rev=1721153&r1=1721152&r2=1721153&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/jaxws-integration/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/jaxws-integration/pom.xml Mon Dec 21 13:35:28 2015
@@ -23,9 +23,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-parent</artifactId>
+        <artifactId>axis2</artifactId>
         <version>1.6.4-SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>axis2-jaxws-integration</artifactId>
     <name>Apache Axis2 - JAXWS Integration Tests</name>

Modified: axis/axis2/java/core/branches/1_6/modules/jaxws-mar/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/jaxws-mar/pom.xml?rev=1721153&r1=1721152&r2=1721153&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/jaxws-mar/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/jaxws-mar/pom.xml Mon Dec 21 13:35:28 2015
@@ -23,9 +23,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-parent</artifactId>
+        <artifactId>axis2</artifactId>
         <version>1.6.4-SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>axis2-jaxws-mar</artifactId>
     <packaging>mar</packaging>

Modified: axis/axis2/java/core/branches/1_6/modules/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/jaxws/pom.xml?rev=1721153&r1=1721152&r2=1721153&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/jaxws/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/jaxws/pom.xml Mon Dec 21 13:35:28 2015
@@ -22,9 +22,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-parent</artifactId>
+        <artifactId>axis2</artifactId>
         <version>1.6.4-SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>axis2-jaxws</artifactId>
     <name>Apache Axis2 - JAXWS</name>

Modified: axis/axis2/java/core/branches/1_6/modules/jibx/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/jibx/pom.xml?rev=1721153&r1=1721152&r2=1721153&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/jibx/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/jibx/pom.xml Mon Dec 21 13:35:28 2015
@@ -23,9 +23,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-parent</artifactId>
+        <artifactId>axis2</artifactId>
         <version>1.6.4-SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>axis2-jibx</artifactId>
     <name>Apache Axis2 - JiBX Data Binding</name>

Modified: axis/axis2/java/core/branches/1_6/modules/json/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/json/pom.xml?rev=1721153&r1=1721152&r2=1721153&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/json/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/json/pom.xml Mon Dec 21 13:35:28 2015
@@ -23,9 +23,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-parent</artifactId>
+        <artifactId>axis2</artifactId>
         <version>1.6.4-SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>axis2-json</artifactId>
     <name>Apache Axis2 - JSON</name>

Modified: axis/axis2/java/core/branches/1_6/modules/kernel/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/kernel/pom.xml?rev=1721153&r1=1721152&r2=1721153&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/kernel/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/kernel/pom.xml Mon Dec 21 13:35:28 2015
@@ -23,9 +23,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-parent</artifactId>
+        <artifactId>axis2</artifactId>
         <version>1.6.4-SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>axis2-kernel</artifactId>
     <name>Apache Axis2 - Kernel</name>

Modified: axis/axis2/java/core/branches/1_6/modules/metadata/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/metadata/pom.xml?rev=1721153&r1=1721152&r2=1721153&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/metadata/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/metadata/pom.xml Mon Dec 21 13:35:28 2015
@@ -23,9 +23,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-parent</artifactId>
+        <artifactId>axis2</artifactId>
         <version>1.6.4-SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>axis2-metadata</artifactId>
     <name>Apache Axis2 - Metadata</name>

Modified: axis/axis2/java/core/branches/1_6/modules/mex/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/mex/pom.xml?rev=1721153&r1=1721152&r2=1721153&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/mex/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/mex/pom.xml Mon Dec 21 13:35:28 2015
@@ -23,9 +23,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-parent</artifactId>
+        <artifactId>axis2</artifactId>
         <version>1.6.4-SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>mex</artifactId>
     <packaging>mar</packaging>

Modified: axis/axis2/java/core/branches/1_6/modules/mtompolicy-mar/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/mtompolicy-mar/pom.xml?rev=1721153&r1=1721152&r2=1721153&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/mtompolicy-mar/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/mtompolicy-mar/pom.xml Mon Dec 21 13:35:28 2015
@@ -23,9 +23,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-parent</artifactId>
+        <artifactId>axis2</artifactId>
         <version>1.6.4-SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>mtompolicy</artifactId>
     <name>Apache Axis2 - MTOM Policy module</name>

Modified: axis/axis2/java/core/branches/1_6/modules/mtompolicy/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/mtompolicy/pom.xml?rev=1721153&r1=1721152&r2=1721153&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/mtompolicy/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/mtompolicy/pom.xml Mon Dec 21 13:35:28 2015
@@ -23,9 +23,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-parent</artifactId>
+        <artifactId>axis2</artifactId>
         <version>1.6.4-SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>axis2-mtompolicy</artifactId>
     <name>Apache Axis2 - MTOM Policy</name>

Modified: axis/axis2/java/core/branches/1_6/modules/osgi-tests/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/osgi-tests/pom.xml?rev=1721153&r1=1721152&r2=1721153&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/osgi-tests/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/osgi-tests/pom.xml Mon Dec 21 13:35:28 2015
@@ -20,9 +20,9 @@
 <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">
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-parent</artifactId>
+        <artifactId>axis2</artifactId>
         <version>1.6.4-SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>osgi-tests</artifactId>

Modified: axis/axis2/java/core/branches/1_6/modules/osgi/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/osgi/pom.xml?rev=1721153&r1=1721152&r2=1721153&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/osgi/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/osgi/pom.xml Mon Dec 21 13:35:28 2015
@@ -23,9 +23,9 @@
 
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-parent</artifactId>
+        <artifactId>axis2</artifactId>
         <version>1.6.4-SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

Modified: axis/axis2/java/core/branches/1_6/modules/ping/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/ping/pom.xml?rev=1721153&r1=1721152&r2=1721153&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/ping/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/ping/pom.xml Mon Dec 21 13:35:28 2015
@@ -23,9 +23,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-parent</artifactId>
+        <artifactId>axis2</artifactId>
         <version>1.6.4-SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>ping</artifactId>
     <packaging>mar</packaging>

Modified: axis/axis2/java/core/branches/1_6/modules/resource-bundle/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/resource-bundle/pom.xml?rev=1721153&r1=1721152&r2=1721153&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/resource-bundle/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/resource-bundle/pom.xml Mon Dec 21 13:35:28 2015
@@ -23,9 +23,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-parent</artifactId>
+        <artifactId>axis2</artifactId>
         <version>1.6.4-SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>axis2-resource-bundle</artifactId>
     <name>Apache Axis2 - Resource bundle</name>

Propchange: axis/axis2/java/core/branches/1_6/modules/saaj/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 21 13:35:28 2015
@@ -1 +1 @@
-/axis/axis2/java/core/trunk/modules/saaj:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096134,1096136,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1127327,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1147485,1149224,1149491,1149578,1150055,1153072,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1157767,1162649,1163389,1166038,1166040,1166132,1167045,1173869,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,1202
 867,1203424,1205716,1205939,1208901,1209034,1213180,1213639,1214118,1220630,1220888,1221716,1222510,1225161,1231465,1231470,1241031,1242238,1242249,1242511,1243469,1243831,1290999,1291158,1294991,1295084,1295479,1296062,1297744,1297765,1298550,1299356,1299392,1300358,1305728,1328733,1331561,1331616,1332362,1332402,1337975,1338816,1343353,1343399,1343543,1348340,1355706,1355710,1358413,1358494,1358508,1358691,1359499,1359504,1360338,1360573,1362377,1364536,1372622,1382245,1383043,1384482,1409145,1409389,1410313,1410499,1410577,1426464,1426467,1426469,1438985,1441907,1442712,1479068,1479351,1480969,1509438,1510122,1609578,1609866,1683827,1683831,1686316,1697205
+/axis/axis2/java/core/trunk/modules/saaj:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096134,1096136,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1127327,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1147485,1149224,1149491,1149578,1150055,1153072,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1157767,1162649,1163389,1166038,1166040,1166132,1167045,1173869,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,1202
 867,1203424,1205716,1205939,1208901,1209034,1213180,1213639,1214118,1220630,1220888,1221716,1222510,1225161,1231465,1231470,1241031,1242238,1242249,1242511,1243469,1243831,1290999,1291158,1294991,1295084,1295479,1296062,1297744,1297765,1298550,1299356,1299392,1300358,1305728,1328733,1331561,1331616,1332362,1332402,1337975,1338816,1343353,1343399,1343543,1348340,1355706,1355710,1358413,1358494,1358508,1358691,1359499,1359504,1360338,1360573,1362377,1364536,1372622,1382245,1383043,1384482,1409145,1409389,1410313,1410499,1410577,1426464,1426467,1426469,1438985,1441907,1442712,1479068,1479351,1480969,1509438,1510122,1609578,1609866,1683827,1683831,1686316,1697205,1721145

Modified: axis/axis2/java/core/branches/1_6/modules/saaj/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/saaj/pom.xml?rev=1721153&r1=1721152&r2=1721153&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/saaj/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/saaj/pom.xml Mon Dec 21 13:35:28 2015
@@ -23,9 +23,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-parent</artifactId>
+        <artifactId>axis2</artifactId>
         <version>1.6.4-SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>axis2-saaj</artifactId>
     <name>Apache Axis2 - SAAJ</name>

Modified: axis/axis2/java/core/branches/1_6/modules/samples/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/samples/pom.xml?rev=1721153&r1=1721152&r2=1721153&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/samples/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/samples/pom.xml Mon Dec 21 13:35:28 2015
@@ -23,9 +23,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-parent</artifactId>
+        <artifactId>axis2</artifactId>
         <version>1.6.4-SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>org.apache.axis2.examples</groupId>
     <artifactId>samples</artifactId>

Modified: axis/axis2/java/core/branches/1_6/modules/samples/version/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/samples/version/pom.xml?rev=1721153&r1=1721152&r2=1721153&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/samples/version/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/samples/version/pom.xml Mon Dec 21 13:35:28 2015
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-parent</artifactId>
+        <artifactId>axis2</artifactId>
         <version>1.6.4-SNAPSHOT</version>
-        <relativePath>../../parent/pom.xml</relativePath>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
     <artifactId>version</artifactId>
     <packaging>aar</packaging>

Modified: axis/axis2/java/core/branches/1_6/modules/scripting/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/scripting/pom.xml?rev=1721153&r1=1721152&r2=1721153&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/scripting/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/scripting/pom.xml Mon Dec 21 13:35:28 2015
@@ -23,9 +23,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-parent</artifactId>
+        <artifactId>axis2</artifactId>
         <version>1.6.4-SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>scripting</artifactId>
     <packaging>mar</packaging>

Modified: axis/axis2/java/core/branches/1_6/modules/soapmonitor/module/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/soapmonitor/module/pom.xml?rev=1721153&r1=1721152&r2=1721153&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/soapmonitor/module/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/soapmonitor/module/pom.xml Mon Dec 21 13:35:28 2015
@@ -23,9 +23,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-parent</artifactId>
+        <artifactId>axis2</artifactId>
         <version>1.6.4-SNAPSHOT</version>
-        <relativePath>../../parent/pom.xml</relativePath>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
     <artifactId>soapmonitor</artifactId>
     <packaging>mar</packaging>

Modified: axis/axis2/java/core/branches/1_6/modules/soapmonitor/servlet/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/soapmonitor/servlet/pom.xml?rev=1721153&r1=1721152&r2=1721153&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/soapmonitor/servlet/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/soapmonitor/servlet/pom.xml Mon Dec 21 13:35:28 2015
@@ -23,9 +23,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-parent</artifactId>
+        <artifactId>axis2</artifactId>
         <version>1.6.4-SNAPSHOT</version>
-        <relativePath>../../parent/pom.xml</relativePath>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
     <artifactId>axis2-soapmonitor-servlet</artifactId>
     <packaging>jar</packaging>

Modified: axis/axis2/java/core/branches/1_6/modules/spring/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/spring/pom.xml?rev=1721153&r1=1721152&r2=1721153&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/spring/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/spring/pom.xml Mon Dec 21 13:35:28 2015
@@ -23,9 +23,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-parent</artifactId>
+        <artifactId>axis2</artifactId>
         <version>1.6.4-SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>axis2-spring</artifactId>
     <name>Apache Axis2 - spring</name>

Modified: axis/axis2/java/core/branches/1_6/modules/testutils/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/testutils/pom.xml?rev=1721153&r1=1721152&r2=1721153&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/testutils/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/testutils/pom.xml Mon Dec 21 13:35:28 2015
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-parent</artifactId>
+        <artifactId>axis2</artifactId>
         <version>1.6.4-SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>axis2-testutils</artifactId>
     <name>Apache Axis2 - Test Utilities</name>

Modified: axis/axis2/java/core/branches/1_6/modules/tool/axis2-aar-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/tool/axis2-aar-maven-plugin/pom.xml?rev=1721153&r1=1721152&r2=1721153&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/tool/axis2-aar-maven-plugin/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/tool/axis2-aar-maven-plugin/pom.xml Mon Dec 21 13:35:28 2015
@@ -23,9 +23,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-parent</artifactId>
+        <artifactId>axis2</artifactId>
         <version>1.6.4-SNAPSHOT</version>
-        <relativePath>../../parent/pom.xml</relativePath>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
     <artifactId>axis2-aar-maven-plugin</artifactId>
     <packaging>maven-plugin</packaging>

Modified: axis/axis2/java/core/branches/1_6/modules/tool/axis2-ant-plugin/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/tool/axis2-ant-plugin/pom.xml?rev=1721153&r1=1721152&r2=1721153&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/tool/axis2-ant-plugin/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/tool/axis2-ant-plugin/pom.xml Mon Dec 21 13:35:28 2015
@@ -23,9 +23,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-parent</artifactId>
+        <artifactId>axis2</artifactId>
         <version>1.6.4-SNAPSHOT</version>
-        <relativePath>../../parent/pom.xml</relativePath>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
     <artifactId>axis2-ant-plugin</artifactId>
     <name>Apache Axis2 - tool - Ant Plugin</name>

Modified: axis/axis2/java/core/branches/1_6/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/tool/axis2-eclipse-codegen-plugin/pom.xml?rev=1721153&r1=1721152&r2=1721153&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/tool/axis2-eclipse-codegen-plugin/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/tool/axis2-eclipse-codegen-plugin/pom.xml Mon Dec 21 13:35:28 2015
@@ -23,9 +23,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-parent</artifactId>
+        <artifactId>axis2</artifactId>
         <version>1.6.4-SNAPSHOT</version>
-        <relativePath>../../parent/pom.xml</relativePath>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
     <artifactId>axis2.eclipse.codegen.plugin</artifactId>
     <name>Apache Axis2 - tool - Eclipse Codegen Plugin</name>

Modified: axis/axis2/java/core/branches/1_6/modules/tool/axis2-eclipse-service-plugin/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/tool/axis2-eclipse-service-plugin/pom.xml?rev=1721153&r1=1721152&r2=1721153&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/tool/axis2-eclipse-service-plugin/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/tool/axis2-eclipse-service-plugin/pom.xml Mon Dec 21 13:35:28 2015
@@ -23,9 +23,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-parent</artifactId>
+        <artifactId>axis2</artifactId>
         <version>1.6.4-SNAPSHOT</version>
-        <relativePath>../../parent/pom.xml</relativePath>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
     <artifactId>axis2.eclipse.service.plugin</artifactId>
     <name>Apache Axis2 - tool - Eclipse service Plugin</name>

Modified: axis/axis2/java/core/branches/1_6/modules/tool/axis2-idea-plugin/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/tool/axis2-idea-plugin/pom.xml?rev=1721153&r1=1721152&r2=1721153&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/tool/axis2-idea-plugin/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/tool/axis2-idea-plugin/pom.xml Mon Dec 21 13:35:28 2015
@@ -23,9 +23,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-parent</artifactId>
+        <artifactId>axis2</artifactId>
         <version>1.6.4-SNAPSHOT</version>
-        <relativePath>../../parent/pom.xml</relativePath>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
     <artifactId>axis2-idea-plugin</artifactId>
     <name>Apache Axis2 - tool - Intellij IDEA Plugin</name>

Modified: axis/axis2/java/core/branches/1_6/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml?rev=1721153&r1=1721152&r2=1721153&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml Mon Dec 21 13:35:28 2015
@@ -23,9 +23,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-parent</artifactId>
+        <artifactId>axis2</artifactId>
         <version>1.6.4-SNAPSHOT</version>
-        <relativePath>../../parent/pom.xml</relativePath>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
     <artifactId>axis2-java2wsdl-maven-plugin</artifactId>
     <name>Apache Axis2 - tool - Java2WSDL Maven Plugin</name>

Modified: axis/axis2/java/core/branches/1_6/modules/tool/axis2-mar-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/tool/axis2-mar-maven-plugin/pom.xml?rev=1721153&r1=1721152&r2=1721153&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/tool/axis2-mar-maven-plugin/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/tool/axis2-mar-maven-plugin/pom.xml Mon Dec 21 13:35:28 2015
@@ -23,9 +23,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-parent</artifactId>
+        <artifactId>axis2</artifactId>
         <version>1.6.4-SNAPSHOT</version>
-        <relativePath>../../parent/pom.xml</relativePath>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
     <artifactId>axis2-mar-maven-plugin</artifactId>
     <packaging>maven-plugin</packaging>

Modified: axis/axis2/java/core/branches/1_6/modules/tool/axis2-repo-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/tool/axis2-repo-maven-plugin/pom.xml?rev=1721153&r1=1721152&r2=1721153&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/tool/axis2-repo-maven-plugin/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/tool/axis2-repo-maven-plugin/pom.xml Mon Dec 21 13:35:28 2015
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-parent</artifactId>
+        <artifactId>axis2</artifactId>
         <version>1.6.4-SNAPSHOT</version>
-        <relativePath>../../parent/pom.xml</relativePath>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
     <artifactId>axis2-repo-maven-plugin</artifactId>
     <packaging>maven-plugin</packaging>

Modified: axis/axis2/java/core/branches/1_6/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml?rev=1721153&r1=1721152&r2=1721153&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml Mon Dec 21 13:35:28 2015
@@ -23,9 +23,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-parent</artifactId>
+        <artifactId>axis2</artifactId>
         <version>1.6.4-SNAPSHOT</version>
-        <relativePath>../../parent/pom.xml</relativePath>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
     <artifactId>axis2-wsdl2code-maven-plugin</artifactId>
     <name>Apache Axis2 - tool - WSDL2Code Maven Plugin</name>

Modified: axis/axis2/java/core/branches/1_6/modules/transport/base/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/transport/base/pom.xml?rev=1721153&r1=1721152&r2=1721153&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/transport/base/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/transport/base/pom.xml Mon Dec 21 13:35:28 2015
@@ -22,9 +22,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-parent</artifactId>
+        <artifactId>axis2</artifactId>
         <version>1.6.4-SNAPSHOT</version>
-        <relativePath>../../parent/pom.xml</relativePath>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.axis2</groupId>

Modified: axis/axis2/java/core/branches/1_6/modules/transport/http/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/transport/http/pom.xml?rev=1721153&r1=1721152&r2=1721153&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/transport/http/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/transport/http/pom.xml Mon Dec 21 13:35:28 2015
@@ -23,9 +23,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-parent</artifactId>
+        <artifactId>axis2</artifactId>
         <version>1.6.4-SNAPSHOT</version>
-        <relativePath>../../parent/pom.xml</relativePath>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
     <artifactId>axis2-transport-http</artifactId>
     <name>Apache Axis2 - Transport - HTTP</name>

Modified: axis/axis2/java/core/branches/1_6/modules/transport/jms/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/transport/jms/pom.xml?rev=1721153&r1=1721152&r2=1721153&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/transport/jms/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/transport/jms/pom.xml Mon Dec 21 13:35:28 2015
@@ -22,9 +22,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-parent</artifactId>
+        <artifactId>axis2</artifactId>
         <version>1.6.4-SNAPSHOT</version>
-        <relativePath>../../parent/pom.xml</relativePath>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.axis2</groupId>

Modified: axis/axis2/java/core/branches/1_6/modules/transport/local/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/transport/local/pom.xml?rev=1721153&r1=1721152&r2=1721153&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/transport/local/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/transport/local/pom.xml Mon Dec 21 13:35:28 2015
@@ -23,9 +23,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-parent</artifactId>
+        <artifactId>axis2</artifactId>
         <version>1.6.4-SNAPSHOT</version>
-        <relativePath>../../parent/pom.xml</relativePath>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
     <artifactId>axis2-transport-local</artifactId>
     <name>Apache Axis2 - Transport - Local</name>

Modified: axis/axis2/java/core/branches/1_6/modules/transport/mail/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/transport/mail/pom.xml?rev=1721153&r1=1721152&r2=1721153&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/transport/mail/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/transport/mail/pom.xml Mon Dec 21 13:35:28 2015
@@ -22,9 +22,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.axis2</groupId>
-    <artifactId>axis2-parent</artifactId>
+    <artifactId>axis2</artifactId>
     <version>1.6.4-SNAPSHOT</version>
-    <relativePath>../../parent/pom.xml</relativePath>
+    <relativePath>../../../pom.xml</relativePath>
   </parent>
 
   <groupId>org.apache.axis2</groupId>

Modified: axis/axis2/java/core/branches/1_6/modules/transport/tcp/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/transport/tcp/pom.xml?rev=1721153&r1=1721152&r2=1721153&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/transport/tcp/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/transport/tcp/pom.xml Mon Dec 21 13:35:28 2015
@@ -23,9 +23,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-parent</artifactId>
+        <artifactId>axis2</artifactId>
         <version>1.6.4-SNAPSHOT</version>
-        <relativePath>../../parent/pom.xml</relativePath>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
     <artifactId>axis2-transport-tcp</artifactId>
     <name>Apache Axis2 - Transport - TCP</name>

Propchange: axis/axis2/java/core/branches/1_6/modules/transport/testkit/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 21 13:35:28 2015
@@ -1 +1 @@
-/axis/axis2/java/core/trunk/modules/transport/testkit:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096134,1096136,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1127327,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1147485,1149224,1149491,1149578,1150055,1153072,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1157767,1162649,1163389,1166038,1166040,1166132,1167045,1173869,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863
 ,1201957,1202867,1203424,1205716,1205939,1208901,1209034,1213180,1213639,1214118,1220630,1220888,1221716,1222510,1225161,1231465,1231470,1241031,1242238,1242249,1242511,1243469,1243831,1290999,1291158,1294991,1295084,1295479,1296159,1297132,1297344,1297348,1297744,1297765,1298550,1298688,1299356,1299392,1299645,1299667,1300358,1305728,1307410,1326968,1327005,1328228,1329084,1331616,1332362,1332402,1332545,1332587,1337975,1340970,1341090,1341780,1341805,1343353,1343543,1348340,1351218,1352413,1352423,1354438,1354834,1355706,1355710,1356080,1358413,1358494,1358508,1358691,1359499,1359504,1360573,1362377,1364536,1372622,1382245,1383043,1384482,1409145,1409389,1410313,1410499,1410577,1426464,1426467,1426469,1438985,1441907,1442712,1479068,1479351,1480969,1509409,1509438,1510122,1576937,1577055,1577119,1577125,1577191,1577342-1577345,1577347-1577348,1593690,1593765,1594378,1594701,1601455-1601456,1608843,1609578,1609866,1649688,1683827,1683831,1686316
+/axis/axis2/java/core/trunk/modules/transport/testkit:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096134,1096136,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1127327,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1147485,1149224,1149491,1149578,1150055,1153072,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1157767,1162649,1163389,1166038,1166040,1166132,1167045,1173869,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863
 ,1201957,1202867,1203424,1205716,1205939,1208901,1209034,1213180,1213639,1214118,1220630,1220888,1221716,1222510,1225161,1231465,1231470,1241031,1242238,1242249,1242511,1243469,1243831,1290999,1291158,1294991,1295084,1295479,1296159,1297132,1297344,1297348,1297744,1297765,1298550,1298688,1299356,1299392,1299645,1299667,1300358,1305728,1307410,1326968,1327005,1328228,1329084,1331616,1332362,1332402,1332545,1332587,1337975,1340970,1341090,1341780,1341805,1343353,1343543,1348340,1351218,1352413,1352423,1354438,1354834,1355706,1355710,1356080,1358413,1358494,1358508,1358691,1359499,1359504,1360573,1362377,1364536,1372622,1382245,1383043,1384482,1409145,1409389,1410313,1410499,1410577,1426464,1426467,1426469,1438985,1441907,1442712,1479068,1479351,1480969,1509409,1509438,1510122,1576937,1577055,1577119,1577125,1577191,1577342-1577345,1577347-1577348,1593690,1593765,1594378,1594701,1601455-1601456,1608843,1609578,1609866,1649688,1683827,1683831,1686316,1721145

Modified: axis/axis2/java/core/branches/1_6/modules/transport/testkit/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/transport/testkit/pom.xml?rev=1721153&r1=1721152&r2=1721153&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/transport/testkit/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/transport/testkit/pom.xml Mon Dec 21 13:35:28 2015
@@ -23,9 +23,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-parent</artifactId>
+        <artifactId>axis2</artifactId>
         <version>1.6.4-SNAPSHOT</version>
-        <relativePath>../../parent/pom.xml</relativePath>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
     <artifactId>axis2-transport-testkit</artifactId>
     <name>Apache Axis2 - Transport - testkit</name>

Modified: axis/axis2/java/core/branches/1_6/modules/transport/udp/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/transport/udp/pom.xml?rev=1721153&r1=1721152&r2=1721153&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/transport/udp/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/transport/udp/pom.xml Mon Dec 21 13:35:28 2015
@@ -23,9 +23,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-parent</artifactId>
+        <artifactId>axis2</artifactId>
         <version>1.6.4-SNAPSHOT</version>
-        <relativePath>../../parent/pom.xml</relativePath>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
     <artifactId>axis2-transport-udp</artifactId>
     <name>Apache Axis2 - Transport - UDP</name>

Modified: axis/axis2/java/core/branches/1_6/modules/transport/xmpp/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/transport/xmpp/pom.xml?rev=1721153&r1=1721152&r2=1721153&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/transport/xmpp/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/transport/xmpp/pom.xml Mon Dec 21 13:35:28 2015
@@ -23,9 +23,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-parent</artifactId>
+        <artifactId>axis2</artifactId>
         <version>1.6.4-SNAPSHOT</version>
-        <relativePath>../../parent/pom.xml</relativePath>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
     <artifactId>axis2-transport-xmpp</artifactId>
     <name>Apache Axis2 - Transport - XMPP</name>

Propchange: axis/axis2/java/core/branches/1_6/modules/webapp/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 21 13:35:28 2015
@@ -1 +1 @@
-/axis/axis2/java/core/trunk/modules/webapp:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096134,1096136,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1127327,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1147485,1149224,1149491,1149578,1150055,1153072,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1157767,1162649,1163389,1166038,1166040,1166132,1167045,1173869,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,12
 02867,1203424,1205716,1205939,1208901,1209034,1213180,1213639,1214118,1220630,1220888,1221716,1222510,1225161,1231465,1231470,1241031,1242238,1242249,1242511,1243469,1243831,1290999,1291158,1294991,1295084,1295479,1296159,1297132,1297344,1297348,1297744,1297765,1298550,1298688,1299356,1299392,1299645,1299667,1300358,1305728,1307410,1326968,1327005,1328228,1329084,1331616,1332362,1332402,1332545,1332587,1337975,1340970,1341090,1341780,1341805,1343353,1343543,1348340,1351218,1352413,1352423,1354438,1354834,1355706,1355710,1356080,1358413,1358494,1358508,1358691,1359499,1359504,1360573,1362377,1364536,1372622,1382245,1383043,1384482,1409145,1409389,1410313,1410499,1410577,1426464,1426467,1426469,1438985,1441907,1442712,1443222,1479068,1479351,1480969,1576937,1577055,1577119,1577125,1577191,1577342-1577345,1577347-1577348,1593690,1593765,1594378,1594701,1601455-1601456,1608843,1621171-1621172,1649688,1686538,1686544,1686553
+/axis/axis2/java/core/trunk/modules/webapp:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096134,1096136,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1127327,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1147485,1149224,1149491,1149578,1150055,1153072,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1157767,1162649,1163389,1166038,1166040,1166132,1167045,1173869,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,12
 02867,1203424,1205716,1205939,1208901,1209034,1213180,1213639,1214118,1220630,1220888,1221716,1222510,1225161,1231465,1231470,1241031,1242238,1242249,1242511,1243469,1243831,1290999,1291158,1294991,1295084,1295479,1296159,1297132,1297344,1297348,1297744,1297765,1298550,1298688,1299356,1299392,1299645,1299667,1300358,1305728,1307410,1326968,1327005,1328228,1329084,1331616,1332362,1332402,1332545,1332587,1337975,1340970,1341090,1341780,1341805,1343353,1343543,1348340,1351218,1352413,1352423,1354438,1354834,1355706,1355710,1356080,1358413,1358494,1358508,1358691,1359499,1359504,1360573,1362377,1364536,1372622,1382245,1383043,1384482,1409145,1409389,1410313,1410499,1410577,1426464,1426467,1426469,1438985,1441907,1442712,1443222,1479068,1479351,1480969,1576937,1577055,1577119,1577125,1577191,1577342-1577345,1577347-1577348,1593690,1593765,1594378,1594701,1601455-1601456,1608843,1621171-1621172,1649688,1686538,1686544,1686553,1721145

Modified: axis/axis2/java/core/branches/1_6/modules/webapp/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/webapp/pom.xml?rev=1721153&r1=1721152&r2=1721153&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/webapp/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/webapp/pom.xml Mon Dec 21 13:35:28 2015
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-parent</artifactId>
+        <artifactId>axis2</artifactId>
         <version>1.6.4-SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>axis2-webapp</artifactId>
     <packaging>war</packaging>

Modified: axis/axis2/java/core/branches/1_6/modules/xmlbeans/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/xmlbeans/pom.xml?rev=1721153&r1=1721152&r2=1721153&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/xmlbeans/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/xmlbeans/pom.xml Mon Dec 21 13:35:28 2015
@@ -23,9 +23,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-parent</artifactId>
+        <artifactId>axis2</artifactId>
         <version>1.6.4-SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>axis2-xmlbeans</artifactId>
     <name>Apache Axis2 - XMLBeans Data Binding</name>