[mapserver-commits] [mapserver/mapserver] d8dfde: Exclude .java files from jar.

GitHub noreply at github.com
Thu Mar 8 05:43:08 PST 2018 

  Branch: refs/heads/master
  Home:   https://github.com/mapserver/mapserver
  Commit: d8dfde1125f432ce61c48b0c89682eed1da725b3
      https://github.com/mapserver/mapserver/commit/d8dfde1125f432ce61c48b0c89682eed1da725b3
  Author: Bas Couwenberg <sebastic at xs4all.nl>
  Date:   2018-02-09 (Fri, 09 Feb 2018)

  Changed paths:
    M mapscript/java/CMakeLists.txt

  Log Message:
  -----------
  Exclude .java files from jar.


  Commit: c0f2f8ae10a661eeeb480bf2d8738b4fa383a93d
      https://github.com/mapserver/mapserver/commit/c0f2f8ae10a661eeeb480bf2d8738b4fa383a93d
  Author: Eric Peiffer <eric.peiffer at metrum.lu>
  Date:   2018-02-22 (Thu, 22 Feb 2018)

  Changed paths:
    M mapmssql2008.c

  Log Message:
  -----------
  Fix MSSql Filter


  Commit: 8edcf557dd72fa6aa34bb29dbf552817e37bd23a
      https://github.com/mapserver/mapserver/commit/8edcf557dd72fa6aa34bb29dbf552817e37bd23a
  Author: Tamas Szekeres <szekerest at gmail.com>
  Date:   2018-02-22 (Thu, 22 Feb 2018)

  Changed paths:
    M mapmssql2008.c

  Log Message:
  -----------
  Merge pull request #5549 from eric-peiffer/eric-peiffer/fix-mapmssql2008-filter

Fix MSSql query generator when using filters with multiple parameters


  Commit: 9297c351ada97ae53813f9cce5525473b648a531
      https://github.com/mapserver/mapserver/commit/9297c351ada97ae53813f9cce5525473b648a531
  Author: Even Rouault <even.rouault at mines-paris.org>
  Date:   2018-02-27 (Tue, 27 Feb 2018)

  Changed paths:
    M mapscript/java/CMakeLists.txt

  Log Message:
  -----------
  Merge pull request #5545 from sebastic/jar-contains-source

Exclude .java files from jar.


  Commit: 4e4885f8598764b7cfb3a8c1c91c6f60eb12671f
      https://github.com/mapserver/mapserver/commit/4e4885f8598764b7cfb3a8c1c91c6f60eb12671f
  Author: Even Rouault <even.rouault at spatialys.com>
  Date:   2018-03-06 (Tue, 06 Mar 2018)

  Changed paths:
    M mapogr.cpp

  Log Message:
  -----------
  msOGRFileOpen(): reset OGR error after trying to run 'SELECT spatialite_version()' for SQlite and GPKG input datasets


  Commit: e78e26fbc50fefed6d26b7d88acba3bbc680e752
      https://github.com/mapserver/mapserver/commit/e78e26fbc50fefed6d26b7d88acba3bbc680e752
  Author: Even Rouault <even.rouault at spatialys.com>
  Date:   2018-03-08 (Thu, 08 Mar 2018)

  Changed paths:
    M mapoutput.c

  Log Message:
  -----------
  WMS capabilities: automatically add 'application/json' to GetMap formats if UTFGRID OUPUTFORMAT is specified (fixes #5560)


  Commit: f2b1afe20a8d26863dff58410ec499ce2d6a20db
      https://github.com/mapserver/mapserver/commit/f2b1afe20a8d26863dff58410ec499ce2d6a20db
  Author: Even Rouault <even.rouault at spatialys.com>
  Date:   2018-03-08 (Thu, 08 Mar 2018)

  Changed paths:
    M msautotest/wxs/expected/ows_all_wms_capabilities.xml
    M msautotest/wxs/expected/ows_all_wms_capabilities_post.xml
    M msautotest/wxs/expected/ows_wms_capabilities.xml
    M msautotest/wxs/expected/wms111_test_xml_escaping.xml
    M msautotest/wxs/expected/wms130_test_xml_escaping.xml
    M msautotest/wxs/expected/wms_dimension_cap.xml
    M msautotest/wxs/expected/wms_dimension_cap130.xml
    M msautotest/wxs/expected/wms_empty_cap111.xml
    M msautotest/wxs/expected/wms_empty_cap130.xml
    M msautotest/wxs/expected/wms_empty_cap_latestversion.xml
    M msautotest/wxs/expected/wms_get_capabilities_tileindexmixedsrs.xml
    M msautotest/wxs/expected/wms_inspire_cap.xml
    M msautotest/wxs/expected/wms_inspire_cap_111.xml
    M msautotest/wxs/expected/wms_inspire_cap_111_eng.xml
    M msautotest/wxs/expected/wms_inspire_cap_111_ger.xml
    M msautotest/wxs/expected/wms_inspire_cap_eng.xml
    M msautotest/wxs/expected/wms_inspire_cap_ger.xml
    M msautotest/wxs/expected/wms_inspire_scenario1_cap130.xml
    M msautotest/wxs/expected/wms_inspire_scenario1_cap130_eng.xml
    M msautotest/wxs/expected/wms_inspire_scenario1_cap130_ger.xml
    M msautotest/wxs/expected/wms_inspire_scenario2_cap111.xml
    M msautotest/wxs/expected/wms_inspire_scenario2_cap111_eng.xml
    M msautotest/wxs/expected/wms_inspire_scenario2_cap111_ger.xml
    M msautotest/wxs/expected/wms_inspire_scenario2_cap130.xml
    M msautotest/wxs/expected/wms_inspire_scenario2_cap130_eng.xml
    M msautotest/wxs/expected/wms_inspire_scenario2_cap130_ger.xml
    M msautotest/wxs/expected/wms_north_polar_stereo_extent.xml
    M msautotest/wxs/expected/wms_nosld_cap.xml
    M msautotest/wxs/expected/wms_nosld_cap_postgis.xml

  Log Message:
  -----------
  Adjust expected results after #5560 fix


  Commit: 8fd394b37e2ad2a8d40d07809be889a6d5687ec5
      https://github.com/mapserver/mapserver/commit/8fd394b37e2ad2a8d40d07809be889a6d5687ec5
  Author: Even Rouault <even.rouault at spatialys.com>
  Date:   2018-03-08 (Thu, 08 Mar 2018)

  Changed paths:
    M mapmssql2008.c
    M mapogr.cpp
    M mapoutput.c
    M mapscript/java/CMakeLists.txt
    M msautotest/wxs/expected/ows_all_wms_capabilities.xml
    M msautotest/wxs/expected/ows_all_wms_capabilities_post.xml
    M msautotest/wxs/expected/ows_wms_capabilities.xml
    M msautotest/wxs/expected/wms111_test_xml_escaping.xml
    M msautotest/wxs/expected/wms130_test_xml_escaping.xml
    M msautotest/wxs/expected/wms_dimension_cap.xml
    M msautotest/wxs/expected/wms_dimension_cap130.xml
    M msautotest/wxs/expected/wms_empty_cap111.xml
    M msautotest/wxs/expected/wms_empty_cap130.xml
    M msautotest/wxs/expected/wms_empty_cap_latestversion.xml
    M msautotest/wxs/expected/wms_get_capabilities_tileindexmixedsrs.xml
    M msautotest/wxs/expected/wms_inspire_cap.xml
    M msautotest/wxs/expected/wms_inspire_cap_111.xml
    M msautotest/wxs/expected/wms_inspire_cap_111_eng.xml
    M msautotest/wxs/expected/wms_inspire_cap_111_ger.xml
    M msautotest/wxs/expected/wms_inspire_cap_eng.xml
    M msautotest/wxs/expected/wms_inspire_cap_ger.xml
    M msautotest/wxs/expected/wms_inspire_scenario1_cap130.xml
    M msautotest/wxs/expected/wms_inspire_scenario1_cap130_eng.xml
    M msautotest/wxs/expected/wms_inspire_scenario1_cap130_ger.xml
    M msautotest/wxs/expected/wms_inspire_scenario2_cap111.xml
    M msautotest/wxs/expected/wms_inspire_scenario2_cap111_eng.xml
    M msautotest/wxs/expected/wms_inspire_scenario2_cap111_ger.xml
    M msautotest/wxs/expected/wms_inspire_scenario2_cap130.xml
    M msautotest/wxs/expected/wms_inspire_scenario2_cap130_eng.xml
    M msautotest/wxs/expected/wms_inspire_scenario2_cap130_ger.xml
    M msautotest/wxs/expected/wms_north_polar_stereo_extent.xml
    M msautotest/wxs/expected/wms_nosld_cap.xml
    M msautotest/wxs/expected/wms_nosld_cap_postgis.xml

  Log Message:
  -----------
  Merge branch 'branch-7-0'


  Commit: e8f718c6ca1ab101278a3e617c71c854dd6da255
      https://github.com/mapserver/mapserver/commit/e8f718c6ca1ab101278a3e617c71c854dd6da255
  Author: Even Rouault <even.rouault at spatialys.com>
  Date:   2018-03-08 (Thu, 08 Mar 2018)

  Changed paths:
    M msautotest/wxs/expected/ows_metadata_wms_capabilities111.xml
    M msautotest/wxs/expected/ows_metadata_wms_capabilities130.xml
    M msautotest/wxs/expected/ows_wms_rootlayer_name_capabilities.xml
    M msautotest/wxs/expected/ows_wms_rootlayer_name_empty_capabilities.xml
    M msautotest/wxs/expected/wms_layer_groups_caps111.xml

  Log Message:
  -----------
  (master) Extra expected result adjsutments after #5560 fix


Compare: https://github.com/mapserver/mapserver/compare/c95d9ba1bb04...e8f718c6ca1a

More information about the mapserver-commits mailing list