Merge commit 'e0f494e942b1be285c0cb822da619a7df0eaaf9c' into issue-2796

.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/

CONTRIBUTING.adoc

@@ -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.

Jenkinsfile

@@ -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'

README.adoc

@@ -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.
 

azure-pipelines-static-analysis.yml

@@ -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'

azure-pipelines.yml

@@ -20,8 +20,30 @@
 resources:
   repositories:
     - repository: templates
-      type: git   
+      type: git
       name: terracotta/terracotta
 
 jobs:
-- template: build-templates/gradle-common.yml@templates  
+- template: build-templates/gradle-common.yml@templates
+  parameters:
+    jdkVersion: '1.8'
+    jobName: 'LinuxJava8'
+
+- template: build-templates/gradle-common.yml@templates
+  parameters:
+    jdkVersion: '1.8'
+    options: '-PtestVM=java11Home'
+    jobName: 'LinuxJava11'
+
+- template: build-templates/gradle-common.yml@templates
+  parameters:
+    vmImage: 'windows-latest'
+    jdkVersion: '1.8'
+    jobName: 'WindowsJava8'
+
+- template: build-templates/gradle-common.yml@templates
+  parameters:
+    vmImage: 'windows-latest'
+    jdkVersion: '1.8'
+    options: '-PtestVM=java11Home'
+    jobName: 'WindowsJava11'

build-logic/build.gradle

@@ -0,0 +1,67 @@
+plugins {
+  id 'java-gradle-plugin'
+}
+
+repositories {
+  gradlePluginPortal()
+  mavenCentral()
+}
+
+gradlePlugin {
+  plugins {
+    internalModule {
+      id = 'org.ehcache.build.internal-module'
+      implementationClass = 'org.ehcache.build.InternalEhcacheModule'
+    }
+    publicModule {
+      id = 'org.ehcache.build.public-module'
+      implementationClass = 'org.ehcache.build.PublicEhcacheModule'
+    }
+    clusteredModule {
+      id = 'org.ehcache.build.clustered-module'
+      implementationClass = 'org.ehcache.build.ClusteredEhcacheModule'
+    }
+    serverModule {
+      id = 'org.ehcache.build.clustered-server-module'
+      implementationClass = 'org.ehcache.build.ClusteredServerModule'
+    }
+    distribution {
+      id = 'org.ehcache.build.package'
+      implementationClass = 'org.ehcache.build.EhcachePackage'
+    }
+
+    variant {
+      id = 'org.ehcache.build.plugins.variant'
+      implementationClass = 'org.ehcache.build.plugins.VariantPlugin'
+    }
+
+    base {
+      id = 'org.ehcache.build.conventions.base'
+      implementationClass = 'org.ehcache.build.conventions.BaseConvention'
+    }
+    java {
+      id = 'org.ehcache.build.conventions.java'
+      implementationClass = 'org.ehcache.build.conventions.JavaConvention'
+    }
+    javaLibrary {
+      id = 'org.ehcache.build.conventions.java-library'
+      implementationClass = 'org.ehcache.build.conventions.JavaLibraryConvention'
+    }
+    war {
+      id = 'org.ehcache.build.conventions.war'
+      implementationClass = 'org.ehcache.build.conventions.WarConvention'
+    }
+  }
+}
+
+dependencies {
+  api gradleApi()
+  api 'biz.aQute.bnd:biz.aQute.bnd.gradle:6.0.0'
+  api 'gradle.plugin.com.github.jengelman.gradle.plugins:shadow:7.0.0'
+  api 'org.unbroken-dome.gradle-plugins:gradle-xjc-plugin:2.0.0'
+  api 'com.github.spotbugs.snom:spotbugs-gradle-plugin:4.7.9'
+  implementation 'biz.aQute.bnd:biz.aQute.bndlib:6.0.0'
+  implementation 'org.osgi:org.osgi.service.component.annotations:1.5.0'
+  implementation 'org.apache.felix:org.apache.felix.scr.generator:1.18.4'
+  implementation 'org.apache.felix:org.apache.felix.scr.ds-annotations:1.2.10'
+}

build-logic/src/main/java/org/ehcache/build/ClusteredEhcacheModule.java

@@ -0,0 +1,12 @@
+package org.ehcache.build;
+
+import org.gradle.api.Project;
+
+public class ClusteredEhcacheModule extends EhcacheModule {
+
+  @Override
+  public void apply(Project project) {
+    project.setGroup("org.ehcache.modules.clustered");
+    super.apply(project);
+  }
+}

build-logic/src/main/java/org/ehcache/build/ClusteredServerModule.java

@@ -0,0 +1,17 @@
+package org.ehcache.build;
+
+import org.ehcache.build.conventions.DeployConvention;
+import org.ehcache.build.plugins.VoltronPlugin;
+import org.gradle.api.Plugin;
+import org.gradle.api.Project;
+
+public class ClusteredServerModule implements Plugin<Project> {
+
+  @Override
+  public void apply(Project project) {
+    project.setGroup("org.ehcache.modules.clustered");
+
+    project.getPlugins().apply(DeployConvention.class);
+    project.getPlugins().apply(VoltronPlugin.class);
+  }
+}

build-logic/src/main/java/org/ehcache/build/EhcacheModule.java

@@ -0,0 +1,17 @@
+package org.ehcache.build;
+
+import org.ehcache.build.conventions.BndConvention;
+import org.ehcache.build.conventions.JavaLibraryConvention;
+import org.ehcache.build.conventions.DeployConvention;
+import org.gradle.api.Plugin;
+import org.gradle.api.Project;
+
+public abstract class EhcacheModule implements Plugin<Project> {
+
+  @Override
+  public void apply(Project project) {
+    project.getPlugins().apply(JavaLibraryConvention.class);
+    project.getPlugins().apply(DeployConvention.class);
+    project.getPlugins().apply(BndConvention.class);
+  }
+}

build-logic/src/main/java/org/ehcache/build/EhcachePackage.java

@@ -0,0 +1,16 @@
+package org.ehcache.build;
+
+import org.ehcache.build.conventions.DeployConvention;
+import org.ehcache.build.plugins.PackagePlugin;
+import org.gradle.api.Plugin;
+import org.gradle.api.Project;
+
+public class EhcachePackage implements Plugin<Project> {
+
+  @Override
+  public void apply(Project project) {
+    project.setGroup("org.ehcache");
+    project.getPlugins().apply(PackagePlugin.class);
+    project.getPlugins().apply(DeployConvention.class);
+  }
+}

build-logic/src/main/java/org/ehcache/build/InternalEhcacheModule.java

@@ -0,0 +1,13 @@
+package org.ehcache.build;
+
+import org.gradle.api.Project;
+
+public class InternalEhcacheModule extends EhcacheModule {
+
+  @Override
+  public void apply(Project project) {
+    project.setGroup("org.ehcache.modules");
+    super.apply(project);
+  }
+}
+

build-logic/src/main/java/org/ehcache/build/PublicEhcacheModule.java

@@ -0,0 +1,11 @@
+package org.ehcache.build;
+
+import org.gradle.api.Project;
+
+public class PublicEhcacheModule extends EhcacheModule {
+  @Override
+  public void apply(Project project) {
+    project.setGroup("org.ehcache");
+    super.apply(project);
+  }
+}

build-logic/src/main/java/org/ehcache/build/conventions/BaseConvention.java

@@ -0,0 +1,23 @@
+package org.ehcache.build.conventions;
+
+import org.gradle.api.Plugin;
+import org.gradle.api.Project;
+import org.gradle.api.artifacts.ResolutionStrategy;
+import org.gradle.api.plugins.BasePlugin;
+
+import java.net.URI;
+
+public class BaseConvention implements Plugin<Project> {
+
+  @Override
+  public void apply(Project project) {
+    project.getPlugins().apply(BasePlugin.class);
+
+    project.getRepositories().mavenCentral();
+    project.getRepositories().maven(repo -> repo.setUrl(URI.create("https://repo.terracotta.org/maven2")));
+
+    project.getConfigurations().configureEach(
+      config -> config.resolutionStrategy(ResolutionStrategy::failOnVersionConflict)
+    );
+  }
+}