Bump junit from 4.12 to 4.13.1 in /geowebcache

RELEASE_NOTES.txt

@@ -1,3 +1,56 @@
+GeoWebCache 1.19-RC (2021-03-01)
+--------------------------------
+
+Release candidate for 1.19.x series.
+
+Improvements:
++++++++++++++
+- Introduce 512px tiles as possible alternative for the default gridsets
+- Update to JTS 1.18.1
+- Update JAIEXT 1.1.20
+- Update Spring to v5.1.20.RELEASE and Spring security to 5.1.13.RELEASE 
+
+Internal:
++++++++++
+- Enabled PMD checks on tests, Switch JUnit tests from v3 to v4
+- Use geotools factory for http connections
+- Cleaning up unnecessary casts
+- Cleaning up unecessary type specifications
+- Repalce iterator loops with enhanced for loops
+- Use isEmpty instead of size() == 0
+- Use try-with-resources replacing try/finally
+- Replace use of Vector/Hashtable with ArrayList/HashMap
+
+GeoWebCache 1.18.2 (2021-01-18)
+-------------------------------
+
+Stable release of the 1.18.x series
+
+Improvements:
++++++++++++++
+- In the seeding form, order threads count numerically instead of lexicographically
+- Bounding box toString scales poorly due to internal synchornization of NumberFormat
+- Creating a new UUID for each temp file scales poorly, reduce the calculation of those to a lower number, appending an atomic integer at the end
+- Upgrading to jaiext 1.1.18, better BufferedImageAdapter (also improves scalability)
+
+GeoWebCache 1.18.1 (2020-11-18)
+-------------------------------
+
+Stable release of the 1.18.x series
+
+Improvements:
++++++++++++++
+- Allow the S3 storage to work against Cohesity too, in addition to AWS S3 and Minio
+
+GeoWebCache 1.18.0 (2020-09-21)
+-------------------------------
+
+First stable release of the 1.18.x series.
+
+Fixes:
+++++++
+- Fixed documentation scripts branch reference
+
 GeoWebCache 1.18.0
 -------------------
 
@@ -6,6 +59,67 @@ Improvements:
 
 - Use of repo.osgeo.org
 
+GeoWebCache 1.18-RC (2020-09-01)
+--------------------------------
+
+Release candidate.
+
+Improvements:
+
+* Include the default ServiceInfo into the WMS & WMTS GetCapabilities document
+* Use of JTS 1.17.1
+
+GeoWebCache 1.17.4 (2020-12-20)
+-------------------------------
+
+Improvements:
++++++++++++++
+- Allow the S3 storage to work against Cohesity too.
+
+GeoWebCache 1.17.3 (2020-09-25)
+-------------------------------
+
+First maintenance release of the 1.17.x series
+
+Improvements:
++++++++++++++
+- Upgraded JTS to 1.17.0
+- Upgraded JAI-EXT to 1.1.17
+
+Fixes:
+++++++
+- Dispose image reader in MetaTile (improves stability downstreams in GeoServer, when using GDAL image readers)
+
+GeoWebCache 1.17.2 (2020-07-19)
+-------------------------------
+
+Stable release of 1.17.x series.
+
+Improvements:
++++++++++++++
+- Upgrade to PostgreSQL driver 42.2.14
+- Upgrade to jai-ext 1.1.15
+- Upgrade to spring-framework to 5.1.16 and spring-security to 5.1.11
+
+GeoWebCache 1.17.1 (2020-06-01)
+-------------------------------
+
+Stable release of 1.17.x series.
+
+Improvements:
++++++++++++++
+- Upgrade to GeoTools 23.1.
+
+GeoWebCache 1.17.0 (2020-04-14)
+-------------------------------
+
+Initial release of 1.17.x series.
+
+Improvements:
++++++++++++++
+- Use of repo.osgeo.org
+- Upgraded jai-ext to 1.1.14
+
 GeoWebCache 1.17-RC (2020-03-11)
 --------------------------------
 

documentation/en/user/source/conf.py

@@ -45,9 +45,9 @@
 # other places throughout the built documents.
 #
 # The short X.Y version.
-version = '1.19'
+version = '1.20'
 # The full version, including alpha/beta/rc tags.
-release = '1.19.x'
+release = '1.20-SNAPSHOT'
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:

geowebcache/arcgiscache/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.geowebcache</groupId>
     <artifactId>geowebcache</artifactId>
-    <version>1.19-SNAPSHOT</version><!-- GWC VERSION -->
+    <version>1.20-SNAPSHOT</version><!-- GWC VERSION -->
   </parent>
   <groupId>org.geowebcache</groupId>
   <artifactId>gwc-arcgiscache</artifactId>

geowebcache/arcgiscache/src/main/java/org/geowebcache/arcgis/layer/ArcGISCacheLayer.java

@@ -30,10 +30,20 @@
 import org.geowebcache.arcgis.compact.ArcGISCompactCache;
 import org.geowebcache.arcgis.compact.ArcGISCompactCacheV1;
 import org.geowebcache.arcgis.compact.ArcGISCompactCacheV2;
-import org.geowebcache.arcgis.config.*;
+import org.geowebcache.arcgis.config.CacheInfo;
+import org.geowebcache.arcgis.config.CacheInfoPersister;
+import org.geowebcache.arcgis.config.CacheStorageInfo;
+import org.geowebcache.arcgis.config.LODInfo;
+import org.geowebcache.arcgis.config.TileCacheInfo;
 import org.geowebcache.conveyor.Conveyor.CacheResult;
 import org.geowebcache.conveyor.ConveyorTile;
-import org.geowebcache.grid.*;
+import org.geowebcache.grid.BoundingBox;
+import org.geowebcache.grid.Grid;
+import org.geowebcache.grid.GridSet;
+import org.geowebcache.grid.GridSetBroker;
+import org.geowebcache.grid.GridSubset;
+import org.geowebcache.grid.GridSubsetFactory;
+import org.geowebcache.grid.OutsideCoverageException;
 import org.geowebcache.io.FileResource;
 import org.geowebcache.io.Resource;
 import org.geowebcache.layer.AbstractTileLayer;

geowebcache/arcgiscache/src/test/java/org/geowebcache/arcgis/compact/ArcGISCompactCacheTest.java

@@ -107,9 +107,9 @@ public void testBundleFileResourceV1() throws Exception {
         Assert.assertEquals(6342, resource.getSize());
 
         File f = new File("5_12_7.jpg");
-        FileOutputStream fos = new FileOutputStream(f);
-        resource.transferTo(fos.getChannel());
-        fos.close();
+        try (FileOutputStream fos = new FileOutputStream(f)) {
+            resource.transferTo(fos.getChannel());
+        }
 
         Assert.assertTrue(startsWithJPEGHeader(f));
 
@@ -120,9 +120,9 @@ public void testBundleFileResourceV1() throws Exception {
         Assert.assertEquals(6308, resource.getSize());
 
         f = new File("6_25_17.jpg");
-        fos = new FileOutputStream(f);
-        resource.transferTo(fos.getChannel());
-        fos.close();
+        try (FileOutputStream fos = new FileOutputStream(f)) {
+            resource.transferTo(fos.getChannel());
+        }
 
         Assert.assertTrue(startsWithJPEGHeader(f));
 
@@ -141,9 +141,9 @@ public void testBundleFileResourceV2() throws Exception {
         Assert.assertEquals(7288, resource.getSize());
 
         File f = new File("4_5_4.jpg");
-        FileOutputStream fos = new FileOutputStream(f);
-        resource.transferTo(fos.getChannel());
-        fos.close();
+        try (FileOutputStream fos = new FileOutputStream(f)) {
+            resource.transferTo(fos.getChannel());
+        }
 
         Assert.assertTrue(startsWithJPEGHeader(f));
 
@@ -154,9 +154,9 @@ public void testBundleFileResourceV2() throws Exception {
         Assert.assertEquals(6055, resource.getSize());
 
         f = new File("5_11_5.jpg");
-        fos = new FileOutputStream(f);
-        resource.transferTo(fos.getChannel());
-        fos.close();
+        try (FileOutputStream fos = new FileOutputStream(f)) {
+            resource.transferTo(fos.getChannel());
+        }
 
         Assert.assertTrue(startsWithJPEGHeader(f));
 

geowebcache/arcgiscache/src/test/java/org/geowebcache/arcgis/config/CacheInfoPersisterTest.java

@@ -228,14 +228,9 @@ public void testLoadCacheInfo_ArcGIS_10() throws Exception {
 
     private CacheInfo load(final URL url) throws Exception {
         CacheInfoPersister persister = new CacheInfoPersister();
-        InputStream stream = url.openStream();
-        Reader reader = new InputStreamReader(stream);
-        CacheInfo cacheInfo;
-        try {
-            cacheInfo = persister.load(reader);
-        } finally {
-            stream.close();
+        try (InputStream stream = url.openStream();
+                Reader reader = new InputStreamReader(stream)) {
+            return persister.load(reader);
         }
-        return cacheInfo;
     }
 }

geowebcache/arcgiscache/src/test/java/org/geowebcache/arcgis/layer/GridSetBuilderTest.java

@@ -35,12 +35,9 @@ public class GridSetBuilderTest {
     public void setUp() throws Exception {
         URL url = getClass().getResource("/arcgis_09.2_conf.xml");
         CacheInfoPersister persister = new CacheInfoPersister();
-        InputStream stream = url.openStream();
-        Reader reader = new InputStreamReader(stream);
-        try {
+        try (InputStream stream = url.openStream();
+                Reader reader = new InputStreamReader(stream)) {
             cacheInfo = persister.load(reader);
-        } finally {
-            stream.close();
         }
         layerBounds = new BoundingBox(-10, -10, 100, 50);
         builder = new GridSetBuilder();

geowebcache/arcgiscache/src/test/java/org/geowebcache/arcgis/layer/XMLConfigurationLayerConformanceWithArcGisLayersTest.java

@@ -16,7 +16,7 @@
 
 import static org.geowebcache.util.TestUtils.isPresent;
 import static org.hamcrest.Matchers.hasProperty;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.io.File;
 import java.io.IOException;
@@ -205,6 +205,7 @@ protected TileLayerConfiguration getConfig(MockWepAppContextRule extensions) thr
     }
 
     @Override
+    @Test
     public void testGetExistingHasGridset() throws Exception {
         Optional<TileLayer> retrieved = getInfo(config, getExistingInfo());
         assertThat(

geowebcache/azureblob/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>geowebcache</artifactId>
         <groupId>org.geowebcache</groupId>
-        <version>1.19-SNAPSHOT</version><!-- GWC VERSION -->
+        <version>1.20-SNAPSHOT</version><!-- GWC VERSION -->
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

geowebcache/azureblob/src/test/java/org/geowebcache/azure/AbstractAzureBlobStoreIntegrationTest.java

@@ -278,7 +278,6 @@ public void testDeleteLayer() throws Exception {
 
         // check the tiles are gone too, give it up to 100 seconds
         long start = System.currentTimeMillis();
-        boolean allDeleted = false;
         boolean t20Deleted = false, t21Deleted = false, t22Deleted = false;
         while (System.currentTimeMillis() - start < 100000
                 && (!t20Deleted || !t21Deleted || !t22Deleted)) {
@@ -604,10 +603,6 @@ private void seed(
         }
     }
 
-    private TileObject put(long x, long y, int z) throws StorageException {
-        return put(x, y, z, DEFAULT_GRIDSET, DEFAULT_FORMAT, null);
-    }
-
     private TileObject put(
             long x,
             long y,

geowebcache/azureblob/src/test/java/org/geowebcache/azure/AzureBlobStoreConfigProviderTest.java

@@ -27,6 +27,7 @@
 public class AzureBlobStoreConfigProviderTest {
 
     @Before
+    @SuppressWarnings("PMD.CloseResource")
     public void setUp() throws Exception {
         System.setProperty("CONTAINER", "MYCONTAINER");
         System.setProperty("MYKEY", "99942777gfa+");

geowebcache/azureblob/src/test/java/org/geowebcache/azure/AzureBlobStoreDataTest.java

@@ -26,6 +26,7 @@
 public class AzureBlobStoreDataTest {
 
     @Before
+    @SuppressWarnings("PMD.CloseResource")
     public void setUp() throws Exception {
         System.setProperty("CONTAINER", "MYCONTAINER");
         System.setProperty("ACCOUNT_NAME", "MYNAME");

geowebcache/azureblob/src/test/java/org/geowebcache/azure/OnlineAzureBlobStoreIntegrationTest.java

@@ -35,7 +35,6 @@ protected AzureBlobStoreData getConfiguration() {
     @Test
     public void testCreatesStoreMetadataOnStart() {
         String prefix = tempFolder.getConfig().getPrefix();
-        String container = tempFolder.getConfig().getContainer();
         // if the file does not exist a StorageException will be thrown
         int status =
                 tempFolder

geowebcache/core/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.geowebcache</groupId>
     <artifactId>geowebcache</artifactId>
-    <version>1.19-SNAPSHOT</version><!-- GWC VERSION -->
+    <version>1.20-SNAPSHOT</version><!-- GWC VERSION -->
   </parent>
   <groupId>org.geowebcache</groupId>
   <artifactId>gwc-core</artifactId>