Merge commit 'e0f494e942b1be285c0cb822da619a7df0eaaf9c' into issue-2796

Author: chrisdennis

.gitignore

@@ -1,22 +1,4 @@
-*/target/
-
-build/
-*/src/generated/
+# Gradle
 .gradle/
-
-.project
-.classpath
-.settings/org.eclipse.m2e.core.prefs
-*/.classpath
-*.prefs
-
-*.iml
-.idea
-out/
-
-.nb-gradle
-.nb-gradle-properties
-
-/classes
-
-**/*.*~
+**/build/
+!**/src/**/build/

107/.gitignore

@@ -54,7 +54,7 @@ An example of `Service` being the `org.ehcache.core.spi.store.Store.Provider`, i
 
 `Service` instances are created using Java's https://docs.oracle.com/javase/6/docs/api/java/util/ServiceLoader.html[`java.util.ServiceLoader` service-provider loading facility].
 It is used to locate all `org.ehcache.core.spi.service.ServiceFactory` implementations on the classpath.
-These are in turn used to create `Service` instances. Each `CacheManager` uses its own `org.ehcache.core.internal.service.ServiceLocator` facility to locate `Service` instances, which it then in turn life cycles.
+These are in turn used to create `Service` instances. Each `CacheManager` uses its own `org.ehcache.core.spi.ServiceLocator` facility to locate `Service` instances, which it then in turn life cycles.
 
 `Service` instances are configured by their own respective `ServiceConfiguration` at `Service.start()` invocation time.
 `CacheManager` and its `Service` instances can then use these services.

107/gradle.properties

@@ -0,0 +1,18 @@
+/*	
+ * All content copyright Terracotta, Inc., unless otherwise indicated.	
+ *	
+ * 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.	
+ */	
+
+ //See Jenkins wiki pages for info	
+checkmarxBuild checkmarx_project_name: 'Terracotta DB (TDB) Ehcache OSS'

107/src/main/java/org/ehcache/jsr107/DefaultJsr107SerializationProvider.java

@@ -1,6 +1,6 @@
 = The Ehcache 3.x line is currently the development line.
 
-Status of the build: 
+Status of the build:
 [link="https://dev.azure.com/TerracottaCI/ehcache/_build/latest?definitionId=14"]
 image::https://dev.azure.com/TerracottaCI/ehcache/_apis/build/status/ehcache3[Build Status]
 
@@ -12,16 +12,15 @@ For samples, documentation, and usage information, please see http://ehcache.org
 
 == Current release
 
-We released 3.6.1 on September 21st 2018.
+We released 3.9.0 on August 25th 2020.
 
-The https://github.com/ehcache/ehcache3/releases/tag/v3.6.1[release notes] contain the links to the artifacts and the documentation to help you get started.
+The https://github.com/ehcache/ehcache3/releases/tag/v3.9.0[release notes] contain the links to the artifacts and the documentation to help you get started.
 
-You should consider upgrading to 3.6.x as it does all previous 3.x do and more with a fully compatible API.
-The only thing to note compared to 3.0.x is that transactional support has been moved to a separate jar.
+You should consider upgrading to 3.9.x as it does all previous 3.x do and more with a fully compatible API.
 
 == Current development & next release
 
-We are still working on the missing features of the clustering tier of Ehcache 3 which will be included in upcoming releases.
+We released the missing features of the clustering tier of Ehcache 3 in 3.7.0.
 
 Starting with version 3.5, Ehcache only supports Java 8 and later.
 

CONTRIBUTING.adoc

@@ -24,6 +24,6 @@ resources:
       name: terracotta/terracotta
 
 jobs:
-- template: build-templates/maven-common.yml@templates  
+- template: build-templates/gradle-common.yml@templates
   parameters:
     gradleTasks: 'check'