From 61e5805d060299e1003dca9b855ffc4c6ebb10bb Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 27 Apr 2022 09:55:23 +0200 Subject: [PATCH] Remove GemFire from dev tools. In preparation, as GemFire used Jira for project management. See #205 --- .../github/ProjectLabelConfiguration.java | 20 ------------------- .../data/release/model/Projects.java | 10 ++-------- .../data/release/model/ReleaseTrains.java | 10 ++++------ .../data/release/model/Tracker.java | 1 - 4 files changed, 6 insertions(+), 35 deletions(-) diff --git a/release-tools/src/main/java/org/springframework/data/release/issues/github/ProjectLabelConfiguration.java b/release-tools/src/main/java/org/springframework/data/release/issues/github/ProjectLabelConfiguration.java index c7b3d22..4643a95 100644 --- a/release-tools/src/main/java/org/springframework/data/release/issues/github/ProjectLabelConfiguration.java +++ b/release-tools/src/main/java/org/springframework/data/release/issues/github/ProjectLabelConfiguration.java @@ -94,26 +94,6 @@ public class ProjectLabelConfiguration { config.register(LabelFactories.IN_LABEL, "wan", "WAN"); })); - labelConfigurations.put(Projects.GEMFIRE, commonLabels.mergeWith(coreMappingRepository).mergeWith(config -> { - - config.register(LabelFactories.IN_LABEL, "api", "Issues with API"); - config.register(LabelFactories.IN_LABEL, "aeq", "AsyncEventQueue"); - config.register(LabelFactories.IN_LABEL, "build", "Build issues"); - config.register(LabelFactories.IN_LABEL, "configuration", "Issues with configuration"); - config.register(LabelFactories.IN_LABEL, "core", "Issues in core support"); - config.register(LabelFactories.IN_LABEL, "documentation", "Issues in documentation"); - config.register(LabelFactories.IN_LABEL, "cq", "Continuous Queries"); - config.register(LabelFactories.IN_LABEL, "functions", "Functions"); - config.register(LabelFactories.IN_LABEL, "infrastructure", "Environment issues"); - config.register(LabelFactories.IN_LABEL, "query", "OQL Query & Indexing"); - config.register(LabelFactories.IN_LABEL, "repository", "Repositories abstraction"); - config.register(LabelFactories.IN_LABEL, "search", "Apache Lucene Integration"); - config.register(LabelFactories.IN_LABEL, "security", "Security issues"); - config.register(LabelFactories.IN_LABEL, "serialization", "Serialization issues"); - config.register(LabelFactories.IN_LABEL, "transactions", "Transaction issues"); - config.register(LabelFactories.IN_LABEL, "wan", "WAN"); - })); - labelConfigurations.put(Projects.JDBC, commonLabels.mergeWith(coreMappingRepository).mergeWith(config -> { config.register(LabelFactories.IN_LABEL, "statement-builder", "SQL Statement builder API"); diff --git a/release-tools/src/main/java/org/springframework/data/release/model/Projects.java b/release-tools/src/main/java/org/springframework/data/release/model/Projects.java index 78f7813..2492a2c 100644 --- a/release-tools/src/main/java/org/springframework/data/release/model/Projects.java +++ b/release-tools/src/main/java/org/springframework/data/release/model/Projects.java @@ -40,8 +40,7 @@ import org.jgrapht.traverse.TopologicalOrderIterator; public class Projects { public static final Project BOM, COMMONS, BUILD, REST, JDBC, RELATIONAL, JPA, MONGO_DB, NEO4J, SOLR, COUCHBASE, - CASSANDRA, - ELASTICSEARCH, R2DBC, REDIS, GEMFIRE, KEY_VALUE, ENVERS, LDAP, GEODE; + CASSANDRA, ELASTICSEARCH, R2DBC, REDIS, KEY_VALUE, ENVERS, LDAP, GEODE; public static final List PROJECTS; static { @@ -94,10 +93,6 @@ public class Projects { R2DBC = new Project("DATAR2DBC", "R2DBC", Tracker.GITHUB).withDependencies(COMMONS, JDBC); - GEMFIRE = new Project("SGF", "Gemfire", Tracker.JIRA) // - .withDependencies(COMMONS)// - .withSkipTests(true); - GEODE = new Project("DATAGEODE", "Geode", Tracker.GITHUB) // .withDependencies(COMMONS) // .withAdditionalArtifacts(ArtifactCoordinates.SPRING_DATA.artifacts("spring-data-gemfire")) @@ -116,8 +111,7 @@ public class Projects { // Specify build order to avoid maven dependency errors during build. List projects = Arrays.asList(BUILD, COMMONS, JPA, JDBC, RELATIONAL, MONGO_DB, NEO4J, SOLR, COUCHBASE, - CASSANDRA, - ELASTICSEARCH, REDIS, GEMFIRE, REST, KEY_VALUE, ENVERS, LDAP, GEODE, R2DBC); + CASSANDRA, ELASTICSEARCH, REDIS, REST, KEY_VALUE, ENVERS, LDAP, GEODE, R2DBC); DefaultDirectedGraph graph = new DefaultDirectedGraph<>(DefaultEdge.class); diff --git a/release-tools/src/main/java/org/springframework/data/release/model/ReleaseTrains.java b/release-tools/src/main/java/org/springframework/data/release/model/ReleaseTrains.java index 2af9362..53e43eb 100644 --- a/release-tools/src/main/java/org/springframework/data/release/model/ReleaseTrains.java +++ b/release-tools/src/main/java/org/springframework/data/release/model/ReleaseTrains.java @@ -55,7 +55,7 @@ public class ReleaseTrains { new Module(MONGO_DB, "3.0"), // new Module(JDBC, "2.0"), // new Module(R2DBC, "1.1")) // - .filterModules(module -> !module.getProject().equals(GEMFIRE)); + .filterModules(module -> !module.getProject().getName().equalsIgnoreCase("GemFire")); OCKHAM = NEUMANN.next("Ockham", Transition.MINOR, // new Module(BOM, "2020.0.0"), // @@ -63,8 +63,7 @@ public class ReleaseTrains { ).withIterations(Train.Iterations.DEFAULT).withCalver("2020.0"); PASCAL = OCKHAM.next("Pascal", Transition.MINOR) // - .filterModules(module -> !module.getProject().equals(SOLR)) - .withCalver("2021.0"); + .filterModules(module -> !module.getProject().equals(SOLR)).withCalver("2021.0"); Q = PASCAL.next("Q", Transition.MINOR) // .withCalver("2021.1") // @@ -114,13 +113,12 @@ public class ReleaseTrains { Module couchbase = new Module(COUCHBASE, "1.1"); Module cassandra = new Module(CASSANDRA, "1.0"); Module elasticsearch = new Module(ELASTICSEARCH, "1.0", "M2"); - Module gemfire = new Module(GEMFIRE, "1.4"); Module redis = new Module(REDIS, "1.3"); Module rest = new Module(REST, "2.1"); - return new Train("Dijkstra", build, commons, jpa, mongoDb, neo4j, solr, couchbase, cassandra, elasticsearch, - gemfire, redis, rest); + return new Train("Dijkstra", build, commons, jpa, mongoDb, neo4j, solr, couchbase, cassandra, elasticsearch, redis, + rest); } public static Train getTrainByName(String name) { diff --git a/release-tools/src/main/java/org/springframework/data/release/model/Tracker.java b/release-tools/src/main/java/org/springframework/data/release/model/Tracker.java index 2e9180c..069a20a 100644 --- a/release-tools/src/main/java/org/springframework/data/release/model/Tracker.java +++ b/release-tools/src/main/java/org/springframework/data/release/model/Tracker.java @@ -27,7 +27,6 @@ import lombok.RequiredArgsConstructor; @RequiredArgsConstructor(access = AccessLevel.PACKAGE) public enum Tracker { - JIRA("(([A-Z]{1,10})+-\\d+)"), // GITHUB("((#)?\\d+)"); public static final String RELEASE_PREFIX = "Release ";