Bump to version 2.6.0 for current development.

Author: chrismattmann

tika/__init__.py

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.25"
+__version__ = "2.6.0"
 
 try:
     __import__('pkg_resources').declare_namespace(__name__)

tika/tika.py

@@ -166,7 +166,7 @@ def make_content_disposition_header(fn):
 log.setLevel(logging.INFO)
 
 Windows = True if platform.system() == "Windows" else False
-TikaVersion = os.getenv('TIKA_VERSION', '1.25')
+TikaVersion = os.getenv('TIKA_VERSION', '2.6.0')
 TikaJarPath = os.getenv('TIKA_PATH', tempfile.gettempdir())
 TikaFilesPath = tempfile.gettempdir()
 TikaServerLogFilePath = log_path