From 4e2d7b442c7f8ce0e3dbf317fecdf1a7285cef67 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Dec 2024 11:47:04 +0100 Subject: [PATCH 1/4] Bump smallrye-config.version from 3.9.1 to 3.10.2 (#723) Bumps `smallrye-config.version` from 3.9.1 to 3.10.2. Updates `io.smallrye.config:smallrye-config-core` from 3.9.1 to 3.10.2 Updates `io.smallrye.config:smallrye-config-source-yaml` from 3.9.1 to 3.10.2 --- updated-dependencies: - dependency-name: io.smallrye.config:smallrye-config-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.smallrye.config:smallrye-config-source-yaml dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8df56a4e3..630f0e7c9 100644 --- a/pom.xml +++ b/pom.xml @@ -103,7 +103,7 @@ 4.4.18 5.24.0 2.0.16 - 3.9.1 + 3.10.2 1.9.22 2.3 2.8 From 201134f46ed99bda59cb60670214d257b7607280 Mon Sep 17 00:00:00 2001 From: Dirk Mahler Date: Wed, 4 Dec 2024 09:17:59 +0100 Subject: [PATCH 2/4] #432 use maven settings in AbstractPluginIT (#724) --- .../ConfigurationMappingLoader.java | 9 +-- .../core/test/plugin/AbstractPluginIT.java | 55 +++++++++++-------- 2 files changed, 38 insertions(+), 26 deletions(-) diff --git a/core/shared/src/main/java/com/buschmais/jqassistant/core/shared/configuration/ConfigurationMappingLoader.java b/core/shared/src/main/java/com/buschmais/jqassistant/core/shared/configuration/ConfigurationMappingLoader.java index 56f847bae..8fbc93c55 100644 --- a/core/shared/src/main/java/com/buschmais/jqassistant/core/shared/configuration/ConfigurationMappingLoader.java +++ b/core/shared/src/main/java/com/buschmais/jqassistant/core/shared/configuration/ConfigurationMappingLoader.java @@ -10,6 +10,7 @@ import java.nio.file.SimpleFileVisitor; import java.nio.file.attribute.BasicFileAttributes; import java.util.*; +import java.util.stream.Stream; import io.smallrye.config.*; import io.smallrye.config.source.yaml.YamlConfigSource; @@ -61,8 +62,7 @@ public class ConfigurationMappingLoader { /** * The default names of configuration files */ - private static final List DEFAULT_CONFIG_LOCATIONS = List.of(".jqassistant.yml", ".jqassistant.yaml", ".jqassistant") - .stream() + private static final List DEFAULT_CONFIG_LOCATIONS = Stream.of(".jqassistant.yml", ".jqassistant.yaml", ".jqassistant") .map(Paths::get) .collect(toUnmodifiableList()); @@ -215,6 +215,7 @@ public Builder withIgnoreProperties(Collection ignoreProperties) { * @return The configuration. */ public C load(ConfigSource... additionalConfigSources) { + log.debug("Loading configuration using profiles {}. ", profiles); // Create intermediate configuration with applied profiles and interpolated properties (without validation) SmallRyeConfig config = new SmallRyeConfigBuilder().withSources(this.configSources) .withSources(additionalConfigSources) @@ -237,7 +238,7 @@ private void logConfigProblems(SmallRyeConfig interpolatedConfig) { Map filteredProperties = stream(interpolatedConfig.getPropertyNames() .spliterator(), false).filter(property -> property.startsWith(PREFIX)) .filter(property -> !ignoreProperties.contains(property)) - .collect(toMap(property -> property, interpolatedConfig::getRawValue, (s1, s2) -> null, () -> new TreeMap<>())); + .collect(toMap(property -> property, interpolatedConfig::getRawValue, (s1, s2) -> null, TreeMap::new)); log.debug("jQAssistant config properties:"); for (Map.Entry entry : filteredProperties.entrySet()) { log.debug("\t{}={}", entry.getKey(), entry.getValue()); @@ -283,7 +284,7 @@ private List getExternalYamlConfigSources(Path configLocationPath, private List findYamlConfigurationFiles(Path configurationDirectory) { List configurationFiles = new ArrayList<>(); try { - walkFileTree(configurationDirectory, new SimpleFileVisitor() { + walkFileTree(configurationDirectory, new SimpleFileVisitor<>() { @Override public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) { diff --git a/core/test/src/main/java/com/buschmais/jqassistant/core/test/plugin/AbstractPluginIT.java b/core/test/src/main/java/com/buschmais/jqassistant/core/test/plugin/AbstractPluginIT.java index 2d0d854dc..e9ee2fcdf 100644 --- a/core/test/src/main/java/com/buschmais/jqassistant/core/test/plugin/AbstractPluginIT.java +++ b/core/test/src/main/java/com/buschmais/jqassistant/core/test/plugin/AbstractPluginIT.java @@ -21,6 +21,7 @@ import com.buschmais.jqassistant.core.report.impl.InMemoryReportPlugin; import com.buschmais.jqassistant.core.report.impl.ReportContextImpl; import com.buschmais.jqassistant.core.resolver.api.ArtifactProviderFactory; +import com.buschmais.jqassistant.core.resolver.api.MavenSettingsConfigSourceBuilder; import com.buschmais.jqassistant.core.rule.api.model.*; import com.buschmais.jqassistant.core.rule.api.reader.RuleParserPlugin; import com.buschmais.jqassistant.core.rule.api.source.FileRuleSource; @@ -50,6 +51,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; import lombok.ToString; +import org.eclipse.microprofile.config.spi.ConfigSource; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; @@ -57,6 +59,7 @@ import static java.util.Collections.emptyList; import static java.util.Collections.emptyMap; +import static java.util.Optional.ofNullable; import static lombok.AccessLevel.PRIVATE; import static org.assertj.core.api.Assertions.assertThat; @@ -65,6 +68,9 @@ */ public abstract class AbstractPluginIT { + private static final String PROPERTY_MAVEN_SETTINGS = "jqassistant.it.maven-settings"; + private static final String PROPERTY_PROFILES = "jqassistant.it.profiles"; + private static final File USER_HOME = new File(System.getProperty("user.home")); private static final File WORKING_DIRECTORY = new File("."); @@ -75,6 +81,8 @@ public abstract class AbstractPluginIT { protected static final String ARTIFACT_ID = "artifact"; + private static ConfigSource mavenSettingsConfigSource; + private static ArtifactProviderFactory artifactProviderFactory; private static PluginRepositoryImpl pluginRepository; @@ -86,17 +94,21 @@ public abstract class AbstractPluginIT { protected RuleSet ruleSet; @BeforeAll - public static final void initPluginRepository() { + public static void initPluginRepository() { artifactProviderFactory = new ArtifactProviderFactory(USER_HOME); - OUTPUT_DIRECTORY.mkdirs(); + Optional mavenSettingsFile = ofNullable(System.getProperty(PROPERTY_MAVEN_SETTINGS)).map(File::new); + List profiles = ofNullable(System.getProperty(PROPERTY_PROFILES)).map(p -> List.of(p.split(","))) + .orElse(emptyList()); + mavenSettingsConfigSource = MavenSettingsConfigSourceBuilder.createMavenSettingsConfigSource(USER_HOME, mavenSettingsFile, profiles); PluginClassLoader pluginClassLoader = new PluginClassLoader(AbstractPluginIT.class.getClassLoader()); PluginConfigurationReader pluginConfigurationReader = new PluginConfigurationReaderImpl(pluginClassLoader); pluginRepository = new PluginRepositoryImpl(pluginConfigurationReader); pluginRepository.initialize(); + OUTPUT_DIRECTORY.mkdirs(); } @AfterAll - public static final void destroyPluginRepository() { + public static void destroyPluginRepository() { if (pluginRepository != null) { pluginRepository.destroy(); } @@ -145,7 +157,7 @@ private ITConfiguration createConfiguration(ConfigurationBuilder configurationBu .withClasspath() .withProfiles(getConfigurationProfiles()) .load(configurationBuilder.build(), new EnvConfigSource() { - }, new SysPropConfigSource()); + }, new SysPropConfigSource(), mavenSettingsConfigSource); } private void initializeRuleSet(Configuration configuration) throws RuleException, IOException { @@ -281,23 +293,22 @@ protected TestResult query(String query) { * @return The {@link AbstractPluginIT.TestResult}. */ protected TestResult query(String query, Map parameters) { - Query.Result compositeRowObjects = store.executeQuery(query, parameters); - List> rows = new ArrayList<>(); - Map> columns = new HashMap<>(); - for (CompositeRowObject rowObject : compositeRowObjects) { - Map row = new HashMap<>(); - Iterable columnNames = rowObject.getColumns(); - for (String columnName : columnNames) { - List columnValues = columns.get(columnName); - if (columnValues == null) { - columnValues = new ArrayList<>(); - columns.put(columnName, columnValues); + List> rows; + Map> columns; + try (Query.Result compositeRowObjects = store.executeQuery(query, parameters)) { + rows = new ArrayList<>(); + columns = new HashMap<>(); + for (CompositeRowObject rowObject : compositeRowObjects) { + Map row = new HashMap<>(); + Iterable columnNames = rowObject.getColumns(); + for (String columnName : columnNames) { + List columnValues = columns.computeIfAbsent(columnName, k -> new ArrayList<>()); + Object value = rowObject.get(columnName, Object.class); + row.put(columnName, value); + columnValues.add(value); } - Object value = rowObject.get(columnName, Object.class); - row.put(columnName, value); - columnValues.add(value); + rows.add(row); } - rows.add(row); } return new TestResult(rows, columns); } @@ -344,7 +355,7 @@ protected Result applyConcept(String id, Map parameters * @return The result. */ protected Result validateConstraint(String id) throws RuleException { - return validateConstraint(id, Collections.emptyMap()); + return validateConstraint(id, emptyMap()); } /** @@ -376,7 +387,7 @@ protected Result validateConstraint(String id, Map p * The id. */ protected void executeGroup(String id) throws RuleException { - executeGroup(id, Collections.emptyMap()); + executeGroup(id, emptyMap()); } /** @@ -404,7 +415,7 @@ protected void executeGroup(String id, Map parameters) throws Ru @Getter @AllArgsConstructor(access = PRIVATE) @ToString - protected class TestResult { + protected static class TestResult { private List> rows; private Map> columns; From e3ee7252f0c229abcec4ec13605736ce286c9913 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Wed, 4 Dec 2024 09:30:06 +0000 Subject: [PATCH 3/4] [maven-release-plugin] prepare release 2.6.0-M2 --- bom/pom.xml | 2 +- cli/application/pom.xml | 2 +- cli/assembly/pom.xml | 2 +- cli/neo4jv4/pom.xml | 2 +- cli/neo4jv5/pom.xml | 2 +- cli/pom.xml | 2 +- cli/test/pom.xml | 2 +- core/analysis/pom.xml | 2 +- core/artifact-resolver/pom.xml | 2 +- core/neo4j/pom.xml | 2 +- core/pom.xml | 2 +- core/report/pom.xml | 2 +- core/rule/pom.xml | 2 +- core/runtime/pom.xml | 2 +- core/scanner/pom.xml | 2 +- core/schemata/pom.xml | 2 +- core/shared/pom.xml | 2 +- core/store/pom.xml | 2 +- core/test/pom.xml | 2 +- distribution-specification/pom.xml | 2 +- manual/pom.xml | 2 +- maven/pom.xml | 2 +- plugin/common/pom.xml | 2 +- plugin/java/pom.xml | 2 +- plugin/json/pom.xml | 2 +- plugin/junit/pom.xml | 2 +- plugin/maven/pom.xml | 2 +- plugin/pom.xml | 2 +- plugin/xml/pom.xml | 2 +- plugin/yaml/pom.xml | 2 +- pom.xml | 4 ++-- 31 files changed, 32 insertions(+), 32 deletions(-) diff --git a/bom/pom.xml b/bom/pom.xml index 367acbdfe..eaedb901a 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -4,7 +4,7 @@ com.buschmais.jqassistant parent - 2.6.0-SNAPSHOT + 2.6.0-M2 bom diff --git a/cli/application/pom.xml b/cli/application/pom.xml index d55554168..940bb0416 100644 --- a/cli/application/pom.xml +++ b/cli/application/pom.xml @@ -4,7 +4,7 @@ com.buschmais.jqassistant.cli parent - 2.6.0-SNAPSHOT + 2.6.0-M2 com.buschmais.jqassistant.cli application diff --git a/cli/assembly/pom.xml b/cli/assembly/pom.xml index aad335605..e79a424c7 100644 --- a/cli/assembly/pom.xml +++ b/cli/assembly/pom.xml @@ -3,7 +3,7 @@ com.buschmais.jqassistant.cli parent - 2.6.0-SNAPSHOT + 2.6.0-M2 assembly diff --git a/cli/neo4jv4/pom.xml b/cli/neo4jv4/pom.xml index d4b319837..c2655b0f6 100644 --- a/cli/neo4jv4/pom.xml +++ b/cli/neo4jv4/pom.xml @@ -3,7 +3,7 @@ com.buschmais.jqassistant.cli parent - 2.6.0-SNAPSHOT + 2.6.0-M2 jqassistant-commandline-neo4jv4 diff --git a/cli/neo4jv5/pom.xml b/cli/neo4jv5/pom.xml index 1afce6cc5..0c251dc4a 100644 --- a/cli/neo4jv5/pom.xml +++ b/cli/neo4jv5/pom.xml @@ -3,7 +3,7 @@ com.buschmais.jqassistant.cli parent - 2.6.0-SNAPSHOT + 2.6.0-M2 jqassistant-commandline-neo4jv5 diff --git a/cli/pom.xml b/cli/pom.xml index a6397edc6..7cbe9864a 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -3,7 +3,7 @@ com.buschmais.jqassistant parent - 2.6.0-SNAPSHOT + 2.6.0-M2 com.buschmais.jqassistant.cli diff --git a/cli/test/pom.xml b/cli/test/pom.xml index bd916482c..10f02bfcf 100644 --- a/cli/test/pom.xml +++ b/cli/test/pom.xml @@ -3,7 +3,7 @@ com.buschmais.jqassistant.cli parent - 2.6.0-SNAPSHOT + 2.6.0-M2 test diff --git a/core/analysis/pom.xml b/core/analysis/pom.xml index aa08edced..0cf3aaf75 100644 --- a/core/analysis/pom.xml +++ b/core/analysis/pom.xml @@ -3,7 +3,7 @@ com.buschmais.jqassistant.core parent - 2.6.0-SNAPSHOT + 2.6.0-M2 analysis diff --git a/core/artifact-resolver/pom.xml b/core/artifact-resolver/pom.xml index 33a172c31..88d645791 100644 --- a/core/artifact-resolver/pom.xml +++ b/core/artifact-resolver/pom.xml @@ -4,7 +4,7 @@ com.buschmais.jqassistant.core parent - 2.6.0-SNAPSHOT + 2.6.0-M2 artifact-resolver diff --git a/core/neo4j/pom.xml b/core/neo4j/pom.xml index bdf9d120a..463230225 100644 --- a/core/neo4j/pom.xml +++ b/core/neo4j/pom.xml @@ -4,7 +4,7 @@ com.buschmais.jqassistant.core parent - 2.6.0-SNAPSHOT + 2.6.0-M2 neo4j diff --git a/core/pom.xml b/core/pom.xml index da7d7d781..82d989747 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -3,7 +3,7 @@ com.buschmais.jqassistant parent - 2.6.0-SNAPSHOT + 2.6.0-M2 com.buschmais.jqassistant.core diff --git a/core/report/pom.xml b/core/report/pom.xml index 968936823..053e75ae2 100644 --- a/core/report/pom.xml +++ b/core/report/pom.xml @@ -3,7 +3,7 @@ com.buschmais.jqassistant.core parent - 2.6.0-SNAPSHOT + 2.6.0-M2 report diff --git a/core/rule/pom.xml b/core/rule/pom.xml index 35c5afdc2..05c60134e 100644 --- a/core/rule/pom.xml +++ b/core/rule/pom.xml @@ -3,7 +3,7 @@ com.buschmais.jqassistant.core parent - 2.6.0-SNAPSHOT + 2.6.0-M2 rule diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml index df10227a6..71b086b49 100644 --- a/core/runtime/pom.xml +++ b/core/runtime/pom.xml @@ -3,7 +3,7 @@ com.buschmais.jqassistant.core parent - 2.6.0-SNAPSHOT + 2.6.0-M2 runtime diff --git a/core/scanner/pom.xml b/core/scanner/pom.xml index c997573c9..605582895 100644 --- a/core/scanner/pom.xml +++ b/core/scanner/pom.xml @@ -3,7 +3,7 @@ com.buschmais.jqassistant.core parent - 2.6.0-SNAPSHOT + 2.6.0-M2 scanner jQAssistant Core Scanner diff --git a/core/schemata/pom.xml b/core/schemata/pom.xml index ed475e757..751c51ecd 100644 --- a/core/schemata/pom.xml +++ b/core/schemata/pom.xml @@ -3,7 +3,7 @@ com.buschmais.jqassistant.core parent - 2.6.0-SNAPSHOT + 2.6.0-M2 schemata diff --git a/core/shared/pom.xml b/core/shared/pom.xml index bbdb1fdc5..7f9f6accf 100644 --- a/core/shared/pom.xml +++ b/core/shared/pom.xml @@ -3,7 +3,7 @@ com.buschmais.jqassistant.core parent - 2.6.0-SNAPSHOT + 2.6.0-M2 shared jQAssistant Core Shared diff --git a/core/store/pom.xml b/core/store/pom.xml index f5d1fe4d2..24bb1b4e0 100644 --- a/core/store/pom.xml +++ b/core/store/pom.xml @@ -3,7 +3,7 @@ com.buschmais.jqassistant.core parent - 2.6.0-SNAPSHOT + 2.6.0-M2 store jQAssistant Core Store diff --git a/core/test/pom.xml b/core/test/pom.xml index 2cc751b48..166f5b4a4 100644 --- a/core/test/pom.xml +++ b/core/test/pom.xml @@ -3,7 +3,7 @@ com.buschmais.jqassistant.core parent - 2.6.0-SNAPSHOT + 2.6.0-M2 test diff --git a/distribution-specification/pom.xml b/distribution-specification/pom.xml index b35fc466f..705daf965 100644 --- a/distribution-specification/pom.xml +++ b/distribution-specification/pom.xml @@ -4,7 +4,7 @@ com.buschmais.jqassistant parent - 2.6.0-SNAPSHOT + 2.6.0-M2 jqa-distribution-specification diff --git a/manual/pom.xml b/manual/pom.xml index c5c505c78..25dabf8d5 100644 --- a/manual/pom.xml +++ b/manual/pom.xml @@ -4,7 +4,7 @@ com.buschmais.jqassistant parent - 2.6.0-SNAPSHOT + 2.6.0-M2 manual diff --git a/maven/pom.xml b/maven/pom.xml index 7590a335a..7f94c26a7 100644 --- a/maven/pom.xml +++ b/maven/pom.xml @@ -4,7 +4,7 @@ com.buschmais.jqassistant parent - 2.6.0-SNAPSHOT + 2.6.0-M2 jqassistant-maven-plugin diff --git a/plugin/common/pom.xml b/plugin/common/pom.xml index 2dab0a0c9..36e63a674 100644 --- a/plugin/common/pom.xml +++ b/plugin/common/pom.xml @@ -4,7 +4,7 @@ com.buschmais.jqassistant.plugin parent - 2.6.0-SNAPSHOT + 2.6.0-M2 common diff --git a/plugin/java/pom.xml b/plugin/java/pom.xml index 12285f29b..3bba16dc1 100644 --- a/plugin/java/pom.xml +++ b/plugin/java/pom.xml @@ -4,7 +4,7 @@ com.buschmais.jqassistant.plugin parent - 2.6.0-SNAPSHOT + 2.6.0-M2 java diff --git a/plugin/json/pom.xml b/plugin/json/pom.xml index e4779749c..533fcfd88 100644 --- a/plugin/json/pom.xml +++ b/plugin/json/pom.xml @@ -4,7 +4,7 @@ com.buschmais.jqassistant.plugin parent - 2.6.0-SNAPSHOT + 2.6.0-M2 json diff --git a/plugin/junit/pom.xml b/plugin/junit/pom.xml index 3aeb21873..5e2aa70f7 100644 --- a/plugin/junit/pom.xml +++ b/plugin/junit/pom.xml @@ -4,7 +4,7 @@ com.buschmais.jqassistant.plugin parent - 2.6.0-SNAPSHOT + 2.6.0-M2 junit diff --git a/plugin/maven/pom.xml b/plugin/maven/pom.xml index fee5b2b75..c12613d4a 100644 --- a/plugin/maven/pom.xml +++ b/plugin/maven/pom.xml @@ -4,7 +4,7 @@ com.buschmais.jqassistant.plugin parent - 2.6.0-SNAPSHOT + 2.6.0-M2 maven3 diff --git a/plugin/pom.xml b/plugin/pom.xml index 4b6c0dc2c..41e7b38e8 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -4,7 +4,7 @@ com.buschmais.jqassistant parent - 2.6.0-SNAPSHOT + 2.6.0-M2 com.buschmais.jqassistant.plugin diff --git a/plugin/xml/pom.xml b/plugin/xml/pom.xml index 1f947eba4..6707c36aa 100644 --- a/plugin/xml/pom.xml +++ b/plugin/xml/pom.xml @@ -4,7 +4,7 @@ com.buschmais.jqassistant.plugin parent - 2.6.0-SNAPSHOT + 2.6.0-M2 xml diff --git a/plugin/yaml/pom.xml b/plugin/yaml/pom.xml index e6613c215..4e2e4acfe 100644 --- a/plugin/yaml/pom.xml +++ b/plugin/yaml/pom.xml @@ -4,7 +4,7 @@ com.buschmais.jqassistant.plugin parent - 2.6.0-SNAPSHOT + 2.6.0-M2 yaml2 diff --git a/pom.xml b/pom.xml index 630f0e7c9..20ad3bbcf 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ com.buschmais.jqassistant parent - 2.6.0-SNAPSHOT + 2.6.0-M2 pom jQAssistant Parent @@ -37,7 +37,7 @@ scm:git:https://github.com/jqassistant/jqassistant.git scm:git:https://github.com/jqassistant/jqassistant.git https://github.com/jqassistant/jqassistant/ - parent-2.4.0-M1 + 2.6.0-M2 From 8f9edb24c98048813a9de99184a51ff3d73537cc Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Wed, 4 Dec 2024 09:30:08 +0000 Subject: [PATCH 4/4] [maven-release-plugin] prepare for next development iteration --- bom/pom.xml | 2 +- cli/application/pom.xml | 2 +- cli/assembly/pom.xml | 2 +- cli/neo4jv4/pom.xml | 2 +- cli/neo4jv5/pom.xml | 2 +- cli/pom.xml | 2 +- cli/test/pom.xml | 2 +- core/analysis/pom.xml | 2 +- core/artifact-resolver/pom.xml | 2 +- core/neo4j/pom.xml | 2 +- core/pom.xml | 2 +- core/report/pom.xml | 2 +- core/rule/pom.xml | 2 +- core/runtime/pom.xml | 2 +- core/scanner/pom.xml | 2 +- core/schemata/pom.xml | 2 +- core/shared/pom.xml | 2 +- core/store/pom.xml | 2 +- core/test/pom.xml | 2 +- distribution-specification/pom.xml | 2 +- manual/pom.xml | 2 +- maven/pom.xml | 2 +- plugin/common/pom.xml | 2 +- plugin/java/pom.xml | 2 +- plugin/json/pom.xml | 2 +- plugin/junit/pom.xml | 2 +- plugin/maven/pom.xml | 2 +- plugin/pom.xml | 2 +- plugin/xml/pom.xml | 2 +- plugin/yaml/pom.xml | 2 +- pom.xml | 4 ++-- 31 files changed, 32 insertions(+), 32 deletions(-) diff --git a/bom/pom.xml b/bom/pom.xml index eaedb901a..367acbdfe 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -4,7 +4,7 @@ com.buschmais.jqassistant parent - 2.6.0-M2 + 2.6.0-SNAPSHOT bom diff --git a/cli/application/pom.xml b/cli/application/pom.xml index 940bb0416..d55554168 100644 --- a/cli/application/pom.xml +++ b/cli/application/pom.xml @@ -4,7 +4,7 @@ com.buschmais.jqassistant.cli parent - 2.6.0-M2 + 2.6.0-SNAPSHOT com.buschmais.jqassistant.cli application diff --git a/cli/assembly/pom.xml b/cli/assembly/pom.xml index e79a424c7..aad335605 100644 --- a/cli/assembly/pom.xml +++ b/cli/assembly/pom.xml @@ -3,7 +3,7 @@ com.buschmais.jqassistant.cli parent - 2.6.0-M2 + 2.6.0-SNAPSHOT assembly diff --git a/cli/neo4jv4/pom.xml b/cli/neo4jv4/pom.xml index c2655b0f6..d4b319837 100644 --- a/cli/neo4jv4/pom.xml +++ b/cli/neo4jv4/pom.xml @@ -3,7 +3,7 @@ com.buschmais.jqassistant.cli parent - 2.6.0-M2 + 2.6.0-SNAPSHOT jqassistant-commandline-neo4jv4 diff --git a/cli/neo4jv5/pom.xml b/cli/neo4jv5/pom.xml index 0c251dc4a..1afce6cc5 100644 --- a/cli/neo4jv5/pom.xml +++ b/cli/neo4jv5/pom.xml @@ -3,7 +3,7 @@ com.buschmais.jqassistant.cli parent - 2.6.0-M2 + 2.6.0-SNAPSHOT jqassistant-commandline-neo4jv5 diff --git a/cli/pom.xml b/cli/pom.xml index 7cbe9864a..a6397edc6 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -3,7 +3,7 @@ com.buschmais.jqassistant parent - 2.6.0-M2 + 2.6.0-SNAPSHOT com.buschmais.jqassistant.cli diff --git a/cli/test/pom.xml b/cli/test/pom.xml index 10f02bfcf..bd916482c 100644 --- a/cli/test/pom.xml +++ b/cli/test/pom.xml @@ -3,7 +3,7 @@ com.buschmais.jqassistant.cli parent - 2.6.0-M2 + 2.6.0-SNAPSHOT test diff --git a/core/analysis/pom.xml b/core/analysis/pom.xml index 0cf3aaf75..aa08edced 100644 --- a/core/analysis/pom.xml +++ b/core/analysis/pom.xml @@ -3,7 +3,7 @@ com.buschmais.jqassistant.core parent - 2.6.0-M2 + 2.6.0-SNAPSHOT analysis diff --git a/core/artifact-resolver/pom.xml b/core/artifact-resolver/pom.xml index 88d645791..33a172c31 100644 --- a/core/artifact-resolver/pom.xml +++ b/core/artifact-resolver/pom.xml @@ -4,7 +4,7 @@ com.buschmais.jqassistant.core parent - 2.6.0-M2 + 2.6.0-SNAPSHOT artifact-resolver diff --git a/core/neo4j/pom.xml b/core/neo4j/pom.xml index 463230225..bdf9d120a 100644 --- a/core/neo4j/pom.xml +++ b/core/neo4j/pom.xml @@ -4,7 +4,7 @@ com.buschmais.jqassistant.core parent - 2.6.0-M2 + 2.6.0-SNAPSHOT neo4j diff --git a/core/pom.xml b/core/pom.xml index 82d989747..da7d7d781 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -3,7 +3,7 @@ com.buschmais.jqassistant parent - 2.6.0-M2 + 2.6.0-SNAPSHOT com.buschmais.jqassistant.core diff --git a/core/report/pom.xml b/core/report/pom.xml index 053e75ae2..968936823 100644 --- a/core/report/pom.xml +++ b/core/report/pom.xml @@ -3,7 +3,7 @@ com.buschmais.jqassistant.core parent - 2.6.0-M2 + 2.6.0-SNAPSHOT report diff --git a/core/rule/pom.xml b/core/rule/pom.xml index 05c60134e..35c5afdc2 100644 --- a/core/rule/pom.xml +++ b/core/rule/pom.xml @@ -3,7 +3,7 @@ com.buschmais.jqassistant.core parent - 2.6.0-M2 + 2.6.0-SNAPSHOT rule diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml index 71b086b49..df10227a6 100644 --- a/core/runtime/pom.xml +++ b/core/runtime/pom.xml @@ -3,7 +3,7 @@ com.buschmais.jqassistant.core parent - 2.6.0-M2 + 2.6.0-SNAPSHOT runtime diff --git a/core/scanner/pom.xml b/core/scanner/pom.xml index 605582895..c997573c9 100644 --- a/core/scanner/pom.xml +++ b/core/scanner/pom.xml @@ -3,7 +3,7 @@ com.buschmais.jqassistant.core parent - 2.6.0-M2 + 2.6.0-SNAPSHOT scanner jQAssistant Core Scanner diff --git a/core/schemata/pom.xml b/core/schemata/pom.xml index 751c51ecd..ed475e757 100644 --- a/core/schemata/pom.xml +++ b/core/schemata/pom.xml @@ -3,7 +3,7 @@ com.buschmais.jqassistant.core parent - 2.6.0-M2 + 2.6.0-SNAPSHOT schemata diff --git a/core/shared/pom.xml b/core/shared/pom.xml index 7f9f6accf..bbdb1fdc5 100644 --- a/core/shared/pom.xml +++ b/core/shared/pom.xml @@ -3,7 +3,7 @@ com.buschmais.jqassistant.core parent - 2.6.0-M2 + 2.6.0-SNAPSHOT shared jQAssistant Core Shared diff --git a/core/store/pom.xml b/core/store/pom.xml index 24bb1b4e0..f5d1fe4d2 100644 --- a/core/store/pom.xml +++ b/core/store/pom.xml @@ -3,7 +3,7 @@ com.buschmais.jqassistant.core parent - 2.6.0-M2 + 2.6.0-SNAPSHOT store jQAssistant Core Store diff --git a/core/test/pom.xml b/core/test/pom.xml index 166f5b4a4..2cc751b48 100644 --- a/core/test/pom.xml +++ b/core/test/pom.xml @@ -3,7 +3,7 @@ com.buschmais.jqassistant.core parent - 2.6.0-M2 + 2.6.0-SNAPSHOT test diff --git a/distribution-specification/pom.xml b/distribution-specification/pom.xml index 705daf965..b35fc466f 100644 --- a/distribution-specification/pom.xml +++ b/distribution-specification/pom.xml @@ -4,7 +4,7 @@ com.buschmais.jqassistant parent - 2.6.0-M2 + 2.6.0-SNAPSHOT jqa-distribution-specification diff --git a/manual/pom.xml b/manual/pom.xml index 25dabf8d5..c5c505c78 100644 --- a/manual/pom.xml +++ b/manual/pom.xml @@ -4,7 +4,7 @@ com.buschmais.jqassistant parent - 2.6.0-M2 + 2.6.0-SNAPSHOT manual diff --git a/maven/pom.xml b/maven/pom.xml index 7f94c26a7..7590a335a 100644 --- a/maven/pom.xml +++ b/maven/pom.xml @@ -4,7 +4,7 @@ com.buschmais.jqassistant parent - 2.6.0-M2 + 2.6.0-SNAPSHOT jqassistant-maven-plugin diff --git a/plugin/common/pom.xml b/plugin/common/pom.xml index 36e63a674..2dab0a0c9 100644 --- a/plugin/common/pom.xml +++ b/plugin/common/pom.xml @@ -4,7 +4,7 @@ com.buschmais.jqassistant.plugin parent - 2.6.0-M2 + 2.6.0-SNAPSHOT common diff --git a/plugin/java/pom.xml b/plugin/java/pom.xml index 3bba16dc1..12285f29b 100644 --- a/plugin/java/pom.xml +++ b/plugin/java/pom.xml @@ -4,7 +4,7 @@ com.buschmais.jqassistant.plugin parent - 2.6.0-M2 + 2.6.0-SNAPSHOT java diff --git a/plugin/json/pom.xml b/plugin/json/pom.xml index 533fcfd88..e4779749c 100644 --- a/plugin/json/pom.xml +++ b/plugin/json/pom.xml @@ -4,7 +4,7 @@ com.buschmais.jqassistant.plugin parent - 2.6.0-M2 + 2.6.0-SNAPSHOT json diff --git a/plugin/junit/pom.xml b/plugin/junit/pom.xml index 5e2aa70f7..3aeb21873 100644 --- a/plugin/junit/pom.xml +++ b/plugin/junit/pom.xml @@ -4,7 +4,7 @@ com.buschmais.jqassistant.plugin parent - 2.6.0-M2 + 2.6.0-SNAPSHOT junit diff --git a/plugin/maven/pom.xml b/plugin/maven/pom.xml index c12613d4a..fee5b2b75 100644 --- a/plugin/maven/pom.xml +++ b/plugin/maven/pom.xml @@ -4,7 +4,7 @@ com.buschmais.jqassistant.plugin parent - 2.6.0-M2 + 2.6.0-SNAPSHOT maven3 diff --git a/plugin/pom.xml b/plugin/pom.xml index 41e7b38e8..4b6c0dc2c 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -4,7 +4,7 @@ com.buschmais.jqassistant parent - 2.6.0-M2 + 2.6.0-SNAPSHOT com.buschmais.jqassistant.plugin diff --git a/plugin/xml/pom.xml b/plugin/xml/pom.xml index 6707c36aa..1f947eba4 100644 --- a/plugin/xml/pom.xml +++ b/plugin/xml/pom.xml @@ -4,7 +4,7 @@ com.buschmais.jqassistant.plugin parent - 2.6.0-M2 + 2.6.0-SNAPSHOT xml diff --git a/plugin/yaml/pom.xml b/plugin/yaml/pom.xml index 4e2e4acfe..e6613c215 100644 --- a/plugin/yaml/pom.xml +++ b/plugin/yaml/pom.xml @@ -4,7 +4,7 @@ com.buschmais.jqassistant.plugin parent - 2.6.0-M2 + 2.6.0-SNAPSHOT yaml2 diff --git a/pom.xml b/pom.xml index 20ad3bbcf..630f0e7c9 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ com.buschmais.jqassistant parent - 2.6.0-M2 + 2.6.0-SNAPSHOT pom jQAssistant Parent @@ -37,7 +37,7 @@ scm:git:https://github.com/jqassistant/jqassistant.git scm:git:https://github.com/jqassistant/jqassistant.git https://github.com/jqassistant/jqassistant/ - 2.6.0-M2 + parent-2.4.0-M1