Merge pull request #1107 from cherrylzhao/dev-new

remove xa property files temporary for M2 publish.

sharding-proxy/src/main/resources/assembly/assembly.xml

@@ -21,7 +21,6 @@
             <directory>src/main/resources</directory>
             <includes>
                 <include>logback.xml</include>
-                <include>jta.properties</include>
             </includes>
             <outputDirectory>conf</outputDirectory>
             <fileMode>0644</fileMode>

sharding-proxy/src/main/resources/jta.properties

-#
-# Copyright 2016-2018 shardingsphere.io.
-# <p>
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# </p>
-#
-
-com.atomikos.icatch.serial_jta_transactions=false
-com.atomikos.icatch.default_jta_timeout = 1000000
-com.atomikos.icatch.max_actives = 10000