From 7cc6bbab1fb40d2f7abbf9df767edf986f4d4a0c Mon Sep 17 00:00:00 2001 From: Gang Li Date: Wed, 13 Mar 2019 15:27:29 +0800 Subject: [PATCH 01/56] Remove exception stacktrace for remote url Malformed exception I really don't think this exception stack trace is needed as all useful info has been logged, And it occupied bunch of the log space and polluted the log reading. So removed it. --- .../java/org/commonjava/indy/model/core/RemoteRepository.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/core-java/src/main/java/org/commonjava/indy/model/core/RemoteRepository.java b/models/core-java/src/main/java/org/commonjava/indy/model/core/RemoteRepository.java index 688ecdad95..82a2b15182 100644 --- a/models/core-java/src/main/java/org/commonjava/indy/model/core/RemoteRepository.java +++ b/models/core-java/src/main/java/org/commonjava/indy/model/core/RemoteRepository.java @@ -206,7 +206,7 @@ public void calculateFields() } catch ( final MalformedURLException e ) { - LOGGER.error( String.format( "Failed to parse repository URL: '%s'. Reason: %s", this.url, e.getMessage() ), e ); + LOGGER.error( String.format( "Failed to parse repository URL: '%s'. Reason: %s", this.url, e.getMessage() ) ); } if ( url == null ) From 55204042b7496e19c48ec898602982d54692b55e Mon Sep 17 00:00:00 2001 From: Gang Li Date: Tue, 12 Mar 2019 21:27:15 +0800 Subject: [PATCH 02/56] Use same package type for promotion tmp remote repo --- .../commonjava/indy/promote/validate/PromotionValidator.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/promote/common/src/main/java/org/commonjava/indy/promote/validate/PromotionValidator.java b/addons/promote/common/src/main/java/org/commonjava/indy/promote/validate/PromotionValidator.java index 9557454a21..559ef9e399 100644 --- a/addons/promote/common/src/main/java/org/commonjava/indy/promote/validate/PromotionValidator.java +++ b/addons/promote/common/src/main/java/org/commonjava/indy/promote/validate/PromotionValidator.java @@ -284,7 +284,9 @@ private ArtifactStore getRequestStore( PromoteRequest promoteRequest, String bas String tempName = PROMOTE_REPO_PREFIX + "tmp_" + pathsReq.getSource().getName() + new SimpleDateFormat( "yyyyMMdd.hhmmss.SSSZ" ).format( new Date() ); - final RemoteRepository tempRemote = new RemoteRepository( tempName, baseUrl ); + String packageType = promoteRequest.getSource().getPackageType(); + + final RemoteRepository tempRemote = new RemoteRepository( packageType, tempName, baseUrl ); tempRemote.setPathMaskPatterns( pathsReq.getPaths() ); From 34e9bc4b9083e9d4a4802be980cfc0b843e0a53d Mon Sep 17 00:00:00 2001 From: Gang Li Date: Tue, 12 Mar 2019 22:01:52 +0800 Subject: [PATCH 03/56] Add separator between name and timestamp in promotion tmp remote repo name --- .../indy/promote/validate/PromotionValidator.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/promote/common/src/main/java/org/commonjava/indy/promote/validate/PromotionValidator.java b/addons/promote/common/src/main/java/org/commonjava/indy/promote/validate/PromotionValidator.java index 559ef9e399..6dc163a16b 100644 --- a/addons/promote/common/src/main/java/org/commonjava/indy/promote/validate/PromotionValidator.java +++ b/addons/promote/common/src/main/java/org/commonjava/indy/promote/validate/PromotionValidator.java @@ -281,10 +281,11 @@ private ArtifactStore getRequestStore( PromoteRequest promoteRequest, String bas baseUrl ); final PathsPromoteRequest pathsReq = (PathsPromoteRequest) promoteRequest; - String tempName = PROMOTE_REPO_PREFIX + "tmp_" + pathsReq.getSource().getName() + new SimpleDateFormat( - "yyyyMMdd.hhmmss.SSSZ" ).format( new Date() ); + String tempName = + PROMOTE_REPO_PREFIX + "tmp_" + pathsReq.getSource().getName() + "_" + new SimpleDateFormat( + "yyyyMMdd.hhmmss.SSSZ" ).format( new Date() ); - String packageType = promoteRequest.getSource().getPackageType(); + String packageType = pathsReq.getSource().getPackageType(); final RemoteRepository tempRemote = new RemoteRepository( packageType, tempName, baseUrl ); From 20559523c00ad05fb47d833c73953c9235e928d4 Mon Sep 17 00:00:00 2001 From: Gang Li Date: Wed, 13 Mar 2019 11:19:32 +0800 Subject: [PATCH 04/56] Fix issue for temporary remote not deleted after promotion validation --- .../promote/validate/PromotionValidator.java | 27 ++++++++++++++----- 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/addons/promote/common/src/main/java/org/commonjava/indy/promote/validate/PromotionValidator.java b/addons/promote/common/src/main/java/org/commonjava/indy/promote/validate/PromotionValidator.java index 6dc163a16b..a3823d284d 100644 --- a/addons/promote/common/src/main/java/org/commonjava/indy/promote/validate/PromotionValidator.java +++ b/addons/promote/common/src/main/java/org/commonjava/indy/promote/validate/PromotionValidator.java @@ -116,18 +116,29 @@ public ValidationRequest validate( PromoteRequest request, ValidationResult resu { ValidationRuleSet set = validationsManager.getRuleSetMatching( request.getTargetKey() ); - final ArtifactStore store = getRequestStore( request, baseUrl ); - final ValidationRequest req = new ValidationRequest( request, set, validationTools, store ); + ArtifactStore source; + try + { + source = storeDataMgr.getArtifactStore( request.getSource() ); + } + catch ( IndyDataException e ) + { + throw new PromotionValidationException( + String.format( "Failed to retrieve source ArtifactStore: %s for validation", request.getSource() ), + e ); + } if ( set != null ) { - + logger.debug( "Running validation rule-set for promotion: {}", set.getName() ); result.setRuleSet( set.getName() ); List ruleNames = set.getRuleNames(); if ( ruleNames != null && !ruleNames.isEmpty() ) { + final ArtifactStore store = getRequestStore( request, baseUrl ); + final ValidationRequest req = new ValidationRequest( request, set, validationTools, store ); try { DrainingExecutorCompletionService svc = @@ -202,15 +213,19 @@ public ValidationRequest validate( PromoteRequest request, ValidationResult resu } } } - + return req; + } + else + { + logger.info( "No validation rules are defined for: {}", request.getTargetKey() ); + return new ValidationRequest( request, set, validationTools, source ); } } else { logger.info( "No validation rule-sets are defined for: {}", request.getTargetKey() ); + return new ValidationRequest( request, set, validationTools, source ); } - - return req; } @Measure From 9d40db7a76054e602076fde632419f8c82cced3b Mon Sep 17 00:00:00 2001 From: Gang Li Date: Thu, 14 Mar 2019 10:10:55 +0800 Subject: [PATCH 05/56] Add system level gauges for metrics --- .../indy/metrics/system/SystemGaugesSet.java | 72 +++++++++++++++++++ .../metrics/system/SystemInstrumentation.java | 31 ++++++++ .../indy/metrics/IndyMetricsManager.java | 3 +- 3 files changed, 105 insertions(+), 1 deletion(-) create mode 100644 subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/system/SystemGaugesSet.java create mode 100644 subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/system/SystemInstrumentation.java diff --git a/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/system/SystemGaugesSet.java b/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/system/SystemGaugesSet.java new file mode 100644 index 0000000000..44ec8b255d --- /dev/null +++ b/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/system/SystemGaugesSet.java @@ -0,0 +1,72 @@ +/** + * Copyright (C) 2013~2019 Red Hat, Inc. + * + * 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. + */ +package org.commonjava.indy.metrics.system; + +import com.codahale.metrics.Gauge; +import com.codahale.metrics.Metric; +import com.codahale.metrics.MetricSet; + +import java.lang.management.ManagementFactory; +import java.lang.management.OperatingSystemMXBean; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + +/** + * A set of gauges for system gauges, including stats on cpu, process, physical mem, swap mem. + */ +public class SystemGaugesSet + implements MetricSet +{ + private final OperatingSystemMXBean operatingSystemMXBean; + + public SystemGaugesSet() + { + this( ManagementFactory.getOperatingSystemMXBean() ); + } + + public SystemGaugesSet( OperatingSystemMXBean mxBean ) + { + this.operatingSystemMXBean = mxBean; + } + + public Map getMetrics() + { + if ( !( operatingSystemMXBean instanceof com.sun.management.OperatingSystemMXBean ) ) + { + return Collections.emptyMap(); + } + + final com.sun.management.OperatingSystemMXBean osMxBean = + (com.sun.management.OperatingSystemMXBean) operatingSystemMXBean; + + final Map gauges = new HashMap<>(); + + gauges.put( "process.cpu.load", (Gauge) osMxBean::getProcessCpuLoad ); + gauges.put( "system.cpu.load", (Gauge) osMxBean::getSystemCpuLoad ); + gauges.put( "system.load.avg", (Gauge) osMxBean::getSystemLoadAverage ); + gauges.put( "process.cpu.time.ms", (Gauge) () -> osMxBean.getProcessCpuTime() * 1000 ); + + gauges.put( "mem.total.swap", (Gauge) osMxBean::getTotalSwapSpaceSize ); + gauges.put( "mem.total.physical", (Gauge) osMxBean::getTotalPhysicalMemorySize ); + gauges.put( "mem.free.physical", (Gauge) osMxBean::getFreePhysicalMemorySize ); + gauges.put( "mem.free.swap", (Gauge) osMxBean::getFreeSwapSpaceSize ); + + return Collections.unmodifiableMap( gauges ); + + } + +} diff --git a/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/system/SystemInstrumentation.java b/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/system/SystemInstrumentation.java new file mode 100644 index 0000000000..65929c50f8 --- /dev/null +++ b/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/system/SystemInstrumentation.java @@ -0,0 +1,31 @@ +/** + * Copyright (C) 2013~2019 Red Hat, Inc. + * + * 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. + */ +package org.commonjava.indy.metrics.system; + +import com.codahale.metrics.MetricRegistry; + +import static com.codahale.metrics.MetricRegistry.name; + +public class SystemInstrumentation +{ + private static final String SYSTEM = "system"; + + public static void registerSystemMetric( String nodePrefix, MetricRegistry registry ) + { + registry.register( name( nodePrefix, SYSTEM ), new SystemGaugesSet() ); + + } +} diff --git a/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/IndyMetricsManager.java b/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/IndyMetricsManager.java index cce312b4d3..7817abfd6f 100644 --- a/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/IndyMetricsManager.java +++ b/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/IndyMetricsManager.java @@ -31,7 +31,6 @@ import javax.annotation.PostConstruct; import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; import javax.enterprise.inject.Instance; import javax.enterprise.inject.Produces; import javax.inject.Inject; @@ -47,6 +46,7 @@ import static org.commonjava.indy.metrics.IndyMetricsConstants.SKIP_METRIC; import static org.commonjava.indy.metrics.IndyMetricsConstants.TIMER; import static org.commonjava.indy.metrics.jvm.IndyJVMInstrumentation.registerJvmMetric; +import static org.commonjava.indy.metrics.system.SystemInstrumentation.registerSystemMetric; import static org.commonjava.indy.model.core.StoreType.remote; import static org.commonjava.indy.pkg.maven.model.MavenPackageTypeDescriptor.MAVEN_PKG_KEY; @@ -99,6 +99,7 @@ public void init() logger.info( "Init metrics subsystem..." ); + registerSystemMetric( config.getNodePrefix(), metricRegistry ); registerJvmMetric( config.getNodePrefix(), metricRegistry ); // Health checks From b5319c1e80512b5d6700a8b5b755dd1cc221c555 Mon Sep 17 00:00:00 2001 From: Gang Li Date: Thu, 14 Mar 2019 14:19:08 +0800 Subject: [PATCH 06/56] Avoid any exception break metrics reporting in SystemGaugeSet --- .../indy/metrics/system/SystemGaugesSet.java | 27 +++++++++++++------ 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/system/SystemGaugesSet.java b/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/system/SystemGaugesSet.java index 44ec8b255d..31edc77eac 100644 --- a/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/system/SystemGaugesSet.java +++ b/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/system/SystemGaugesSet.java @@ -18,6 +18,8 @@ import com.codahale.metrics.Gauge; import com.codahale.metrics.Metric; import com.codahale.metrics.MetricSet; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.lang.management.ManagementFactory; import java.lang.management.OperatingSystemMXBean; @@ -31,6 +33,8 @@ public class SystemGaugesSet implements MetricSet { + private final Logger logger = LoggerFactory.getLogger( this.getClass() ); + private final OperatingSystemMXBean operatingSystemMXBean; public SystemGaugesSet() @@ -55,15 +59,22 @@ public Map getMetrics() final Map gauges = new HashMap<>(); - gauges.put( "process.cpu.load", (Gauge) osMxBean::getProcessCpuLoad ); - gauges.put( "system.cpu.load", (Gauge) osMxBean::getSystemCpuLoad ); - gauges.put( "system.load.avg", (Gauge) osMxBean::getSystemLoadAverage ); - gauges.put( "process.cpu.time.ms", (Gauge) () -> osMxBean.getProcessCpuTime() * 1000 ); + try + { + gauges.put( "process.cpu.load", (Gauge) osMxBean::getProcessCpuLoad ); + gauges.put( "system.cpu.load", (Gauge) osMxBean::getSystemCpuLoad ); + gauges.put( "system.load.avg", (Gauge) osMxBean::getSystemLoadAverage ); + gauges.put( "process.cpu.time.ms", (Gauge) () -> osMxBean.getProcessCpuTime() * 1000 ); - gauges.put( "mem.total.swap", (Gauge) osMxBean::getTotalSwapSpaceSize ); - gauges.put( "mem.total.physical", (Gauge) osMxBean::getTotalPhysicalMemorySize ); - gauges.put( "mem.free.physical", (Gauge) osMxBean::getFreePhysicalMemorySize ); - gauges.put( "mem.free.swap", (Gauge) osMxBean::getFreeSwapSpaceSize ); + gauges.put( "mem.total.swap", (Gauge) osMxBean::getTotalSwapSpaceSize ); + gauges.put( "mem.total.physical", (Gauge) osMxBean::getTotalPhysicalMemorySize ); + gauges.put( "mem.free.physical", (Gauge) osMxBean::getFreePhysicalMemorySize ); + gauges.put( "mem.free.swap", (Gauge) osMxBean::getFreeSwapSpaceSize ); + } + catch ( Throwable e ) + { + logger.warn( "Can not get system level metrics. Reason: {}", e.getMessage() ); + } return Collections.unmodifiableMap( gauges ); From f7e2e5f26e1f57340654accbc4e8b037e428020d Mon Sep 17 00:00:00 2001 From: Gang Li Date: Thu, 14 Mar 2019 15:10:56 +0800 Subject: [PATCH 07/56] Add path promotion files count metrics --- addons/promote/common/pom.xml | 4 +++ .../indy/promote/data/PromotionManager.java | 27 +++++++++++++++++-- .../indy/metrics/IndyMetricsManager.java | 10 +++++++ 3 files changed, 39 insertions(+), 2 deletions(-) diff --git a/addons/promote/common/pom.xml b/addons/promote/common/pom.xml index a047663702..5cdeec3304 100644 --- a/addons/promote/common/pom.xml +++ b/addons/promote/common/pom.xml @@ -61,6 +61,10 @@ org.commonjava.atlas atlas-identities + + org.commonjava.indy + indy-subsys-metrics-reporter + diff --git a/addons/promote/common/src/main/java/org/commonjava/indy/promote/data/PromotionManager.java b/addons/promote/common/src/main/java/org/commonjava/indy/promote/data/PromotionManager.java index 35798b3790..55d416edba 100644 --- a/addons/promote/common/src/main/java/org/commonjava/indy/promote/data/PromotionManager.java +++ b/addons/promote/common/src/main/java/org/commonjava/indy/promote/data/PromotionManager.java @@ -30,6 +30,7 @@ import org.commonjava.indy.data.IndyDataException; import org.commonjava.indy.data.StoreDataManager; import org.commonjava.indy.measure.annotation.Measure; +import org.commonjava.indy.metrics.IndyMetricsManager; import org.commonjava.indy.model.core.ArtifactStore; import org.commonjava.indy.model.core.Group; import org.commonjava.indy.model.core.HostedRepository; @@ -64,6 +65,7 @@ import java.io.InputStream; import java.util.ArrayList; import java.util.Collections; +import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; @@ -93,6 +95,9 @@ public class PromotionManager private final Logger logger = LoggerFactory.getLogger( getClass() ); + @Inject + private IndyMetricsManager metricsManager; + @Inject private PromoteConfig config; @@ -511,8 +516,10 @@ private PathsPromoteResult doPathsPromotion( PathsPromoteRequest request, String } else if ( validation.isValid() ) { - return runPathPromotions( request, pending, Collections.emptySet(), Collections.emptySet(), contents, - validation, validationRequest ); + PathsPromoteResult result = runPathPromotions( request, pending, Collections.emptySet(), Collections.emptySet(), contents, + validation, validationRequest ); + doPathPromoteMetrics( contents.size(), result ); + return result; } else { @@ -521,6 +528,22 @@ else if ( validation.isValid() ) } } + private void doPathPromoteMetrics( int total, PathsPromoteResult result ) + { + try + { + Map pathPromoteMetrics = new HashMap<>(); + pathPromoteMetrics.put( "total", total ); + pathPromoteMetrics.put( "complete", result.getCompletedPaths().size() ); + pathPromoteMetrics.put( "skipped", result.getSkippedPaths().size() ); + metricsManager.addGauges( this.getClass(), "path.promote", pathPromoteMetrics ); + } + catch ( Throwable e ) + { + logger.warn( "Failed to get path promote files metrics. Reason: {} ", e.getMessage() ); + } + } + private Future submitPathsPromoteRequest( PathsPromoteRequest request, final String baseUrl ) throws IndyWorkflowException { diff --git a/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/IndyMetricsManager.java b/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/IndyMetricsManager.java index 7817abfd6f..14ccdb5fdb 100644 --- a/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/IndyMetricsManager.java +++ b/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/IndyMetricsManager.java @@ -41,6 +41,7 @@ import static com.codahale.metrics.MetricRegistry.name; import static org.apache.commons.lang.StringUtils.isNotBlank; +import static org.commonjava.indy.metrics.IndyMetricsConstants.DEFAULT; import static org.commonjava.indy.metrics.IndyMetricsConstants.EXCEPTION; import static org.commonjava.indy.metrics.IndyMetricsConstants.METER; import static org.commonjava.indy.metrics.IndyMetricsConstants.SKIP_METRIC; @@ -252,4 +253,13 @@ public T wrapWithStandardMetrics( final Supplier method, final Supplier void addGauges( Class className, String method, Map gauges ) + { + String defaultName = IndyMetricsConstants.getDefaultName( className, method ); + gauges.forEach( ( k, t ) -> { + String name = IndyMetricsConstants.getName( config.getNodePrefix(), DEFAULT, defaultName, k ); + metricRegistry.gauge( name, () -> () -> t ); + } ); + } + } From 20a3b227d144aa71468e3b351e8038aad0631a1e Mon Sep 17 00:00:00 2001 From: Gang Li Date: Thu, 14 Mar 2019 08:24:44 +0000 Subject: [PATCH 08/56] Fix license headers --- .../indy/core/expire/ScheduleManagerBooter.java | 15 +++++++++++++++ .../subsys/cpool/CPInitialContextFactory.java | 15 +++++++++++++++ .../indy/subsys/cpool/ConnectionPoolBooter.java | 15 +++++++++++++++ .../indy/subsys/cpool/ConnectionPoolConfig.java | 15 +++++++++++++++ .../indy/subsys/cpool/ConnectionPoolInfo.java | 15 +++++++++++++++ .../indy/subsys/cpool/ConnectionPoolProvider.java | 15 +++++++++++++++ .../subsys/cpool/ContextBindAndLookupTest.java | 15 +++++++++++++++ .../indy/metrics/system/SystemGaugesSet.java | 2 +- .../metrics/system/SystemInstrumentation.java | 2 +- 9 files changed, 107 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/org/commonjava/indy/core/expire/ScheduleManagerBooter.java b/core/src/main/java/org/commonjava/indy/core/expire/ScheduleManagerBooter.java index 34c101a5ff..d9299ef6b2 100644 --- a/core/src/main/java/org/commonjava/indy/core/expire/ScheduleManagerBooter.java +++ b/core/src/main/java/org/commonjava/indy/core/expire/ScheduleManagerBooter.java @@ -1,3 +1,18 @@ +/** + * Copyright (C) 2011-2018 Red Hat, Inc. (https://github.com/Commonjava/indy) + * + * 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. + */ package org.commonjava.indy.core.expire; import org.commonjava.indy.action.BootupAction; diff --git a/subsys/cpool/src/main/java/org/commonjava/indy/subsys/cpool/CPInitialContextFactory.java b/subsys/cpool/src/main/java/org/commonjava/indy/subsys/cpool/CPInitialContextFactory.java index 3da2de12bd..337aef1604 100644 --- a/subsys/cpool/src/main/java/org/commonjava/indy/subsys/cpool/CPInitialContextFactory.java +++ b/subsys/cpool/src/main/java/org/commonjava/indy/subsys/cpool/CPInitialContextFactory.java @@ -1,3 +1,18 @@ +/** + * Copyright (C) 2011-2018 Red Hat, Inc. (https://github.com/Commonjava/indy) + * + * 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. + */ package org.commonjava.indy.subsys.cpool; import javax.naming.Context; diff --git a/subsys/cpool/src/main/java/org/commonjava/indy/subsys/cpool/ConnectionPoolBooter.java b/subsys/cpool/src/main/java/org/commonjava/indy/subsys/cpool/ConnectionPoolBooter.java index 7b7aa56d8e..7de45bd36b 100644 --- a/subsys/cpool/src/main/java/org/commonjava/indy/subsys/cpool/ConnectionPoolBooter.java +++ b/subsys/cpool/src/main/java/org/commonjava/indy/subsys/cpool/ConnectionPoolBooter.java @@ -1,3 +1,18 @@ +/** + * Copyright (C) 2011-2018 Red Hat, Inc. (https://github.com/Commonjava/indy) + * + * 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. + */ package org.commonjava.indy.subsys.cpool; import org.commonjava.indy.action.BootupAction; diff --git a/subsys/cpool/src/main/java/org/commonjava/indy/subsys/cpool/ConnectionPoolConfig.java b/subsys/cpool/src/main/java/org/commonjava/indy/subsys/cpool/ConnectionPoolConfig.java index ea8bdb1c6e..5387b94012 100644 --- a/subsys/cpool/src/main/java/org/commonjava/indy/subsys/cpool/ConnectionPoolConfig.java +++ b/subsys/cpool/src/main/java/org/commonjava/indy/subsys/cpool/ConnectionPoolConfig.java @@ -1,3 +1,18 @@ +/** + * Copyright (C) 2011-2018 Red Hat, Inc. (https://github.com/Commonjava/indy) + * + * 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. + */ package org.commonjava.indy.subsys.cpool; import org.commonjava.indy.conf.IndyConfigInfo; diff --git a/subsys/cpool/src/main/java/org/commonjava/indy/subsys/cpool/ConnectionPoolInfo.java b/subsys/cpool/src/main/java/org/commonjava/indy/subsys/cpool/ConnectionPoolInfo.java index f4519670c1..0ad574b15c 100644 --- a/subsys/cpool/src/main/java/org/commonjava/indy/subsys/cpool/ConnectionPoolInfo.java +++ b/subsys/cpool/src/main/java/org/commonjava/indy/subsys/cpool/ConnectionPoolInfo.java @@ -1,3 +1,18 @@ +/** + * Copyright (C) 2011-2018 Red Hat, Inc. (https://github.com/Commonjava/indy) + * + * 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. + */ package org.commonjava.indy.subsys.cpool; import java.util.Collections; diff --git a/subsys/cpool/src/main/java/org/commonjava/indy/subsys/cpool/ConnectionPoolProvider.java b/subsys/cpool/src/main/java/org/commonjava/indy/subsys/cpool/ConnectionPoolProvider.java index 70e6646c8d..cae55744dd 100644 --- a/subsys/cpool/src/main/java/org/commonjava/indy/subsys/cpool/ConnectionPoolProvider.java +++ b/subsys/cpool/src/main/java/org/commonjava/indy/subsys/cpool/ConnectionPoolProvider.java @@ -1,3 +1,18 @@ +/** + * Copyright (C) 2011-2018 Red Hat, Inc. (https://github.com/Commonjava/indy) + * + * 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. + */ package org.commonjava.indy.subsys.cpool; import com.codahale.metrics.MetricRegistry; diff --git a/subsys/cpool/src/test/java/org/commonjava/indy/subsys/cpool/ContextBindAndLookupTest.java b/subsys/cpool/src/test/java/org/commonjava/indy/subsys/cpool/ContextBindAndLookupTest.java index 274ee12861..8c133fc864 100644 --- a/subsys/cpool/src/test/java/org/commonjava/indy/subsys/cpool/ContextBindAndLookupTest.java +++ b/subsys/cpool/src/test/java/org/commonjava/indy/subsys/cpool/ContextBindAndLookupTest.java @@ -1,3 +1,18 @@ +/** + * Copyright (C) 2011-2018 Red Hat, Inc. (https://github.com/Commonjava/indy) + * + * 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. + */ package org.commonjava.indy.subsys.cpool; import org.junit.Test; diff --git a/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/system/SystemGaugesSet.java b/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/system/SystemGaugesSet.java index 31edc77eac..de7c3bd5b9 100644 --- a/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/system/SystemGaugesSet.java +++ b/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/system/SystemGaugesSet.java @@ -1,5 +1,5 @@ /** - * Copyright (C) 2013~2019 Red Hat, Inc. + * Copyright (C) 2011-2018 Red Hat, Inc. (https://github.com/Commonjava/indy) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/system/SystemInstrumentation.java b/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/system/SystemInstrumentation.java index 65929c50f8..36c8a90418 100644 --- a/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/system/SystemInstrumentation.java +++ b/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/system/SystemInstrumentation.java @@ -1,5 +1,5 @@ /** - * Copyright (C) 2013~2019 Red Hat, Inc. + * Copyright (C) 2011-2018 Red Hat, Inc. (https://github.com/Commonjava/indy) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. From 8cd73d22bad66f5ec9ba31780d39d27cb011ede1 Mon Sep 17 00:00:00 2001 From: Gang Li Date: Thu, 14 Mar 2019 08:31:49 +0000 Subject: [PATCH 09/56] Align SNAPSHOT versions --- deployments/docker/pom.xml | 2 +- embedder-tests/pom.xml | 2 +- embedder-tests/savant/pom.xml | 2 +- embedder-tests/sonar-report/pom.xml | 2 +- test/docker/gogs-test-appliance/pom.xml | 2 +- test/docker/keycloak-test-appliance/pom.xml | 2 +- test/docker/pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/deployments/docker/pom.xml b/deployments/docker/pom.xml index 18e717db95..468ebb80bb 100644 --- a/deployments/docker/pom.xml +++ b/deployments/docker/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-deployments - 1.7.3-SNAPSHOT + 1.7.4-SNAPSHOT org.commonjava.indy.docker diff --git a/embedder-tests/pom.xml b/embedder-tests/pom.xml index 2543c0b52e..4f2243dbd3 100644 --- a/embedder-tests/pom.xml +++ b/embedder-tests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 1.7.3-SNAPSHOT + 1.7.4-SNAPSHOT org.commonjava.indy.embed.test diff --git a/embedder-tests/savant/pom.xml b/embedder-tests/savant/pom.xml index c6fd1550e1..588972d837 100644 --- a/embedder-tests/savant/pom.xml +++ b/embedder-tests/savant/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.embed.test indy-embedder-tests - 1.7.3-SNAPSHOT + 1.7.4-SNAPSHOT indy-embedder-test-savant diff --git a/embedder-tests/sonar-report/pom.xml b/embedder-tests/sonar-report/pom.xml index e2da32f633..61e7fda705 100644 --- a/embedder-tests/sonar-report/pom.xml +++ b/embedder-tests/sonar-report/pom.xml @@ -22,7 +22,7 @@ indy-embedder-tests org.commonjava.indy.embed.test - 1.7.3-SNAPSHOT + 1.7.4-SNAPSHOT 4.0.0 diff --git a/test/docker/gogs-test-appliance/pom.xml b/test/docker/gogs-test-appliance/pom.xml index 3abf1d070d..4d9c1bf634 100644 --- a/test/docker/gogs-test-appliance/pom.xml +++ b/test/docker/gogs-test-appliance/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.docker indy-test-docker-appliances - 1.7.3-SNAPSHOT + 1.7.4-SNAPSHOT indy-docker-gogs-test-appliance diff --git a/test/docker/keycloak-test-appliance/pom.xml b/test/docker/keycloak-test-appliance/pom.xml index 6e87155a28..55fc7acd74 100644 --- a/test/docker/keycloak-test-appliance/pom.xml +++ b/test/docker/keycloak-test-appliance/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.docker indy-test-docker-appliances - 1.7.3-SNAPSHOT + 1.7.4-SNAPSHOT indy-docker-keycloak-test-appliance diff --git a/test/docker/pom.xml b/test/docker/pom.xml index cecdb9fb05..f9c83f4234 100644 --- a/test/docker/pom.xml +++ b/test/docker/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 1.7.3-SNAPSHOT + 1.7.4-SNAPSHOT org.commonjava.indy.docker From 4d8fe39b05629ab2ec36881baaf2a6fa9fe5487b Mon Sep 17 00:00:00 2001 From: Gang Li Date: Thu, 14 Mar 2019 08:42:06 +0000 Subject: [PATCH 10/56] Disable docker for release for now --- deployments/pom.xml | 2 ++ test/pom.xml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/deployments/pom.xml b/deployments/pom.xml index 8bf92df4c7..e8a380f47e 100644 --- a/deployments/pom.xml +++ b/deployments/pom.xml @@ -42,11 +42,13 @@ docker + diff --git a/test/pom.xml b/test/pom.xml index 192d8c2731..c01a7b4a4e 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -57,11 +57,13 @@ docker + From 08e4309da0a1a7ea1ffbad691c3b24c869e13ced Mon Sep 17 00:00:00 2001 From: Gang Li Date: Thu, 14 Mar 2019 08:51:10 +0000 Subject: [PATCH 11/56] [maven-release-plugin] prepare release indy-parent-1.7.4 --- addons/autoprox/client-java/pom.xml | 2 +- addons/autoprox/common/pom.xml | 2 +- addons/autoprox/ftests/pom.xml | 2 +- addons/autoprox/jaxrs/pom.xml | 2 +- addons/autoprox/model-java/pom.xml | 2 +- addons/autoprox/pom.xml | 2 +- addons/content-browse/common/pom.xml | 2 +- addons/content-browse/ftests/pom.xml | 2 +- addons/content-browse/jaxrs/pom.xml | 2 +- addons/content-browse/model-java/pom.xml | 2 +- addons/content-browse/pom.xml | 2 +- addons/content-browse/ui/pom.xml | 2 +- addons/content-index/pom.xml | 2 +- addons/diagnostics/client-java/pom.xml | 2 +- addons/diagnostics/common/pom.xml | 2 +- addons/diagnostics/ftests/pom.xml | 2 +- addons/diagnostics/jaxrs/pom.xml | 2 +- addons/diagnostics/pom.xml | 2 +- addons/dot-maven/common/pom.xml | 2 +- addons/dot-maven/ftests/pom.xml | 2 +- addons/dot-maven/jaxrs/pom.xml | 2 +- addons/dot-maven/pom.xml | 2 +- addons/folo/client-java/pom.xml | 2 +- addons/folo/common/pom.xml | 2 +- addons/folo/ftests/pom.xml | 2 +- addons/folo/jaxrs/pom.xml | 2 +- addons/folo/model-java/pom.xml | 2 +- addons/folo/pom.xml | 2 +- addons/hosted-by-archive/client-java/pom.xml | 2 +- addons/hosted-by-archive/common/pom.xml | 2 +- addons/hosted-by-archive/ftests/pom.xml | 2 +- addons/hosted-by-archive/jaxrs/pom.xml | 2 +- addons/hosted-by-archive/pom.xml | 2 +- addons/httprox/common/pom.xml | 2 +- addons/httprox/ftests/pom.xml | 2 +- addons/httprox/jaxrs/pom.xml | 2 +- addons/httprox/pom.xml | 2 +- addons/implied-repos/client-java/pom.xml | 2 +- addons/implied-repos/common/pom.xml | 2 +- addons/implied-repos/ftests/pom.xml | 2 +- addons/implied-repos/model-java/pom.xml | 2 +- addons/implied-repos/pom.xml | 2 +- addons/koji/client-java/pom.xml | 2 +- addons/koji/common/pom.xml | 2 +- addons/koji/jaxrs/pom.xml | 2 +- addons/koji/model-java/pom.xml | 2 +- addons/koji/pom.xml | 2 +- addons/pkg-maven/common/pom.xml | 2 +- addons/pkg-maven/ftests/pom.xml | 2 +- addons/pkg-maven/jaxrs/pom.xml | 2 +- addons/pkg-maven/pom.xml | 2 +- addons/pkg-npm/common/pom.xml | 2 +- addons/pkg-npm/ftests/pom.xml | 2 +- addons/pkg-npm/jaxrs/pom.xml | 2 +- addons/pkg-npm/model-java/pom.xml | 2 +- addons/pkg-npm/pom.xml | 2 +- addons/pom.xml | 2 +- addons/promote/client-java/pom.xml | 2 +- addons/promote/common/pom.xml | 2 +- addons/promote/ftests/pom.xml | 2 +- addons/promote/jaxrs/pom.xml | 2 +- addons/promote/model-java/pom.xml | 2 +- addons/promote/pom.xml | 2 +- addons/relate/common/pom.xml | 2 +- addons/relate/ftests/pom.xml | 2 +- addons/relate/pom.xml | 2 +- addons/revisions/common/pom.xml | 2 +- addons/revisions/jaxrs/pom.xml | 2 +- addons/revisions/pom.xml | 2 +- addons/setback/common/pom.xml | 2 +- addons/setback/jaxrs/pom.xml | 2 +- addons/setback/pom.xml | 2 +- api/pom.xml | 2 +- bindings/jaxrs/pom.xml | 2 +- bindings/pom.xml | 2 +- boot/api/pom.xml | 2 +- boot/jaxrs/pom.xml | 2 +- boot/pom.xml | 2 +- clients/core-java/pom.xml | 2 +- clients/pom.xml | 2 +- core/pom.xml | 2 +- db/flat/pom.xml | 2 +- db/memory/pom.xml | 2 +- db/pom.xml | 2 +- deployments/cache-migrator/pom.xml | 2 +- deployments/launcher/pom.xml | 2 +- deployments/pom.xml | 2 +- embedder/pom.xml | 2 +- filers/default/pom.xml | 2 +- filers/pom.xml | 2 +- ftests/common/pom.xml | 2 +- ftests/core/pom.xml | 2 +- ftests/metrics/pom.xml | 2 +- ftests/pom.xml | 2 +- models/core-java/pom.xml | 2 +- models/pom.xml | 2 +- pom.xml | 240 +++++++++---------- rest/api/pom.xml | 2 +- rest/pom.xml | 2 +- subsys/cpool/pom.xml | 2 +- subsys/flatfile/pom.xml | 2 +- subsys/git/pom.xml | 2 +- subsys/groovy/pom.xml | 2 +- subsys/http/pom.xml | 2 +- subsys/infinispan/pom.xml | 2 +- subsys/jaxrs/pom.xml | 2 +- subsys/kafka/pom.xml | 2 +- subsys/keycloak/pom.xml | 2 +- subsys/metrics/core/pom.xml | 2 +- subsys/metrics/pom.xml | 2 +- subsys/metrics/reporter/pom.xml | 2 +- subsys/pom.xml | 2 +- subsys/prefetch/pom.xml | 2 +- test/db/pom.xml | 2 +- test/fixtures-core/pom.xml | 2 +- test/pom.xml | 2 +- test/providers-core/pom.xml | 2 +- test/utils/pom.xml | 2 +- tools/assemblies/pom.xml | 2 +- tools/pom.xml | 2 +- uis/layover/pom.xml | 2 +- uis/pom.xml | 2 +- 122 files changed, 241 insertions(+), 241 deletions(-) diff --git a/addons/autoprox/client-java/pom.xml b/addons/autoprox/client-java/pom.xml index e29bb8e7b5..f0b11389c3 100644 --- a/addons/autoprox/client-java/pom.xml +++ b/addons/autoprox/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-autoprox - 1.7.4-SNAPSHOT + 1.7.4 indy-autoprox-client-java Indy :: Add-Ons :: Auto-Proxy :: Java Client diff --git a/addons/autoprox/common/pom.xml b/addons/autoprox/common/pom.xml index 6829d7721f..c3a77cfc7f 100644 --- a/addons/autoprox/common/pom.xml +++ b/addons/autoprox/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-autoprox - 1.7.4-SNAPSHOT + 1.7.4 indy-autoprox-common Indy :: Add-Ons :: Auto-Proxy :: Common diff --git a/addons/autoprox/ftests/pom.xml b/addons/autoprox/ftests/pom.xml index 448be73f86..f0efd21c82 100644 --- a/addons/autoprox/ftests/pom.xml +++ b/addons/autoprox/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-autoprox - 1.7.4-SNAPSHOT + 1.7.4 indy-ftests-autoprox diff --git a/addons/autoprox/jaxrs/pom.xml b/addons/autoprox/jaxrs/pom.xml index 2584cb8977..a0d4e8b7d0 100644 --- a/addons/autoprox/jaxrs/pom.xml +++ b/addons/autoprox/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-autoprox - 1.7.4-SNAPSHOT + 1.7.4 indy-autoprox-jaxrs diff --git a/addons/autoprox/model-java/pom.xml b/addons/autoprox/model-java/pom.xml index e4492d5d0e..1ab05a105e 100644 --- a/addons/autoprox/model-java/pom.xml +++ b/addons/autoprox/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-autoprox - 1.7.4-SNAPSHOT + 1.7.4 indy-autoprox-model-java Indy :: Add-Ons :: Auto-Proxy :: Java Domain Model diff --git a/addons/autoprox/pom.xml b/addons/autoprox/pom.xml index f701fac99b..5618fd2986 100644 --- a/addons/autoprox/pom.xml +++ b/addons/autoprox/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 1.7.4-SNAPSHOT + 1.7.4 indy-autoprox Indy :: Add-Ons :: Auto-Proxy :: Parent diff --git a/addons/content-browse/common/pom.xml b/addons/content-browse/common/pom.xml index d294e40a19..5de854078a 100644 --- a/addons/content-browse/common/pom.xml +++ b/addons/content-browse/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-content-browse - 1.7.4-SNAPSHOT + 1.7.4 indy-content-browse-common Indy :: Add-Ons :: Directory Content Browse :: Common diff --git a/addons/content-browse/ftests/pom.xml b/addons/content-browse/ftests/pom.xml index 5aad032c78..13747d9449 100644 --- a/addons/content-browse/ftests/pom.xml +++ b/addons/content-browse/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-content-browse - 1.7.4-SNAPSHOT + 1.7.4 indy-ftests-content-browse diff --git a/addons/content-browse/jaxrs/pom.xml b/addons/content-browse/jaxrs/pom.xml index 240b5977b9..3ae4f7077b 100644 --- a/addons/content-browse/jaxrs/pom.xml +++ b/addons/content-browse/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-content-browse - 1.7.4-SNAPSHOT + 1.7.4 indy-content-browse-jaxrs diff --git a/addons/content-browse/model-java/pom.xml b/addons/content-browse/model-java/pom.xml index 0101484b3c..0018f5b6c2 100644 --- a/addons/content-browse/model-java/pom.xml +++ b/addons/content-browse/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-content-browse - 1.7.4-SNAPSHOT + 1.7.4 indy-content-browse-model-java Indy :: Add-Ons :: Directory Content Browse :: Java Domain Model diff --git a/addons/content-browse/pom.xml b/addons/content-browse/pom.xml index 153aa63a23..09eeb291e6 100644 --- a/addons/content-browse/pom.xml +++ b/addons/content-browse/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 1.7.4-SNAPSHOT + 1.7.4 indy-content-browse Indy :: Add-Ons :: Directory Content Browse :: Parent diff --git a/addons/content-browse/ui/pom.xml b/addons/content-browse/ui/pom.xml index f75bcbb584..c9cf393328 100644 --- a/addons/content-browse/ui/pom.xml +++ b/addons/content-browse/ui/pom.xml @@ -20,7 +20,7 @@ indy-content-browse org.commonjava.indy - 1.7.4-SNAPSHOT + 1.7.4 4.0.0 diff --git a/addons/content-index/pom.xml b/addons/content-index/pom.xml index a84988fbe8..645d612b90 100644 --- a/addons/content-index/pom.xml +++ b/addons/content-index/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 1.7.4-SNAPSHOT + 1.7.4 indy-content-index diff --git a/addons/diagnostics/client-java/pom.xml b/addons/diagnostics/client-java/pom.xml index c0c09dc1ff..33dc375784 100644 --- a/addons/diagnostics/client-java/pom.xml +++ b/addons/diagnostics/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 1.7.4-SNAPSHOT + 1.7.4 indy-diagnostics-client-java Indy :: Add-Ons :: Diagnostic Tools :: Java Client diff --git a/addons/diagnostics/common/pom.xml b/addons/diagnostics/common/pom.xml index 9fda20368a..cf719a1369 100644 --- a/addons/diagnostics/common/pom.xml +++ b/addons/diagnostics/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 1.7.4-SNAPSHOT + 1.7.4 indy-diagnostics-common Indy :: Add-Ons :: Diagnostic Tools :: Common diff --git a/addons/diagnostics/ftests/pom.xml b/addons/diagnostics/ftests/pom.xml index 665b7d76cd..6c2a19e9cf 100644 --- a/addons/diagnostics/ftests/pom.xml +++ b/addons/diagnostics/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 1.7.4-SNAPSHOT + 1.7.4 indy-ftests-diagnostics diff --git a/addons/diagnostics/jaxrs/pom.xml b/addons/diagnostics/jaxrs/pom.xml index c1325f06d6..bebd768e18 100644 --- a/addons/diagnostics/jaxrs/pom.xml +++ b/addons/diagnostics/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 1.7.4-SNAPSHOT + 1.7.4 indy-diagnostics-jaxrs diff --git a/addons/diagnostics/pom.xml b/addons/diagnostics/pom.xml index 11c5bf8eb2..9df2962981 100644 --- a/addons/diagnostics/pom.xml +++ b/addons/diagnostics/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 1.7.4-SNAPSHOT + 1.7.4 indy-diagnostics Indy :: Add-Ons :: Diagnostic Tools :: Parent diff --git a/addons/dot-maven/common/pom.xml b/addons/dot-maven/common/pom.xml index c54ef30656..e2b78ec92a 100644 --- a/addons/dot-maven/common/pom.xml +++ b/addons/dot-maven/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-dot-maven - 1.7.4-SNAPSHOT + 1.7.4 indy-dot-maven-common Indy :: Add-Ons :: Dot-Maven (.m2 WebDAV) :: Common Core diff --git a/addons/dot-maven/ftests/pom.xml b/addons/dot-maven/ftests/pom.xml index 1f7d4a3bd6..01707eed3e 100644 --- a/addons/dot-maven/ftests/pom.xml +++ b/addons/dot-maven/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-dot-maven - 1.7.4-SNAPSHOT + 1.7.4 indy-ftests-dot-maven diff --git a/addons/dot-maven/jaxrs/pom.xml b/addons/dot-maven/jaxrs/pom.xml index c4dec6d31f..5b5cb09a32 100644 --- a/addons/dot-maven/jaxrs/pom.xml +++ b/addons/dot-maven/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-dot-maven - 1.7.4-SNAPSHOT + 1.7.4 indy-dot-maven-jaxrs diff --git a/addons/dot-maven/pom.xml b/addons/dot-maven/pom.xml index 7b41862d5b..4ce465f2ad 100644 --- a/addons/dot-maven/pom.xml +++ b/addons/dot-maven/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 1.7.4-SNAPSHOT + 1.7.4 indy-dot-maven diff --git a/addons/folo/client-java/pom.xml b/addons/folo/client-java/pom.xml index 1ea9289ef1..b9e7c11a60 100644 --- a/addons/folo/client-java/pom.xml +++ b/addons/folo/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 1.7.4-SNAPSHOT + 1.7.4 indy-folo-client-java Indy :: Add-Ons :: Folo Usage Tracker :: Java Client diff --git a/addons/folo/common/pom.xml b/addons/folo/common/pom.xml index bcf6f0e25d..143765affb 100644 --- a/addons/folo/common/pom.xml +++ b/addons/folo/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 1.7.4-SNAPSHOT + 1.7.4 indy-folo-common Indy :: Add-Ons :: Folo Usage Tracker :: Common diff --git a/addons/folo/ftests/pom.xml b/addons/folo/ftests/pom.xml index e01a70a5e7..be3bff8de8 100644 --- a/addons/folo/ftests/pom.xml +++ b/addons/folo/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 1.7.4-SNAPSHOT + 1.7.4 indy-ftests-folo diff --git a/addons/folo/jaxrs/pom.xml b/addons/folo/jaxrs/pom.xml index 7d47ec570e..3a7a1c667d 100644 --- a/addons/folo/jaxrs/pom.xml +++ b/addons/folo/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 1.7.4-SNAPSHOT + 1.7.4 indy-folo-jaxrs diff --git a/addons/folo/model-java/pom.xml b/addons/folo/model-java/pom.xml index 6f2977caba..0750fc7b48 100644 --- a/addons/folo/model-java/pom.xml +++ b/addons/folo/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 1.7.4-SNAPSHOT + 1.7.4 indy-folo-model-java Indy :: Add-Ons :: Folo Usage Tracker :: Java Domain Model diff --git a/addons/folo/pom.xml b/addons/folo/pom.xml index bf23d45799..e8889346bf 100644 --- a/addons/folo/pom.xml +++ b/addons/folo/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 1.7.4-SNAPSHOT + 1.7.4 indy-folo Indy :: Add-Ons :: Folo Usage Tracker :: Parent diff --git a/addons/hosted-by-archive/client-java/pom.xml b/addons/hosted-by-archive/client-java/pom.xml index 0e6f916935..c71017d9c2 100644 --- a/addons/hosted-by-archive/client-java/pom.xml +++ b/addons/hosted-by-archive/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-hosted-by-archive - 1.7.4-SNAPSHOT + 1.7.4 indy-hosted-by-archive-client-java Indy :: Add-Ons :: Hosted By Archive :: Java Client diff --git a/addons/hosted-by-archive/common/pom.xml b/addons/hosted-by-archive/common/pom.xml index b2ad7a338e..e64a45fe3a 100644 --- a/addons/hosted-by-archive/common/pom.xml +++ b/addons/hosted-by-archive/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-hosted-by-archive - 1.7.4-SNAPSHOT + 1.7.4 indy-hosted-by-archive-common Indy :: Add-Ons :: Hosted By Archive :: Common diff --git a/addons/hosted-by-archive/ftests/pom.xml b/addons/hosted-by-archive/ftests/pom.xml index 23a68178c3..12c79ade79 100644 --- a/addons/hosted-by-archive/ftests/pom.xml +++ b/addons/hosted-by-archive/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-hosted-by-archive - 1.7.4-SNAPSHOT + 1.7.4 indy-ftests-hosted-by-archive diff --git a/addons/hosted-by-archive/jaxrs/pom.xml b/addons/hosted-by-archive/jaxrs/pom.xml index d198b6c08a..4e8d54158b 100644 --- a/addons/hosted-by-archive/jaxrs/pom.xml +++ b/addons/hosted-by-archive/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-hosted-by-archive - 1.7.4-SNAPSHOT + 1.7.4 indy-hosted-by-archive-jaxrs diff --git a/addons/hosted-by-archive/pom.xml b/addons/hosted-by-archive/pom.xml index 1655698a64..1cbac8d77b 100644 --- a/addons/hosted-by-archive/pom.xml +++ b/addons/hosted-by-archive/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 1.7.4-SNAPSHOT + 1.7.4 indy-hosted-by-archive Indy :: Add-Ons :: Hosted By Archive :: Parent diff --git a/addons/httprox/common/pom.xml b/addons/httprox/common/pom.xml index b77ed0c21e..f44e46ce90 100644 --- a/addons/httprox/common/pom.xml +++ b/addons/httprox/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 1.7.4-SNAPSHOT + 1.7.4 indy-httprox-common Indy :: Add-Ons :: HTTProx (HTTP Proxy) :: Common Core diff --git a/addons/httprox/ftests/pom.xml b/addons/httprox/ftests/pom.xml index fb506d49fa..8ddf9e49fe 100644 --- a/addons/httprox/ftests/pom.xml +++ b/addons/httprox/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 1.7.4-SNAPSHOT + 1.7.4 indy-ftests-httprox diff --git a/addons/httprox/jaxrs/pom.xml b/addons/httprox/jaxrs/pom.xml index ca03ef51fb..7e66a0ebd2 100644 --- a/addons/httprox/jaxrs/pom.xml +++ b/addons/httprox/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 1.7.4-SNAPSHOT + 1.7.4 indy-httprox-jaxrs Indy :: Add-Ons :: HTTProx (HTTP Proxy) :: JAX-RS Handlers diff --git a/addons/httprox/pom.xml b/addons/httprox/pom.xml index 31280cb7cf..bd61ed92b1 100644 --- a/addons/httprox/pom.xml +++ b/addons/httprox/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 1.7.4-SNAPSHOT + 1.7.4 indy-httprox diff --git a/addons/implied-repos/client-java/pom.xml b/addons/implied-repos/client-java/pom.xml index 24f9197de7..6e6c989c39 100644 --- a/addons/implied-repos/client-java/pom.xml +++ b/addons/implied-repos/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-implied-repos - 1.7.4-SNAPSHOT + 1.7.4 indy-implied-repos-client-java Indy :: Add-Ons :: Implied Repositories :: Java Client diff --git a/addons/implied-repos/common/pom.xml b/addons/implied-repos/common/pom.xml index f83f647ca1..7eaeb6c9a4 100644 --- a/addons/implied-repos/common/pom.xml +++ b/addons/implied-repos/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-implied-repos - 1.7.4-SNAPSHOT + 1.7.4 indy-implied-repos-common Indy :: Add-Ons :: Implied Repositories :: Common diff --git a/addons/implied-repos/ftests/pom.xml b/addons/implied-repos/ftests/pom.xml index d9f0fe1de6..ef866de927 100644 --- a/addons/implied-repos/ftests/pom.xml +++ b/addons/implied-repos/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-implied-repos - 1.7.4-SNAPSHOT + 1.7.4 indy-ftests-implied-repos diff --git a/addons/implied-repos/model-java/pom.xml b/addons/implied-repos/model-java/pom.xml index 3960d635b9..9da11e9177 100644 --- a/addons/implied-repos/model-java/pom.xml +++ b/addons/implied-repos/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-implied-repos - 1.7.4-SNAPSHOT + 1.7.4 indy-implied-repos-model-java Indy :: Add-Ons :: Implied Repositories :: Java Domain Model diff --git a/addons/implied-repos/pom.xml b/addons/implied-repos/pom.xml index 346583b09e..29ffc67efe 100644 --- a/addons/implied-repos/pom.xml +++ b/addons/implied-repos/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 1.7.4-SNAPSHOT + 1.7.4 indy-implied-repos Indy :: Add-Ons :: Implied Repositories :: Parent diff --git a/addons/koji/client-java/pom.xml b/addons/koji/client-java/pom.xml index 7391a4cee5..2195313b68 100644 --- a/addons/koji/client-java/pom.xml +++ b/addons/koji/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 1.7.4-SNAPSHOT + 1.7.4 indy-koji-client-java Indy :: Add-Ons :: Koji Integration :: Java Client diff --git a/addons/koji/common/pom.xml b/addons/koji/common/pom.xml index 1593aa33ca..07de5bb5da 100644 --- a/addons/koji/common/pom.xml +++ b/addons/koji/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 1.7.4-SNAPSHOT + 1.7.4 indy-koji-common Indy :: Add-Ons :: Koji Integration :: Common diff --git a/addons/koji/jaxrs/pom.xml b/addons/koji/jaxrs/pom.xml index dc00afcce2..926d1be8ab 100644 --- a/addons/koji/jaxrs/pom.xml +++ b/addons/koji/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 1.7.4-SNAPSHOT + 1.7.4 indy-koji-jaxrs diff --git a/addons/koji/model-java/pom.xml b/addons/koji/model-java/pom.xml index 607c2f81cb..0563718da5 100644 --- a/addons/koji/model-java/pom.xml +++ b/addons/koji/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 1.7.4-SNAPSHOT + 1.7.4 indy-koji-model-java Indy :: Add-Ons :: Koji Integration :: Java Domain Model diff --git a/addons/koji/pom.xml b/addons/koji/pom.xml index cf78060f36..72b98d4b7d 100644 --- a/addons/koji/pom.xml +++ b/addons/koji/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 1.7.4-SNAPSHOT + 1.7.4 indy-koji Indy :: Add-Ons :: Koji Integration :: Parent diff --git a/addons/pkg-maven/common/pom.xml b/addons/pkg-maven/common/pom.xml index b1dbd1cf35..c88a326b31 100644 --- a/addons/pkg-maven/common/pom.xml +++ b/addons/pkg-maven/common/pom.xml @@ -20,7 +20,7 @@ indy-pkg-maven org.commonjava.indy - 1.7.4-SNAPSHOT + 1.7.4 4.0.0 diff --git a/addons/pkg-maven/ftests/pom.xml b/addons/pkg-maven/ftests/pom.xml index a69704414f..eeab1cd440 100644 --- a/addons/pkg-maven/ftests/pom.xml +++ b/addons/pkg-maven/ftests/pom.xml @@ -20,7 +20,7 @@ indy-pkg-maven org.commonjava.indy - 1.7.4-SNAPSHOT + 1.7.4 4.0.0 diff --git a/addons/pkg-maven/jaxrs/pom.xml b/addons/pkg-maven/jaxrs/pom.xml index 309095b5d3..9329db3068 100644 --- a/addons/pkg-maven/jaxrs/pom.xml +++ b/addons/pkg-maven/jaxrs/pom.xml @@ -20,7 +20,7 @@ indy-pkg-maven org.commonjava.indy - 1.7.4-SNAPSHOT + 1.7.4 4.0.0 diff --git a/addons/pkg-maven/pom.xml b/addons/pkg-maven/pom.xml index e191694c48..e38388a1a7 100644 --- a/addons/pkg-maven/pom.xml +++ b/addons/pkg-maven/pom.xml @@ -20,7 +20,7 @@ indy-addons org.commonjava.indy - 1.7.4-SNAPSHOT + 1.7.4 4.0.0 diff --git a/addons/pkg-npm/common/pom.xml b/addons/pkg-npm/common/pom.xml index 5bd3946244..4c6f53105a 100644 --- a/addons/pkg-npm/common/pom.xml +++ b/addons/pkg-npm/common/pom.xml @@ -20,7 +20,7 @@ indy-pkg-npm org.commonjava.indy - 1.7.4-SNAPSHOT + 1.7.4 4.0.0 diff --git a/addons/pkg-npm/ftests/pom.xml b/addons/pkg-npm/ftests/pom.xml index ed99f5b6d7..ccc9157c6b 100644 --- a/addons/pkg-npm/ftests/pom.xml +++ b/addons/pkg-npm/ftests/pom.xml @@ -20,7 +20,7 @@ indy-pkg-npm org.commonjava.indy - 1.7.4-SNAPSHOT + 1.7.4 4.0.0 diff --git a/addons/pkg-npm/jaxrs/pom.xml b/addons/pkg-npm/jaxrs/pom.xml index 0a3c57cb81..6b10934ab8 100644 --- a/addons/pkg-npm/jaxrs/pom.xml +++ b/addons/pkg-npm/jaxrs/pom.xml @@ -20,7 +20,7 @@ indy-pkg-npm org.commonjava.indy - 1.7.4-SNAPSHOT + 1.7.4 4.0.0 diff --git a/addons/pkg-npm/model-java/pom.xml b/addons/pkg-npm/model-java/pom.xml index b1f85d8655..ac1d208556 100644 --- a/addons/pkg-npm/model-java/pom.xml +++ b/addons/pkg-npm/model-java/pom.xml @@ -20,7 +20,7 @@ indy-pkg-npm org.commonjava.indy - 1.7.4-SNAPSHOT + 1.7.4 4.0.0 diff --git a/addons/pkg-npm/pom.xml b/addons/pkg-npm/pom.xml index 7d448ca49b..2f2df1c961 100644 --- a/addons/pkg-npm/pom.xml +++ b/addons/pkg-npm/pom.xml @@ -20,7 +20,7 @@ indy-addons org.commonjava.indy - 1.7.4-SNAPSHOT + 1.7.4 4.0.0 diff --git a/addons/pom.xml b/addons/pom.xml index 68d7a3fbae..3ed4225c6c 100644 --- a/addons/pom.xml +++ b/addons/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-parent - 1.7.4-SNAPSHOT + 1.7.4 indy-addons diff --git a/addons/promote/client-java/pom.xml b/addons/promote/client-java/pom.xml index f33e8d6697..b0f120fdf4 100644 --- a/addons/promote/client-java/pom.xml +++ b/addons/promote/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 1.7.4-SNAPSHOT + 1.7.4 indy-promote-client-java Indy :: Add-Ons :: Artifact Promotion :: Java Client diff --git a/addons/promote/common/pom.xml b/addons/promote/common/pom.xml index 5cdeec3304..242fc37f48 100644 --- a/addons/promote/common/pom.xml +++ b/addons/promote/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 1.7.4-SNAPSHOT + 1.7.4 indy-promote-common Indy :: Add-Ons :: Artifact Promotion :: Common diff --git a/addons/promote/ftests/pom.xml b/addons/promote/ftests/pom.xml index 75eea54af2..f2c68a0f84 100644 --- a/addons/promote/ftests/pom.xml +++ b/addons/promote/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 1.7.4-SNAPSHOT + 1.7.4 indy-ftests-promote diff --git a/addons/promote/jaxrs/pom.xml b/addons/promote/jaxrs/pom.xml index b43852b8ef..e8d3c3ac2d 100644 --- a/addons/promote/jaxrs/pom.xml +++ b/addons/promote/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 1.7.4-SNAPSHOT + 1.7.4 indy-promote-jaxrs diff --git a/addons/promote/model-java/pom.xml b/addons/promote/model-java/pom.xml index 13a47e4853..7b80e35f7c 100644 --- a/addons/promote/model-java/pom.xml +++ b/addons/promote/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 1.7.4-SNAPSHOT + 1.7.4 indy-promote-model-java Indy :: Add-Ons :: Artifact Promotion :: Java Domain Model diff --git a/addons/promote/pom.xml b/addons/promote/pom.xml index 44d208aa5b..818d50c984 100644 --- a/addons/promote/pom.xml +++ b/addons/promote/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 1.7.4-SNAPSHOT + 1.7.4 indy-promote Indy :: Add-Ons :: Artifact Promotion :: Parent diff --git a/addons/relate/common/pom.xml b/addons/relate/common/pom.xml index 40b23f956d..24afcc0817 100644 --- a/addons/relate/common/pom.xml +++ b/addons/relate/common/pom.xml @@ -20,7 +20,7 @@ indy-relate org.commonjava.indy - 1.7.4-SNAPSHOT + 1.7.4 4.0.0 diff --git a/addons/relate/ftests/pom.xml b/addons/relate/ftests/pom.xml index b358c7fea2..6e172ea1f0 100644 --- a/addons/relate/ftests/pom.xml +++ b/addons/relate/ftests/pom.xml @@ -20,7 +20,7 @@ indy-relate org.commonjava.indy - 1.7.4-SNAPSHOT + 1.7.4 4.0.0 diff --git a/addons/relate/pom.xml b/addons/relate/pom.xml index 82f58ebac9..62e68d82c0 100644 --- a/addons/relate/pom.xml +++ b/addons/relate/pom.xml @@ -21,7 +21,7 @@ indy-addons org.commonjava.indy - 1.7.4-SNAPSHOT + 1.7.4 indy-relate diff --git a/addons/revisions/common/pom.xml b/addons/revisions/common/pom.xml index 8e1492eb76..d42f19c956 100644 --- a/addons/revisions/common/pom.xml +++ b/addons/revisions/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-revisions - 1.7.4-SNAPSHOT + 1.7.4 indy-revisions-common Indy :: Add-Ons :: Revisions :: Common diff --git a/addons/revisions/jaxrs/pom.xml b/addons/revisions/jaxrs/pom.xml index 2421ccbc2f..c3ba9147fe 100644 --- a/addons/revisions/jaxrs/pom.xml +++ b/addons/revisions/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-revisions - 1.7.4-SNAPSHOT + 1.7.4 indy-revisions-jaxrs diff --git a/addons/revisions/pom.xml b/addons/revisions/pom.xml index 4c540d6a1b..1031a29dec 100644 --- a/addons/revisions/pom.xml +++ b/addons/revisions/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 1.7.4-SNAPSHOT + 1.7.4 indy-revisions Indy :: Add-Ons :: Revisions :: Parent diff --git a/addons/setback/common/pom.xml b/addons/setback/common/pom.xml index 93f4bbd47b..70f097dc38 100644 --- a/addons/setback/common/pom.xml +++ b/addons/setback/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-setback - 1.7.4-SNAPSHOT + 1.7.4 indy-setback-common Indy :: Add-Ons :: Set-Back :: Common diff --git a/addons/setback/jaxrs/pom.xml b/addons/setback/jaxrs/pom.xml index ae8b788c55..1ceb28c8ea 100644 --- a/addons/setback/jaxrs/pom.xml +++ b/addons/setback/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-setback - 1.7.4-SNAPSHOT + 1.7.4 indy-setback-jaxrs diff --git a/addons/setback/pom.xml b/addons/setback/pom.xml index 10499aa130..f7a3d276aa 100644 --- a/addons/setback/pom.xml +++ b/addons/setback/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 1.7.4-SNAPSHOT + 1.7.4 indy-setback Indy :: Add-Ons :: Set-Back :: Parent diff --git a/api/pom.xml b/api/pom.xml index c594b4e50d..e5c6932420 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 1.7.4-SNAPSHOT + 1.7.4 indy-api diff --git a/bindings/jaxrs/pom.xml b/bindings/jaxrs/pom.xml index bb934fe4a4..1ee507cf4f 100644 --- a/bindings/jaxrs/pom.xml +++ b/bindings/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-bindings - 1.7.4-SNAPSHOT + 1.7.4 indy-bindings-jaxrs diff --git a/bindings/pom.xml b/bindings/pom.xml index 7e520eee7d..53a43c9658 100644 --- a/bindings/pom.xml +++ b/bindings/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-parent - 1.7.4-SNAPSHOT + 1.7.4 indy-bindings diff --git a/boot/api/pom.xml b/boot/api/pom.xml index ecd379cbf2..3a678a940d 100644 --- a/boot/api/pom.xml +++ b/boot/api/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.boot indy-booters - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy.boot diff --git a/boot/jaxrs/pom.xml b/boot/jaxrs/pom.xml index 99faebbbe3..4f07d331fa 100644 --- a/boot/jaxrs/pom.xml +++ b/boot/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.boot indy-booters - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy.boot diff --git a/boot/pom.xml b/boot/pom.xml index c655750e3f..bc3a0b6bbb 100644 --- a/boot/pom.xml +++ b/boot/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy.boot diff --git a/clients/core-java/pom.xml b/clients/core-java/pom.xml index 378ce12069..76eebe1801 100644 --- a/clients/core-java/pom.xml +++ b/clients/core-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-clients-parent - 1.7.4-SNAPSHOT + 1.7.4 indy-client-core-java diff --git a/clients/pom.xml b/clients/pom.xml index 808f9da4d1..d4fd513309 100644 --- a/clients/pom.xml +++ b/clients/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 1.7.4-SNAPSHOT + 1.7.4 indy-clients-parent diff --git a/core/pom.xml b/core/pom.xml index b3013f75c6..8823d95682 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 1.7.4-SNAPSHOT + 1.7.4 indy-core diff --git a/db/flat/pom.xml b/db/flat/pom.xml index f3a74b40c0..3141b16c2f 100644 --- a/db/flat/pom.xml +++ b/db/flat/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 1.7.4-SNAPSHOT + 1.7.4 indy-db-flat diff --git a/db/memory/pom.xml b/db/memory/pom.xml index 5896168b0d..0806568768 100644 --- a/db/memory/pom.xml +++ b/db/memory/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 1.7.4-SNAPSHOT + 1.7.4 indy-db-memory diff --git a/db/pom.xml b/db/pom.xml index cdaab6de9f..6243152bde 100644 --- a/db/pom.xml +++ b/db/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 1.7.4-SNAPSHOT + 1.7.4 indy-db diff --git a/deployments/cache-migrator/pom.xml b/deployments/cache-migrator/pom.xml index d4d3a4aa8f..d4a6f93079 100644 --- a/deployments/cache-migrator/pom.xml +++ b/deployments/cache-migrator/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-deployments - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy.launch diff --git a/deployments/launcher/pom.xml b/deployments/launcher/pom.xml index 6b539b1954..9d90507661 100644 --- a/deployments/launcher/pom.xml +++ b/deployments/launcher/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-deployments - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy.launch diff --git a/deployments/pom.xml b/deployments/pom.xml index e8a380f47e..add49921e4 100644 --- a/deployments/pom.xml +++ b/deployments/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy diff --git a/embedder/pom.xml b/embedder/pom.xml index 7fa09dce49..77febda242 100644 --- a/embedder/pom.xml +++ b/embedder/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy.embed diff --git a/filers/default/pom.xml b/filers/default/pom.xml index 26b328017a..0415b322a2 100644 --- a/filers/default/pom.xml +++ b/filers/default/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-file-managers - 1.7.4-SNAPSHOT + 1.7.4 indy-filer-default diff --git a/filers/pom.xml b/filers/pom.xml index b694bb01ec..1d70f5d072 100644 --- a/filers/pom.xml +++ b/filers/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 1.7.4-SNAPSHOT + 1.7.4 indy-file-managers diff --git a/ftests/common/pom.xml b/ftests/common/pom.xml index ee83d8c072..eb3a3e6db1 100644 --- a/ftests/common/pom.xml +++ b/ftests/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-ftests-parent - 1.7.4-SNAPSHOT + 1.7.4 indy-ftests-common diff --git a/ftests/core/pom.xml b/ftests/core/pom.xml index 5189339d6a..ddbf0e495b 100644 --- a/ftests/core/pom.xml +++ b/ftests/core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-ftests-parent - 1.7.4-SNAPSHOT + 1.7.4 indy-ftests-core diff --git a/ftests/metrics/pom.xml b/ftests/metrics/pom.xml index 1b24a1779d..0ca6be60b0 100644 --- a/ftests/metrics/pom.xml +++ b/ftests/metrics/pom.xml @@ -20,7 +20,7 @@ indy-ftests-parent org.commonjava.indy - 1.7.4-SNAPSHOT + 1.7.4 4.0.0 diff --git a/ftests/pom.xml b/ftests/pom.xml index b014f739cd..08f4306667 100644 --- a/ftests/pom.xml +++ b/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 1.7.4-SNAPSHOT + 1.7.4 indy-ftests-parent diff --git a/models/core-java/pom.xml b/models/core-java/pom.xml index eaf34bfda8..ad11081826 100644 --- a/models/core-java/pom.xml +++ b/models/core-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-models-parent - 1.7.4-SNAPSHOT + 1.7.4 indy-model-core-java diff --git a/models/pom.xml b/models/pom.xml index 9961e915ac..cf66b5fa11 100644 --- a/models/pom.xml +++ b/models/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 1.7.4-SNAPSHOT + 1.7.4 indy-models-parent diff --git a/pom.xml b/pom.xml index e740465e5a..1e406b106b 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.commonjava.indy indy-parent - 1.7.4-SNAPSHOT + 1.7.4 pom @@ -37,7 +37,7 @@ scm:git:https://github.com/Commonjava/indy.git scm:git:git@github.com:Commonjava/indy.git http://github.com/Commonjava/indy - indy-parent-1.6.0 + indy-parent-1.7.4 @@ -151,7 +151,7 @@ org.commonjava.indy.ui indy-ui-layover - 1.7.4-SNAPSHOT + 1.7.4 runtime @@ -159,22 +159,22 @@ org.commonjava.indy indy-model-core-java - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-api - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-core - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-core - 1.7.4-SNAPSHOT + 1.7.4 tar.gz confset provided @@ -182,17 +182,17 @@ org.commonjava.indy indy-db-flat - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-bindings-jaxrs - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy.launch indy-launcher - 1.7.4-SNAPSHOT + 1.7.4 tar.gz skinny provided @@ -200,7 +200,7 @@ org.commonjava.indy.launch indy-launcher - 1.7.4-SNAPSHOT + 1.7.4 tar.gz complete provided @@ -208,7 +208,7 @@ org.commonjava.indy.launch indy-launcher - 1.7.4-SNAPSHOT + 1.7.4 tar.gz data provided @@ -216,7 +216,7 @@ org.commonjava.indy.launch indy-launcher - 1.7.4-SNAPSHOT + 1.7.4 tar.gz etc provided @@ -225,17 +225,17 @@ org.commonjava.indy indy-autoprox-jaxrs - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-autoprox-common - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-autoprox-common - 1.7.4-SNAPSHOT + 1.7.4 tar.gz dataset provided @@ -243,7 +243,7 @@ org.commonjava.indy indy-autoprox-common - 1.7.4-SNAPSHOT + 1.7.4 tar.gz docset provided @@ -251,7 +251,7 @@ org.commonjava.indy indy-autoprox-common - 1.7.4-SNAPSHOT + 1.7.4 tar.gz confset provided @@ -259,7 +259,7 @@ org.commonjava.indy indy-autoprox-common - 1.7.4-SNAPSHOT + 1.7.4 tar.gz uiset provided @@ -267,32 +267,32 @@ org.commonjava.indy indy-autoprox-model-java - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-autoprox-client-java - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-ftests-autoprox - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-setback-jaxrs - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-setback-common - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-setback-common - 1.7.4-SNAPSHOT + 1.7.4 tar.gz dataset provided @@ -300,7 +300,7 @@ org.commonjava.indy indy-setback-common - 1.7.4-SNAPSHOT + 1.7.4 tar.gz confset provided @@ -308,17 +308,17 @@ org.commonjava.indy indy-revisions-jaxrs - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-revisions-common - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-revisions-common - 1.7.4-SNAPSHOT + 1.7.4 tar.gz confset provided @@ -326,7 +326,7 @@ org.commonjava.indy indy-revisions-common - 1.7.4-SNAPSHOT + 1.7.4 tar.gz uiset provided @@ -334,12 +334,12 @@ org.commonjava.indy indy-dot-maven-common - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-dot-maven-common - 1.7.4-SNAPSHOT + 1.7.4 tar.gz dataset provided @@ -347,22 +347,22 @@ org.commonjava.indy indy-dot-maven-jaxrs - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-ftests-dot-maven - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-httprox-common - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-httprox-common - 1.7.4-SNAPSHOT + 1.7.4 tar.gz confset provided @@ -370,17 +370,17 @@ org.commonjava.indy indy-ftests-httprox - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-content-index - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-content-index - 1.7.4-SNAPSHOT + 1.7.4 tar.gz confset provided @@ -388,123 +388,123 @@ org.commonjava.indy indy-db-memory - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-test-db - 1.7.4-SNAPSHOT + 1.7.4 test org.commonjava.indy indy-test-fixtures-core - 1.7.4-SNAPSHOT + 1.7.4 test org.commonjava.indy indy-test-providers-core - 1.7.4-SNAPSHOT + 1.7.4 test org.commonjava.indy indy-test-utils - 1.7.4-SNAPSHOT + 1.7.4 test org.commonjava.indy indy-filer-default - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-subsys-jaxrs - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-subsys-flatfile - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-subsys-infinispan - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-subsys-http - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-subsys-git - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-subsys-groovy - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-subsys-prefetch - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-subsys-cpool - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-client-core-java - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-ftests-common - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-ftests-core - 1.7.4-SNAPSHOT + 1.7.4 test org.commonjava.indy indy-folo-jaxrs - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-ftests-folo - 1.7.4-SNAPSHOT + 1.7.4 test org.commonjava.indy indy-folo-client-java - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-folo-model-java - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-folo-common - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-folo-common - 1.7.4-SNAPSHOT + 1.7.4 tar.gz dataset provided @@ -512,7 +512,7 @@ org.commonjava.indy indy-folo-common - 1.7.4-SNAPSHOT + 1.7.4 tar.gz confset provided @@ -520,33 +520,33 @@ org.commonjava.indy indy-promote-jaxrs - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-ftests-promote - 1.7.4-SNAPSHOT + 1.7.4 test org.commonjava.indy indy-promote-client-java - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-promote-model-java - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-promote-common - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-promote-common - 1.7.4-SNAPSHOT + 1.7.4 tar.gz confset provided @@ -554,7 +554,7 @@ org.commonjava.indy indy-promote-common - 1.7.4-SNAPSHOT + 1.7.4 tar.gz dataset provided @@ -562,19 +562,19 @@ org.commonjava.indy indy-promote-common - 1.7.4-SNAPSHOT + 1.7.4 dataset provided org.commonjava.indy indy-implied-repos-common - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-implied-repos-common - 1.7.4-SNAPSHOT + 1.7.4 tar.gz confset provided @@ -582,27 +582,27 @@ org.commonjava.indy indy-implied-repos-model-java - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-implied-repos-client-java - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-ftests-implied-repos - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-relate-common - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-relate-common - 1.7.4-SNAPSHOT + 1.7.4 tar.gz confset provided @@ -610,32 +610,32 @@ org.commonjava.indy indy-ftests-relate - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy.embed indy-embedder - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy.boot indy-booter-api - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy.boot indy-booter-jaxrs - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-subsys-keycloak - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-subsys-keycloak - 1.7.4-SNAPSHOT + 1.7.4 tar.gz confset provided @@ -643,7 +643,7 @@ org.commonjava.indy indy-subsys-infinispan - 1.7.4-SNAPSHOT + 1.7.4 tar.gz confset provided @@ -651,7 +651,7 @@ org.commonjava.indy indy-subsys-prefetch - 1.7.4-SNAPSHOT + 1.7.4 tar.gz confset provided @@ -660,7 +660,7 @@ org.commonjava.indy indy-koji-common - 1.7.4-SNAPSHOT + 1.7.4 tar.gz confset provided @@ -668,22 +668,22 @@ org.commonjava.indy indy-koji-common - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-koji-model-java - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-koji-client-java - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-koji-jaxrs - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy @@ -694,66 +694,66 @@ org.commonjava.indy indy-pkg-maven-common - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-pkg-maven-jaxrs - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-pkg-npm-jaxrs - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-ftests-pkg-maven - 1.7.4-SNAPSHOT + 1.7.4 test org.commonjava.indy indy-ftests-pkg-npm - 1.7.4-SNAPSHOT + 1.7.4 test org.commonjava.indy indy-pkg-npm-common - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-pkg-npm-model-java - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-diagnostics-jaxrs - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-diagnostics-client-java - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-diagnostics-common - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-ftests-diagnostics - 1.7.4-SNAPSHOT + 1.7.4 test org.commonjava.indy indy-diagnostics-common - 1.7.4-SNAPSHOT + 1.7.4 confset tar.gz provided @@ -761,28 +761,28 @@ org.commonjava.indy indy-hosted-by-archive-common - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-hosted-by-archive-client-java - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-ftests-hosted-by-archive - 1.7.4-SNAPSHOT + 1.7.4 test org.commonjava.indy indy-hosted-by-archive-jaxrs - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-hosted-by-archive-common - 1.7.4-SNAPSHOT + 1.7.4 confset tar.gz @@ -790,17 +790,17 @@ org.commonjava.indy indy-subsys-metrics-core - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-subsys-metrics-reporter - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-subsys-metrics-reporter - 1.7.4-SNAPSHOT + 1.7.4 confset tar.gz provided @@ -809,7 +809,7 @@ org.commonjava.indy indy-ftests-metrics - 1.7.4-SNAPSHOT + 1.7.4 test @@ -817,14 +817,14 @@ org.commonjava.indy.rest indy-rest-api yaml - 1.7.4-SNAPSHOT + 1.7.4 provided org.commonjava.indy.rest indy-rest-api json - 1.7.4-SNAPSHOT + 1.7.4 provided @@ -858,28 +858,28 @@ org.commonjava.indy indy-content-browse-common - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-content-browse-jaxrs - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-ftests-content-browse - 1.7.4-SNAPSHOT + 1.7.4 test org.commonjava.indy indy-content-browse-model-java - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy indy-content-browse-common - 1.7.4-SNAPSHOT + 1.7.4 confset tar.gz provided @@ -887,7 +887,7 @@ org.commonjava.indy indy-content-browse-ui - 1.7.4-SNAPSHOT + 1.7.4 reactui tar.gz diff --git a/rest/api/pom.xml b/rest/api/pom.xml index 46614fe49d..5824cd9964 100644 --- a/rest/api/pom.xml +++ b/rest/api/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.rest indy-rest-parent - 1.7.4-SNAPSHOT + 1.7.4 indy-rest-api diff --git a/rest/pom.xml b/rest/pom.xml index e27dccffb7..5968eb0593 100644 --- a/rest/pom.xml +++ b/rest/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy.rest diff --git a/subsys/cpool/pom.xml b/subsys/cpool/pom.xml index ab1578521e..6a95aa1899 100644 --- a/subsys/cpool/pom.xml +++ b/subsys/cpool/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 1.7.4-SNAPSHOT + 1.7.4 indy-subsys-cpool diff --git a/subsys/flatfile/pom.xml b/subsys/flatfile/pom.xml index c4e97773df..54007ea6a3 100644 --- a/subsys/flatfile/pom.xml +++ b/subsys/flatfile/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 1.7.4-SNAPSHOT + 1.7.4 indy-subsys-flatfile diff --git a/subsys/git/pom.xml b/subsys/git/pom.xml index 9d3598e7ea..6170e2fb75 100644 --- a/subsys/git/pom.xml +++ b/subsys/git/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 1.7.4-SNAPSHOT + 1.7.4 indy-subsys-git diff --git a/subsys/groovy/pom.xml b/subsys/groovy/pom.xml index fc2e707aca..1b062e368d 100644 --- a/subsys/groovy/pom.xml +++ b/subsys/groovy/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 1.7.4-SNAPSHOT + 1.7.4 indy-subsys-groovy diff --git a/subsys/http/pom.xml b/subsys/http/pom.xml index 37850ca986..b6983e6668 100644 --- a/subsys/http/pom.xml +++ b/subsys/http/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 1.7.4-SNAPSHOT + 1.7.4 indy-subsys-http diff --git a/subsys/infinispan/pom.xml b/subsys/infinispan/pom.xml index 71ddd9cecd..2d6bb0b725 100644 --- a/subsys/infinispan/pom.xml +++ b/subsys/infinispan/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 1.7.4-SNAPSHOT + 1.7.4 indy-subsys-infinispan diff --git a/subsys/jaxrs/pom.xml b/subsys/jaxrs/pom.xml index 766d1a376b..1857ece6e4 100644 --- a/subsys/jaxrs/pom.xml +++ b/subsys/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 1.7.4-SNAPSHOT + 1.7.4 indy-subsys-jaxrs diff --git a/subsys/kafka/pom.xml b/subsys/kafka/pom.xml index e74600e42e..c27c945484 100644 --- a/subsys/kafka/pom.xml +++ b/subsys/kafka/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 1.7.4-SNAPSHOT + 1.7.4 4.0.0 diff --git a/subsys/keycloak/pom.xml b/subsys/keycloak/pom.xml index 89ad65ef92..02e0638c89 100644 --- a/subsys/keycloak/pom.xml +++ b/subsys/keycloak/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 1.7.4-SNAPSHOT + 1.7.4 indy-subsys-keycloak Indy :: Subsystems :: Keycloak diff --git a/subsys/metrics/core/pom.xml b/subsys/metrics/core/pom.xml index 71e2e64755..3293e1fa4a 100644 --- a/subsys/metrics/core/pom.xml +++ b/subsys/metrics/core/pom.xml @@ -20,7 +20,7 @@ indy-subsys-metrics org.commonjava.indy - 1.7.4-SNAPSHOT + 1.7.4 4.0.0 diff --git a/subsys/metrics/pom.xml b/subsys/metrics/pom.xml index f15e5f7490..ae3a186022 100644 --- a/subsys/metrics/pom.xml +++ b/subsys/metrics/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 1.7.4-SNAPSHOT + 1.7.4 4.0.0 diff --git a/subsys/metrics/reporter/pom.xml b/subsys/metrics/reporter/pom.xml index 6b2e61f796..6b5b031aea 100644 --- a/subsys/metrics/reporter/pom.xml +++ b/subsys/metrics/reporter/pom.xml @@ -20,7 +20,7 @@ indy-subsys-metrics org.commonjava.indy - 1.7.4-SNAPSHOT + 1.7.4 4.0.0 diff --git a/subsys/pom.xml b/subsys/pom.xml index 47e06ffee0..9df80b033e 100644 --- a/subsys/pom.xml +++ b/subsys/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 1.7.4-SNAPSHOT + 1.7.4 indy-subsystems diff --git a/subsys/prefetch/pom.xml b/subsys/prefetch/pom.xml index 97bacad68f..906a752087 100644 --- a/subsys/prefetch/pom.xml +++ b/subsys/prefetch/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 1.7.4-SNAPSHOT + 1.7.4 4.0.0 diff --git a/test/db/pom.xml b/test/db/pom.xml index 5d0c9233c7..b7098707ae 100644 --- a/test/db/pom.xml +++ b/test/db/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 1.7.4-SNAPSHOT + 1.7.4 indy-test-db diff --git a/test/fixtures-core/pom.xml b/test/fixtures-core/pom.xml index 2260ece7cf..ac2b145c19 100644 --- a/test/fixtures-core/pom.xml +++ b/test/fixtures-core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 1.7.4-SNAPSHOT + 1.7.4 indy-test-fixtures-core diff --git a/test/pom.xml b/test/pom.xml index c01a7b4a4e..f2f5234844 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 1.7.4-SNAPSHOT + 1.7.4 indy-test diff --git a/test/providers-core/pom.xml b/test/providers-core/pom.xml index 3cf03aeb35..ffdc747a09 100644 --- a/test/providers-core/pom.xml +++ b/test/providers-core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 1.7.4-SNAPSHOT + 1.7.4 indy-test-providers-core diff --git a/test/utils/pom.xml b/test/utils/pom.xml index 87e81db620..281f61caba 100644 --- a/test/utils/pom.xml +++ b/test/utils/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 1.7.4-SNAPSHOT + 1.7.4 indy-test-utils diff --git a/tools/assemblies/pom.xml b/tools/assemblies/pom.xml index af726aeb5f..0ac9fe67af 100644 --- a/tools/assemblies/pom.xml +++ b/tools/assemblies/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.tools indy-tools - 1.7.4-SNAPSHOT + 1.7.4 indy-assemblies diff --git a/tools/pom.xml b/tools/pom.xml index d08f622c65..57f97dc260 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy.tools diff --git a/uis/layover/pom.xml b/uis/layover/pom.xml index e537a4dfac..3bbb83ff03 100644 --- a/uis/layover/pom.xml +++ b/uis/layover/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.ui indy-uis - 1.7.4-SNAPSHOT + 1.7.4 indy-ui-layover diff --git a/uis/pom.xml b/uis/pom.xml index 90c2c293cf..060e418a00 100644 --- a/uis/pom.xml +++ b/uis/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 1.7.4-SNAPSHOT + 1.7.4 org.commonjava.indy.ui From d48073bfa7a712d4d0b40c3d1a089639081adb19 Mon Sep 17 00:00:00 2001 From: Gang Li Date: Thu, 14 Mar 2019 08:51:17 +0000 Subject: [PATCH 12/56] [maven-release-plugin] prepare for next development iteration --- addons/autoprox/client-java/pom.xml | 2 +- addons/autoprox/common/pom.xml | 2 +- addons/autoprox/ftests/pom.xml | 2 +- addons/autoprox/jaxrs/pom.xml | 2 +- addons/autoprox/model-java/pom.xml | 2 +- addons/autoprox/pom.xml | 2 +- addons/content-browse/common/pom.xml | 2 +- addons/content-browse/ftests/pom.xml | 2 +- addons/content-browse/jaxrs/pom.xml | 2 +- addons/content-browse/model-java/pom.xml | 2 +- addons/content-browse/pom.xml | 2 +- addons/content-browse/ui/pom.xml | 2 +- addons/content-index/pom.xml | 2 +- addons/diagnostics/client-java/pom.xml | 2 +- addons/diagnostics/common/pom.xml | 2 +- addons/diagnostics/ftests/pom.xml | 2 +- addons/diagnostics/jaxrs/pom.xml | 2 +- addons/diagnostics/pom.xml | 2 +- addons/dot-maven/common/pom.xml | 2 +- addons/dot-maven/ftests/pom.xml | 2 +- addons/dot-maven/jaxrs/pom.xml | 2 +- addons/dot-maven/pom.xml | 2 +- addons/folo/client-java/pom.xml | 2 +- addons/folo/common/pom.xml | 2 +- addons/folo/ftests/pom.xml | 2 +- addons/folo/jaxrs/pom.xml | 2 +- addons/folo/model-java/pom.xml | 2 +- addons/folo/pom.xml | 2 +- addons/hosted-by-archive/client-java/pom.xml | 2 +- addons/hosted-by-archive/common/pom.xml | 2 +- addons/hosted-by-archive/ftests/pom.xml | 2 +- addons/hosted-by-archive/jaxrs/pom.xml | 2 +- addons/hosted-by-archive/pom.xml | 2 +- addons/httprox/common/pom.xml | 2 +- addons/httprox/ftests/pom.xml | 2 +- addons/httprox/jaxrs/pom.xml | 2 +- addons/httprox/pom.xml | 2 +- addons/implied-repos/client-java/pom.xml | 2 +- addons/implied-repos/common/pom.xml | 2 +- addons/implied-repos/ftests/pom.xml | 2 +- addons/implied-repos/model-java/pom.xml | 2 +- addons/implied-repos/pom.xml | 2 +- addons/koji/client-java/pom.xml | 2 +- addons/koji/common/pom.xml | 2 +- addons/koji/jaxrs/pom.xml | 2 +- addons/koji/model-java/pom.xml | 2 +- addons/koji/pom.xml | 2 +- addons/pkg-maven/common/pom.xml | 2 +- addons/pkg-maven/ftests/pom.xml | 2 +- addons/pkg-maven/jaxrs/pom.xml | 2 +- addons/pkg-maven/pom.xml | 2 +- addons/pkg-npm/common/pom.xml | 2 +- addons/pkg-npm/ftests/pom.xml | 2 +- addons/pkg-npm/jaxrs/pom.xml | 2 +- addons/pkg-npm/model-java/pom.xml | 2 +- addons/pkg-npm/pom.xml | 2 +- addons/pom.xml | 2 +- addons/promote/client-java/pom.xml | 2 +- addons/promote/common/pom.xml | 2 +- addons/promote/ftests/pom.xml | 2 +- addons/promote/jaxrs/pom.xml | 2 +- addons/promote/model-java/pom.xml | 2 +- addons/promote/pom.xml | 2 +- addons/relate/common/pom.xml | 2 +- addons/relate/ftests/pom.xml | 2 +- addons/relate/pom.xml | 2 +- addons/revisions/common/pom.xml | 2 +- addons/revisions/jaxrs/pom.xml | 2 +- addons/revisions/pom.xml | 2 +- addons/setback/common/pom.xml | 2 +- addons/setback/jaxrs/pom.xml | 2 +- addons/setback/pom.xml | 2 +- api/pom.xml | 2 +- bindings/jaxrs/pom.xml | 2 +- bindings/pom.xml | 2 +- boot/api/pom.xml | 2 +- boot/jaxrs/pom.xml | 2 +- boot/pom.xml | 2 +- clients/core-java/pom.xml | 2 +- clients/pom.xml | 2 +- core/pom.xml | 2 +- db/flat/pom.xml | 2 +- db/memory/pom.xml | 2 +- db/pom.xml | 2 +- deployments/cache-migrator/pom.xml | 2 +- deployments/launcher/pom.xml | 2 +- deployments/pom.xml | 2 +- embedder/pom.xml | 2 +- filers/default/pom.xml | 2 +- filers/pom.xml | 2 +- ftests/common/pom.xml | 2 +- ftests/core/pom.xml | 2 +- ftests/metrics/pom.xml | 2 +- ftests/pom.xml | 2 +- models/core-java/pom.xml | 2 +- models/pom.xml | 2 +- pom.xml | 240 +++++++++---------- rest/api/pom.xml | 2 +- rest/pom.xml | 2 +- subsys/cpool/pom.xml | 2 +- subsys/flatfile/pom.xml | 2 +- subsys/git/pom.xml | 2 +- subsys/groovy/pom.xml | 2 +- subsys/http/pom.xml | 2 +- subsys/infinispan/pom.xml | 2 +- subsys/jaxrs/pom.xml | 2 +- subsys/kafka/pom.xml | 2 +- subsys/keycloak/pom.xml | 2 +- subsys/metrics/core/pom.xml | 2 +- subsys/metrics/pom.xml | 2 +- subsys/metrics/reporter/pom.xml | 2 +- subsys/pom.xml | 2 +- subsys/prefetch/pom.xml | 2 +- test/db/pom.xml | 2 +- test/fixtures-core/pom.xml | 2 +- test/pom.xml | 2 +- test/providers-core/pom.xml | 2 +- test/utils/pom.xml | 2 +- tools/assemblies/pom.xml | 2 +- tools/pom.xml | 2 +- uis/layover/pom.xml | 2 +- uis/pom.xml | 2 +- 122 files changed, 241 insertions(+), 241 deletions(-) diff --git a/addons/autoprox/client-java/pom.xml b/addons/autoprox/client-java/pom.xml index f0b11389c3..9bd6685f18 100644 --- a/addons/autoprox/client-java/pom.xml +++ b/addons/autoprox/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-autoprox - 1.7.4 + 1.7.5-SNAPSHOT indy-autoprox-client-java Indy :: Add-Ons :: Auto-Proxy :: Java Client diff --git a/addons/autoprox/common/pom.xml b/addons/autoprox/common/pom.xml index c3a77cfc7f..7c7cac3ffe 100644 --- a/addons/autoprox/common/pom.xml +++ b/addons/autoprox/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-autoprox - 1.7.4 + 1.7.5-SNAPSHOT indy-autoprox-common Indy :: Add-Ons :: Auto-Proxy :: Common diff --git a/addons/autoprox/ftests/pom.xml b/addons/autoprox/ftests/pom.xml index f0efd21c82..57955cd1d1 100644 --- a/addons/autoprox/ftests/pom.xml +++ b/addons/autoprox/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-autoprox - 1.7.4 + 1.7.5-SNAPSHOT indy-ftests-autoprox diff --git a/addons/autoprox/jaxrs/pom.xml b/addons/autoprox/jaxrs/pom.xml index a0d4e8b7d0..44f4c5f7f3 100644 --- a/addons/autoprox/jaxrs/pom.xml +++ b/addons/autoprox/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-autoprox - 1.7.4 + 1.7.5-SNAPSHOT indy-autoprox-jaxrs diff --git a/addons/autoprox/model-java/pom.xml b/addons/autoprox/model-java/pom.xml index 1ab05a105e..a12f43a92d 100644 --- a/addons/autoprox/model-java/pom.xml +++ b/addons/autoprox/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-autoprox - 1.7.4 + 1.7.5-SNAPSHOT indy-autoprox-model-java Indy :: Add-Ons :: Auto-Proxy :: Java Domain Model diff --git a/addons/autoprox/pom.xml b/addons/autoprox/pom.xml index 5618fd2986..7c08bead02 100644 --- a/addons/autoprox/pom.xml +++ b/addons/autoprox/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 1.7.4 + 1.7.5-SNAPSHOT indy-autoprox Indy :: Add-Ons :: Auto-Proxy :: Parent diff --git a/addons/content-browse/common/pom.xml b/addons/content-browse/common/pom.xml index 5de854078a..b5104a0201 100644 --- a/addons/content-browse/common/pom.xml +++ b/addons/content-browse/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-content-browse - 1.7.4 + 1.7.5-SNAPSHOT indy-content-browse-common Indy :: Add-Ons :: Directory Content Browse :: Common diff --git a/addons/content-browse/ftests/pom.xml b/addons/content-browse/ftests/pom.xml index 13747d9449..0de1aba8a5 100644 --- a/addons/content-browse/ftests/pom.xml +++ b/addons/content-browse/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-content-browse - 1.7.4 + 1.7.5-SNAPSHOT indy-ftests-content-browse diff --git a/addons/content-browse/jaxrs/pom.xml b/addons/content-browse/jaxrs/pom.xml index 3ae4f7077b..d66c2d3cb5 100644 --- a/addons/content-browse/jaxrs/pom.xml +++ b/addons/content-browse/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-content-browse - 1.7.4 + 1.7.5-SNAPSHOT indy-content-browse-jaxrs diff --git a/addons/content-browse/model-java/pom.xml b/addons/content-browse/model-java/pom.xml index 0018f5b6c2..a582b7a710 100644 --- a/addons/content-browse/model-java/pom.xml +++ b/addons/content-browse/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-content-browse - 1.7.4 + 1.7.5-SNAPSHOT indy-content-browse-model-java Indy :: Add-Ons :: Directory Content Browse :: Java Domain Model diff --git a/addons/content-browse/pom.xml b/addons/content-browse/pom.xml index 09eeb291e6..60611eef3f 100644 --- a/addons/content-browse/pom.xml +++ b/addons/content-browse/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 1.7.4 + 1.7.5-SNAPSHOT indy-content-browse Indy :: Add-Ons :: Directory Content Browse :: Parent diff --git a/addons/content-browse/ui/pom.xml b/addons/content-browse/ui/pom.xml index c9cf393328..933c0eddbd 100644 --- a/addons/content-browse/ui/pom.xml +++ b/addons/content-browse/ui/pom.xml @@ -20,7 +20,7 @@ indy-content-browse org.commonjava.indy - 1.7.4 + 1.7.5-SNAPSHOT 4.0.0 diff --git a/addons/content-index/pom.xml b/addons/content-index/pom.xml index 645d612b90..1640da26bb 100644 --- a/addons/content-index/pom.xml +++ b/addons/content-index/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 1.7.4 + 1.7.5-SNAPSHOT indy-content-index diff --git a/addons/diagnostics/client-java/pom.xml b/addons/diagnostics/client-java/pom.xml index 33dc375784..f9067de684 100644 --- a/addons/diagnostics/client-java/pom.xml +++ b/addons/diagnostics/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 1.7.4 + 1.7.5-SNAPSHOT indy-diagnostics-client-java Indy :: Add-Ons :: Diagnostic Tools :: Java Client diff --git a/addons/diagnostics/common/pom.xml b/addons/diagnostics/common/pom.xml index cf719a1369..1fb379ed17 100644 --- a/addons/diagnostics/common/pom.xml +++ b/addons/diagnostics/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 1.7.4 + 1.7.5-SNAPSHOT indy-diagnostics-common Indy :: Add-Ons :: Diagnostic Tools :: Common diff --git a/addons/diagnostics/ftests/pom.xml b/addons/diagnostics/ftests/pom.xml index 6c2a19e9cf..63f3fac02e 100644 --- a/addons/diagnostics/ftests/pom.xml +++ b/addons/diagnostics/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 1.7.4 + 1.7.5-SNAPSHOT indy-ftests-diagnostics diff --git a/addons/diagnostics/jaxrs/pom.xml b/addons/diagnostics/jaxrs/pom.xml index bebd768e18..1981e2e350 100644 --- a/addons/diagnostics/jaxrs/pom.xml +++ b/addons/diagnostics/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 1.7.4 + 1.7.5-SNAPSHOT indy-diagnostics-jaxrs diff --git a/addons/diagnostics/pom.xml b/addons/diagnostics/pom.xml index 9df2962981..050cb61c45 100644 --- a/addons/diagnostics/pom.xml +++ b/addons/diagnostics/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 1.7.4 + 1.7.5-SNAPSHOT indy-diagnostics Indy :: Add-Ons :: Diagnostic Tools :: Parent diff --git a/addons/dot-maven/common/pom.xml b/addons/dot-maven/common/pom.xml index e2b78ec92a..916bc74164 100644 --- a/addons/dot-maven/common/pom.xml +++ b/addons/dot-maven/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-dot-maven - 1.7.4 + 1.7.5-SNAPSHOT indy-dot-maven-common Indy :: Add-Ons :: Dot-Maven (.m2 WebDAV) :: Common Core diff --git a/addons/dot-maven/ftests/pom.xml b/addons/dot-maven/ftests/pom.xml index 01707eed3e..0bd63917a7 100644 --- a/addons/dot-maven/ftests/pom.xml +++ b/addons/dot-maven/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-dot-maven - 1.7.4 + 1.7.5-SNAPSHOT indy-ftests-dot-maven diff --git a/addons/dot-maven/jaxrs/pom.xml b/addons/dot-maven/jaxrs/pom.xml index 5b5cb09a32..f15489b318 100644 --- a/addons/dot-maven/jaxrs/pom.xml +++ b/addons/dot-maven/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-dot-maven - 1.7.4 + 1.7.5-SNAPSHOT indy-dot-maven-jaxrs diff --git a/addons/dot-maven/pom.xml b/addons/dot-maven/pom.xml index 4ce465f2ad..3e5d2c4367 100644 --- a/addons/dot-maven/pom.xml +++ b/addons/dot-maven/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 1.7.4 + 1.7.5-SNAPSHOT indy-dot-maven diff --git a/addons/folo/client-java/pom.xml b/addons/folo/client-java/pom.xml index b9e7c11a60..8b66b6f801 100644 --- a/addons/folo/client-java/pom.xml +++ b/addons/folo/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 1.7.4 + 1.7.5-SNAPSHOT indy-folo-client-java Indy :: Add-Ons :: Folo Usage Tracker :: Java Client diff --git a/addons/folo/common/pom.xml b/addons/folo/common/pom.xml index 143765affb..c0119ae4ab 100644 --- a/addons/folo/common/pom.xml +++ b/addons/folo/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 1.7.4 + 1.7.5-SNAPSHOT indy-folo-common Indy :: Add-Ons :: Folo Usage Tracker :: Common diff --git a/addons/folo/ftests/pom.xml b/addons/folo/ftests/pom.xml index be3bff8de8..0238b0601b 100644 --- a/addons/folo/ftests/pom.xml +++ b/addons/folo/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 1.7.4 + 1.7.5-SNAPSHOT indy-ftests-folo diff --git a/addons/folo/jaxrs/pom.xml b/addons/folo/jaxrs/pom.xml index 3a7a1c667d..5aae00dec2 100644 --- a/addons/folo/jaxrs/pom.xml +++ b/addons/folo/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 1.7.4 + 1.7.5-SNAPSHOT indy-folo-jaxrs diff --git a/addons/folo/model-java/pom.xml b/addons/folo/model-java/pom.xml index 0750fc7b48..508b7ec730 100644 --- a/addons/folo/model-java/pom.xml +++ b/addons/folo/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 1.7.4 + 1.7.5-SNAPSHOT indy-folo-model-java Indy :: Add-Ons :: Folo Usage Tracker :: Java Domain Model diff --git a/addons/folo/pom.xml b/addons/folo/pom.xml index e8889346bf..3893ced649 100644 --- a/addons/folo/pom.xml +++ b/addons/folo/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 1.7.4 + 1.7.5-SNAPSHOT indy-folo Indy :: Add-Ons :: Folo Usage Tracker :: Parent diff --git a/addons/hosted-by-archive/client-java/pom.xml b/addons/hosted-by-archive/client-java/pom.xml index c71017d9c2..56e5d65cb2 100644 --- a/addons/hosted-by-archive/client-java/pom.xml +++ b/addons/hosted-by-archive/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-hosted-by-archive - 1.7.4 + 1.7.5-SNAPSHOT indy-hosted-by-archive-client-java Indy :: Add-Ons :: Hosted By Archive :: Java Client diff --git a/addons/hosted-by-archive/common/pom.xml b/addons/hosted-by-archive/common/pom.xml index e64a45fe3a..c6b66ea6b0 100644 --- a/addons/hosted-by-archive/common/pom.xml +++ b/addons/hosted-by-archive/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-hosted-by-archive - 1.7.4 + 1.7.5-SNAPSHOT indy-hosted-by-archive-common Indy :: Add-Ons :: Hosted By Archive :: Common diff --git a/addons/hosted-by-archive/ftests/pom.xml b/addons/hosted-by-archive/ftests/pom.xml index 12c79ade79..58f2a80777 100644 --- a/addons/hosted-by-archive/ftests/pom.xml +++ b/addons/hosted-by-archive/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-hosted-by-archive - 1.7.4 + 1.7.5-SNAPSHOT indy-ftests-hosted-by-archive diff --git a/addons/hosted-by-archive/jaxrs/pom.xml b/addons/hosted-by-archive/jaxrs/pom.xml index 4e8d54158b..21c703af49 100644 --- a/addons/hosted-by-archive/jaxrs/pom.xml +++ b/addons/hosted-by-archive/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-hosted-by-archive - 1.7.4 + 1.7.5-SNAPSHOT indy-hosted-by-archive-jaxrs diff --git a/addons/hosted-by-archive/pom.xml b/addons/hosted-by-archive/pom.xml index 1cbac8d77b..7c9e053967 100644 --- a/addons/hosted-by-archive/pom.xml +++ b/addons/hosted-by-archive/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 1.7.4 + 1.7.5-SNAPSHOT indy-hosted-by-archive Indy :: Add-Ons :: Hosted By Archive :: Parent diff --git a/addons/httprox/common/pom.xml b/addons/httprox/common/pom.xml index f44e46ce90..3029359354 100644 --- a/addons/httprox/common/pom.xml +++ b/addons/httprox/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 1.7.4 + 1.7.5-SNAPSHOT indy-httprox-common Indy :: Add-Ons :: HTTProx (HTTP Proxy) :: Common Core diff --git a/addons/httprox/ftests/pom.xml b/addons/httprox/ftests/pom.xml index 8ddf9e49fe..fda2a71d55 100644 --- a/addons/httprox/ftests/pom.xml +++ b/addons/httprox/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 1.7.4 + 1.7.5-SNAPSHOT indy-ftests-httprox diff --git a/addons/httprox/jaxrs/pom.xml b/addons/httprox/jaxrs/pom.xml index 7e66a0ebd2..ba0ff1e8f2 100644 --- a/addons/httprox/jaxrs/pom.xml +++ b/addons/httprox/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 1.7.4 + 1.7.5-SNAPSHOT indy-httprox-jaxrs Indy :: Add-Ons :: HTTProx (HTTP Proxy) :: JAX-RS Handlers diff --git a/addons/httprox/pom.xml b/addons/httprox/pom.xml index bd61ed92b1..0e122a3a55 100644 --- a/addons/httprox/pom.xml +++ b/addons/httprox/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 1.7.4 + 1.7.5-SNAPSHOT indy-httprox diff --git a/addons/implied-repos/client-java/pom.xml b/addons/implied-repos/client-java/pom.xml index 6e6c989c39..11064707f5 100644 --- a/addons/implied-repos/client-java/pom.xml +++ b/addons/implied-repos/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-implied-repos - 1.7.4 + 1.7.5-SNAPSHOT indy-implied-repos-client-java Indy :: Add-Ons :: Implied Repositories :: Java Client diff --git a/addons/implied-repos/common/pom.xml b/addons/implied-repos/common/pom.xml index 7eaeb6c9a4..91b8c8b16c 100644 --- a/addons/implied-repos/common/pom.xml +++ b/addons/implied-repos/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-implied-repos - 1.7.4 + 1.7.5-SNAPSHOT indy-implied-repos-common Indy :: Add-Ons :: Implied Repositories :: Common diff --git a/addons/implied-repos/ftests/pom.xml b/addons/implied-repos/ftests/pom.xml index ef866de927..b685c83644 100644 --- a/addons/implied-repos/ftests/pom.xml +++ b/addons/implied-repos/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-implied-repos - 1.7.4 + 1.7.5-SNAPSHOT indy-ftests-implied-repos diff --git a/addons/implied-repos/model-java/pom.xml b/addons/implied-repos/model-java/pom.xml index 9da11e9177..6ba2d73849 100644 --- a/addons/implied-repos/model-java/pom.xml +++ b/addons/implied-repos/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-implied-repos - 1.7.4 + 1.7.5-SNAPSHOT indy-implied-repos-model-java Indy :: Add-Ons :: Implied Repositories :: Java Domain Model diff --git a/addons/implied-repos/pom.xml b/addons/implied-repos/pom.xml index 29ffc67efe..8a96883f0d 100644 --- a/addons/implied-repos/pom.xml +++ b/addons/implied-repos/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 1.7.4 + 1.7.5-SNAPSHOT indy-implied-repos Indy :: Add-Ons :: Implied Repositories :: Parent diff --git a/addons/koji/client-java/pom.xml b/addons/koji/client-java/pom.xml index 2195313b68..5a4922775c 100644 --- a/addons/koji/client-java/pom.xml +++ b/addons/koji/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 1.7.4 + 1.7.5-SNAPSHOT indy-koji-client-java Indy :: Add-Ons :: Koji Integration :: Java Client diff --git a/addons/koji/common/pom.xml b/addons/koji/common/pom.xml index 07de5bb5da..b4584a316a 100644 --- a/addons/koji/common/pom.xml +++ b/addons/koji/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 1.7.4 + 1.7.5-SNAPSHOT indy-koji-common Indy :: Add-Ons :: Koji Integration :: Common diff --git a/addons/koji/jaxrs/pom.xml b/addons/koji/jaxrs/pom.xml index 926d1be8ab..bf7728c8a4 100644 --- a/addons/koji/jaxrs/pom.xml +++ b/addons/koji/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 1.7.4 + 1.7.5-SNAPSHOT indy-koji-jaxrs diff --git a/addons/koji/model-java/pom.xml b/addons/koji/model-java/pom.xml index 0563718da5..1deb254e29 100644 --- a/addons/koji/model-java/pom.xml +++ b/addons/koji/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 1.7.4 + 1.7.5-SNAPSHOT indy-koji-model-java Indy :: Add-Ons :: Koji Integration :: Java Domain Model diff --git a/addons/koji/pom.xml b/addons/koji/pom.xml index 72b98d4b7d..600a113ece 100644 --- a/addons/koji/pom.xml +++ b/addons/koji/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 1.7.4 + 1.7.5-SNAPSHOT indy-koji Indy :: Add-Ons :: Koji Integration :: Parent diff --git a/addons/pkg-maven/common/pom.xml b/addons/pkg-maven/common/pom.xml index c88a326b31..8b958de203 100644 --- a/addons/pkg-maven/common/pom.xml +++ b/addons/pkg-maven/common/pom.xml @@ -20,7 +20,7 @@ indy-pkg-maven org.commonjava.indy - 1.7.4 + 1.7.5-SNAPSHOT 4.0.0 diff --git a/addons/pkg-maven/ftests/pom.xml b/addons/pkg-maven/ftests/pom.xml index eeab1cd440..9b9f7128e7 100644 --- a/addons/pkg-maven/ftests/pom.xml +++ b/addons/pkg-maven/ftests/pom.xml @@ -20,7 +20,7 @@ indy-pkg-maven org.commonjava.indy - 1.7.4 + 1.7.5-SNAPSHOT 4.0.0 diff --git a/addons/pkg-maven/jaxrs/pom.xml b/addons/pkg-maven/jaxrs/pom.xml index 9329db3068..898f8894e1 100644 --- a/addons/pkg-maven/jaxrs/pom.xml +++ b/addons/pkg-maven/jaxrs/pom.xml @@ -20,7 +20,7 @@ indy-pkg-maven org.commonjava.indy - 1.7.4 + 1.7.5-SNAPSHOT 4.0.0 diff --git a/addons/pkg-maven/pom.xml b/addons/pkg-maven/pom.xml index e38388a1a7..4ad011a2c4 100644 --- a/addons/pkg-maven/pom.xml +++ b/addons/pkg-maven/pom.xml @@ -20,7 +20,7 @@ indy-addons org.commonjava.indy - 1.7.4 + 1.7.5-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/common/pom.xml b/addons/pkg-npm/common/pom.xml index 4c6f53105a..6d7825542a 100644 --- a/addons/pkg-npm/common/pom.xml +++ b/addons/pkg-npm/common/pom.xml @@ -20,7 +20,7 @@ indy-pkg-npm org.commonjava.indy - 1.7.4 + 1.7.5-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/ftests/pom.xml b/addons/pkg-npm/ftests/pom.xml index ccc9157c6b..72a62ea7c8 100644 --- a/addons/pkg-npm/ftests/pom.xml +++ b/addons/pkg-npm/ftests/pom.xml @@ -20,7 +20,7 @@ indy-pkg-npm org.commonjava.indy - 1.7.4 + 1.7.5-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/jaxrs/pom.xml b/addons/pkg-npm/jaxrs/pom.xml index 6b10934ab8..9ca7ff70fc 100644 --- a/addons/pkg-npm/jaxrs/pom.xml +++ b/addons/pkg-npm/jaxrs/pom.xml @@ -20,7 +20,7 @@ indy-pkg-npm org.commonjava.indy - 1.7.4 + 1.7.5-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/model-java/pom.xml b/addons/pkg-npm/model-java/pom.xml index ac1d208556..14a0cf3b5d 100644 --- a/addons/pkg-npm/model-java/pom.xml +++ b/addons/pkg-npm/model-java/pom.xml @@ -20,7 +20,7 @@ indy-pkg-npm org.commonjava.indy - 1.7.4 + 1.7.5-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/pom.xml b/addons/pkg-npm/pom.xml index 2f2df1c961..9320ea80c5 100644 --- a/addons/pkg-npm/pom.xml +++ b/addons/pkg-npm/pom.xml @@ -20,7 +20,7 @@ indy-addons org.commonjava.indy - 1.7.4 + 1.7.5-SNAPSHOT 4.0.0 diff --git a/addons/pom.xml b/addons/pom.xml index 3ed4225c6c..4d1ba36cc0 100644 --- a/addons/pom.xml +++ b/addons/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-parent - 1.7.4 + 1.7.5-SNAPSHOT indy-addons diff --git a/addons/promote/client-java/pom.xml b/addons/promote/client-java/pom.xml index b0f120fdf4..189ffbbd91 100644 --- a/addons/promote/client-java/pom.xml +++ b/addons/promote/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 1.7.4 + 1.7.5-SNAPSHOT indy-promote-client-java Indy :: Add-Ons :: Artifact Promotion :: Java Client diff --git a/addons/promote/common/pom.xml b/addons/promote/common/pom.xml index 242fc37f48..50cb3079cc 100644 --- a/addons/promote/common/pom.xml +++ b/addons/promote/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 1.7.4 + 1.7.5-SNAPSHOT indy-promote-common Indy :: Add-Ons :: Artifact Promotion :: Common diff --git a/addons/promote/ftests/pom.xml b/addons/promote/ftests/pom.xml index f2c68a0f84..bbbab5700c 100644 --- a/addons/promote/ftests/pom.xml +++ b/addons/promote/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 1.7.4 + 1.7.5-SNAPSHOT indy-ftests-promote diff --git a/addons/promote/jaxrs/pom.xml b/addons/promote/jaxrs/pom.xml index e8d3c3ac2d..af9e3a1c40 100644 --- a/addons/promote/jaxrs/pom.xml +++ b/addons/promote/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 1.7.4 + 1.7.5-SNAPSHOT indy-promote-jaxrs diff --git a/addons/promote/model-java/pom.xml b/addons/promote/model-java/pom.xml index 7b80e35f7c..2a764b7ca2 100644 --- a/addons/promote/model-java/pom.xml +++ b/addons/promote/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 1.7.4 + 1.7.5-SNAPSHOT indy-promote-model-java Indy :: Add-Ons :: Artifact Promotion :: Java Domain Model diff --git a/addons/promote/pom.xml b/addons/promote/pom.xml index 818d50c984..613bfaa1f5 100644 --- a/addons/promote/pom.xml +++ b/addons/promote/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 1.7.4 + 1.7.5-SNAPSHOT indy-promote Indy :: Add-Ons :: Artifact Promotion :: Parent diff --git a/addons/relate/common/pom.xml b/addons/relate/common/pom.xml index 24afcc0817..a9411c0fad 100644 --- a/addons/relate/common/pom.xml +++ b/addons/relate/common/pom.xml @@ -20,7 +20,7 @@ indy-relate org.commonjava.indy - 1.7.4 + 1.7.5-SNAPSHOT 4.0.0 diff --git a/addons/relate/ftests/pom.xml b/addons/relate/ftests/pom.xml index 6e172ea1f0..611716fed2 100644 --- a/addons/relate/ftests/pom.xml +++ b/addons/relate/ftests/pom.xml @@ -20,7 +20,7 @@ indy-relate org.commonjava.indy - 1.7.4 + 1.7.5-SNAPSHOT 4.0.0 diff --git a/addons/relate/pom.xml b/addons/relate/pom.xml index 62e68d82c0..b431c1887a 100644 --- a/addons/relate/pom.xml +++ b/addons/relate/pom.xml @@ -21,7 +21,7 @@ indy-addons org.commonjava.indy - 1.7.4 + 1.7.5-SNAPSHOT indy-relate diff --git a/addons/revisions/common/pom.xml b/addons/revisions/common/pom.xml index d42f19c956..f404439a93 100644 --- a/addons/revisions/common/pom.xml +++ b/addons/revisions/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-revisions - 1.7.4 + 1.7.5-SNAPSHOT indy-revisions-common Indy :: Add-Ons :: Revisions :: Common diff --git a/addons/revisions/jaxrs/pom.xml b/addons/revisions/jaxrs/pom.xml index c3ba9147fe..ff795d0075 100644 --- a/addons/revisions/jaxrs/pom.xml +++ b/addons/revisions/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-revisions - 1.7.4 + 1.7.5-SNAPSHOT indy-revisions-jaxrs diff --git a/addons/revisions/pom.xml b/addons/revisions/pom.xml index 1031a29dec..3ecca41a4d 100644 --- a/addons/revisions/pom.xml +++ b/addons/revisions/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 1.7.4 + 1.7.5-SNAPSHOT indy-revisions Indy :: Add-Ons :: Revisions :: Parent diff --git a/addons/setback/common/pom.xml b/addons/setback/common/pom.xml index 70f097dc38..d1061a8813 100644 --- a/addons/setback/common/pom.xml +++ b/addons/setback/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-setback - 1.7.4 + 1.7.5-SNAPSHOT indy-setback-common Indy :: Add-Ons :: Set-Back :: Common diff --git a/addons/setback/jaxrs/pom.xml b/addons/setback/jaxrs/pom.xml index 1ceb28c8ea..f4bf73e74f 100644 --- a/addons/setback/jaxrs/pom.xml +++ b/addons/setback/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-setback - 1.7.4 + 1.7.5-SNAPSHOT indy-setback-jaxrs diff --git a/addons/setback/pom.xml b/addons/setback/pom.xml index f7a3d276aa..e06ac6f4d2 100644 --- a/addons/setback/pom.xml +++ b/addons/setback/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 1.7.4 + 1.7.5-SNAPSHOT indy-setback Indy :: Add-Ons :: Set-Back :: Parent diff --git a/api/pom.xml b/api/pom.xml index e5c6932420..26c1fadc1c 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 1.7.4 + 1.7.5-SNAPSHOT indy-api diff --git a/bindings/jaxrs/pom.xml b/bindings/jaxrs/pom.xml index 1ee507cf4f..d2c9f507da 100644 --- a/bindings/jaxrs/pom.xml +++ b/bindings/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-bindings - 1.7.4 + 1.7.5-SNAPSHOT indy-bindings-jaxrs diff --git a/bindings/pom.xml b/bindings/pom.xml index 53a43c9658..398279b756 100644 --- a/bindings/pom.xml +++ b/bindings/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-parent - 1.7.4 + 1.7.5-SNAPSHOT indy-bindings diff --git a/boot/api/pom.xml b/boot/api/pom.xml index 3a678a940d..3d9569a769 100644 --- a/boot/api/pom.xml +++ b/boot/api/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.boot indy-booters - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy.boot diff --git a/boot/jaxrs/pom.xml b/boot/jaxrs/pom.xml index 4f07d331fa..d5be98a74e 100644 --- a/boot/jaxrs/pom.xml +++ b/boot/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.boot indy-booters - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy.boot diff --git a/boot/pom.xml b/boot/pom.xml index bc3a0b6bbb..f0e53e4539 100644 --- a/boot/pom.xml +++ b/boot/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy.boot diff --git a/clients/core-java/pom.xml b/clients/core-java/pom.xml index 76eebe1801..1c2c9287f3 100644 --- a/clients/core-java/pom.xml +++ b/clients/core-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-clients-parent - 1.7.4 + 1.7.5-SNAPSHOT indy-client-core-java diff --git a/clients/pom.xml b/clients/pom.xml index d4fd513309..2a86b0bccb 100644 --- a/clients/pom.xml +++ b/clients/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 1.7.4 + 1.7.5-SNAPSHOT indy-clients-parent diff --git a/core/pom.xml b/core/pom.xml index 8823d95682..778b6a5f37 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 1.7.4 + 1.7.5-SNAPSHOT indy-core diff --git a/db/flat/pom.xml b/db/flat/pom.xml index 3141b16c2f..bb3443d39e 100644 --- a/db/flat/pom.xml +++ b/db/flat/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 1.7.4 + 1.7.5-SNAPSHOT indy-db-flat diff --git a/db/memory/pom.xml b/db/memory/pom.xml index 0806568768..74c23e65d5 100644 --- a/db/memory/pom.xml +++ b/db/memory/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 1.7.4 + 1.7.5-SNAPSHOT indy-db-memory diff --git a/db/pom.xml b/db/pom.xml index 6243152bde..a64b942a46 100644 --- a/db/pom.xml +++ b/db/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 1.7.4 + 1.7.5-SNAPSHOT indy-db diff --git a/deployments/cache-migrator/pom.xml b/deployments/cache-migrator/pom.xml index d4a6f93079..90466f7894 100644 --- a/deployments/cache-migrator/pom.xml +++ b/deployments/cache-migrator/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-deployments - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy.launch diff --git a/deployments/launcher/pom.xml b/deployments/launcher/pom.xml index 9d90507661..c01a421d97 100644 --- a/deployments/launcher/pom.xml +++ b/deployments/launcher/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-deployments - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy.launch diff --git a/deployments/pom.xml b/deployments/pom.xml index add49921e4..f628a596a4 100644 --- a/deployments/pom.xml +++ b/deployments/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy diff --git a/embedder/pom.xml b/embedder/pom.xml index 77febda242..2b1dc0d1e0 100644 --- a/embedder/pom.xml +++ b/embedder/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy.embed diff --git a/filers/default/pom.xml b/filers/default/pom.xml index 0415b322a2..79690a2d39 100644 --- a/filers/default/pom.xml +++ b/filers/default/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-file-managers - 1.7.4 + 1.7.5-SNAPSHOT indy-filer-default diff --git a/filers/pom.xml b/filers/pom.xml index 1d70f5d072..264eb82c20 100644 --- a/filers/pom.xml +++ b/filers/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 1.7.4 + 1.7.5-SNAPSHOT indy-file-managers diff --git a/ftests/common/pom.xml b/ftests/common/pom.xml index eb3a3e6db1..9ad86c4419 100644 --- a/ftests/common/pom.xml +++ b/ftests/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-ftests-parent - 1.7.4 + 1.7.5-SNAPSHOT indy-ftests-common diff --git a/ftests/core/pom.xml b/ftests/core/pom.xml index ddbf0e495b..4b52c786bb 100644 --- a/ftests/core/pom.xml +++ b/ftests/core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-ftests-parent - 1.7.4 + 1.7.5-SNAPSHOT indy-ftests-core diff --git a/ftests/metrics/pom.xml b/ftests/metrics/pom.xml index 0ca6be60b0..afb0f6180f 100644 --- a/ftests/metrics/pom.xml +++ b/ftests/metrics/pom.xml @@ -20,7 +20,7 @@ indy-ftests-parent org.commonjava.indy - 1.7.4 + 1.7.5-SNAPSHOT 4.0.0 diff --git a/ftests/pom.xml b/ftests/pom.xml index 08f4306667..f4172e2b6c 100644 --- a/ftests/pom.xml +++ b/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 1.7.4 + 1.7.5-SNAPSHOT indy-ftests-parent diff --git a/models/core-java/pom.xml b/models/core-java/pom.xml index ad11081826..f977108c8f 100644 --- a/models/core-java/pom.xml +++ b/models/core-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-models-parent - 1.7.4 + 1.7.5-SNAPSHOT indy-model-core-java diff --git a/models/pom.xml b/models/pom.xml index cf66b5fa11..1ad926e62e 100644 --- a/models/pom.xml +++ b/models/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 1.7.4 + 1.7.5-SNAPSHOT indy-models-parent diff --git a/pom.xml b/pom.xml index 1e406b106b..c67853805d 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.commonjava.indy indy-parent - 1.7.4 + 1.7.5-SNAPSHOT pom @@ -37,7 +37,7 @@ scm:git:https://github.com/Commonjava/indy.git scm:git:git@github.com:Commonjava/indy.git http://github.com/Commonjava/indy - indy-parent-1.7.4 + indy-parent-1.6.0 @@ -151,7 +151,7 @@ org.commonjava.indy.ui indy-ui-layover - 1.7.4 + 1.7.5-SNAPSHOT runtime @@ -159,22 +159,22 @@ org.commonjava.indy indy-model-core-java - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-api - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-core - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-core - 1.7.4 + 1.7.5-SNAPSHOT tar.gz confset provided @@ -182,17 +182,17 @@ org.commonjava.indy indy-db-flat - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-bindings-jaxrs - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy.launch indy-launcher - 1.7.4 + 1.7.5-SNAPSHOT tar.gz skinny provided @@ -200,7 +200,7 @@ org.commonjava.indy.launch indy-launcher - 1.7.4 + 1.7.5-SNAPSHOT tar.gz complete provided @@ -208,7 +208,7 @@ org.commonjava.indy.launch indy-launcher - 1.7.4 + 1.7.5-SNAPSHOT tar.gz data provided @@ -216,7 +216,7 @@ org.commonjava.indy.launch indy-launcher - 1.7.4 + 1.7.5-SNAPSHOT tar.gz etc provided @@ -225,17 +225,17 @@ org.commonjava.indy indy-autoprox-jaxrs - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-autoprox-common - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-autoprox-common - 1.7.4 + 1.7.5-SNAPSHOT tar.gz dataset provided @@ -243,7 +243,7 @@ org.commonjava.indy indy-autoprox-common - 1.7.4 + 1.7.5-SNAPSHOT tar.gz docset provided @@ -251,7 +251,7 @@ org.commonjava.indy indy-autoprox-common - 1.7.4 + 1.7.5-SNAPSHOT tar.gz confset provided @@ -259,7 +259,7 @@ org.commonjava.indy indy-autoprox-common - 1.7.4 + 1.7.5-SNAPSHOT tar.gz uiset provided @@ -267,32 +267,32 @@ org.commonjava.indy indy-autoprox-model-java - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-autoprox-client-java - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-ftests-autoprox - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-setback-jaxrs - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-setback-common - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-setback-common - 1.7.4 + 1.7.5-SNAPSHOT tar.gz dataset provided @@ -300,7 +300,7 @@ org.commonjava.indy indy-setback-common - 1.7.4 + 1.7.5-SNAPSHOT tar.gz confset provided @@ -308,17 +308,17 @@ org.commonjava.indy indy-revisions-jaxrs - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-revisions-common - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-revisions-common - 1.7.4 + 1.7.5-SNAPSHOT tar.gz confset provided @@ -326,7 +326,7 @@ org.commonjava.indy indy-revisions-common - 1.7.4 + 1.7.5-SNAPSHOT tar.gz uiset provided @@ -334,12 +334,12 @@ org.commonjava.indy indy-dot-maven-common - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-dot-maven-common - 1.7.4 + 1.7.5-SNAPSHOT tar.gz dataset provided @@ -347,22 +347,22 @@ org.commonjava.indy indy-dot-maven-jaxrs - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-ftests-dot-maven - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-httprox-common - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-httprox-common - 1.7.4 + 1.7.5-SNAPSHOT tar.gz confset provided @@ -370,17 +370,17 @@ org.commonjava.indy indy-ftests-httprox - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-content-index - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-content-index - 1.7.4 + 1.7.5-SNAPSHOT tar.gz confset provided @@ -388,123 +388,123 @@ org.commonjava.indy indy-db-memory - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-test-db - 1.7.4 + 1.7.5-SNAPSHOT test org.commonjava.indy indy-test-fixtures-core - 1.7.4 + 1.7.5-SNAPSHOT test org.commonjava.indy indy-test-providers-core - 1.7.4 + 1.7.5-SNAPSHOT test org.commonjava.indy indy-test-utils - 1.7.4 + 1.7.5-SNAPSHOT test org.commonjava.indy indy-filer-default - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-subsys-jaxrs - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-subsys-flatfile - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-subsys-infinispan - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-subsys-http - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-subsys-git - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-subsys-groovy - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-subsys-prefetch - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-subsys-cpool - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-client-core-java - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-ftests-common - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-ftests-core - 1.7.4 + 1.7.5-SNAPSHOT test org.commonjava.indy indy-folo-jaxrs - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-ftests-folo - 1.7.4 + 1.7.5-SNAPSHOT test org.commonjava.indy indy-folo-client-java - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-folo-model-java - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-folo-common - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-folo-common - 1.7.4 + 1.7.5-SNAPSHOT tar.gz dataset provided @@ -512,7 +512,7 @@ org.commonjava.indy indy-folo-common - 1.7.4 + 1.7.5-SNAPSHOT tar.gz confset provided @@ -520,33 +520,33 @@ org.commonjava.indy indy-promote-jaxrs - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-ftests-promote - 1.7.4 + 1.7.5-SNAPSHOT test org.commonjava.indy indy-promote-client-java - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-promote-model-java - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-promote-common - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-promote-common - 1.7.4 + 1.7.5-SNAPSHOT tar.gz confset provided @@ -554,7 +554,7 @@ org.commonjava.indy indy-promote-common - 1.7.4 + 1.7.5-SNAPSHOT tar.gz dataset provided @@ -562,19 +562,19 @@ org.commonjava.indy indy-promote-common - 1.7.4 + 1.7.5-SNAPSHOT dataset provided org.commonjava.indy indy-implied-repos-common - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-implied-repos-common - 1.7.4 + 1.7.5-SNAPSHOT tar.gz confset provided @@ -582,27 +582,27 @@ org.commonjava.indy indy-implied-repos-model-java - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-implied-repos-client-java - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-ftests-implied-repos - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-relate-common - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-relate-common - 1.7.4 + 1.7.5-SNAPSHOT tar.gz confset provided @@ -610,32 +610,32 @@ org.commonjava.indy indy-ftests-relate - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy.embed indy-embedder - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy.boot indy-booter-api - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy.boot indy-booter-jaxrs - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-subsys-keycloak - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-subsys-keycloak - 1.7.4 + 1.7.5-SNAPSHOT tar.gz confset provided @@ -643,7 +643,7 @@ org.commonjava.indy indy-subsys-infinispan - 1.7.4 + 1.7.5-SNAPSHOT tar.gz confset provided @@ -651,7 +651,7 @@ org.commonjava.indy indy-subsys-prefetch - 1.7.4 + 1.7.5-SNAPSHOT tar.gz confset provided @@ -660,7 +660,7 @@ org.commonjava.indy indy-koji-common - 1.7.4 + 1.7.5-SNAPSHOT tar.gz confset provided @@ -668,22 +668,22 @@ org.commonjava.indy indy-koji-common - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-koji-model-java - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-koji-client-java - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-koji-jaxrs - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy @@ -694,66 +694,66 @@ org.commonjava.indy indy-pkg-maven-common - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-pkg-maven-jaxrs - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-pkg-npm-jaxrs - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-ftests-pkg-maven - 1.7.4 + 1.7.5-SNAPSHOT test org.commonjava.indy indy-ftests-pkg-npm - 1.7.4 + 1.7.5-SNAPSHOT test org.commonjava.indy indy-pkg-npm-common - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-pkg-npm-model-java - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-diagnostics-jaxrs - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-diagnostics-client-java - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-diagnostics-common - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-ftests-diagnostics - 1.7.4 + 1.7.5-SNAPSHOT test org.commonjava.indy indy-diagnostics-common - 1.7.4 + 1.7.5-SNAPSHOT confset tar.gz provided @@ -761,28 +761,28 @@ org.commonjava.indy indy-hosted-by-archive-common - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-hosted-by-archive-client-java - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-ftests-hosted-by-archive - 1.7.4 + 1.7.5-SNAPSHOT test org.commonjava.indy indy-hosted-by-archive-jaxrs - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-hosted-by-archive-common - 1.7.4 + 1.7.5-SNAPSHOT confset tar.gz @@ -790,17 +790,17 @@ org.commonjava.indy indy-subsys-metrics-core - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-subsys-metrics-reporter - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-subsys-metrics-reporter - 1.7.4 + 1.7.5-SNAPSHOT confset tar.gz provided @@ -809,7 +809,7 @@ org.commonjava.indy indy-ftests-metrics - 1.7.4 + 1.7.5-SNAPSHOT test @@ -817,14 +817,14 @@ org.commonjava.indy.rest indy-rest-api yaml - 1.7.4 + 1.7.5-SNAPSHOT provided org.commonjava.indy.rest indy-rest-api json - 1.7.4 + 1.7.5-SNAPSHOT provided @@ -858,28 +858,28 @@ org.commonjava.indy indy-content-browse-common - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-content-browse-jaxrs - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-ftests-content-browse - 1.7.4 + 1.7.5-SNAPSHOT test org.commonjava.indy indy-content-browse-model-java - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy indy-content-browse-common - 1.7.4 + 1.7.5-SNAPSHOT confset tar.gz provided @@ -887,7 +887,7 @@ org.commonjava.indy indy-content-browse-ui - 1.7.4 + 1.7.5-SNAPSHOT reactui tar.gz diff --git a/rest/api/pom.xml b/rest/api/pom.xml index 5824cd9964..8cebd4c885 100644 --- a/rest/api/pom.xml +++ b/rest/api/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.rest indy-rest-parent - 1.7.4 + 1.7.5-SNAPSHOT indy-rest-api diff --git a/rest/pom.xml b/rest/pom.xml index 5968eb0593..fa193fa1bb 100644 --- a/rest/pom.xml +++ b/rest/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy.rest diff --git a/subsys/cpool/pom.xml b/subsys/cpool/pom.xml index 6a95aa1899..56cd379403 100644 --- a/subsys/cpool/pom.xml +++ b/subsys/cpool/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 1.7.4 + 1.7.5-SNAPSHOT indy-subsys-cpool diff --git a/subsys/flatfile/pom.xml b/subsys/flatfile/pom.xml index 54007ea6a3..585558f709 100644 --- a/subsys/flatfile/pom.xml +++ b/subsys/flatfile/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 1.7.4 + 1.7.5-SNAPSHOT indy-subsys-flatfile diff --git a/subsys/git/pom.xml b/subsys/git/pom.xml index 6170e2fb75..0f1dd43d4c 100644 --- a/subsys/git/pom.xml +++ b/subsys/git/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 1.7.4 + 1.7.5-SNAPSHOT indy-subsys-git diff --git a/subsys/groovy/pom.xml b/subsys/groovy/pom.xml index 1b062e368d..49b4fb8f77 100644 --- a/subsys/groovy/pom.xml +++ b/subsys/groovy/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 1.7.4 + 1.7.5-SNAPSHOT indy-subsys-groovy diff --git a/subsys/http/pom.xml b/subsys/http/pom.xml index b6983e6668..8130cf357f 100644 --- a/subsys/http/pom.xml +++ b/subsys/http/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 1.7.4 + 1.7.5-SNAPSHOT indy-subsys-http diff --git a/subsys/infinispan/pom.xml b/subsys/infinispan/pom.xml index 2d6bb0b725..a1f35d781f 100644 --- a/subsys/infinispan/pom.xml +++ b/subsys/infinispan/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 1.7.4 + 1.7.5-SNAPSHOT indy-subsys-infinispan diff --git a/subsys/jaxrs/pom.xml b/subsys/jaxrs/pom.xml index 1857ece6e4..773457e005 100644 --- a/subsys/jaxrs/pom.xml +++ b/subsys/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 1.7.4 + 1.7.5-SNAPSHOT indy-subsys-jaxrs diff --git a/subsys/kafka/pom.xml b/subsys/kafka/pom.xml index c27c945484..6443d660e0 100644 --- a/subsys/kafka/pom.xml +++ b/subsys/kafka/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 1.7.4 + 1.7.5-SNAPSHOT 4.0.0 diff --git a/subsys/keycloak/pom.xml b/subsys/keycloak/pom.xml index 02e0638c89..76501d3902 100644 --- a/subsys/keycloak/pom.xml +++ b/subsys/keycloak/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 1.7.4 + 1.7.5-SNAPSHOT indy-subsys-keycloak Indy :: Subsystems :: Keycloak diff --git a/subsys/metrics/core/pom.xml b/subsys/metrics/core/pom.xml index 3293e1fa4a..57cc8f8ed3 100644 --- a/subsys/metrics/core/pom.xml +++ b/subsys/metrics/core/pom.xml @@ -20,7 +20,7 @@ indy-subsys-metrics org.commonjava.indy - 1.7.4 + 1.7.5-SNAPSHOT 4.0.0 diff --git a/subsys/metrics/pom.xml b/subsys/metrics/pom.xml index ae3a186022..69f1c2c1fc 100644 --- a/subsys/metrics/pom.xml +++ b/subsys/metrics/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 1.7.4 + 1.7.5-SNAPSHOT 4.0.0 diff --git a/subsys/metrics/reporter/pom.xml b/subsys/metrics/reporter/pom.xml index 6b5b031aea..d828a22e18 100644 --- a/subsys/metrics/reporter/pom.xml +++ b/subsys/metrics/reporter/pom.xml @@ -20,7 +20,7 @@ indy-subsys-metrics org.commonjava.indy - 1.7.4 + 1.7.5-SNAPSHOT 4.0.0 diff --git a/subsys/pom.xml b/subsys/pom.xml index 9df80b033e..d87e9cb511 100644 --- a/subsys/pom.xml +++ b/subsys/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 1.7.4 + 1.7.5-SNAPSHOT indy-subsystems diff --git a/subsys/prefetch/pom.xml b/subsys/prefetch/pom.xml index 906a752087..de2bae58f5 100644 --- a/subsys/prefetch/pom.xml +++ b/subsys/prefetch/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 1.7.4 + 1.7.5-SNAPSHOT 4.0.0 diff --git a/test/db/pom.xml b/test/db/pom.xml index b7098707ae..dd7df639ce 100644 --- a/test/db/pom.xml +++ b/test/db/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 1.7.4 + 1.7.5-SNAPSHOT indy-test-db diff --git a/test/fixtures-core/pom.xml b/test/fixtures-core/pom.xml index ac2b145c19..37a3d6ca87 100644 --- a/test/fixtures-core/pom.xml +++ b/test/fixtures-core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 1.7.4 + 1.7.5-SNAPSHOT indy-test-fixtures-core diff --git a/test/pom.xml b/test/pom.xml index f2f5234844..dcccdcd767 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 1.7.4 + 1.7.5-SNAPSHOT indy-test diff --git a/test/providers-core/pom.xml b/test/providers-core/pom.xml index ffdc747a09..be6949104f 100644 --- a/test/providers-core/pom.xml +++ b/test/providers-core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 1.7.4 + 1.7.5-SNAPSHOT indy-test-providers-core diff --git a/test/utils/pom.xml b/test/utils/pom.xml index 281f61caba..bf349d42c3 100644 --- a/test/utils/pom.xml +++ b/test/utils/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 1.7.4 + 1.7.5-SNAPSHOT indy-test-utils diff --git a/tools/assemblies/pom.xml b/tools/assemblies/pom.xml index 0ac9fe67af..3b6786d4c5 100644 --- a/tools/assemblies/pom.xml +++ b/tools/assemblies/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.tools indy-tools - 1.7.4 + 1.7.5-SNAPSHOT indy-assemblies diff --git a/tools/pom.xml b/tools/pom.xml index 57f97dc260..86b577f2e5 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy.tools diff --git a/uis/layover/pom.xml b/uis/layover/pom.xml index 3bbb83ff03..67518f3d1d 100644 --- a/uis/layover/pom.xml +++ b/uis/layover/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.ui indy-uis - 1.7.4 + 1.7.5-SNAPSHOT indy-ui-layover diff --git a/uis/pom.xml b/uis/pom.xml index 060e418a00..492f42ae91 100644 --- a/uis/pom.xml +++ b/uis/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 1.7.4 + 1.7.5-SNAPSHOT org.commonjava.indy.ui From 7fdd635666c3e2bc3ae179ee81055df5d3e6053c Mon Sep 17 00:00:00 2001 From: Gang Li Date: Thu, 14 Mar 2019 19:17:42 +0800 Subject: [PATCH 13/56] Remove koji ftests dep and align SNAPSHOT --- deployments/docker/pom.xml | 2 +- embedder-tests/pom.xml | 2 +- embedder-tests/savant/pom.xml | 2 +- embedder-tests/sonar-report/pom.xml | 2 +- pom.xml | 2 ++ test/docker/gogs-test-appliance/pom.xml | 2 +- test/docker/keycloak-test-appliance/pom.xml | 2 +- test/docker/pom.xml | 2 +- 8 files changed, 9 insertions(+), 7 deletions(-) diff --git a/deployments/docker/pom.xml b/deployments/docker/pom.xml index 468ebb80bb..ad2df7c70e 100644 --- a/deployments/docker/pom.xml +++ b/deployments/docker/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-deployments - 1.7.4-SNAPSHOT + 1.7.5-SNAPSHOT org.commonjava.indy.docker diff --git a/embedder-tests/pom.xml b/embedder-tests/pom.xml index 4f2243dbd3..9ed8dca4e8 100644 --- a/embedder-tests/pom.xml +++ b/embedder-tests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 1.7.4-SNAPSHOT + 1.7.5-SNAPSHOT org.commonjava.indy.embed.test diff --git a/embedder-tests/savant/pom.xml b/embedder-tests/savant/pom.xml index 588972d837..d133f0560e 100644 --- a/embedder-tests/savant/pom.xml +++ b/embedder-tests/savant/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.embed.test indy-embedder-tests - 1.7.4-SNAPSHOT + 1.7.5-SNAPSHOT indy-embedder-test-savant diff --git a/embedder-tests/sonar-report/pom.xml b/embedder-tests/sonar-report/pom.xml index 61e7fda705..d135bdf7d1 100644 --- a/embedder-tests/sonar-report/pom.xml +++ b/embedder-tests/sonar-report/pom.xml @@ -22,7 +22,7 @@ indy-embedder-tests org.commonjava.indy.embed.test - 1.7.4-SNAPSHOT + 1.7.5-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index c67853805d..a5ebf4e7f5 100644 --- a/pom.xml +++ b/pom.xml @@ -685,11 +685,13 @@ indy-koji-jaxrs 1.7.5-SNAPSHOT + org.commonjava.indy diff --git a/test/docker/gogs-test-appliance/pom.xml b/test/docker/gogs-test-appliance/pom.xml index 4d9c1bf634..aad5aca265 100644 --- a/test/docker/gogs-test-appliance/pom.xml +++ b/test/docker/gogs-test-appliance/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.docker indy-test-docker-appliances - 1.7.4-SNAPSHOT + 1.7.5-SNAPSHOT indy-docker-gogs-test-appliance diff --git a/test/docker/keycloak-test-appliance/pom.xml b/test/docker/keycloak-test-appliance/pom.xml index 55fc7acd74..5567692ce9 100644 --- a/test/docker/keycloak-test-appliance/pom.xml +++ b/test/docker/keycloak-test-appliance/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.docker indy-test-docker-appliances - 1.7.4-SNAPSHOT + 1.7.5-SNAPSHOT indy-docker-keycloak-test-appliance diff --git a/test/docker/pom.xml b/test/docker/pom.xml index f9c83f4234..e009c56100 100644 --- a/test/docker/pom.xml +++ b/test/docker/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 1.7.4-SNAPSHOT + 1.7.5-SNAPSHOT org.commonjava.indy.docker From dd3124e9646e93a8803184767e25efdd0b4df3e5 Mon Sep 17 00:00:00 2001 From: Gang Li Date: Fri, 15 Mar 2019 12:47:16 +0800 Subject: [PATCH 14/56] Update weft to 1.14 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a5ebf4e7f5..9971ea286e 100644 --- a/pom.xml +++ b/pom.xml @@ -73,7 +73,7 @@ 2.7 2.3 1.9 - 1.12 + 1.14 1.4 From bc4fbfecfdc43fb4ebcbc66256e29fd34a2d4d2d Mon Sep 17 00:00:00 2001 From: Gang Li Date: Fri, 15 Mar 2019 05:58:54 +0000 Subject: [PATCH 15/56] [maven-release-plugin] prepare release indy-parent-1.7.5 --- addons/autoprox/client-java/pom.xml | 2 +- addons/autoprox/common/pom.xml | 2 +- addons/autoprox/ftests/pom.xml | 2 +- addons/autoprox/jaxrs/pom.xml | 2 +- addons/autoprox/model-java/pom.xml | 2 +- addons/autoprox/pom.xml | 2 +- addons/content-browse/common/pom.xml | 2 +- addons/content-browse/ftests/pom.xml | 2 +- addons/content-browse/jaxrs/pom.xml | 2 +- addons/content-browse/model-java/pom.xml | 2 +- addons/content-browse/pom.xml | 2 +- addons/content-browse/ui/pom.xml | 2 +- addons/content-index/pom.xml | 2 +- addons/diagnostics/client-java/pom.xml | 2 +- addons/diagnostics/common/pom.xml | 2 +- addons/diagnostics/ftests/pom.xml | 2 +- addons/diagnostics/jaxrs/pom.xml | 2 +- addons/diagnostics/pom.xml | 2 +- addons/dot-maven/common/pom.xml | 2 +- addons/dot-maven/ftests/pom.xml | 2 +- addons/dot-maven/jaxrs/pom.xml | 2 +- addons/dot-maven/pom.xml | 2 +- addons/folo/client-java/pom.xml | 2 +- addons/folo/common/pom.xml | 2 +- addons/folo/ftests/pom.xml | 2 +- addons/folo/jaxrs/pom.xml | 2 +- addons/folo/model-java/pom.xml | 2 +- addons/folo/pom.xml | 2 +- addons/hosted-by-archive/client-java/pom.xml | 2 +- addons/hosted-by-archive/common/pom.xml | 2 +- addons/hosted-by-archive/ftests/pom.xml | 2 +- addons/hosted-by-archive/jaxrs/pom.xml | 2 +- addons/hosted-by-archive/pom.xml | 2 +- addons/httprox/common/pom.xml | 2 +- addons/httprox/ftests/pom.xml | 2 +- addons/httprox/jaxrs/pom.xml | 2 +- addons/httprox/pom.xml | 2 +- addons/implied-repos/client-java/pom.xml | 2 +- addons/implied-repos/common/pom.xml | 2 +- addons/implied-repos/ftests/pom.xml | 2 +- addons/implied-repos/model-java/pom.xml | 2 +- addons/implied-repos/pom.xml | 2 +- addons/koji/client-java/pom.xml | 2 +- addons/koji/common/pom.xml | 2 +- addons/koji/jaxrs/pom.xml | 2 +- addons/koji/model-java/pom.xml | 2 +- addons/koji/pom.xml | 2 +- addons/pkg-maven/common/pom.xml | 2 +- addons/pkg-maven/ftests/pom.xml | 2 +- addons/pkg-maven/jaxrs/pom.xml | 2 +- addons/pkg-maven/pom.xml | 2 +- addons/pkg-npm/common/pom.xml | 2 +- addons/pkg-npm/ftests/pom.xml | 2 +- addons/pkg-npm/jaxrs/pom.xml | 2 +- addons/pkg-npm/model-java/pom.xml | 2 +- addons/pkg-npm/pom.xml | 2 +- addons/pom.xml | 2 +- addons/promote/client-java/pom.xml | 2 +- addons/promote/common/pom.xml | 2 +- addons/promote/ftests/pom.xml | 2 +- addons/promote/jaxrs/pom.xml | 2 +- addons/promote/model-java/pom.xml | 2 +- addons/promote/pom.xml | 2 +- addons/relate/common/pom.xml | 2 +- addons/relate/ftests/pom.xml | 2 +- addons/relate/pom.xml | 2 +- addons/revisions/common/pom.xml | 2 +- addons/revisions/jaxrs/pom.xml | 2 +- addons/revisions/pom.xml | 2 +- addons/setback/common/pom.xml | 2 +- addons/setback/jaxrs/pom.xml | 2 +- addons/setback/pom.xml | 2 +- api/pom.xml | 2 +- bindings/jaxrs/pom.xml | 2 +- bindings/pom.xml | 2 +- boot/api/pom.xml | 2 +- boot/jaxrs/pom.xml | 2 +- boot/pom.xml | 2 +- clients/core-java/pom.xml | 2 +- clients/pom.xml | 2 +- core/pom.xml | 2 +- db/flat/pom.xml | 2 +- db/memory/pom.xml | 2 +- db/pom.xml | 2 +- deployments/cache-migrator/pom.xml | 2 +- deployments/launcher/pom.xml | 2 +- deployments/pom.xml | 2 +- embedder/pom.xml | 2 +- filers/default/pom.xml | 2 +- filers/pom.xml | 2 +- ftests/common/pom.xml | 2 +- ftests/core/pom.xml | 2 +- ftests/metrics/pom.xml | 2 +- ftests/pom.xml | 2 +- models/core-java/pom.xml | 2 +- models/pom.xml | 2 +- pom.xml | 240 +++++++++---------- rest/api/pom.xml | 2 +- rest/pom.xml | 2 +- subsys/cpool/pom.xml | 2 +- subsys/flatfile/pom.xml | 2 +- subsys/git/pom.xml | 2 +- subsys/groovy/pom.xml | 2 +- subsys/http/pom.xml | 2 +- subsys/infinispan/pom.xml | 2 +- subsys/jaxrs/pom.xml | 2 +- subsys/kafka/pom.xml | 2 +- subsys/keycloak/pom.xml | 2 +- subsys/metrics/core/pom.xml | 2 +- subsys/metrics/pom.xml | 2 +- subsys/metrics/reporter/pom.xml | 2 +- subsys/pom.xml | 2 +- subsys/prefetch/pom.xml | 2 +- test/db/pom.xml | 2 +- test/fixtures-core/pom.xml | 2 +- test/pom.xml | 2 +- test/providers-core/pom.xml | 2 +- test/utils/pom.xml | 2 +- tools/assemblies/pom.xml | 2 +- tools/pom.xml | 2 +- uis/layover/pom.xml | 2 +- uis/pom.xml | 2 +- 122 files changed, 241 insertions(+), 241 deletions(-) diff --git a/addons/autoprox/client-java/pom.xml b/addons/autoprox/client-java/pom.xml index 9bd6685f18..6e4010c4d8 100644 --- a/addons/autoprox/client-java/pom.xml +++ b/addons/autoprox/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-autoprox - 1.7.5-SNAPSHOT + 1.7.5 indy-autoprox-client-java Indy :: Add-Ons :: Auto-Proxy :: Java Client diff --git a/addons/autoprox/common/pom.xml b/addons/autoprox/common/pom.xml index 7c7cac3ffe..515627d5d2 100644 --- a/addons/autoprox/common/pom.xml +++ b/addons/autoprox/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-autoprox - 1.7.5-SNAPSHOT + 1.7.5 indy-autoprox-common Indy :: Add-Ons :: Auto-Proxy :: Common diff --git a/addons/autoprox/ftests/pom.xml b/addons/autoprox/ftests/pom.xml index 57955cd1d1..13a088f310 100644 --- a/addons/autoprox/ftests/pom.xml +++ b/addons/autoprox/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-autoprox - 1.7.5-SNAPSHOT + 1.7.5 indy-ftests-autoprox diff --git a/addons/autoprox/jaxrs/pom.xml b/addons/autoprox/jaxrs/pom.xml index 44f4c5f7f3..4a945bc736 100644 --- a/addons/autoprox/jaxrs/pom.xml +++ b/addons/autoprox/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-autoprox - 1.7.5-SNAPSHOT + 1.7.5 indy-autoprox-jaxrs diff --git a/addons/autoprox/model-java/pom.xml b/addons/autoprox/model-java/pom.xml index a12f43a92d..7b6efa10eb 100644 --- a/addons/autoprox/model-java/pom.xml +++ b/addons/autoprox/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-autoprox - 1.7.5-SNAPSHOT + 1.7.5 indy-autoprox-model-java Indy :: Add-Ons :: Auto-Proxy :: Java Domain Model diff --git a/addons/autoprox/pom.xml b/addons/autoprox/pom.xml index 7c08bead02..b625727cee 100644 --- a/addons/autoprox/pom.xml +++ b/addons/autoprox/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 1.7.5-SNAPSHOT + 1.7.5 indy-autoprox Indy :: Add-Ons :: Auto-Proxy :: Parent diff --git a/addons/content-browse/common/pom.xml b/addons/content-browse/common/pom.xml index b5104a0201..ba6e6927c8 100644 --- a/addons/content-browse/common/pom.xml +++ b/addons/content-browse/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-content-browse - 1.7.5-SNAPSHOT + 1.7.5 indy-content-browse-common Indy :: Add-Ons :: Directory Content Browse :: Common diff --git a/addons/content-browse/ftests/pom.xml b/addons/content-browse/ftests/pom.xml index 0de1aba8a5..e525cb0f16 100644 --- a/addons/content-browse/ftests/pom.xml +++ b/addons/content-browse/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-content-browse - 1.7.5-SNAPSHOT + 1.7.5 indy-ftests-content-browse diff --git a/addons/content-browse/jaxrs/pom.xml b/addons/content-browse/jaxrs/pom.xml index d66c2d3cb5..9256138c12 100644 --- a/addons/content-browse/jaxrs/pom.xml +++ b/addons/content-browse/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-content-browse - 1.7.5-SNAPSHOT + 1.7.5 indy-content-browse-jaxrs diff --git a/addons/content-browse/model-java/pom.xml b/addons/content-browse/model-java/pom.xml index a582b7a710..e9f49c75b9 100644 --- a/addons/content-browse/model-java/pom.xml +++ b/addons/content-browse/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-content-browse - 1.7.5-SNAPSHOT + 1.7.5 indy-content-browse-model-java Indy :: Add-Ons :: Directory Content Browse :: Java Domain Model diff --git a/addons/content-browse/pom.xml b/addons/content-browse/pom.xml index 60611eef3f..b16f7fb36d 100644 --- a/addons/content-browse/pom.xml +++ b/addons/content-browse/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 1.7.5-SNAPSHOT + 1.7.5 indy-content-browse Indy :: Add-Ons :: Directory Content Browse :: Parent diff --git a/addons/content-browse/ui/pom.xml b/addons/content-browse/ui/pom.xml index 933c0eddbd..89875f5fa3 100644 --- a/addons/content-browse/ui/pom.xml +++ b/addons/content-browse/ui/pom.xml @@ -20,7 +20,7 @@ indy-content-browse org.commonjava.indy - 1.7.5-SNAPSHOT + 1.7.5 4.0.0 diff --git a/addons/content-index/pom.xml b/addons/content-index/pom.xml index 1640da26bb..7060dafcb4 100644 --- a/addons/content-index/pom.xml +++ b/addons/content-index/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 1.7.5-SNAPSHOT + 1.7.5 indy-content-index diff --git a/addons/diagnostics/client-java/pom.xml b/addons/diagnostics/client-java/pom.xml index f9067de684..205f08c713 100644 --- a/addons/diagnostics/client-java/pom.xml +++ b/addons/diagnostics/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 1.7.5-SNAPSHOT + 1.7.5 indy-diagnostics-client-java Indy :: Add-Ons :: Diagnostic Tools :: Java Client diff --git a/addons/diagnostics/common/pom.xml b/addons/diagnostics/common/pom.xml index 1fb379ed17..26822df3de 100644 --- a/addons/diagnostics/common/pom.xml +++ b/addons/diagnostics/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 1.7.5-SNAPSHOT + 1.7.5 indy-diagnostics-common Indy :: Add-Ons :: Diagnostic Tools :: Common diff --git a/addons/diagnostics/ftests/pom.xml b/addons/diagnostics/ftests/pom.xml index 63f3fac02e..8242c0477e 100644 --- a/addons/diagnostics/ftests/pom.xml +++ b/addons/diagnostics/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 1.7.5-SNAPSHOT + 1.7.5 indy-ftests-diagnostics diff --git a/addons/diagnostics/jaxrs/pom.xml b/addons/diagnostics/jaxrs/pom.xml index 1981e2e350..be105e9b77 100644 --- a/addons/diagnostics/jaxrs/pom.xml +++ b/addons/diagnostics/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 1.7.5-SNAPSHOT + 1.7.5 indy-diagnostics-jaxrs diff --git a/addons/diagnostics/pom.xml b/addons/diagnostics/pom.xml index 050cb61c45..aaf8a98271 100644 --- a/addons/diagnostics/pom.xml +++ b/addons/diagnostics/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 1.7.5-SNAPSHOT + 1.7.5 indy-diagnostics Indy :: Add-Ons :: Diagnostic Tools :: Parent diff --git a/addons/dot-maven/common/pom.xml b/addons/dot-maven/common/pom.xml index 916bc74164..c44ec5ea18 100644 --- a/addons/dot-maven/common/pom.xml +++ b/addons/dot-maven/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-dot-maven - 1.7.5-SNAPSHOT + 1.7.5 indy-dot-maven-common Indy :: Add-Ons :: Dot-Maven (.m2 WebDAV) :: Common Core diff --git a/addons/dot-maven/ftests/pom.xml b/addons/dot-maven/ftests/pom.xml index 0bd63917a7..afdfe0f837 100644 --- a/addons/dot-maven/ftests/pom.xml +++ b/addons/dot-maven/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-dot-maven - 1.7.5-SNAPSHOT + 1.7.5 indy-ftests-dot-maven diff --git a/addons/dot-maven/jaxrs/pom.xml b/addons/dot-maven/jaxrs/pom.xml index f15489b318..41e45e9d61 100644 --- a/addons/dot-maven/jaxrs/pom.xml +++ b/addons/dot-maven/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-dot-maven - 1.7.5-SNAPSHOT + 1.7.5 indy-dot-maven-jaxrs diff --git a/addons/dot-maven/pom.xml b/addons/dot-maven/pom.xml index 3e5d2c4367..8815d31ec6 100644 --- a/addons/dot-maven/pom.xml +++ b/addons/dot-maven/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 1.7.5-SNAPSHOT + 1.7.5 indy-dot-maven diff --git a/addons/folo/client-java/pom.xml b/addons/folo/client-java/pom.xml index 8b66b6f801..248c0aae0e 100644 --- a/addons/folo/client-java/pom.xml +++ b/addons/folo/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 1.7.5-SNAPSHOT + 1.7.5 indy-folo-client-java Indy :: Add-Ons :: Folo Usage Tracker :: Java Client diff --git a/addons/folo/common/pom.xml b/addons/folo/common/pom.xml index c0119ae4ab..263443d319 100644 --- a/addons/folo/common/pom.xml +++ b/addons/folo/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 1.7.5-SNAPSHOT + 1.7.5 indy-folo-common Indy :: Add-Ons :: Folo Usage Tracker :: Common diff --git a/addons/folo/ftests/pom.xml b/addons/folo/ftests/pom.xml index 0238b0601b..38c55eb617 100644 --- a/addons/folo/ftests/pom.xml +++ b/addons/folo/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 1.7.5-SNAPSHOT + 1.7.5 indy-ftests-folo diff --git a/addons/folo/jaxrs/pom.xml b/addons/folo/jaxrs/pom.xml index 5aae00dec2..fb59e98b02 100644 --- a/addons/folo/jaxrs/pom.xml +++ b/addons/folo/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 1.7.5-SNAPSHOT + 1.7.5 indy-folo-jaxrs diff --git a/addons/folo/model-java/pom.xml b/addons/folo/model-java/pom.xml index 508b7ec730..e7ec7e7528 100644 --- a/addons/folo/model-java/pom.xml +++ b/addons/folo/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 1.7.5-SNAPSHOT + 1.7.5 indy-folo-model-java Indy :: Add-Ons :: Folo Usage Tracker :: Java Domain Model diff --git a/addons/folo/pom.xml b/addons/folo/pom.xml index 3893ced649..661c5b9287 100644 --- a/addons/folo/pom.xml +++ b/addons/folo/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 1.7.5-SNAPSHOT + 1.7.5 indy-folo Indy :: Add-Ons :: Folo Usage Tracker :: Parent diff --git a/addons/hosted-by-archive/client-java/pom.xml b/addons/hosted-by-archive/client-java/pom.xml index 56e5d65cb2..ca2ca8e26d 100644 --- a/addons/hosted-by-archive/client-java/pom.xml +++ b/addons/hosted-by-archive/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-hosted-by-archive - 1.7.5-SNAPSHOT + 1.7.5 indy-hosted-by-archive-client-java Indy :: Add-Ons :: Hosted By Archive :: Java Client diff --git a/addons/hosted-by-archive/common/pom.xml b/addons/hosted-by-archive/common/pom.xml index c6b66ea6b0..9a6784e0dd 100644 --- a/addons/hosted-by-archive/common/pom.xml +++ b/addons/hosted-by-archive/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-hosted-by-archive - 1.7.5-SNAPSHOT + 1.7.5 indy-hosted-by-archive-common Indy :: Add-Ons :: Hosted By Archive :: Common diff --git a/addons/hosted-by-archive/ftests/pom.xml b/addons/hosted-by-archive/ftests/pom.xml index 58f2a80777..090d8a9f03 100644 --- a/addons/hosted-by-archive/ftests/pom.xml +++ b/addons/hosted-by-archive/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-hosted-by-archive - 1.7.5-SNAPSHOT + 1.7.5 indy-ftests-hosted-by-archive diff --git a/addons/hosted-by-archive/jaxrs/pom.xml b/addons/hosted-by-archive/jaxrs/pom.xml index 21c703af49..5924656ddc 100644 --- a/addons/hosted-by-archive/jaxrs/pom.xml +++ b/addons/hosted-by-archive/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-hosted-by-archive - 1.7.5-SNAPSHOT + 1.7.5 indy-hosted-by-archive-jaxrs diff --git a/addons/hosted-by-archive/pom.xml b/addons/hosted-by-archive/pom.xml index 7c9e053967..864f4c63af 100644 --- a/addons/hosted-by-archive/pom.xml +++ b/addons/hosted-by-archive/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 1.7.5-SNAPSHOT + 1.7.5 indy-hosted-by-archive Indy :: Add-Ons :: Hosted By Archive :: Parent diff --git a/addons/httprox/common/pom.xml b/addons/httprox/common/pom.xml index 3029359354..a7d7ba3c51 100644 --- a/addons/httprox/common/pom.xml +++ b/addons/httprox/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 1.7.5-SNAPSHOT + 1.7.5 indy-httprox-common Indy :: Add-Ons :: HTTProx (HTTP Proxy) :: Common Core diff --git a/addons/httprox/ftests/pom.xml b/addons/httprox/ftests/pom.xml index fda2a71d55..8d83f13c3c 100644 --- a/addons/httprox/ftests/pom.xml +++ b/addons/httprox/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 1.7.5-SNAPSHOT + 1.7.5 indy-ftests-httprox diff --git a/addons/httprox/jaxrs/pom.xml b/addons/httprox/jaxrs/pom.xml index ba0ff1e8f2..bfb71082bb 100644 --- a/addons/httprox/jaxrs/pom.xml +++ b/addons/httprox/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 1.7.5-SNAPSHOT + 1.7.5 indy-httprox-jaxrs Indy :: Add-Ons :: HTTProx (HTTP Proxy) :: JAX-RS Handlers diff --git a/addons/httprox/pom.xml b/addons/httprox/pom.xml index 0e122a3a55..8886c4d60d 100644 --- a/addons/httprox/pom.xml +++ b/addons/httprox/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 1.7.5-SNAPSHOT + 1.7.5 indy-httprox diff --git a/addons/implied-repos/client-java/pom.xml b/addons/implied-repos/client-java/pom.xml index 11064707f5..9fb45c001d 100644 --- a/addons/implied-repos/client-java/pom.xml +++ b/addons/implied-repos/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-implied-repos - 1.7.5-SNAPSHOT + 1.7.5 indy-implied-repos-client-java Indy :: Add-Ons :: Implied Repositories :: Java Client diff --git a/addons/implied-repos/common/pom.xml b/addons/implied-repos/common/pom.xml index 91b8c8b16c..9becb37c24 100644 --- a/addons/implied-repos/common/pom.xml +++ b/addons/implied-repos/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-implied-repos - 1.7.5-SNAPSHOT + 1.7.5 indy-implied-repos-common Indy :: Add-Ons :: Implied Repositories :: Common diff --git a/addons/implied-repos/ftests/pom.xml b/addons/implied-repos/ftests/pom.xml index b685c83644..097a156ce8 100644 --- a/addons/implied-repos/ftests/pom.xml +++ b/addons/implied-repos/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-implied-repos - 1.7.5-SNAPSHOT + 1.7.5 indy-ftests-implied-repos diff --git a/addons/implied-repos/model-java/pom.xml b/addons/implied-repos/model-java/pom.xml index 6ba2d73849..92e971d106 100644 --- a/addons/implied-repos/model-java/pom.xml +++ b/addons/implied-repos/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-implied-repos - 1.7.5-SNAPSHOT + 1.7.5 indy-implied-repos-model-java Indy :: Add-Ons :: Implied Repositories :: Java Domain Model diff --git a/addons/implied-repos/pom.xml b/addons/implied-repos/pom.xml index 8a96883f0d..b2bed80863 100644 --- a/addons/implied-repos/pom.xml +++ b/addons/implied-repos/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 1.7.5-SNAPSHOT + 1.7.5 indy-implied-repos Indy :: Add-Ons :: Implied Repositories :: Parent diff --git a/addons/koji/client-java/pom.xml b/addons/koji/client-java/pom.xml index 5a4922775c..d02891ae2b 100644 --- a/addons/koji/client-java/pom.xml +++ b/addons/koji/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 1.7.5-SNAPSHOT + 1.7.5 indy-koji-client-java Indy :: Add-Ons :: Koji Integration :: Java Client diff --git a/addons/koji/common/pom.xml b/addons/koji/common/pom.xml index b4584a316a..37db034abf 100644 --- a/addons/koji/common/pom.xml +++ b/addons/koji/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 1.7.5-SNAPSHOT + 1.7.5 indy-koji-common Indy :: Add-Ons :: Koji Integration :: Common diff --git a/addons/koji/jaxrs/pom.xml b/addons/koji/jaxrs/pom.xml index bf7728c8a4..33d11d77bf 100644 --- a/addons/koji/jaxrs/pom.xml +++ b/addons/koji/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 1.7.5-SNAPSHOT + 1.7.5 indy-koji-jaxrs diff --git a/addons/koji/model-java/pom.xml b/addons/koji/model-java/pom.xml index 1deb254e29..f2691ce366 100644 --- a/addons/koji/model-java/pom.xml +++ b/addons/koji/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 1.7.5-SNAPSHOT + 1.7.5 indy-koji-model-java Indy :: Add-Ons :: Koji Integration :: Java Domain Model diff --git a/addons/koji/pom.xml b/addons/koji/pom.xml index 600a113ece..cf2f94c325 100644 --- a/addons/koji/pom.xml +++ b/addons/koji/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 1.7.5-SNAPSHOT + 1.7.5 indy-koji Indy :: Add-Ons :: Koji Integration :: Parent diff --git a/addons/pkg-maven/common/pom.xml b/addons/pkg-maven/common/pom.xml index 8b958de203..19440ab22d 100644 --- a/addons/pkg-maven/common/pom.xml +++ b/addons/pkg-maven/common/pom.xml @@ -20,7 +20,7 @@ indy-pkg-maven org.commonjava.indy - 1.7.5-SNAPSHOT + 1.7.5 4.0.0 diff --git a/addons/pkg-maven/ftests/pom.xml b/addons/pkg-maven/ftests/pom.xml index 9b9f7128e7..610c6d9dd3 100644 --- a/addons/pkg-maven/ftests/pom.xml +++ b/addons/pkg-maven/ftests/pom.xml @@ -20,7 +20,7 @@ indy-pkg-maven org.commonjava.indy - 1.7.5-SNAPSHOT + 1.7.5 4.0.0 diff --git a/addons/pkg-maven/jaxrs/pom.xml b/addons/pkg-maven/jaxrs/pom.xml index 898f8894e1..477dab593b 100644 --- a/addons/pkg-maven/jaxrs/pom.xml +++ b/addons/pkg-maven/jaxrs/pom.xml @@ -20,7 +20,7 @@ indy-pkg-maven org.commonjava.indy - 1.7.5-SNAPSHOT + 1.7.5 4.0.0 diff --git a/addons/pkg-maven/pom.xml b/addons/pkg-maven/pom.xml index 4ad011a2c4..cf05fadbaf 100644 --- a/addons/pkg-maven/pom.xml +++ b/addons/pkg-maven/pom.xml @@ -20,7 +20,7 @@ indy-addons org.commonjava.indy - 1.7.5-SNAPSHOT + 1.7.5 4.0.0 diff --git a/addons/pkg-npm/common/pom.xml b/addons/pkg-npm/common/pom.xml index 6d7825542a..73fa9ee0bc 100644 --- a/addons/pkg-npm/common/pom.xml +++ b/addons/pkg-npm/common/pom.xml @@ -20,7 +20,7 @@ indy-pkg-npm org.commonjava.indy - 1.7.5-SNAPSHOT + 1.7.5 4.0.0 diff --git a/addons/pkg-npm/ftests/pom.xml b/addons/pkg-npm/ftests/pom.xml index 72a62ea7c8..66a9ee7267 100644 --- a/addons/pkg-npm/ftests/pom.xml +++ b/addons/pkg-npm/ftests/pom.xml @@ -20,7 +20,7 @@ indy-pkg-npm org.commonjava.indy - 1.7.5-SNAPSHOT + 1.7.5 4.0.0 diff --git a/addons/pkg-npm/jaxrs/pom.xml b/addons/pkg-npm/jaxrs/pom.xml index 9ca7ff70fc..f98fdb4d3a 100644 --- a/addons/pkg-npm/jaxrs/pom.xml +++ b/addons/pkg-npm/jaxrs/pom.xml @@ -20,7 +20,7 @@ indy-pkg-npm org.commonjava.indy - 1.7.5-SNAPSHOT + 1.7.5 4.0.0 diff --git a/addons/pkg-npm/model-java/pom.xml b/addons/pkg-npm/model-java/pom.xml index 14a0cf3b5d..55e5e64436 100644 --- a/addons/pkg-npm/model-java/pom.xml +++ b/addons/pkg-npm/model-java/pom.xml @@ -20,7 +20,7 @@ indy-pkg-npm org.commonjava.indy - 1.7.5-SNAPSHOT + 1.7.5 4.0.0 diff --git a/addons/pkg-npm/pom.xml b/addons/pkg-npm/pom.xml index 9320ea80c5..26a9838810 100644 --- a/addons/pkg-npm/pom.xml +++ b/addons/pkg-npm/pom.xml @@ -20,7 +20,7 @@ indy-addons org.commonjava.indy - 1.7.5-SNAPSHOT + 1.7.5 4.0.0 diff --git a/addons/pom.xml b/addons/pom.xml index 4d1ba36cc0..3b62cea208 100644 --- a/addons/pom.xml +++ b/addons/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-parent - 1.7.5-SNAPSHOT + 1.7.5 indy-addons diff --git a/addons/promote/client-java/pom.xml b/addons/promote/client-java/pom.xml index 189ffbbd91..f67276202a 100644 --- a/addons/promote/client-java/pom.xml +++ b/addons/promote/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 1.7.5-SNAPSHOT + 1.7.5 indy-promote-client-java Indy :: Add-Ons :: Artifact Promotion :: Java Client diff --git a/addons/promote/common/pom.xml b/addons/promote/common/pom.xml index 50cb3079cc..c5566be019 100644 --- a/addons/promote/common/pom.xml +++ b/addons/promote/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 1.7.5-SNAPSHOT + 1.7.5 indy-promote-common Indy :: Add-Ons :: Artifact Promotion :: Common diff --git a/addons/promote/ftests/pom.xml b/addons/promote/ftests/pom.xml index bbbab5700c..8cdcb33742 100644 --- a/addons/promote/ftests/pom.xml +++ b/addons/promote/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 1.7.5-SNAPSHOT + 1.7.5 indy-ftests-promote diff --git a/addons/promote/jaxrs/pom.xml b/addons/promote/jaxrs/pom.xml index af9e3a1c40..0ce54cac79 100644 --- a/addons/promote/jaxrs/pom.xml +++ b/addons/promote/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 1.7.5-SNAPSHOT + 1.7.5 indy-promote-jaxrs diff --git a/addons/promote/model-java/pom.xml b/addons/promote/model-java/pom.xml index 2a764b7ca2..897697772c 100644 --- a/addons/promote/model-java/pom.xml +++ b/addons/promote/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 1.7.5-SNAPSHOT + 1.7.5 indy-promote-model-java Indy :: Add-Ons :: Artifact Promotion :: Java Domain Model diff --git a/addons/promote/pom.xml b/addons/promote/pom.xml index 613bfaa1f5..1c3545dd31 100644 --- a/addons/promote/pom.xml +++ b/addons/promote/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 1.7.5-SNAPSHOT + 1.7.5 indy-promote Indy :: Add-Ons :: Artifact Promotion :: Parent diff --git a/addons/relate/common/pom.xml b/addons/relate/common/pom.xml index a9411c0fad..6a0c679b19 100644 --- a/addons/relate/common/pom.xml +++ b/addons/relate/common/pom.xml @@ -20,7 +20,7 @@ indy-relate org.commonjava.indy - 1.7.5-SNAPSHOT + 1.7.5 4.0.0 diff --git a/addons/relate/ftests/pom.xml b/addons/relate/ftests/pom.xml index 611716fed2..318619d943 100644 --- a/addons/relate/ftests/pom.xml +++ b/addons/relate/ftests/pom.xml @@ -20,7 +20,7 @@ indy-relate org.commonjava.indy - 1.7.5-SNAPSHOT + 1.7.5 4.0.0 diff --git a/addons/relate/pom.xml b/addons/relate/pom.xml index b431c1887a..1b823e48c5 100644 --- a/addons/relate/pom.xml +++ b/addons/relate/pom.xml @@ -21,7 +21,7 @@ indy-addons org.commonjava.indy - 1.7.5-SNAPSHOT + 1.7.5 indy-relate diff --git a/addons/revisions/common/pom.xml b/addons/revisions/common/pom.xml index f404439a93..4c8e04441d 100644 --- a/addons/revisions/common/pom.xml +++ b/addons/revisions/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-revisions - 1.7.5-SNAPSHOT + 1.7.5 indy-revisions-common Indy :: Add-Ons :: Revisions :: Common diff --git a/addons/revisions/jaxrs/pom.xml b/addons/revisions/jaxrs/pom.xml index ff795d0075..4720e9e928 100644 --- a/addons/revisions/jaxrs/pom.xml +++ b/addons/revisions/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-revisions - 1.7.5-SNAPSHOT + 1.7.5 indy-revisions-jaxrs diff --git a/addons/revisions/pom.xml b/addons/revisions/pom.xml index 3ecca41a4d..163446ac54 100644 --- a/addons/revisions/pom.xml +++ b/addons/revisions/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 1.7.5-SNAPSHOT + 1.7.5 indy-revisions Indy :: Add-Ons :: Revisions :: Parent diff --git a/addons/setback/common/pom.xml b/addons/setback/common/pom.xml index d1061a8813..fc1d6739da 100644 --- a/addons/setback/common/pom.xml +++ b/addons/setback/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-setback - 1.7.5-SNAPSHOT + 1.7.5 indy-setback-common Indy :: Add-Ons :: Set-Back :: Common diff --git a/addons/setback/jaxrs/pom.xml b/addons/setback/jaxrs/pom.xml index f4bf73e74f..9ee9a5c62e 100644 --- a/addons/setback/jaxrs/pom.xml +++ b/addons/setback/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-setback - 1.7.5-SNAPSHOT + 1.7.5 indy-setback-jaxrs diff --git a/addons/setback/pom.xml b/addons/setback/pom.xml index e06ac6f4d2..5025d65e09 100644 --- a/addons/setback/pom.xml +++ b/addons/setback/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 1.7.5-SNAPSHOT + 1.7.5 indy-setback Indy :: Add-Ons :: Set-Back :: Parent diff --git a/api/pom.xml b/api/pom.xml index 26c1fadc1c..01cbff49b3 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 1.7.5-SNAPSHOT + 1.7.5 indy-api diff --git a/bindings/jaxrs/pom.xml b/bindings/jaxrs/pom.xml index d2c9f507da..fe0050f59b 100644 --- a/bindings/jaxrs/pom.xml +++ b/bindings/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-bindings - 1.7.5-SNAPSHOT + 1.7.5 indy-bindings-jaxrs diff --git a/bindings/pom.xml b/bindings/pom.xml index 398279b756..8ad97211c8 100644 --- a/bindings/pom.xml +++ b/bindings/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-parent - 1.7.5-SNAPSHOT + 1.7.5 indy-bindings diff --git a/boot/api/pom.xml b/boot/api/pom.xml index 3d9569a769..5f08c8e21d 100644 --- a/boot/api/pom.xml +++ b/boot/api/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.boot indy-booters - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy.boot diff --git a/boot/jaxrs/pom.xml b/boot/jaxrs/pom.xml index d5be98a74e..bfb0434428 100644 --- a/boot/jaxrs/pom.xml +++ b/boot/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.boot indy-booters - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy.boot diff --git a/boot/pom.xml b/boot/pom.xml index f0e53e4539..eb3ccd79a5 100644 --- a/boot/pom.xml +++ b/boot/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy.boot diff --git a/clients/core-java/pom.xml b/clients/core-java/pom.xml index 1c2c9287f3..63e44cc82c 100644 --- a/clients/core-java/pom.xml +++ b/clients/core-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-clients-parent - 1.7.5-SNAPSHOT + 1.7.5 indy-client-core-java diff --git a/clients/pom.xml b/clients/pom.xml index 2a86b0bccb..f0fa4e5c68 100644 --- a/clients/pom.xml +++ b/clients/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 1.7.5-SNAPSHOT + 1.7.5 indy-clients-parent diff --git a/core/pom.xml b/core/pom.xml index 778b6a5f37..092f72f9ff 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 1.7.5-SNAPSHOT + 1.7.5 indy-core diff --git a/db/flat/pom.xml b/db/flat/pom.xml index bb3443d39e..a373370cd5 100644 --- a/db/flat/pom.xml +++ b/db/flat/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 1.7.5-SNAPSHOT + 1.7.5 indy-db-flat diff --git a/db/memory/pom.xml b/db/memory/pom.xml index 74c23e65d5..bfa87616bf 100644 --- a/db/memory/pom.xml +++ b/db/memory/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 1.7.5-SNAPSHOT + 1.7.5 indy-db-memory diff --git a/db/pom.xml b/db/pom.xml index a64b942a46..3c1807fe39 100644 --- a/db/pom.xml +++ b/db/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 1.7.5-SNAPSHOT + 1.7.5 indy-db diff --git a/deployments/cache-migrator/pom.xml b/deployments/cache-migrator/pom.xml index 90466f7894..228cd120cf 100644 --- a/deployments/cache-migrator/pom.xml +++ b/deployments/cache-migrator/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-deployments - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy.launch diff --git a/deployments/launcher/pom.xml b/deployments/launcher/pom.xml index c01a421d97..b5cd5d80b5 100644 --- a/deployments/launcher/pom.xml +++ b/deployments/launcher/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-deployments - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy.launch diff --git a/deployments/pom.xml b/deployments/pom.xml index f628a596a4..66a3b24fad 100644 --- a/deployments/pom.xml +++ b/deployments/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy diff --git a/embedder/pom.xml b/embedder/pom.xml index 2b1dc0d1e0..b536542789 100644 --- a/embedder/pom.xml +++ b/embedder/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy.embed diff --git a/filers/default/pom.xml b/filers/default/pom.xml index 79690a2d39..cf9e1d78f0 100644 --- a/filers/default/pom.xml +++ b/filers/default/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-file-managers - 1.7.5-SNAPSHOT + 1.7.5 indy-filer-default diff --git a/filers/pom.xml b/filers/pom.xml index 264eb82c20..354fb9b0e6 100644 --- a/filers/pom.xml +++ b/filers/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 1.7.5-SNAPSHOT + 1.7.5 indy-file-managers diff --git a/ftests/common/pom.xml b/ftests/common/pom.xml index 9ad86c4419..53db67f62b 100644 --- a/ftests/common/pom.xml +++ b/ftests/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-ftests-parent - 1.7.5-SNAPSHOT + 1.7.5 indy-ftests-common diff --git a/ftests/core/pom.xml b/ftests/core/pom.xml index 4b52c786bb..3a7ccb04ee 100644 --- a/ftests/core/pom.xml +++ b/ftests/core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-ftests-parent - 1.7.5-SNAPSHOT + 1.7.5 indy-ftests-core diff --git a/ftests/metrics/pom.xml b/ftests/metrics/pom.xml index afb0f6180f..133af47d8d 100644 --- a/ftests/metrics/pom.xml +++ b/ftests/metrics/pom.xml @@ -20,7 +20,7 @@ indy-ftests-parent org.commonjava.indy - 1.7.5-SNAPSHOT + 1.7.5 4.0.0 diff --git a/ftests/pom.xml b/ftests/pom.xml index f4172e2b6c..a81af32677 100644 --- a/ftests/pom.xml +++ b/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 1.7.5-SNAPSHOT + 1.7.5 indy-ftests-parent diff --git a/models/core-java/pom.xml b/models/core-java/pom.xml index f977108c8f..598178a84e 100644 --- a/models/core-java/pom.xml +++ b/models/core-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-models-parent - 1.7.5-SNAPSHOT + 1.7.5 indy-model-core-java diff --git a/models/pom.xml b/models/pom.xml index 1ad926e62e..f5e5a9f752 100644 --- a/models/pom.xml +++ b/models/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 1.7.5-SNAPSHOT + 1.7.5 indy-models-parent diff --git a/pom.xml b/pom.xml index 9971ea286e..aba71c5dfb 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.commonjava.indy indy-parent - 1.7.5-SNAPSHOT + 1.7.5 pom @@ -37,7 +37,7 @@ scm:git:https://github.com/Commonjava/indy.git scm:git:git@github.com:Commonjava/indy.git http://github.com/Commonjava/indy - indy-parent-1.6.0 + indy-parent-1.7.5 @@ -151,7 +151,7 @@ org.commonjava.indy.ui indy-ui-layover - 1.7.5-SNAPSHOT + 1.7.5 runtime @@ -159,22 +159,22 @@ org.commonjava.indy indy-model-core-java - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy indy-api - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy indy-core - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy indy-core - 1.7.5-SNAPSHOT + 1.7.5 tar.gz confset provided @@ -182,17 +182,17 @@ org.commonjava.indy indy-db-flat - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy indy-bindings-jaxrs - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy.launch indy-launcher - 1.7.5-SNAPSHOT + 1.7.5 tar.gz skinny provided @@ -200,7 +200,7 @@ org.commonjava.indy.launch indy-launcher - 1.7.5-SNAPSHOT + 1.7.5 tar.gz complete provided @@ -208,7 +208,7 @@ org.commonjava.indy.launch indy-launcher - 1.7.5-SNAPSHOT + 1.7.5 tar.gz data provided @@ -216,7 +216,7 @@ org.commonjava.indy.launch indy-launcher - 1.7.5-SNAPSHOT + 1.7.5 tar.gz etc provided @@ -225,17 +225,17 @@ org.commonjava.indy indy-autoprox-jaxrs - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy indy-autoprox-common - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy indy-autoprox-common - 1.7.5-SNAPSHOT + 1.7.5 tar.gz dataset provided @@ -243,7 +243,7 @@ org.commonjava.indy indy-autoprox-common - 1.7.5-SNAPSHOT + 1.7.5 tar.gz docset provided @@ -251,7 +251,7 @@ org.commonjava.indy indy-autoprox-common - 1.7.5-SNAPSHOT + 1.7.5 tar.gz confset provided @@ -259,7 +259,7 @@ org.commonjava.indy indy-autoprox-common - 1.7.5-SNAPSHOT + 1.7.5 tar.gz uiset provided @@ -267,32 +267,32 @@ org.commonjava.indy indy-autoprox-model-java - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy indy-autoprox-client-java - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy indy-ftests-autoprox - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy indy-setback-jaxrs - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy indy-setback-common - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy indy-setback-common - 1.7.5-SNAPSHOT + 1.7.5 tar.gz dataset provided @@ -300,7 +300,7 @@ org.commonjava.indy indy-setback-common - 1.7.5-SNAPSHOT + 1.7.5 tar.gz confset provided @@ -308,17 +308,17 @@ org.commonjava.indy indy-revisions-jaxrs - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy indy-revisions-common - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy indy-revisions-common - 1.7.5-SNAPSHOT + 1.7.5 tar.gz confset provided @@ -326,7 +326,7 @@ org.commonjava.indy indy-revisions-common - 1.7.5-SNAPSHOT + 1.7.5 tar.gz uiset provided @@ -334,12 +334,12 @@ org.commonjava.indy indy-dot-maven-common - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy indy-dot-maven-common - 1.7.5-SNAPSHOT + 1.7.5 tar.gz dataset provided @@ -347,22 +347,22 @@ org.commonjava.indy indy-dot-maven-jaxrs - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy indy-ftests-dot-maven - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy indy-httprox-common - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy indy-httprox-common - 1.7.5-SNAPSHOT + 1.7.5 tar.gz confset provided @@ -370,17 +370,17 @@ org.commonjava.indy indy-ftests-httprox - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy indy-content-index - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy indy-content-index - 1.7.5-SNAPSHOT + 1.7.5 tar.gz confset provided @@ -388,123 +388,123 @@ org.commonjava.indy indy-db-memory - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy indy-test-db - 1.7.5-SNAPSHOT + 1.7.5 test org.commonjava.indy indy-test-fixtures-core - 1.7.5-SNAPSHOT + 1.7.5 test org.commonjava.indy indy-test-providers-core - 1.7.5-SNAPSHOT + 1.7.5 test org.commonjava.indy indy-test-utils - 1.7.5-SNAPSHOT + 1.7.5 test org.commonjava.indy indy-filer-default - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy indy-subsys-jaxrs - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy indy-subsys-flatfile - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy indy-subsys-infinispan - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy indy-subsys-http - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy indy-subsys-git - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy indy-subsys-groovy - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy indy-subsys-prefetch - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy indy-subsys-cpool - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy indy-client-core-java - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy indy-ftests-common - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy indy-ftests-core - 1.7.5-SNAPSHOT + 1.7.5 test org.commonjava.indy indy-folo-jaxrs - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy indy-ftests-folo - 1.7.5-SNAPSHOT + 1.7.5 test org.commonjava.indy indy-folo-client-java - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy indy-folo-model-java - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy indy-folo-common - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy indy-folo-common - 1.7.5-SNAPSHOT + 1.7.5 tar.gz dataset provided @@ -512,7 +512,7 @@ org.commonjava.indy indy-folo-common - 1.7.5-SNAPSHOT + 1.7.5 tar.gz confset provided @@ -520,33 +520,33 @@ org.commonjava.indy indy-promote-jaxrs - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy indy-ftests-promote - 1.7.5-SNAPSHOT + 1.7.5 test org.commonjava.indy indy-promote-client-java - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy indy-promote-model-java - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy indy-promote-common - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy indy-promote-common - 1.7.5-SNAPSHOT + 1.7.5 tar.gz confset provided @@ -554,7 +554,7 @@ org.commonjava.indy indy-promote-common - 1.7.5-SNAPSHOT + 1.7.5 tar.gz dataset provided @@ -562,19 +562,19 @@ org.commonjava.indy indy-promote-common - 1.7.5-SNAPSHOT + 1.7.5 dataset provided org.commonjava.indy indy-implied-repos-common - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy indy-implied-repos-common - 1.7.5-SNAPSHOT + 1.7.5 tar.gz confset provided @@ -582,27 +582,27 @@ org.commonjava.indy indy-implied-repos-model-java - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy indy-implied-repos-client-java - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy indy-ftests-implied-repos - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy indy-relate-common - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy indy-relate-common - 1.7.5-SNAPSHOT + 1.7.5 tar.gz confset provided @@ -610,32 +610,32 @@ org.commonjava.indy indy-ftests-relate - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy.embed indy-embedder - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy.boot indy-booter-api - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy.boot indy-booter-jaxrs - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy indy-subsys-keycloak - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy indy-subsys-keycloak - 1.7.5-SNAPSHOT + 1.7.5 tar.gz confset provided @@ -643,7 +643,7 @@ org.commonjava.indy indy-subsys-infinispan - 1.7.5-SNAPSHOT + 1.7.5 tar.gz confset provided @@ -651,7 +651,7 @@ org.commonjava.indy indy-subsys-prefetch - 1.7.5-SNAPSHOT + 1.7.5 tar.gz confset provided @@ -660,7 +660,7 @@ org.commonjava.indy indy-koji-common - 1.7.5-SNAPSHOT + 1.7.5 tar.gz confset provided @@ -668,22 +668,22 @@ org.commonjava.indy indy-koji-common - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy indy-koji-model-java - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy indy-koji-client-java - 1.7.5-SNAPSHOT + 1.7.5 org.commonjava.indy indy-koji-jaxrs - 1.7.5-SNAPSHOT + 1.7.5 runtime @@ -159,22 +159,22 @@ org.commonjava.indy indy-model-core-java - 1.7.5 + 1.7.6-SNAPSHOT org.commonjava.indy indy-api - 1.7.5 + 1.7.6-SNAPSHOT org.commonjava.indy indy-core - 1.7.5 + 1.7.6-SNAPSHOT org.commonjava.indy indy-core - 1.7.5 + 1.7.6-SNAPSHOT tar.gz confset provided @@ -182,17 +182,17 @@ org.commonjava.indy indy-db-flat - 1.7.5 + 1.7.6-SNAPSHOT org.commonjava.indy indy-bindings-jaxrs - 1.7.5 + 1.7.6-SNAPSHOT org.commonjava.indy.launch indy-launcher - 1.7.5 + 1.7.6-SNAPSHOT tar.gz skinny provided @@ -200,7 +200,7 @@ org.commonjava.indy.launch indy-launcher - 1.7.5 + 1.7.6-SNAPSHOT tar.gz complete provided @@ -208,7 +208,7 @@ org.commonjava.indy.launch indy-launcher - 1.7.5 + 1.7.6-SNAPSHOT tar.gz data provided @@ -216,7 +216,7 @@ org.commonjava.indy.launch indy-launcher - 1.7.5 + 1.7.6-SNAPSHOT tar.gz etc provided @@ -225,17 +225,17 @@ org.commonjava.indy indy-autoprox-jaxrs - 1.7.5 + 1.7.6-SNAPSHOT org.commonjava.indy indy-autoprox-common - 1.7.5 + 1.7.6-SNAPSHOT org.commonjava.indy indy-autoprox-common - 1.7.5 + 1.7.6-SNAPSHOT tar.gz dataset provided @@ -243,7 +243,7 @@ org.commonjava.indy indy-autoprox-common - 1.7.5 + 1.7.6-SNAPSHOT tar.gz docset provided @@ -251,7 +251,7 @@ org.commonjava.indy indy-autoprox-common - 1.7.5 + 1.7.6-SNAPSHOT tar.gz confset provided @@ -259,7 +259,7 @@ org.commonjava.indy indy-autoprox-common - 1.7.5 + 1.7.6-SNAPSHOT tar.gz uiset provided @@ -267,32 +267,32 @@ org.commonjava.indy indy-autoprox-model-java - 1.7.5 + 1.7.6-SNAPSHOT org.commonjava.indy indy-autoprox-client-java - 1.7.5 + 1.7.6-SNAPSHOT org.commonjava.indy indy-ftests-autoprox - 1.7.5 + 1.7.6-SNAPSHOT org.commonjava.indy indy-setback-jaxrs - 1.7.5 + 1.7.6-SNAPSHOT org.commonjava.indy indy-setback-common - 1.7.5 + 1.7.6-SNAPSHOT org.commonjava.indy indy-setback-common - 1.7.5 + 1.7.6-SNAPSHOT tar.gz dataset provided @@ -300,7 +300,7 @@ org.commonjava.indy indy-setback-common - 1.7.5 + 1.7.6-SNAPSHOT tar.gz confset provided @@ -308,17 +308,17 @@ org.commonjava.indy indy-revisions-jaxrs - 1.7.5 + 1.7.6-SNAPSHOT org.commonjava.indy indy-revisions-common - 1.7.5 + 1.7.6-SNAPSHOT org.commonjava.indy indy-revisions-common - 1.7.5 + 1.7.6-SNAPSHOT tar.gz confset provided @@ -326,7 +326,7 @@ org.commonjava.indy indy-revisions-common - 1.7.5 + 1.7.6-SNAPSHOT tar.gz uiset provided @@ -334,12 +334,12 @@ org.commonjava.indy indy-dot-maven-common - 1.7.5 + 1.7.6-SNAPSHOT org.commonjava.indy indy-dot-maven-common - 1.7.5 + 1.7.6-SNAPSHOT tar.gz dataset provided @@ -347,22 +347,22 @@ org.commonjava.indy indy-dot-maven-jaxrs - 1.7.5 + 1.7.6-SNAPSHOT org.commonjava.indy indy-ftests-dot-maven - 1.7.5 + 1.7.6-SNAPSHOT org.commonjava.indy indy-httprox-common - 1.7.5 + 1.7.6-SNAPSHOT org.commonjava.indy indy-httprox-common - 1.7.5 + 1.7.6-SNAPSHOT tar.gz confset provided @@ -370,17 +370,17 @@ org.commonjava.indy indy-ftests-httprox - 1.7.5 + 1.7.6-SNAPSHOT org.commonjava.indy indy-content-index - 1.7.5 + 1.7.6-SNAPSHOT org.commonjava.indy indy-content-index - 1.7.5 + 1.7.6-SNAPSHOT tar.gz confset provided @@ -388,123 +388,123 @@ org.commonjava.indy indy-db-memory - 1.7.5 + 1.7.6-SNAPSHOT org.commonjava.indy indy-test-db - 1.7.5 + 1.7.6-SNAPSHOT test org.commonjava.indy indy-test-fixtures-core - 1.7.5 + 1.7.6-SNAPSHOT test org.commonjava.indy indy-test-providers-core - 1.7.5 + 1.7.6-SNAPSHOT test org.commonjava.indy indy-test-utils - 1.7.5 + 1.7.6-SNAPSHOT test org.commonjava.indy indy-filer-default - 1.7.5 + 1.7.6-SNAPSHOT org.commonjava.indy indy-subsys-jaxrs - 1.7.5 + 1.7.6-SNAPSHOT org.commonjava.indy indy-subsys-flatfile - 1.7.5 + 1.7.6-SNAPSHOT org.commonjava.indy indy-subsys-infinispan - 1.7.5 + 1.7.6-SNAPSHOT org.commonjava.indy indy-subsys-http - 1.7.5 + 1.7.6-SNAPSHOT org.commonjava.indy indy-subsys-git - 1.7.5 + 1.7.6-SNAPSHOT org.commonjava.indy indy-subsys-groovy - 1.7.5 + 1.7.6-SNAPSHOT org.commonjava.indy indy-subsys-prefetch - 1.7.5 + 1.7.6-SNAPSHOT org.commonjava.indy indy-subsys-cpool - 1.7.5 + 1.7.6-SNAPSHOT org.commonjava.indy indy-client-core-java - 1.7.5 + 1.7.6-SNAPSHOT org.commonjava.indy indy-ftests-common - 1.7.5 + 1.7.6-SNAPSHOT org.commonjava.indy indy-ftests-core - 1.7.5 + 1.7.6-SNAPSHOT test org.commonjava.indy indy-folo-jaxrs - 1.7.5 + 1.7.6-SNAPSHOT org.commonjava.indy indy-ftests-folo - 1.7.5 + 1.7.6-SNAPSHOT test org.commonjava.indy indy-folo-client-java - 1.7.5 + 1.7.6-SNAPSHOT org.commonjava.indy indy-folo-model-java - 1.7.5 + 1.7.6-SNAPSHOT org.commonjava.indy indy-folo-common - 1.7.5 + 1.7.6-SNAPSHOT org.commonjava.indy indy-folo-common - 1.7.5 + 1.7.6-SNAPSHOT tar.gz dataset provided @@ -512,7 +512,7 @@ org.commonjava.indy indy-folo-common - 1.7.5 + 1.7.6-SNAPSHOT tar.gz confset provided @@ -520,33 +520,33 @@ org.commonjava.indy indy-promote-jaxrs - 1.7.5 + 1.7.6-SNAPSHOT org.commonjava.indy indy-ftests-promote - 1.7.5 + 1.7.6-SNAPSHOT test org.commonjava.indy indy-promote-client-java - 1.7.5 + 1.7.6-SNAPSHOT org.commonjava.indy indy-promote-model-java - 1.7.5 + 1.7.6-SNAPSHOT org.commonjava.indy indy-promote-common - 1.7.5 + 1.7.6-SNAPSHOT org.commonjava.indy indy-promote-common - 1.7.5 + 1.7.6-SNAPSHOT tar.gz confset provided @@ -554,7 +554,7 @@ org.commonjava.indy indy-promote-common - 1.7.5 + 1.7.6-SNAPSHOT tar.gz dataset provided @@ -562,19 +562,19 @@ org.commonjava.indy indy-promote-common - 1.7.5 + 1.7.6-SNAPSHOT dataset provided org.commonjava.indy indy-implied-repos-common - 1.7.5 + 1.7.6-SNAPSHOT org.commonjava.indy indy-implied-repos-common - 1.7.5 + 1.7.6-SNAPSHOT tar.gz confset provided @@ -582,27 +582,27 @@ org.commonjava.indy indy-implied-repos-model-java - 1.7.5 + 1.7.6-SNAPSHOT org.commonjava.indy indy-implied-repos-client-java - 1.7.5 + 1.7.6-SNAPSHOT org.commonjava.indy indy-ftests-implied-repos - 1.7.5 + 1.7.6-SNAPSHOT org.commonjava.indy indy-relate-common - 1.7.5 + 1.7.6-SNAPSHOT org.commonjava.indy indy-relate-common - 1.7.5 + 1.7.6-SNAPSHOT tar.gz confset provided @@ -610,32 +610,32 @@ org.commonjava.indy indy-ftests-relate - 1.7.5 + 1.7.6-SNAPSHOT org.commonjava.indy.embed indy-embedder - 1.7.5 + 1.7.6-SNAPSHOT org.commonjava.indy.boot indy-booter-api - 1.7.5 + 1.7.6-SNAPSHOT org.commonjava.indy.boot indy-booter-jaxrs - 1.7.5 + 1.7.6-SNAPSHOT org.commonjava.indy indy-subsys-keycloak - 1.7.5 + 1.7.6-SNAPSHOT org.commonjava.indy indy-subsys-keycloak - 1.7.5 + 1.7.6-SNAPSHOT tar.gz confset provided @@ -643,7 +643,7 @@ org.commonjava.indy indy-subsys-infinispan - 1.7.5 + 1.7.6-SNAPSHOT tar.gz confset provided @@ -651,7 +651,7 @@ org.commonjava.indy indy-subsys-prefetch - 1.7.5 + 1.7.6-SNAPSHOT tar.gz confset provided @@ -660,7 +660,7 @@ org.commonjava.indy indy-koji-common - 1.7.5 + 1.7.6-SNAPSHOT tar.gz confset provided @@ -668,22 +668,22 @@ org.commonjava.indy indy-koji-common - 1.7.5 + 1.7.6-SNAPSHOT org.commonjava.indy indy-koji-model-java - 1.7.5 + 1.7.6-SNAPSHOT org.commonjava.indy indy-koji-client-java - 1.7.5 + 1.7.6-SNAPSHOT org.commonjava.indy indy-koji-jaxrs - 1.7.5 + 1.7.6-SNAPSHOT - @@ -105,7 +112,6 @@ - @@ -116,10 +122,12 @@ - + + + diff --git a/subsys/infinispan/src/main/resources/infinispan.xml b/subsys/infinispan/src/main/resources/infinispan.xml index d8855e1d06..ecedfd079d 100644 --- a/subsys/infinispan/src/main/resources/infinispan.xml +++ b/subsys/infinispan/src/main/resources/infinispan.xml @@ -19,12 +19,9 @@ - - - + - org.commonjava.indy.folo.data.FoloCacheProducer ram @@ -33,26 +30,27 @@ - + + + - - - + - + + + - - @@ -72,21 +69,25 @@ - + + + ram - + + + From 5dc11e519564566d164f96de42edc12aceafab16 Mon Sep 17 00:00:00 2001 From: Gang Li Date: Thu, 7 Mar 2019 15:08:28 +0800 Subject: [PATCH 23/56] Fix TrackingKey mapper for WrappedByteArray type Add WrappedByteArray type check in TrackingKey2StringMapper which refers ISPN DefaultTwoWayKey2StringMapper implementation. And also adjust some ISPN config for default settings. --- .../idxmodel/TrackingKey2StringMapper.java | 22 +++++++++++++++++-- .../src/main/resources/infinispan-jdbc.xml | 9 +++++--- .../src/main/resources/infinispan.xml | 8 +++---- 3 files changed, 30 insertions(+), 9 deletions(-) diff --git a/addons/folo/common/src/main/java/org/commonjava/indy/folo/data/idxmodel/TrackingKey2StringMapper.java b/addons/folo/common/src/main/java/org/commonjava/indy/folo/data/idxmodel/TrackingKey2StringMapper.java index 890ae7dda6..9c58124043 100644 --- a/addons/folo/common/src/main/java/org/commonjava/indy/folo/data/idxmodel/TrackingKey2StringMapper.java +++ b/addons/folo/common/src/main/java/org/commonjava/indy/folo/data/idxmodel/TrackingKey2StringMapper.java @@ -17,18 +17,26 @@ import org.apache.commons.lang3.StringUtils; import org.commonjava.indy.folo.model.TrackingKey; +import org.infinispan.commons.marshall.WrappedByteArray; import org.infinispan.persistence.keymappers.TwoWayKey2StringMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class TrackingKey2StringMapper implements TwoWayKey2StringMapper +import java.util.Base64; + +public class TrackingKey2StringMapper + implements TwoWayKey2StringMapper { private final Logger LOGGER = LoggerFactory.getLogger( this.getClass() ); + private static final char NON_STRING_PREFIX = '\uFEFF'; + + private static final char BYTEARRAYKEY_IDENTIFIER = '8'; + @Override public boolean isSupportedType( Class keyType ) { - return keyType == TrackingKey.class; + return keyType == TrackingKey.class || keyType == WrappedByteArray.class; } @Override @@ -40,11 +48,21 @@ public String getStringMapping( Object key ) return tk.getId(); } + else if ( key instanceof WrappedByteArray ) + { + return generateString( BYTEARRAYKEY_IDENTIFIER, + Base64.getEncoder().encodeToString( ( (WrappedByteArray) key ).getBytes() ) ); + } LOGGER.error( "Folo tracking JDBC store error: Not supported key type {}", key == null ? null : key.getClass() ); return null; } + private String generateString( char identifier, String s ) + { + return String.valueOf( NON_STRING_PREFIX ) + String.valueOf( identifier ) + s; + } + @Override public Object getKeyMapping( String stringKey ) { diff --git a/subsys/infinispan/src/main/resources/infinispan-jdbc.xml b/subsys/infinispan/src/main/resources/infinispan-jdbc.xml index ec4d997408..1aaf236b6c 100644 --- a/subsys/infinispan/src/main/resources/infinispan-jdbc.xml +++ b/subsys/infinispan/src/main/resources/infinispan-jdbc.xml @@ -8,7 +8,7 @@ - + @@ -26,6 +26,9 @@ + + + @@ -50,7 +53,7 @@ - + @@ -126,7 +129,7 @@ - + diff --git a/subsys/infinispan/src/main/resources/infinispan.xml b/subsys/infinispan/src/main/resources/infinispan.xml index ecedfd079d..c20faa7174 100644 --- a/subsys/infinispan/src/main/resources/infinispan.xml +++ b/subsys/infinispan/src/main/resources/infinispan.xml @@ -34,7 +34,7 @@ - + @@ -44,7 +44,7 @@ - + @@ -74,7 +74,7 @@ --> - + ram @@ -86,7 +86,7 @@ - + From c0a9a2b5da8146dd483e30d8ad40d99d0b10cf75 Mon Sep 17 00:00:00 2001 From: Gang Li Date: Fri, 8 Mar 2019 11:36:13 +0800 Subject: [PATCH 24/56] Fix way of WrappedByteArray for TrackingKey by using ObjInputStream --- .../idxmodel/TrackingKey2StringMapper.java | 41 +++++++++++-------- 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/addons/folo/common/src/main/java/org/commonjava/indy/folo/data/idxmodel/TrackingKey2StringMapper.java b/addons/folo/common/src/main/java/org/commonjava/indy/folo/data/idxmodel/TrackingKey2StringMapper.java index 9c58124043..088d65e93a 100644 --- a/addons/folo/common/src/main/java/org/commonjava/indy/folo/data/idxmodel/TrackingKey2StringMapper.java +++ b/addons/folo/common/src/main/java/org/commonjava/indy/folo/data/idxmodel/TrackingKey2StringMapper.java @@ -22,17 +22,15 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Base64; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.ObjectInputStream; public class TrackingKey2StringMapper implements TwoWayKey2StringMapper { private final Logger LOGGER = LoggerFactory.getLogger( this.getClass() ); - private static final char NON_STRING_PREFIX = '\uFEFF'; - - private static final char BYTEARRAYKEY_IDENTIFIER = '8'; - @Override public boolean isSupportedType( Class keyType ) { @@ -42,27 +40,34 @@ public boolean isSupportedType( Class keyType ) @Override public String getStringMapping( Object key ) { - if ( key instanceof TrackingKey ) + Object keyObj = key; + if ( keyObj instanceof TrackingKey ) { - TrackingKey tk = (TrackingKey) key; + TrackingKey tk = (TrackingKey) keyObj; return tk.getId(); - } - else if ( key instanceof WrappedByteArray ) + else if ( keyObj instanceof WrappedByteArray ) { - return generateString( BYTEARRAYKEY_IDENTIFIER, - Base64.getEncoder().encodeToString( ( (WrappedByteArray) key ).getBytes() ) ); + try (ObjectInputStream objStream = new ObjectInputStream( + new ByteArrayInputStream( ( (WrappedByteArray) keyObj ).getBytes() ) )) + { + keyObj = objStream.readObject(); + if ( keyObj instanceof TrackingKey ) + { + return ( (TrackingKey) keyObj ).getId(); + } + } + catch ( IOException | ClassNotFoundException e ) + { + LOGGER.error( + "Folo tracking JDBC store error: Cannot deserialize tracking key type {}, is using off-heap with unsupported type?", + keyObj == null ? null : keyObj.getClass() ); + } } - LOGGER.error( "Folo tracking JDBC store error: Not supported key type {}", - key == null ? null : key.getClass() ); + LOGGER.error( "Folo tracking JDBC store error: Not supported key type {}", keyObj == null ? null : keyObj.getClass() ); return null; } - private String generateString( char identifier, String s ) - { - return String.valueOf( NON_STRING_PREFIX ) + String.valueOf( identifier ) + s; - } - @Override public Object getKeyMapping( String stringKey ) { From 5cff5479cbb83c7f8899d4851785feb4e0167994 Mon Sep 17 00:00:00 2001 From: Gang Li Date: Fri, 8 Mar 2019 13:48:36 +0800 Subject: [PATCH 25/56] Use externalize but not direct obj stream of TrackingKey2StringMapper --- .../idxmodel/TrackingKey2StringMapper.java | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/addons/folo/common/src/main/java/org/commonjava/indy/folo/data/idxmodel/TrackingKey2StringMapper.java b/addons/folo/common/src/main/java/org/commonjava/indy/folo/data/idxmodel/TrackingKey2StringMapper.java index 088d65e93a..50bc528532 100644 --- a/addons/folo/common/src/main/java/org/commonjava/indy/folo/data/idxmodel/TrackingKey2StringMapper.java +++ b/addons/folo/common/src/main/java/org/commonjava/indy/folo/data/idxmodel/TrackingKey2StringMapper.java @@ -40,31 +40,29 @@ public boolean isSupportedType( Class keyType ) @Override public String getStringMapping( Object key ) { - Object keyObj = key; - if ( keyObj instanceof TrackingKey ) + if ( key instanceof TrackingKey ) { - TrackingKey tk = (TrackingKey) keyObj; + TrackingKey tk = (TrackingKey) key; return tk.getId(); } - else if ( keyObj instanceof WrappedByteArray ) + else if ( key instanceof WrappedByteArray ) { try (ObjectInputStream objStream = new ObjectInputStream( - new ByteArrayInputStream( ( (WrappedByteArray) keyObj ).getBytes() ) )) + new ByteArrayInputStream( ( (WrappedByteArray) key ).getBytes() ) )) { - keyObj = objStream.readObject(); - if ( keyObj instanceof TrackingKey ) - { - return ( (TrackingKey) keyObj ).getId(); - } + TrackingKey newKey = new TrackingKey(); + newKey.readExternal( objStream ); + return newKey.getId(); } catch ( IOException | ClassNotFoundException e ) { LOGGER.error( "Folo tracking JDBC store error: Cannot deserialize tracking key type {}, is using off-heap with unsupported type?", - keyObj == null ? null : keyObj.getClass() ); + key.getClass() ); } } - LOGGER.error( "Folo tracking JDBC store error: Not supported key type {}", keyObj == null ? null : keyObj.getClass() ); + LOGGER.error( "Folo tracking JDBC store error: Not supported key type {}", + key == null ? null : key.getClass() ); return null; } From 28259873835df2f917f8cb82bae3400913aab963 Mon Sep 17 00:00:00 2001 From: Gang Li Date: Fri, 8 Mar 2019 14:09:22 +0800 Subject: [PATCH 26/56] Extract abstract class for key2StringMapper with WrappedArrayByte handling --- .../idxmodel/TrackingKey2StringMapper.java | 58 +++------- .../data/TrackingKey2StringMapperTest.java | 70 +++++++++++ .../AbstractIndyKey2StringMapper.java | 109 ++++++++++++++++++ 3 files changed, 196 insertions(+), 41 deletions(-) create mode 100644 addons/folo/common/src/test/java/org/commonjava/indy/folo/data/TrackingKey2StringMapperTest.java create mode 100644 subsys/infinispan/src/main/java/org/commonjava/indy/subsys/infinispan/AbstractIndyKey2StringMapper.java diff --git a/addons/folo/common/src/main/java/org/commonjava/indy/folo/data/idxmodel/TrackingKey2StringMapper.java b/addons/folo/common/src/main/java/org/commonjava/indy/folo/data/idxmodel/TrackingKey2StringMapper.java index 50bc528532..2bf9f8470f 100644 --- a/addons/folo/common/src/main/java/org/commonjava/indy/folo/data/idxmodel/TrackingKey2StringMapper.java +++ b/addons/folo/common/src/main/java/org/commonjava/indy/folo/data/idxmodel/TrackingKey2StringMapper.java @@ -17,66 +17,42 @@ import org.apache.commons.lang3.StringUtils; import org.commonjava.indy.folo.model.TrackingKey; -import org.infinispan.commons.marshall.WrappedByteArray; -import org.infinispan.persistence.keymappers.TwoWayKey2StringMapper; +import org.commonjava.indy.subsys.infinispan.AbstractIndyKey2StringMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.ObjectInputStream; - public class TrackingKey2StringMapper - implements TwoWayKey2StringMapper + extends AbstractIndyKey2StringMapper { private final Logger LOGGER = LoggerFactory.getLogger( this.getClass() ); @Override - public boolean isSupportedType( Class keyType ) - { - return keyType == TrackingKey.class || keyType == WrappedByteArray.class; - } - - @Override - public String getStringMapping( Object key ) + public Object getKeyMapping( String stringKey ) { - if ( key instanceof TrackingKey ) + if ( StringUtils.isNotEmpty( stringKey ) ) { - TrackingKey tk = (TrackingKey) key; - return tk.getId(); + return new TrackingKey( stringKey ); } - else if ( key instanceof WrappedByteArray ) + else { - try (ObjectInputStream objStream = new ObjectInputStream( - new ByteArrayInputStream( ( (WrappedByteArray) key ).getBytes() ) )) - { - TrackingKey newKey = new TrackingKey(); - newKey.readExternal( objStream ); - return newKey.getId(); - } - catch ( IOException | ClassNotFoundException e ) - { - LOGGER.error( - "Folo tracking JDBC store error: Cannot deserialize tracking key type {}, is using off-heap with unsupported type?", - key.getClass() ); - } + LOGGER.error( "Folo tracking JDBC store error: an empty store key from store" ); + return null; } - LOGGER.error( "Folo tracking JDBC store error: Not supported key type {}", - key == null ? null : key.getClass() ); - return null; } @Override - public Object getKeyMapping( String stringKey ) + protected String getStringMappingFromInst( Object key ) { - if ( StringUtils.isNotEmpty( stringKey ) ) - { - return new TrackingKey( stringKey ); - } - else + if ( !( key instanceof TrackingKey ) ) { - LOGGER.error( "Folo tracking JDBC store error: an empty store key from store" ); return null; } + return ( (TrackingKey) key ).getId(); + } + + @Override + protected Class provideKeyClass() + { + return TrackingKey.class; } } diff --git a/addons/folo/common/src/test/java/org/commonjava/indy/folo/data/TrackingKey2StringMapperTest.java b/addons/folo/common/src/test/java/org/commonjava/indy/folo/data/TrackingKey2StringMapperTest.java new file mode 100644 index 0000000000..1c812f5dc4 --- /dev/null +++ b/addons/folo/common/src/test/java/org/commonjava/indy/folo/data/TrackingKey2StringMapperTest.java @@ -0,0 +1,70 @@ +/** + * Copyright (C) 2013~2019 Red Hat, Inc. + * + * 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. + */ +package org.commonjava.indy.folo.data; + +import org.commonjava.indy.folo.data.idxmodel.TrackingKey2StringMapper; +import org.commonjava.indy.folo.model.TrackedContent; +import org.commonjava.indy.folo.model.TrackingKey; +import org.infinispan.commons.marshall.WrappedByteArray; +import org.junit.Assert; +import org.junit.Test; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.ObjectOutputStream; +import java.util.Arrays; + +public class TrackingKey2StringMapperTest +{ + private static final String TEST_ID = "testid"; + + @Test + public void testMapper() + throws IOException + { + TrackingKey2StringMapper mapper = new TrackingKey2StringMapper(); + TrackingKey key = new TrackingKey( TEST_ID ); + + Assert.assertTrue( mapper.isSupportedType( TrackingKey.class ) ); + Assert.assertFalse( mapper.isSupportedType( Object.class ) ); + Assert.assertFalse( mapper.isSupportedType( TrackedContent.class ) ); + Assert.assertTrue( mapper.isSupportedType( WrappedByteArray.class ) ); + + Object genKey = mapper.getKeyMapping( TEST_ID ); + Assert.assertEquals( key, genKey ); + + String genId = mapper.getStringMapping( key ); + Assert.assertEquals( TEST_ID, genId ); + + WrappedByteArray array = bytesOfTrackingKey( key ); + genId = mapper.getStringMapping( array ); + Assert.assertEquals( TEST_ID, genId ); + + } + + private WrappedByteArray bytesOfTrackingKey( TrackingKey key ) + throws IOException + { + byte[] bytes = null; + try (ByteArrayOutputStream byteOut = new ByteArrayOutputStream(); + ObjectOutputStream stream = new ObjectOutputStream( byteOut )) + { + key.writeExternal( stream ); + bytes = byteOut.toByteArray(); + return new WrappedByteArray( bytes, Arrays.hashCode( bytes ) ); + } + } +} diff --git a/subsys/infinispan/src/main/java/org/commonjava/indy/subsys/infinispan/AbstractIndyKey2StringMapper.java b/subsys/infinispan/src/main/java/org/commonjava/indy/subsys/infinispan/AbstractIndyKey2StringMapper.java new file mode 100644 index 0000000000..1fc466ce70 --- /dev/null +++ b/subsys/infinispan/src/main/java/org/commonjava/indy/subsys/infinispan/AbstractIndyKey2StringMapper.java @@ -0,0 +1,109 @@ +/** + * Copyright (C) 2013~2019 Red Hat, Inc. + * + * 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. + */ +package org.commonjava.indy.subsys.infinispan; + +import org.infinispan.commons.marshall.WrappedByteArray; +import org.infinispan.persistence.keymappers.TwoWayKey2StringMapper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.ByteArrayInputStream; +import java.io.Externalizable; +import java.io.IOException; +import java.io.ObjectInputStream; + +/** + * A default Key2StringMapper for all indy ISPN cache keys which will be used for ISPN jdbc store. This class + * aims to resolve some off-heap migration, which may use java ser/deser mechanism for storing key instances. It + * will cause the deserialized instance wrapped in a ISPN WrappedByteArray instance.
+ * Note: Because this class uses reflection to initialize key instance, so all key class which extends + * this should provide default non-arg public constructor for initialization. + * + * @param - Key type to do this mapping + */ +public abstract class AbstractIndyKey2StringMapper + implements TwoWayKey2StringMapper +{ + private final Logger LOGGER = LoggerFactory.getLogger( this.getClass() ); + + @Override + public boolean isSupportedType( Class keyType ) + { + return keyType == provideKeyClass() || keyType == WrappedByteArray.class; + } + + @Override + public String getStringMapping( Object key ) + { + Class typeClass = provideKeyClass(); + if ( typeClass == null ) + { + return null; + } + Object keyObj = key; + if ( keyObj != null ) + { + if ( keyObj.getClass().isAssignableFrom( typeClass ) ) + { + return getStringMappingFromInst( key ); + } + else if ( keyObj instanceof WrappedByteArray ) + { + try (ObjectInputStream objStream = new ObjectInputStream( + new ByteArrayInputStream( ( (WrappedByteArray) keyObj ).getBytes() ) )) + { + T newKey = typeClass.newInstance(); + if ( newKey instanceof Externalizable ) + { + Externalizable deSerKey = (Externalizable) newKey; + deSerKey.readExternal( objStream ); + return getStringMappingFromInst( newKey ); + } + else + { + keyObj = objStream.readObject(); + if ( keyObj.getClass().isAssignableFrom( provideKeyClass() ) ) + { + return getStringMappingFromInst( keyObj ); + } + } + } + catch ( IOException | ClassNotFoundException | InstantiationException | IllegalAccessException e ) + { + LOGGER.error( "JDBC store error: Cannot deserialize key of WrappedByteArray, error is {}: {}", + e.getClass(), e.getMessage() ); + } + } + } + LOGGER.error( "JDBC store error: Not supported key type {}", keyObj == null ? null : keyObj.getClass() ); + return null; + } + + /** + * Sub class should implement this method to supply customized way to provide your string key from your key object. + * + * @param key - key object + * @return - string type of the key + */ + protected abstract String getStringMappingFromInst( Object key ); + + /** + * Sub class should implement this method to supply the Class type of your key object. Normally it is class object of your key type. + * + * @return + */ + protected abstract Class provideKeyClass(); +} From 2f97150cd236a04e81d396bd6e594f95af875986 Mon Sep 17 00:00:00 2001 From: Rui Han Date: Tue, 19 Mar 2019 15:34:12 +0800 Subject: [PATCH 27/56] Allow workflow like promotion to bypass readonly flag --- .../indy/promote/data/PromotionManager.java | 4 +- .../PromoteAllWithIgnoreReadonlyTest.java | 40 +++++++++++++++++++ .../indy/data/StoreDataManager.java | 6 +++ .../indy/model/galley/CacheOnlyLocation.java | 10 ++++- .../core/content/DefaultDownloadManager.java | 19 +++++++-- 5 files changed, 74 insertions(+), 5 deletions(-) create mode 100644 addons/promote/ftests/src/main/java/org/commonjava/indy/promote/ftest/PromoteAllWithIgnoreReadonlyTest.java diff --git a/addons/promote/common/src/main/java/org/commonjava/indy/promote/data/PromotionManager.java b/addons/promote/common/src/main/java/org/commonjava/indy/promote/data/PromotionManager.java index 55d416edba..77f24ddd20 100644 --- a/addons/promote/common/src/main/java/org/commonjava/indy/promote/data/PromotionManager.java +++ b/addons/promote/common/src/main/java/org/commonjava/indy/promote/data/PromotionManager.java @@ -81,6 +81,7 @@ import static org.commonjava.indy.change.EventUtils.fireEvent; import static org.commonjava.indy.core.ctl.PoolUtils.detectOverload; import static org.commonjava.indy.core.ctl.PoolUtils.detectOverloadVoid; +import static org.commonjava.indy.data.StoreDataManager.IGNORE_READONLY; import static org.commonjava.indy.model.core.StoreType.hosted; /** @@ -1041,7 +1042,8 @@ private Callable newPathsPromoteTransfer( final Transfer tra { try (InputStream stream = transfer.openInputStream( true )) { - contentManager.store( tgt, path, stream, TransferOperation.UPLOAD, new EventMetadata() ); + contentManager.store( tgt, path, stream, TransferOperation.UPLOAD, + new EventMetadata().set( IGNORE_READONLY, true ) ); result.traversed = true; result.completed = true; diff --git a/addons/promote/ftests/src/main/java/org/commonjava/indy/promote/ftest/PromoteAllWithIgnoreReadonlyTest.java b/addons/promote/ftests/src/main/java/org/commonjava/indy/promote/ftest/PromoteAllWithIgnoreReadonlyTest.java new file mode 100644 index 0000000000..dc08852a1b --- /dev/null +++ b/addons/promote/ftests/src/main/java/org/commonjava/indy/promote/ftest/PromoteAllWithIgnoreReadonlyTest.java @@ -0,0 +1,40 @@ +/** + * Copyright (C) 2011-2018 Red Hat, Inc. (https://github.com/Commonjava/indy) + * + * 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. + */ +package org.commonjava.indy.promote.ftest; + +import org.commonjava.indy.model.core.ArtifactStore; +import org.commonjava.indy.model.core.HostedRepository; +import org.commonjava.indy.pkg.maven.model.MavenPackageTypeDescriptor; +import org.junit.Test; + +public class PromoteAllWithIgnoreReadonlyTest + extends PromoteAllTest +{ + @Test + public void run() throws Exception + { + super.run(); + } + + @Override + protected ArtifactStore createTarget( String changelog ) throws Exception + { + HostedRepository target = new HostedRepository( MavenPackageTypeDescriptor.MAVEN_PKG_KEY, "target" ); + target.setReadonly( true ); + client.stores().create( target, changelog, HostedRepository.class ); + return target; + } +} diff --git a/api/src/main/java/org/commonjava/indy/data/StoreDataManager.java b/api/src/main/java/org/commonjava/indy/data/StoreDataManager.java index d126699cc4..12fde7bbca 100644 --- a/api/src/main/java/org/commonjava/indy/data/StoreDataManager.java +++ b/api/src/main/java/org/commonjava/indy/data/StoreDataManager.java @@ -36,6 +36,12 @@ public interface StoreDataManager String EVENT_ORIGIN = "event-origin"; + /** + * We need to modify the way Indy processes the readonly flag on repositories. It should apply to user operations but + * NOT apply to workflow like promotion. Set it to true in EventMetadata to bypass the readonly check. + */ + String IGNORE_READONLY = "ignore-readonly"; + ArtifactStoreQuery query(); /** diff --git a/api/src/main/java/org/commonjava/indy/model/galley/CacheOnlyLocation.java b/api/src/main/java/org/commonjava/indy/model/galley/CacheOnlyLocation.java index 666f9c6b7b..b3c1d44095 100644 --- a/api/src/main/java/org/commonjava/indy/model/galley/CacheOnlyLocation.java +++ b/api/src/main/java/org/commonjava/indy/model/galley/CacheOnlyLocation.java @@ -43,7 +43,15 @@ public class CacheOnlyLocation private final boolean isAllowReleases; - private final boolean isReadOnly; + private boolean isReadOnly; + + /** + * This is used to bypass the repo's readonly flag in case of internal workflow like promotion. + */ + public void setReadonly( boolean isReadOnly ) + { + this.isReadOnly = isReadOnly; + } public CacheOnlyLocation( final HostedRepository repo ) { diff --git a/core/src/main/java/org/commonjava/indy/core/content/DefaultDownloadManager.java b/core/src/main/java/org/commonjava/indy/core/content/DefaultDownloadManager.java index 1e79abb215..e9bca7c679 100644 --- a/core/src/main/java/org/commonjava/indy/core/content/DefaultDownloadManager.java +++ b/core/src/main/java/org/commonjava/indy/core/content/DefaultDownloadManager.java @@ -35,6 +35,7 @@ import org.commonjava.indy.model.core.RemoteRepository; import org.commonjava.indy.model.core.StoreKey; import org.commonjava.indy.model.core.StoreType; +import org.commonjava.indy.model.galley.CacheOnlyLocation; import org.commonjava.indy.model.galley.KeyedLocation; import org.commonjava.indy.spi.pkg.ContentAdvisor; import org.commonjava.indy.spi.pkg.ContentQuality; @@ -80,6 +81,7 @@ import static org.commonjava.indy.IndyContentConstants.CHECK_CACHE_ONLY; import static org.commonjava.indy.change.EventUtils.fireEvent; import static org.commonjava.indy.core.ctl.PoolUtils.detectOverloadVoid; +import static org.commonjava.indy.data.StoreDataManager.IGNORE_READONLY; import static org.commonjava.indy.measure.annotation.MetricNamed.DEFAULT; import static org.commonjava.indy.model.core.StoreType.hosted; import static org.commonjava.indy.util.ContentUtils.dedupeListing; @@ -570,13 +572,14 @@ public Transfer store( final ArtifactStore store, final String path, final Input "Cannot deploy to non-deploy point artifact store: {}.", store.getKey() ); } - if ( storeManager.isReadonly( store ) ) + if ( !isIgnoreReadonly( eventMetadata ) && storeManager.isReadonly( store ) ) { throw new IndyWorkflowException( ApplicationStatus.METHOD_NOT_ALLOWED.code(), "The store {} is readonly. If you want to store any content to this store, please modify it to non-readonly", store.getKey() ); } + if ( store instanceof HostedRepository ) { final HostedRepository deploy = (HostedRepository) store; @@ -613,7 +616,12 @@ else if ( !deploy.isAllowReleases() ) try { - final ConcreteResource resource = new ConcreteResource( LocationUtils.toLocation( store ), path ); + KeyedLocation loc = LocationUtils.toLocation( store ); + if ( isIgnoreReadonly( eventMetadata ) && loc instanceof CacheOnlyLocation ) + { + ( (CacheOnlyLocation) loc ).setReadonly( false ); + } + final ConcreteResource resource = new ConcreteResource( loc, path ); Transfer txfr = transfers.store( resource, stream, eventMetadata ); nfc.clearMissing( resource ); return txfr; @@ -650,6 +658,11 @@ else if ( !deploy.isAllowReleases() ) } } + private boolean isIgnoreReadonly( EventMetadata eventMetadata ) + { + return Boolean.TRUE.equals( eventMetadata.get( IGNORE_READONLY ) ); + } + /* * (non-Javadoc) * @see org.commonjava.indy.core.rest.util.FileManager#upload(java.util.List, java.lang.String, @@ -678,7 +691,7 @@ public Transfer store( final List stores, final String HostedRepository selected = null; for ( final ArtifactStore store : stores ) { - if ( storeManager.isReadonly( store ) ) + if ( !isIgnoreReadonly( eventMetadata ) && storeManager.isReadonly( store ) ) { logger.debug( "The store {} is readonly, store operation not allowed" ); continue; From 7bce7733ad130d49e33c9a4a6d624084b79ce97b Mon Sep 17 00:00:00 2001 From: John Casey Date: Tue, 2 Apr 2019 09:23:06 -0500 Subject: [PATCH 28/56] Add configurable envars under mdc logging (#1183) (#1194) * Add configurable envars under mdc logging * ADD static SYSTEM_ OPENSHIFT ENV * EnvironmentConfig refactor, make it focusing on variable keys extracting, add MDC entry by JsonLayout extender --- .../indy/conf/EnvironmentConfig.java | 97 +++++++++++++++++++ core/src/main/conf/conf.d/environment.conf | 5 + .../main/resources/default-environment.conf | 5 + .../indy/core/conf/EnvironmentConfigTest.java | 54 +++++++++++ .../indy/bind/jaxrs/CustomJsonLayout.java | 61 ++++++++++++ .../indy/bind/jaxrs/MDCManager.java | 3 + .../bind/jaxrs/RequestContextConstants.java | 2 + 7 files changed, 227 insertions(+) create mode 100644 api/src/main/java/org/commonjava/indy/conf/EnvironmentConfig.java create mode 100644 core/src/main/conf/conf.d/environment.conf create mode 100644 core/src/main/resources/default-environment.conf create mode 100644 core/src/test/java/org/commonjava/indy/core/conf/EnvironmentConfigTest.java create mode 100644 subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/CustomJsonLayout.java diff --git a/api/src/main/java/org/commonjava/indy/conf/EnvironmentConfig.java b/api/src/main/java/org/commonjava/indy/conf/EnvironmentConfig.java new file mode 100644 index 0000000000..cafacaf9ae --- /dev/null +++ b/api/src/main/java/org/commonjava/indy/conf/EnvironmentConfig.java @@ -0,0 +1,97 @@ +/** + * Copyright (C) 2011-2018 Red Hat, Inc. (https://github.com/Commonjava/indy) + * + * 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. + */ +package org.commonjava.indy.conf; + +import org.commonjava.web.config.ConfigurationException; +import org.commonjava.web.config.annotation.SectionName; +import org.commonjava.web.config.section.MapSectionListener; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.enterprise.context.ApplicationScoped; +import java.io.File; +import java.io.InputStream; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.HashMap; +import java.util.Map; + +/** + * Created by yma on 2019/3/19. + */ + +@ApplicationScoped +@SectionName( EnvironmentConfig.SECTION_NAME ) +public class EnvironmentConfig + extends MapSectionListener + implements IndyConfigInfo +{ + public static final String SECTION_NAME = "environment"; + + public static final String ENV_PREFIX = "mdc.env"; + + public static final String HOSTNAME = "HOSTNAME"; + + public static final String UNKNOWN = "UNKNOWN"; + + private final Logger logger = LoggerFactory.getLogger( getClass() ); + + private Map envars = new HashMap<>(); + + public EnvironmentConfig() + { + } + + @Override + public String getDefaultConfigFileName() + { + return new File( IndyConfigInfo.CONF_INCLUDES_DIR, "environment.conf" ).getPath(); + } + + @Override + public InputStream getDefaultConfig() + { + return Thread.currentThread().getContextClassLoader().getResourceAsStream( "default-environment.conf" ); + } + + @Override + public synchronized void parameter( final String name, final String value ) + throws ConfigurationException + { + if ( name.startsWith( ENV_PREFIX ) ) + { + String envKey = name.substring( ENV_PREFIX.length() ); + String enValue = System.getenv( envKey ); + if ( envKey.equals( HOSTNAME ) && enValue == null ) + { + try + { + enValue = InetAddress.getLocalHost().getHostName(); + } + catch ( UnknownHostException e ) + { + logger.error( String.format( "Unknown host. Reason: %s", e.getMessage() ), e ); + } + } + envars.put( value, enValue == null ? UNKNOWN : enValue ); + } + } + + public Map getEnvars() + { + return envars; + } +} diff --git a/core/src/main/conf/conf.d/environment.conf b/core/src/main/conf/conf.d/environment.conf new file mode 100644 index 0000000000..7c64d72b46 --- /dev/null +++ b/core/src/main/conf/conf.d/environment.conf @@ -0,0 +1,5 @@ +[environment] +mdc.env.OPENSHIFT_BUILD_NAMESPACE = NAMESPACE +mdc.env.OPENSHIFT_BUILD_NAME = BUILD_NAME +mdc.env.OPENSHIFT_BUILD_COMMIT = BUILD_COMMIT +mdc.env.HOSTNAME = HOSTNAME \ No newline at end of file diff --git a/core/src/main/resources/default-environment.conf b/core/src/main/resources/default-environment.conf new file mode 100644 index 0000000000..7c64d72b46 --- /dev/null +++ b/core/src/main/resources/default-environment.conf @@ -0,0 +1,5 @@ +[environment] +mdc.env.OPENSHIFT_BUILD_NAMESPACE = NAMESPACE +mdc.env.OPENSHIFT_BUILD_NAME = BUILD_NAME +mdc.env.OPENSHIFT_BUILD_COMMIT = BUILD_COMMIT +mdc.env.HOSTNAME = HOSTNAME \ No newline at end of file diff --git a/core/src/test/java/org/commonjava/indy/core/conf/EnvironmentConfigTest.java b/core/src/test/java/org/commonjava/indy/core/conf/EnvironmentConfigTest.java new file mode 100644 index 0000000000..d41e25499a --- /dev/null +++ b/core/src/test/java/org/commonjava/indy/core/conf/EnvironmentConfigTest.java @@ -0,0 +1,54 @@ +/** + * Copyright (C) 2011-2018 Red Hat, Inc. (https://github.com/Commonjava/indy) + * + * 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. + */ +package org.commonjava.indy.core.conf; + +import org.commonjava.indy.conf.EnvironmentConfig; +import org.commonjava.indy.test.utils.WeldJUnit4Runner; +import org.commonjava.web.config.ConfigUtils; +import org.junit.Test; +import org.junit.runner.RunWith; + +import javax.enterprise.inject.Instance; +import javax.inject.Inject; +import java.util.ArrayList; +import java.util.List; + +import static org.hamcrest.CoreMatchers.equalTo; +import static org.junit.Assert.assertThat; + +/** + * Created by yma on 2019/3/21. + */ +@RunWith( WeldJUnit4Runner.class ) +public class EnvironmentConfigTest +{ + @Inject + private Instance instance; + + @Test + public void weldInjection_IterateIndyLoggingConfigurators() + { + List sections = new ArrayList<>(); + instance.iterator().forEachRemaining( ( instance)->{ + String section = ConfigUtils.getSectionName( instance ); + System.out.printf( "Got instance: %s with section: %s\n", instance, section ); + sections.add( section ); + } ); + + System.out.println(sections); + assertThat( sections.contains( EnvironmentConfig.SECTION_NAME ), equalTo( true ) ); + } +} diff --git a/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/CustomJsonLayout.java b/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/CustomJsonLayout.java new file mode 100644 index 0000000000..c910ab3ced --- /dev/null +++ b/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/CustomJsonLayout.java @@ -0,0 +1,61 @@ +/** + * Copyright (C) 2011-2018 Red Hat, Inc. (https://github.com/Commonjava/indy) + * + * 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. + */ +package org.commonjava.indy.bind.jaxrs; + +import ch.qos.logback.classic.spi.ILoggingEvent; +import ch.qos.logback.contrib.json.classic.JsonLayout; +import com.fasterxml.jackson.core.JsonProcessingException; +import org.commonjava.indy.conf.EnvironmentConfig; +import org.commonjava.indy.model.core.io.IndyObjectMapper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.enterprise.inject.spi.CDI; +import java.util.Map; + +import static org.commonjava.indy.bind.jaxrs.RequestContextConstants.ENVIRONMENT; + +/** + * Created by yma on 2019/3/26. + */ +public class CustomJsonLayout + extends JsonLayout +{ + private final Logger logger = LoggerFactory.getLogger( getClass() ); + + @Override + protected void addCustomDataToJsonMap( Map map, ILoggingEvent iLoggingEvent ) + { + IndyObjectMapper objectMapper = new IndyObjectMapper( true ); + super.addCustomDataToJsonMap( map, iLoggingEvent ); + + if ( !iLoggingEvent.getMDCPropertyMap().isEmpty() ) + { + Map mdcs = (Map) map.get( MDC_ATTR_NAME ); + try + { + Map envars = CDI.current().select( EnvironmentConfig.class ).get().getEnvars(); + mdcs.put( ENVIRONMENT, objectMapper.writeValueAsString( envars ) ); + } + catch ( JsonProcessingException e ) + { + mdcs.put( ENVIRONMENT, "{error: \"Envars could not be processed by Jackson.\"}" ); + logger.error( String.format( "Failed to create environment mdc. Reason: %s", e.getMessage() ), e ); + } + map.put( MDC_ATTR_NAME, mdcs ); + } + } +} diff --git a/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/MDCManager.java b/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/MDCManager.java index 650a4a657e..0f231dc542 100644 --- a/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/MDCManager.java +++ b/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/MDCManager.java @@ -15,9 +15,12 @@ */ package org.commonjava.indy.bind.jaxrs; +import com.fasterxml.jackson.core.JsonProcessingException; import org.apache.http.Header; import org.apache.http.HttpRequest; import org.commonjava.indy.conf.IndyConfiguration; +import org.commonjava.indy.conf.EnvironmentConfig; +import org.commonjava.indy.model.core.io.IndyObjectMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.MDC; diff --git a/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/RequestContextConstants.java b/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/RequestContextConstants.java index d9f17ac0e1..33e6985c15 100644 --- a/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/RequestContextConstants.java +++ b/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/RequestContextConstants.java @@ -61,4 +61,6 @@ public class RequestContextConstants @Thread @MDC public static final String PREFERRED_ID = "preferred-id"; + @Thread @MDC + public static final String ENVIRONMENT = "environment"; } From ab968329521c945c9753798495799ecf6e3bbd4c Mon Sep 17 00:00:00 2001 From: John Casey Date: Wed, 3 Apr 2019 17:31:34 -0500 Subject: [PATCH 29/56] fixing serialization / deserialization in tracking record entries (#1195) --- .../indy/folo/model/TrackedContentEntry.java | 46 ++- .../folo/model/TrackedContentEntryTest.java | 109 ++++++ .../folo/model/TrackedContentEntryV1.java | 314 ++++++++++++++++++ 3 files changed, 467 insertions(+), 2 deletions(-) create mode 100644 addons/folo/model-java/src/test/java/org/commonjava/indy/folo/model/TrackedContentEntryTest.java create mode 100644 addons/folo/model-java/src/test/java/org/commonjava/indy/folo/model/TrackedContentEntryV1.java diff --git a/addons/folo/model-java/src/main/java/org/commonjava/indy/folo/model/TrackedContentEntry.java b/addons/folo/model-java/src/main/java/org/commonjava/indy/folo/model/TrackedContentEntry.java index 430db979d4..d7cb8247ab 100644 --- a/addons/folo/model-java/src/main/java/org/commonjava/indy/folo/model/TrackedContentEntry.java +++ b/addons/folo/model-java/src/main/java/org/commonjava/indy/folo/model/TrackedContentEntry.java @@ -24,9 +24,15 @@ import java.io.ObjectInput; import java.io.ObjectOutput; +import static org.commonjava.indy.model.core.AccessChannel.GENERIC_PROXY; +import static org.commonjava.indy.pkg.PackageTypeConstants.PKG_TYPE_GENERIC_HTTP; +import static org.commonjava.indy.pkg.PackageTypeConstants.PKG_TYPE_MAVEN; + public class TrackedContentEntry implements Comparable,Externalizable { + private static final int VERSION = 2; + private TrackingKey trackingKey; private StoreKey storeKey; @@ -258,7 +264,9 @@ public String toString() public void writeExternal( final ObjectOutput out ) throws IOException { + out.writeObject( Integer.toString( VERSION ) ); out.writeObject( trackingKey ); + out.writeObject( storeKey.getPackageType() ); out.writeObject( storeKey.getName() ); out.writeObject( storeKey.getType().name() ); out.writeObject( accessChannel.name() ); @@ -276,15 +284,48 @@ public void writeExternal( final ObjectOutput out ) public void readExternal( final ObjectInput in ) throws IOException, ClassNotFoundException { - trackingKey = (TrackingKey) in.readObject(); + // This is a little awkward. The original version didn't have a version constant, so it wasn't possible + // to just read it from the data stream and use it to guide the deserialization process. Instead, + // we have to read the first object and determine whether it's the object version or the tracking key, + // which was the first field in the serialized data stream back in the first version of this class. + Object whatIsThis = in.readObject(); + + int version; + String packageType = null; + if ( whatIsThis instanceof TrackingKey ) + { + version = 1; + trackingKey = (TrackingKey) whatIsThis; + packageType = PKG_TYPE_MAVEN; + } + else + { + version = Integer.parseInt( String.valueOf( whatIsThis ) ); + trackingKey = (TrackingKey) in.readObject(); + packageType = (String) in.readObject(); + } + + // TODO: We should make future versioning / deserialization decisions based on the version we read / infer above + if ( version > VERSION ) + { + throw new IOException( + "This class is of an older version: " + VERSION + " vs. the version read from the data stream: " + + version + ". Cannot deserialize." ); + } final String storeKeyName = (String) in.readObject(); final StoreType storeType = StoreType.get( (String) in.readObject() ); - storeKey = new StoreKey( storeType, storeKeyName ); final String accessChannelStr = (String) in.readObject(); accessChannel = "".equals( accessChannelStr ) ? null : AccessChannel.valueOf( accessChannelStr ); + if ( version == 1 && accessChannel == GENERIC_PROXY ) + { + packageType = PKG_TYPE_GENERIC_HTTP; + } + + storeKey = new StoreKey( packageType, storeType, storeKeyName ); + final String pathStr = (String) in.readObject(); path = "".equals( pathStr ) ? null : pathStr; @@ -306,6 +347,7 @@ public void readExternal( final ObjectInput in ) size = (Long) in.readObject(); index = in.readLong(); + } } diff --git a/addons/folo/model-java/src/test/java/org/commonjava/indy/folo/model/TrackedContentEntryTest.java b/addons/folo/model-java/src/test/java/org/commonjava/indy/folo/model/TrackedContentEntryTest.java new file mode 100644 index 0000000000..deca4d5eaf --- /dev/null +++ b/addons/folo/model-java/src/test/java/org/commonjava/indy/folo/model/TrackedContentEntryTest.java @@ -0,0 +1,109 @@ +package org.commonjava.indy.folo.model; + +import org.commonjava.indy.model.core.AccessChannel; +import org.commonjava.indy.model.core.StoreKey; +import org.junit.Test; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; + +import static org.commonjava.indy.folo.model.StoreEffect.DOWNLOAD; +import static org.commonjava.indy.model.core.AccessChannel.GENERIC_PROXY; +import static org.commonjava.indy.model.core.AccessChannel.MAVEN_REPO; +import static org.commonjava.indy.model.core.StoreType.hosted; +import static org.commonjava.indy.model.core.StoreType.remote; +import static org.commonjava.indy.pkg.PackageTypeConstants.PKG_TYPE_GENERIC_HTTP; +import static org.commonjava.indy.pkg.PackageTypeConstants.PKG_TYPE_MAVEN; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.junit.Assert.assertThat; + +public class TrackedContentEntryTest +{ + /** + * We have to hack this test a bit in order to test the ability to deserialize this first version of + * TrackedContentEntry. + * @throws IOException + * @throws ClassNotFoundException + */ + @Test + public void externalizeAsV1_readCurrentVersion() + throws IOException, ClassNotFoundException + { + TrackedContentEntryV1 ev1 = new TrackedContentEntryV1( new TrackingKey( "test-key" ), + new StoreKey( PKG_TYPE_GENERIC_HTTP, remote, + "some-upstream" ), GENERIC_PROXY, + "http://some.upstream.url/path/to/file", "path/to/file", + DOWNLOAD, 10101010L, "aaaafffffccccceeeeddd", + "bbbcccceeeedddaaaaa", "aaadadaaaadaeee" ); + + TrackedContentEntry out = new TrackedContentEntry( new TrackingKey( "test-key2" ), + new StoreKey( PKG_TYPE_MAVEN, hosted, + "some-upstream2" ), MAVEN_REPO, + "http://some.upstream.url/path/to/file2", "path/to/file2", + DOWNLOAD, 10101011L, "aaaafffffccccceeeedddfffffff", + "bbbcccceeeedddaaaaaffffffff", "aaadadaaaadaeeeffffffff" ); + + TrackedContentEntry test = + new TrackedContentEntry( ev1.getTrackingKey(), ev1.getStoreKey(), ev1.getAccessChannel(), + ev1.getOriginUrl(), ev1.getPath(), ev1.getEffect(), ev1.getSize(), + ev1.getMd5(), ev1.getSha1(), ev1.getSha256() ); + + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + ObjectOutputStream oos = new ObjectOutputStream( baos ); + ev1.writeExternal( oos ); + oos.flush(); + + ObjectInputStream oin = new ObjectInputStream( new ByteArrayInputStream( baos.toByteArray() ) ); + out.readExternal( oin ); + + assertThat( out.getTrackingKey(), equalTo( test.getTrackingKey() ) ); + assertThat( out.getStoreKey(), equalTo( test.getStoreKey() ) ); + assertThat( out.getAccessChannel(), equalTo( test.getAccessChannel() ) ); + assertThat( out.getOriginUrl(), equalTo( test.getOriginUrl() ) ); + assertThat( out.getPath(), equalTo( test.getPath() ) ); + assertThat( out.getEffect(), equalTo( test.getEffect() ) ); + assertThat( out.getSize(), equalTo( test.getSize() ) ); + assertThat( out.getMd5(), equalTo( test.getMd5() ) ); + assertThat( out.getSha1(), equalTo( test.getSha1() ) ); + assertThat( out.getSha256(), equalTo( test.getSha256() ) ); + } + + @Test + public void serializeRoundTrip_CurrentVersion() + throws IOException, ClassNotFoundException + { + TrackedContentEntry entry = new TrackedContentEntry( new TrackingKey( "test-key" ), + new StoreKey( PKG_TYPE_GENERIC_HTTP, remote, + "some-upstream" ), GENERIC_PROXY, + "http://some.upstream.url/path/to/file", "path/to/file", + DOWNLOAD, 10101010L, "aaaafffffccccceeeeddd", + "bbbcccceeeedddaaaaa", "aaadadaaaadaeee" ); + + TrackedContentEntry test = + new TrackedContentEntry( entry.getTrackingKey(), entry.getStoreKey(), entry.getAccessChannel(), + entry.getOriginUrl(), entry.getPath(), entry.getEffect(), entry.getSize(), + entry.getMd5(), entry.getSha1(), entry.getSha256() ); + + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + ObjectOutputStream oos = new ObjectOutputStream( baos ); + oos.writeObject( entry ); + oos.flush(); + + ObjectInputStream oin = new ObjectInputStream( new ByteArrayInputStream( baos.toByteArray() ) ); + TrackedContentEntry out = (TrackedContentEntry) oin.readObject(); + + assertThat( out.getTrackingKey(), equalTo( test.getTrackingKey() ) ); + assertThat( out.getStoreKey(), equalTo( test.getStoreKey() ) ); + assertThat( out.getAccessChannel(), equalTo( test.getAccessChannel() ) ); + assertThat( out.getOriginUrl(), equalTo( test.getOriginUrl() ) ); + assertThat( out.getPath(), equalTo( test.getPath() ) ); + assertThat( out.getEffect(), equalTo( test.getEffect() ) ); + assertThat( out.getSize(), equalTo( test.getSize() ) ); + assertThat( out.getMd5(), equalTo( test.getMd5() ) ); + assertThat( out.getSha1(), equalTo( test.getSha1() ) ); + assertThat( out.getSha256(), equalTo( test.getSha256() ) ); + } +} diff --git a/addons/folo/model-java/src/test/java/org/commonjava/indy/folo/model/TrackedContentEntryV1.java b/addons/folo/model-java/src/test/java/org/commonjava/indy/folo/model/TrackedContentEntryV1.java new file mode 100644 index 0000000000..e18ccb658d --- /dev/null +++ b/addons/folo/model-java/src/test/java/org/commonjava/indy/folo/model/TrackedContentEntryV1.java @@ -0,0 +1,314 @@ +/** + * Copyright (C) 2011-2018 Red Hat, Inc. (https://github.com/Commonjava/indy) + * + * 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. + */ +package org.commonjava.indy.folo.model; + +import org.commonjava.indy.model.core.AccessChannel; +import org.commonjava.indy.model.core.StoreKey; +import org.commonjava.indy.model.core.StoreType; + +import java.io.Externalizable; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; + +import static org.commonjava.indy.pkg.PackageTypeConstants.PKG_TYPE_MAVEN; + +public class TrackedContentEntryV1 + implements Comparable, Externalizable +{ + private TrackingKey trackingKey; + + private StoreKey storeKey; + + private AccessChannel accessChannel; + + private String path; + + private String originUrl; + + private StoreEffect effect; + + private String md5; + + private String sha256; + + private String sha1; + + private Long size; + + private long index = System.currentTimeMillis(); + + public TrackedContentEntryV1() + { + } + + public TrackedContentEntryV1( final TrackingKey trackingKey, final StoreKey storeKey, + final AccessChannel accessChannel, final String originUrl, final String path, + final StoreEffect effect, final Long size, + final String md5, final String sha1, final String sha256 ) + { + this.trackingKey = trackingKey; + this.storeKey = storeKey; + this.accessChannel = accessChannel; + this.path = path; + this.originUrl = originUrl; + this.effect = effect; + this.md5=md5; + this.sha1=sha1; + this.sha256=sha256; + this.size = size; + } + + public String getOriginUrl() + { + return originUrl; + } + + public String getMd5() + { + return md5; + } + + public String getSha256() + { + return sha256; + } + + public String getSha1() + { + return sha1; + } + + public StoreKey getStoreKey() + { + return storeKey; + } + + public AccessChannel getAccessChannel() + { + return accessChannel; + } + + public String getPath() + { + return path; + } + + public TrackingKey getTrackingKey() + { + return trackingKey; + } + + public StoreEffect getEffect() + { + return effect; + } + + public Long getSize() + { + return size; + } + + public long getIndex() + { + return index; + } + + public void setStoreKey( StoreKey storeKey ) + { + this.storeKey = storeKey; + } + + public void setOriginUrl( String originUrl ) + { + this.originUrl = originUrl; + } + + @Override + public int compareTo( final TrackedContentEntryV1 other ) + { + int comp = trackingKey.getId().compareTo( other.getTrackingKey().getId() ); + if ( comp == 0 ) + { + comp = storeKey.compareTo( other.getStoreKey() ); + } + if ( comp == 0 ) + { + comp = accessChannel.compareTo( other.getAccessChannel() ); + } + if ( comp == 0 ) + { + comp = path.compareTo( other.getPath() ); + } + if ( comp == 0 ) + { + comp = effect.compareTo( other.getEffect() ); + } + + return comp; + } + + @Override + public int hashCode() + { + final int prime = 31; + int result = 1; + result = prime * result + ( ( trackingKey == null ) ? 0 : trackingKey.hashCode() ); + result = prime * result + ( ( path == null ) ? 0 : path.hashCode() ); + result = prime * result + ( ( storeKey == null ) ? 0 : storeKey.hashCode() ); + result = prime * result + ( ( accessChannel == null ) ? 0 : accessChannel.hashCode() ); + result = prime * result + ( ( effect == null ) ? 0 : effect.hashCode() ); + return result; + } + + @Override + public boolean equals( final Object obj ) + { + if ( this == obj ) + { + return true; + } + if ( obj == null ) + { + return false; + } + if ( getClass() != obj.getClass() ) + { + return false; + } + final TrackedContentEntryV1 other = (TrackedContentEntryV1) obj; + if ( trackingKey == null ) + { + if ( other.trackingKey != null ) + { + return false; + } + } + else if ( !trackingKey.equals( other.trackingKey ) ) + { + return false; + } + if ( path == null ) + { + if ( other.path != null ) + { + return false; + } + } + else if ( !path.equals( other.path ) ) + { + return false; + } + if ( storeKey == null ) + { + if ( other.storeKey != null ) + { + return false; + } + } + else if ( !storeKey.equals( other.storeKey ) ) + { + return false; + } + if ( accessChannel == null ) + { + if ( other.accessChannel != null ) + { + return false; + } + } + else if ( !accessChannel.equals( other.accessChannel ) ) + { + return false; + } + if ( effect == null ) + { + if ( other.effect != null ) + { + return false; + } + } + else if ( !effect.equals( other.effect ) ) + { + return false; + } + return true; + } + + @Override + public String toString() + { + return String.format( + "TrackedContentEntry [\n trackingKey=%s\n storeKey=%s\n accessChannel=%s\n path=%s\n originUrl=%s\n effect=%s\n md5=%s\n sha1=%s\n sha256=%s\nObject hashcode=%s\n]", + trackingKey, storeKey, accessChannel, path, originUrl, effect, md5, sha1, sha256, super.hashCode() ); + } + + @Override + public void writeExternal( final ObjectOutput out ) + throws IOException + { + out.writeObject( trackingKey ); + out.writeObject( storeKey.getName() ); + out.writeObject( storeKey.getType().name() ); + out.writeObject( accessChannel.name() ); + out.writeObject( path == null ? "" : path ); + out.writeObject( originUrl == null ? "" : originUrl ); + out.writeObject( effect == null ? "" : effect.name() ); + out.writeObject( md5 == null ? "" : md5 ); + out.writeObject( sha1 == null ? "" : sha1 ); + out.writeObject( sha256 == null ? "" : sha256 ); + out.writeObject( size ); + out.writeLong( index ); + } + + @Override + public void readExternal( final ObjectInput in ) + throws IOException, ClassNotFoundException + { + trackingKey = (TrackingKey) in.readObject(); + + final String storeKeyName = (String) in.readObject(); + final StoreType storeType = StoreType.get( (String) in.readObject() ); + storeKey = new StoreKey( storeType, storeKeyName ); + + final String accessChannelStr = (String) in.readObject(); + accessChannel = "".equals( accessChannelStr ) ? null : AccessChannel.valueOf( accessChannelStr ); + + final String pathStr = (String) in.readObject(); + path = "".equals( pathStr ) ? null : pathStr; + + final String originUrlStr = (String) in.readObject(); + originUrl = "".equals( originUrlStr ) ? null : originUrlStr; + + final String effectStr = (String) in.readObject(); + effect = "".equals( effectStr ) ? null : StoreEffect.valueOf( effectStr ); + + final String md5Str = (String) in.readObject(); + md5 = "".equals( md5Str ) ? null : md5Str; + + final String sha1Str = (String) in.readObject(); + sha1 = "".equals( sha1Str ) ? null : sha1Str; + + final String sha256Str = (String) in.readObject(); + sha256 = "".equals( sha256Str ) ? null : sha256Str; + + size = (Long) in.readObject(); + + index = in.readLong(); + + } + +} From b6bafde196fb35f48327a7ea90dcbe8c0153663d Mon Sep 17 00:00:00 2001 From: Rui Han Date: Mon, 8 Apr 2019 14:47:47 +0800 Subject: [PATCH 30/56] Catch all exceptions in promotion executeValidationRule (#1201) --- .../indy/promote/validate/PromotionValidator.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/promote/common/src/main/java/org/commonjava/indy/promote/validate/PromotionValidator.java b/addons/promote/common/src/main/java/org/commonjava/indy/promote/validate/PromotionValidator.java index a3823d284d..e484f38bf0 100644 --- a/addons/promote/common/src/main/java/org/commonjava/indy/promote/validate/PromotionValidator.java +++ b/addons/promote/common/src/main/java/org/commonjava/indy/promote/validate/PromotionValidator.java @@ -141,19 +141,19 @@ public ValidationRequest validate( PromoteRequest request, ValidationResult resu final ValidationRequest req = new ValidationRequest( request, set, validationTools, store ); try { - DrainingExecutorCompletionService svc = + DrainingExecutorCompletionService svc = new DrainingExecutorCompletionService<>( validateService ); detectOverloadVoid(()->{ for ( String ruleRef : ruleNames ) { svc.submit( () -> { - PromotionValidationException err = null; + Exception err = null; try { executeValidationRule( ruleRef, req, result, request ); } - catch ( PromotionValidationException e ) + catch ( Exception e ) { err = e; } From ea96b5f387b7f53836fbb6b2522266c7cddb953f Mon Sep 17 00:00:00 2001 From: Gang Li Date: Tue, 9 Apr 2019 16:38:17 +0800 Subject: [PATCH 31/56] Fix typo of Storertifact.copyBase() --- .../main/java/org/commonjava/indy/model/core/ArtifactStore.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/core-java/src/main/java/org/commonjava/indy/model/core/ArtifactStore.java b/models/core-java/src/main/java/org/commonjava/indy/model/core/ArtifactStore.java index 9fa39693e0..10a263f354 100644 --- a/models/core-java/src/main/java/org/commonjava/indy/model/core/ArtifactStore.java +++ b/models/core-java/src/main/java/org/commonjava/indy/model/core/ArtifactStore.java @@ -233,7 +233,7 @@ public Object getTransientMetadata( final String key ) protected void copyBase( ArtifactStore store ) { - store.setRescanInProgress( store.isRescanInProgress() ); + store.setRescanInProgress( isRescanInProgress() ); store.setDescription( getDescription() ); store.setDisabled( isDisabled() ); store.setMetadata( getMetadata() ); From a7cbf21e0ae9d1823913ca3b65543957530b5f8e Mon Sep 17 00:00:00 2001 From: John Casey Date: Wed, 10 Apr 2019 14:02:33 -0500 Subject: [PATCH 32/56] [1.7.x] Refactor CustomJsonLayout, and test it locally (#1200) * Refactor CustomJsonLayout to use default logback layout configuration for envars This will skip the period when CDI isn't started, when it's still trying to log things. It also skips the need for CDI.current() to lookup the environment configuration, putting the envar extraction config directly in logback.xml Conflicts: deployments/launcher/src/main/etc/indy/logging/logback.xml * Remove old CustomJsonLayout class * remove unused constant * Be more careful about empty strings when pulling envars * adjust example kafka config to include SSL params --- api/pom.xml | 8 +++ .../commonjava/indy}/CustomJsonLayout.java | 60 +++++++++++------- .../src/main/etc/indy/logging/logback.xml | 63 +++++-------------- .../bind/jaxrs/RequestContextConstants.java | 3 - 4 files changed, 60 insertions(+), 74 deletions(-) rename {subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs => api/src/main/java/org/commonjava/indy}/CustomJsonLayout.java (52%) diff --git a/api/pom.xml b/api/pom.xml index b1dff324cf..dc952d41b6 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -68,6 +68,14 @@ com.fasterxml.jackson.core jackson-databind + + ch.qos.logback.contrib + logback-jackson + + + ch.qos.logback.contrib + logback-json-classic + diff --git a/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/CustomJsonLayout.java b/api/src/main/java/org/commonjava/indy/CustomJsonLayout.java similarity index 52% rename from subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/CustomJsonLayout.java rename to api/src/main/java/org/commonjava/indy/CustomJsonLayout.java index c910ab3ced..13fd677b8d 100644 --- a/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/CustomJsonLayout.java +++ b/api/src/main/java/org/commonjava/indy/CustomJsonLayout.java @@ -13,20 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.commonjava.indy.bind.jaxrs; +package org.commonjava.indy; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.contrib.json.classic.JsonLayout; -import com.fasterxml.jackson.core.JsonProcessingException; -import org.commonjava.indy.conf.EnvironmentConfig; -import org.commonjava.indy.model.core.io.IndyObjectMapper; +import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.enterprise.inject.spi.CDI; +import java.util.HashMap; import java.util.Map; - -import static org.commonjava.indy.bind.jaxrs.RequestContextConstants.ENVIRONMENT; +import java.util.stream.Stream; /** * Created by yma on 2019/3/26. @@ -34,28 +31,45 @@ public class CustomJsonLayout extends JsonLayout { + public static final String ENVIRONMENT = "environment"; + private final Logger logger = LoggerFactory.getLogger( getClass() ); + private String environmentMappings; + + private Map envars; + + public String getEnvironmentMappings() + { + return environmentMappings; + } + + public void setEnvironmentMappings( final String environmentMappings ) + { + this.environmentMappings = environmentMappings; + + String[] mappings = environmentMappings == null ? new String[0] : environmentMappings.split( "\\s*,\\s*" ); + envars = new HashMap<>(); + Stream.of(mappings).forEach( kv ->{ + String[] keyAlias = kv.split( "\\s*=\\s*" ); + if ( keyAlias.length > 1 ) + { + String value = System.getenv( keyAlias[0].trim() ); + if ( StringUtils.isEmpty( value ) ) + { + value = "Unknown"; + } + + envars.put( keyAlias[1].trim(), value ); + } + } ); + } + @Override protected void addCustomDataToJsonMap( Map map, ILoggingEvent iLoggingEvent ) { - IndyObjectMapper objectMapper = new IndyObjectMapper( true ); super.addCustomDataToJsonMap( map, iLoggingEvent ); - if ( !iLoggingEvent.getMDCPropertyMap().isEmpty() ) - { - Map mdcs = (Map) map.get( MDC_ATTR_NAME ); - try - { - Map envars = CDI.current().select( EnvironmentConfig.class ).get().getEnvars(); - mdcs.put( ENVIRONMENT, objectMapper.writeValueAsString( envars ) ); - } - catch ( JsonProcessingException e ) - { - mdcs.put( ENVIRONMENT, "{error: \"Envars could not be processed by Jackson.\"}" ); - logger.error( String.format( "Failed to create environment mdc. Reason: %s", e.getMessage() ), e ); - } - map.put( MDC_ATTR_NAME, mdcs ); - } + map.put( ENVIRONMENT, envars ); } } diff --git a/deployments/launcher/src/main/etc/indy/logging/logback.xml b/deployments/launcher/src/main/etc/indy/logging/logback.xml index e95738566f..7bb312d41f 100644 --- a/deployments/launcher/src/main/etc/indy/logging/logback.xml +++ b/deployments/launcher/src/main/etc/indy/logging/logback.xml @@ -82,43 +82,6 @@ - - - @@ -134,9 +97,16 @@ - @@ -193,14 +168,6 @@ - - - - diff --git a/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/RequestContextConstants.java b/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/RequestContextConstants.java index 33e6985c15..b702556c0b 100644 --- a/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/RequestContextConstants.java +++ b/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/RequestContextConstants.java @@ -60,7 +60,4 @@ public class RequestContextConstants @Thread @MDC public static final String PREFERRED_ID = "preferred-id"; - - @Thread @MDC - public static final String ENVIRONMENT = "environment"; } From af402d5eb385e562f955c0eda3e2583a311064e0 Mon Sep 17 00:00:00 2001 From: Rui Han Date: Thu, 11 Apr 2019 03:03:24 +0800 Subject: [PATCH 33/56] Generate metadata for a group containing Maven plugins artifacts (#1207) --- .../maven/content/MavenMetadataGenerator.java | 6 + .../content/GroupMetadataForRemoteTest.java | 137 ++++++++++++++++++ pom.xml | 6 + 3 files changed, 149 insertions(+) create mode 100644 addons/pkg-maven/ftests/src/main/java/org/commonjava/indy/pkg/maven/content/GroupMetadataForRemoteTest.java diff --git a/addons/pkg-maven/common/src/main/java/org/commonjava/indy/pkg/maven/content/MavenMetadataGenerator.java b/addons/pkg-maven/common/src/main/java/org/commonjava/indy/pkg/maven/content/MavenMetadataGenerator.java index 1c6b495636..9e687c8df2 100644 --- a/addons/pkg-maven/common/src/main/java/org/commonjava/indy/pkg/maven/content/MavenMetadataGenerator.java +++ b/addons/pkg-maven/common/src/main/java/org/commonjava/indy/pkg/maven/content/MavenMetadataGenerator.java @@ -18,6 +18,7 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; import org.apache.maven.artifact.repository.metadata.Metadata; +import org.apache.maven.artifact.repository.metadata.Plugin; import org.apache.maven.artifact.repository.metadata.Versioning; import org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader; import org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Writer; @@ -597,7 +598,12 @@ private Metadata generateGroupMetadata( final Group group, final List plugins = master.getPlugins(); + if ( plugins != null && !plugins.isEmpty() ) + { return master; } diff --git a/addons/pkg-maven/ftests/src/main/java/org/commonjava/indy/pkg/maven/content/GroupMetadataForRemoteTest.java b/addons/pkg-maven/ftests/src/main/java/org/commonjava/indy/pkg/maven/content/GroupMetadataForRemoteTest.java new file mode 100644 index 0000000000..c12a84adc2 --- /dev/null +++ b/addons/pkg-maven/ftests/src/main/java/org/commonjava/indy/pkg/maven/content/GroupMetadataForRemoteTest.java @@ -0,0 +1,137 @@ +/** + * Copyright (C) 2011-2018 Red Hat, Inc. (https://github.com/Commonjava/indy) + * + * 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. + */ +package org.commonjava.indy.pkg.maven.content; + +import org.apache.commons.io.IOUtils; +import org.commonjava.indy.ftest.core.AbstractIndyFunctionalTest; +import org.commonjava.indy.model.core.Group; +import org.commonjava.indy.model.core.RemoteRepository; +import org.commonjava.test.http.expect.ExpectationServer; +import org.junit.Rule; +import org.junit.Test; + +import java.io.InputStream; + +import static org.commonjava.indy.pkg.maven.model.MavenPackageTypeDescriptor.MAVEN_PKG_KEY; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.IsNull.notNullValue; + +/** + * GIVEN: + * GroupId: o.a.maven.plugins + * ArtifactId: maven-antrun-plugin + * + *
  • + * Remote repo A contains paths and content for: + * + * org/foo/plugins/my-plugin/1.0/my-plugin-1.0.pom + * org/foo/plugins/my-plugin/maven-metadata.xml + * org/foo/plugins/maven-metadata.xml + *
    • + *
  • Group G contains A
    • + * + *
    + * WHEN: + *
      + *
    • Path org/foo/plugins/maven-metadata.xml is requested from A
      • + *
    • Path org/foo/plugins/maven-metadata.xml is requested from G
      • + *
    + * + *
    + * THEN: + *
      + *
    • Indy can get plugins maven-metadata.xml from A and G
      • + *
    + */ +public class GroupMetadataForRemoteTest + extends AbstractIndyFunctionalTest +{ + @Rule + public ExpectationServer server = new ExpectationServer( "repos" ); + + private final String REMOTE = "remote-A"; + + private final String GROUP = "group-G"; + + private final String pomPath = "org/foo/plugins/my-plugin/1.0/my-plugin-1.0.pom"; + + private final String metadataPath = "org/foo/plugins/my-plugin/maven-metadata.xml"; + + private final String metadataPluginsPath = "org/foo/plugins/maven-metadata.xml"; + + /* @formatter:off */ + final String metadataContent = "" + + " org.foo.plugins" + + " my-plugin" + + " " + + " 1.0" + + " 1.0" + + " " + + " 1.0" + + " " + + " " + + ""; + + private final String pomContent = "" + + " 4.0.0" + + " org.foo.plugins" + + " my-plugin" + + " 1.0" + + ""; + + final String metadataPluginsContent = "" + + "" + + " " + + " My Plugin" + + " mp" + + " my-plugin" + + " " + + "" + + ""; + + /* @formatter:on */ + + @Test + public void run() throws Exception + { + server.expect( server.formatUrl( REMOTE, pomPath ), 200, pomContent ); + server.expect( server.formatUrl( REMOTE, metadataPath ), 200, metadataContent ); + server.expect( server.formatUrl( REMOTE, metadataPluginsPath ), 200, metadataPluginsContent ); + + RemoteRepository remote1 = new RemoteRepository( MAVEN_PKG_KEY, REMOTE, server.formatUrl( REMOTE ) ); + remote1 = client.stores().create( remote1, "remote A", RemoteRepository.class ); + + Group g = new Group( MAVEN_PKG_KEY, GROUP, remote1.getKey() ); + g = client.stores().create( g, "Create group G", Group.class ); + + /*// Get meta from remote + try (final InputStream stream = client.content().get( remote1.getKey(), metadataPluginsPath )) + { + assertThat( stream, notNullValue() ); + String meta = IOUtils.toString( stream ); + logger.debug( "Remote A meta >>>>\n" + meta ); + }*/ + + // Get meta from group + try (final InputStream stream = client.content().get( g.getKey(), metadataPluginsPath )) + { + assertThat( stream, notNullValue() ); + String meta = IOUtils.toString( stream ); + logger.debug( "Group meta >>>>\n" + meta ); + } + + } +} diff --git a/pom.xml b/pom.xml index 740874c3be..c2beaeba07 100644 --- a/pom.xml +++ b/pom.xml @@ -939,6 +939,12 @@ org.infinispan infinispan-cachestore-jdbc ${infinispanVersion} + + + org.jboss.slf4j + slf4j-jboss-logging + + org.infinispan From 7a4b3fcaebcb7b5bb1fe16d81a4307c0b48d6a12 Mon Sep 17 00:00:00 2001 From: Rui Han Date: Thu, 11 Apr 2019 03:05:57 +0800 Subject: [PATCH 34/56] [1.7.x] Indy promote perf (#1205) * Performance fixes for promotion * Throw timeout exception in runParallelAndWait * Revert default promotion groovy to use paralleledEach --- .../promote/rules/artifact-refs-via.groovy | 20 +++-- .../rules/no-pre-existing-paths.groovy | 6 +- .../data/promote/rules/no-snapshots.groovy | 10 +-- .../promote/rules/no-version-ranges.groovy | 6 +- .../data/promote/rules/parsable-pom.groovy | 6 +- .../promote/rules/project-artifacts.groovy | 6 +- .../rules/project-version-pattern.groovy | 8 +- .../validate/PromotionValidationTools.java | 31 ++++++- .../promote/validate/PromotionValidator.java | 81 ++++++++++++++----- .../promote/data/PromotionManagerTest.java | 2 +- .../jaxrs/interceptor/MetricsInterceptor.java | 5 ++ 11 files changed, 120 insertions(+), 61 deletions(-) diff --git a/addons/promote/common/src/main/data/promote/rules/artifact-refs-via.groovy b/addons/promote/common/src/main/data/promote/rules/artifact-refs-via.groovy index 2b1a0a69bc..d44066ff45 100644 --- a/addons/promote/common/src/main/data/promote/rules/artifact-refs-via.groovy +++ b/addons/promote/common/src/main/data/promote/rules/artifact-refs-via.groovy @@ -15,7 +15,7 @@ class ArtifactRefAvailability implements ValidationRule { String validate(ValidationRequest request) { def verifyStoreKeys = request.getTools().getValidationStoreKeys(request, true); - def errors = new ArrayList() + def errors = Collections.synchronizedList(new ArrayList()); def tools = request.getTools() def dc = new ModelProcessorConfig().setIncludeBuildSection(false).setIncludeManagedDependencies(false) @@ -62,17 +62,15 @@ class ArtifactRefAvailability implements ValidationRule { } }) - synchronized (errors) { - if (!found) { - errors.add(String.format("%s is invalid: %s is not available via: %s", - it, path, StringUtils.join(verifyStoreKeys, ", "))) - } + if (!found) { + errors.add(String.format("%s is invalid: %s is not available via: %s", + it, path, StringUtils.join(verifyStoreKeys, ", "))) + } - if (!foundPom) { - errors.add(String.format("%s is invalid: %s is not available via: %s", it, - tools.toArtifactPath(target.asPomArtifact()), - StringUtils.join(verifyStoreKeys, ", "))) - } + if (!foundPom) { + errors.add(String.format("%s is invalid: %s is not available via: %s", it, + tools.toArtifactPath(target.asPomArtifact()), + StringUtils.join(verifyStoreKeys, ", "))) } } }) diff --git a/addons/promote/common/src/main/data/promote/rules/no-pre-existing-paths.groovy b/addons/promote/common/src/main/data/promote/rules/no-pre-existing-paths.groovy index 398954cee8..fce0a7ab0d 100644 --- a/addons/promote/common/src/main/data/promote/rules/no-pre-existing-paths.groovy +++ b/addons/promote/common/src/main/data/promote/rules/no-pre-existing-paths.groovy @@ -10,7 +10,7 @@ class NoPreExistingPaths implements ValidationRule { String validate(ValidationRequest request) throws PromotionValidationException { def verifyStoreKeys = request.getTools().getValidationStoreKeys(request, false); - def errors = new ArrayList() + def errors = Collections.synchronizedList(new ArrayList()); def tools = request.getTools() tools.paralleledEach(request.getSourcePaths(), { it -> @@ -18,9 +18,7 @@ class NoPreExistingPaths implements ValidationRule { if (aref != null) { tools.paralleledEach(verifyStoreKeys, { verifyStoreKey -> if (tools.exists(verifyStoreKey, it)) { - synchronized (errors) { - errors.add(String.format("%s is already available in: %s", it, verifyStoreKey)) - } + errors.add(String.format("%s is already available in: %s", it, verifyStoreKey)) } }) } diff --git a/addons/promote/common/src/main/data/promote/rules/no-snapshots.groovy b/addons/promote/common/src/main/data/promote/rules/no-snapshots.groovy index 2efbcc68e9..7aec723d63 100644 --- a/addons/promote/common/src/main/data/promote/rules/no-snapshots.groovy +++ b/addons/promote/common/src/main/data/promote/rules/no-snapshots.groovy @@ -11,7 +11,7 @@ class NoSnapshots implements ValidationRule { String validate(ValidationRequest request) { def verifyStoreKeys = request.getTools().getValidationStoreKeys(request, true) - def errors = new ArrayList() + def errors = Collections.synchronizedList(new ArrayList()); def tools = request.getTools() def dc = new ModelProcessorConfig().setIncludeBuildSection(true).setIncludeManagedPlugins(true).setIncludeManagedDependencies(true) @@ -20,9 +20,7 @@ class NoSnapshots implements ValidationRule { def ref = tools.getArtifact(it) if (ref != null) { if (!ref.getVersionSpec().isRelease()) { - synchronized (errors) { - errors.add(String.format("%s is a variable/snapshot version.", it)) - } + errors.add(String.format("%s is a variable/snapshot version.", it)) } } @@ -31,9 +29,7 @@ class NoSnapshots implements ValidationRule { tools.paralleledEach(relationships, { rel -> def target = rel.getTarget() if (!target.getVersionSpec().isRelease()) { - synchronized (errors) { - errors.add(String.format("%s uses a variable/snapshot version in: %s", target, it)) - } + errors.add(String.format("%s uses a variable/snapshot version in: %s", target, it)) } }) } diff --git a/addons/promote/common/src/main/data/promote/rules/no-version-ranges.groovy b/addons/promote/common/src/main/data/promote/rules/no-version-ranges.groovy index b2df2763c9..7035b02d43 100644 --- a/addons/promote/common/src/main/data/promote/rules/no-version-ranges.groovy +++ b/addons/promote/common/src/main/data/promote/rules/no-version-ranges.groovy @@ -10,7 +10,7 @@ class NoVersionRanges implements ValidationRule { String validate(ValidationRequest request) { def verifyStoreKeys = request.getTools().getValidationStoreKeys(request, true) - def errors = new ArrayList() + def errors = Collections.synchronizedList(new ArrayList()); def tools = request.getTools() def dc = new ModelProcessorConfig().setIncludeBuildSection(true).setIncludeManagedPlugins(true).setIncludeManagedDependencies(true) @@ -21,9 +21,7 @@ class NoVersionRanges implements ValidationRule { tools.paralleledEach(relationships, { rel -> def target = rel.getTarget() if (!target.getVersionSpec().isSingle()) { - synchronized(errors) { - errors.add(String.format( "%s uses a compound version in: %s", target, it)) - } + errors.add(String.format("%s uses a compound version in: %s", target, it)) } }) } diff --git a/addons/promote/common/src/main/data/promote/rules/parsable-pom.groovy b/addons/promote/common/src/main/data/promote/rules/parsable-pom.groovy index 764cdf1856..caa5cedd3e 100644 --- a/addons/promote/common/src/main/data/promote/rules/parsable-pom.groovy +++ b/addons/promote/common/src/main/data/promote/rules/parsable-pom.groovy @@ -8,7 +8,7 @@ import org.slf4j.LoggerFactory class ParsablePom implements ValidationRule { String validate(ValidationRequest request) { - def errors = new ArrayList() + def errors = Collections.synchronizedList(new ArrayList()); def tools = request.getTools() def logger = LoggerFactory.getLogger(ValidationRule.class) logger.info("Parsing POMs in:\n {}.", request.getSourcePaths().join("\n ")) @@ -20,9 +20,7 @@ class ParsablePom implements ValidationRule { def pom = tools.readLocalPom(it, request) } catch (Exception e) { - synchronized(errors) { - errors.add(String.format("%s: Failed to parse POM. Error was: %s", it, e)) - } + errors.add(String.format("%s: Failed to parse POM. Error was: %s", it, e)) } } }) diff --git a/addons/promote/common/src/main/data/promote/rules/project-artifacts.groovy b/addons/promote/common/src/main/data/promote/rules/project-artifacts.groovy index 0ae814e25a..cc403b7616 100644 --- a/addons/promote/common/src/main/data/promote/rules/project-artifacts.groovy +++ b/addons/promote/common/src/main/data/promote/rules/project-artifacts.groovy @@ -11,7 +11,7 @@ class ProjectArtifacts implements ValidationRule { String validate(ValidationRequest request) throws Exception { def classifierAndTypeSet = request.getValidationParameter("classifierAndTypeSet") - def errors = new ArrayList() + def errors = Collections.synchronizedList(new ArrayList()); if (classifierAndTypeSet != null) { def ctStrings = classifierAndTypeSet.split("\\s*,\\s*") @@ -57,9 +57,7 @@ class ProjectArtifacts implements ValidationRule { tcs.each { tc -> logger.trace("Checking if TC: {} is in: {} for: {}", tc, entry.value, entry.key) if (!entry.value.contains(tc)) { - synchronized(errors) { - errors.add(String.format("%s: missing artifact with type/classifier: %s", entry.key, tc)) - } + errors.add(String.format("%s: missing artifact with type/classifier: %s", entry.key, tc)) } } } diff --git a/addons/promote/common/src/main/data/promote/rules/project-version-pattern.groovy b/addons/promote/common/src/main/data/promote/rules/project-version-pattern.groovy index 7e199782bc..4f39380b31 100644 --- a/addons/promote/common/src/main/data/promote/rules/project-version-pattern.groovy +++ b/addons/promote/common/src/main/data/promote/rules/project-version-pattern.groovy @@ -9,7 +9,7 @@ class ProjectVersionPattern implements ValidationRule { String validate(ValidationRequest request) throws Exception { def versionPattern = request.getValidationParameter("versionPattern") - def errors = new ArrayList() + def errors = Collections.synchronizedList(new ArrayList()); if (versionPattern != null) { def tools = request.getTools() @@ -18,10 +18,8 @@ class ProjectVersionPattern implements ValidationRule { if (ref != null) { def vs = ref.getVersionString() if (!vs.matches(versionPattern)) { - synchronized (errors) { - errors.add(String.format("%s does not match version pattern: '%s' (version was: '%s')", - it, versionPattern, vs)) - } + errors.add(String.format("%s does not match version pattern: '%s' (version was: '%s')", + it, versionPattern, vs)) } } }) diff --git a/addons/promote/common/src/main/java/org/commonjava/indy/promote/validate/PromotionValidationTools.java b/addons/promote/common/src/main/java/org/commonjava/indy/promote/validate/PromotionValidationTools.java index b18b0a181b..9ec0659fc7 100644 --- a/addons/promote/common/src/main/java/org/commonjava/indy/promote/validate/PromotionValidationTools.java +++ b/addons/promote/common/src/main/java/org/commonjava/indy/promote/validate/PromotionValidationTools.java @@ -79,12 +79,14 @@ */ public class PromotionValidationTools { + final Logger logger = LoggerFactory.getLogger( this.getClass() ); + public static final String AVAILABLE_IN_STORES = "availableInStores"; @Deprecated public static final String AVAILABLE_IN_STORE_KEY = "availableInStoreKey"; - private static final int DEFAULT_RULE_PARALLEL_WAIT_TIME_MINS = 10; + private static final int DEFAULT_RULE_PARALLEL_WAIT_TIME_MINS = 30; @Inject private ContentManager contentManager; @@ -561,7 +563,7 @@ public void paralleledEach( Map map, Closure closure ) private void runParallelAndWait( Collection runCollection, Closure closure, Logger logger ) { - Set todo = new HashSet<>( runCollection); + Set todo = new HashSet<>( runCollection ); final CountDownLatch latch = new CountDownLatch( todo.size() ); todo.forEach( e -> ruleParallelExecutor.execute( () -> { try @@ -577,7 +579,12 @@ private void runParallelAndWait( Collection runCollection, Closure closur try { - latch.await( DEFAULT_RULE_PARALLEL_WAIT_TIME_MINS, TimeUnit.MINUTES ); + // true if the count reached zero and false if timeout + boolean finished = latch.await( DEFAULT_RULE_PARALLEL_WAIT_TIME_MINS, TimeUnit.MINUTES ); + if ( !finished ) + { + throw new RuntimeException( "Parallel execution timeout" ); + } } catch ( InterruptedException e ) { @@ -586,4 +593,22 @@ private void runParallelAndWait( Collection runCollection, Closure closur } } + public void forEach( Collection collection, Closure closure ) + { + logger.trace( "Exe on collection {} with closure {}", collection, closure ); + collection.forEach( e -> closure.call( e ) ); + } + + public void forEach( T[] array, Closure closure ) + { + logger.trace( "Exe on array {} with closure {}", array, closure ); + Arrays.asList( array ).forEach( e -> closure.call( e ) ); + } + + public void forEach( Map map, Closure closure ) + { + Set> entries = map.entrySet(); + logger.trace( "Exe on map {} with closure {}", entries, closure ); + entries.forEach( e -> closure.call( e ) ); + } } diff --git a/addons/promote/common/src/main/java/org/commonjava/indy/promote/validate/PromotionValidator.java b/addons/promote/common/src/main/java/org/commonjava/indy/promote/validate/PromotionValidator.java index e484f38bf0..1e46925023 100644 --- a/addons/promote/common/src/main/java/org/commonjava/indy/promote/validate/PromotionValidator.java +++ b/addons/promote/common/src/main/java/org/commonjava/indy/promote/validate/PromotionValidator.java @@ -16,6 +16,7 @@ package org.commonjava.indy.promote.validate; import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.ClassUtils; import org.commonjava.cdi.util.weft.DrainingExecutorCompletionService; import org.commonjava.cdi.util.weft.ExecutorConfig; import org.commonjava.cdi.util.weft.WeftExecutorService; @@ -27,6 +28,7 @@ import org.commonjava.indy.data.IndyDataException; import org.commonjava.indy.data.StoreDataManager; import org.commonjava.indy.measure.annotation.Measure; +import org.commonjava.indy.metrics.IndyMetricsManager; import org.commonjava.indy.model.core.ArtifactStore; import org.commonjava.indy.model.core.RemoteRepository; import org.commonjava.indy.promote.conf.PromoteConfig; @@ -51,7 +53,9 @@ import java.util.List; import java.util.Set; import java.util.concurrent.ExecutionException; +import java.util.concurrent.atomic.AtomicReference; +import static com.codahale.metrics.MetricRegistry.name; import static java.lang.String.format; import static org.apache.commons.lang.StringUtils.join; import static org.commonjava.indy.core.ctl.PoolUtils.detectOverloadVoid; @@ -78,6 +82,9 @@ public class PromotionValidator @Inject private PromoteConfig config; + @Inject + private IndyMetricsManager metricsManager; + @Inject @WeftManaged @ExecutorConfig( named = "promote-validation-rules-runner", threads = 20, priority = 5, loadSensitive = ExecutorConfig.BooleanLiteral.TRUE, maxLoadFactor = 400 ) @@ -90,13 +97,15 @@ protected PromotionValidator() } public PromotionValidator( PromoteValidationsManager validationsManager, PromotionValidationTools validationTools, - StoreDataManager storeDataMgr, DownloadManager downloadManager, WeftExecutorService validateService ) + StoreDataManager storeDataMgr, DownloadManager downloadManager, + WeftExecutorService validateService, IndyMetricsManager metricsManager ) { this.validationsManager = validationsManager; this.validationTools = validationTools; this.storeDataMgr = storeDataMgr; this.downloadManager = downloadManager; this.validateService = validateService; + this.metricsManager = metricsManager; } /** @@ -228,7 +237,7 @@ public ValidationRequest validate( PromoteRequest request, ValidationResult resu } } - @Measure + //@Measure <-- this does not work. Internal calls can never be intercepted. private void executeValidationRule( final String ruleRef, final ValidationRequest req, final ValidationResult result, final PromoteRequest request ) throws PromotionValidationException @@ -239,32 +248,68 @@ private void executeValidationRule( final String ruleRef, final ValidationReques ValidationRuleMapping rule = validationsManager.getRuleMappingNamed( ruleName ); if ( rule != null ) { - try + logger.debug( "Running promotion validation rule: {}", rule.getName() ); + String error = null; + if ( metricsManager != null ) { - logger.debug( "Running promotion validation rule: {}", rule.getName() ); - String error = rule.getRule().validate( req ); - if ( StringUtils.isNotEmpty( error ) ) - { - logger.debug( "{} failed", rule.getName() ); - result.addValidatorError( rule.getName(), error ); - } - else + AtomicReference ex = new AtomicReference<>(); + error = metricsManager.wrapWithStandardMetrics( () -> { + try + { + return rule.getRule().validate( req ); + } + catch ( Exception e ) + { + ex.set( e ); + return null; + } + }, () -> getMetricName( rule.getName() ) ); + + if ( ex.get() != null ) { - logger.debug( "{} succeeded", rule.getName() ); + throwException( ex.get(), rule, request ); } } - catch ( Exception e ) + else { - if ( e instanceof PromotionValidationException ) + try + { + error = rule.getRule().validate( req ); + } + catch ( Exception e ) { - throw (PromotionValidationException) e; + throwException( e, rule, request ); } + } - throw new PromotionValidationException( - "Failed to run validation rule: {} for request: {}. Reason: {}", e, - rule.getName(), request, e ); + if ( StringUtils.isNotEmpty( error ) ) + { + logger.debug( "{} failed", rule.getName() ); + result.addValidatorError( rule.getName(), error ); } + else + { + logger.debug( "{} succeeded", rule.getName() ); + } + } + } + + private void throwException( Exception e, ValidationRuleMapping rule, PromoteRequest request ) + throws PromotionValidationException + { + if ( e instanceof PromotionValidationException ) + { + throw (PromotionValidationException) e; } + + throw new PromotionValidationException( "Failed to run validation rule: {} for request: {}. Reason: {}", e, + rule.getName(), request, e ); + } + + private String getMetricName( String ruleName ) + { + String cls = ClassUtils.getAbbreviatedName( getClass().getName(), 1 ); + return name( cls, "rule", ruleName ); } private boolean needTempRepo( PromoteRequest promoteRequest ) diff --git a/addons/promote/common/src/test/java/org/commonjava/indy/promote/data/PromotionManagerTest.java b/addons/promote/common/src/test/java/org/commonjava/indy/promote/data/PromotionManagerTest.java index 651f986bfe..1cee6b402c 100644 --- a/addons/promote/common/src/test/java/org/commonjava/indy/promote/data/PromotionManagerTest.java +++ b/addons/promote/common/src/test/java/org/commonjava/indy/promote/data/PromotionManagerTest.java @@ -178,7 +178,7 @@ public void setup() galleyParts.getMavenMetadataReader(), modelProcessor, galleyParts.getTypeMapper(), galleyParts.getTransferManager(), - contentDigester ), storeManager, downloadManager, validateService ); + contentDigester ), storeManager, downloadManager, validateService, null ); PromoteConfig config = new PromoteConfig(); diff --git a/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/jaxrs/interceptor/MetricsInterceptor.java b/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/jaxrs/interceptor/MetricsInterceptor.java index fe146f6408..77e66e3d12 100644 --- a/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/jaxrs/interceptor/MetricsInterceptor.java +++ b/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/jaxrs/interceptor/MetricsInterceptor.java @@ -69,6 +69,11 @@ public Object operation( InvocationContext context ) throws Exception measure = method.getDeclaringClass().getAnnotation( Measure.class ); } + if ( measure == null ) + { + return context.proceed(); + } + String defaultName = getDefaultName( context.getMethod().getDeclaringClass(), context.getMethod().getName() ); logger.trace( "Gathering metrics for: {} using context: {}", defaultName, context.getContextData() ); From 46982a68d3933bf02e9404d68d3c903a3df6b0b5 Mon Sep 17 00:00:00 2001 From: Rui Han Date: Fri, 12 Apr 2019 00:01:36 +0800 Subject: [PATCH 35/56] Add skipVersionTest flag when doing Koji path mask repair (#1210) --- .../indy/koji/content/KojiPathPatternFormatter.java | 7 ++++++- .../org/commonjava/indy/koji/data/KojiRepairManager.java | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/addons/koji/common/src/main/java/org/commonjava/indy/koji/content/KojiPathPatternFormatter.java b/addons/koji/common/src/main/java/org/commonjava/indy/koji/content/KojiPathPatternFormatter.java index f80bbf2205..6e4f2d90ac 100644 --- a/addons/koji/common/src/main/java/org/commonjava/indy/koji/content/KojiPathPatternFormatter.java +++ b/addons/koji/common/src/main/java/org/commonjava/indy/koji/content/KojiPathPatternFormatter.java @@ -45,12 +45,17 @@ public class KojiPathPatternFormatter private final Logger logger = LoggerFactory.getLogger( getClass() ); public Set getPatterns( ArtifactRef artifactRef, List archives ) + { + return getPatterns( artifactRef, archives, false ); + } + + public Set getPatterns( ArtifactRef artifactRef, List archives, boolean skipVersionTest ) { Set patterns = new HashSet<>(); for ( KojiArchiveInfo a : archives ) { ArtifactRef ar = a.asArtifact(); - if ( !kojiUtils.isVersionSignatureAllowedWithVersion( a.getVersion() ) ) + if ( !skipVersionTest && !kojiUtils.isVersionSignatureAllowedWithVersion( a.getVersion() ) ) { logger.warn( "Cannot use Koji archive for path_mask_patterns: {}. Version '{}' is not allowed from Koji.", a, diff --git a/addons/koji/common/src/main/java/org/commonjava/indy/koji/data/KojiRepairManager.java b/addons/koji/common/src/main/java/org/commonjava/indy/koji/data/KojiRepairManager.java index 58dc28ab8d..0fcfcdecf3 100644 --- a/addons/koji/common/src/main/java/org/commonjava/indy/koji/data/KojiRepairManager.java +++ b/addons/koji/common/src/main/java/org/commonjava/indy/koji/data/KojiRepairManager.java @@ -228,7 +228,7 @@ public KojiRepairResult repairPathMask( KojiRepairRequest request, String user, } // set pathMaskPatterns using build output paths - Set patterns = kojiPathFormatter.getPatterns( artifactRef, archives ); + Set patterns = kojiPathFormatter.getPatterns( artifactRef, archives, true ); logger.debug( "For repo: {}, resetting path_mask_patterns to:\n\n{}\n\n", store.getKey(), patterns ); From d59bdf309eba62dcf3ea0a7cef138919561f6ddb Mon Sep 17 00:00:00 2001 From: Rui Han Date: Fri, 12 Apr 2019 13:56:55 +0800 Subject: [PATCH 36/56] [1.7.x] Support paralleledInBatch in promotion tool (#1209) * Support paralleledInBatch in promotion tool * Move batchsize to config and fix commented issues --- .../indy/promote/conf/PromoteConfig.java | 19 +++++ .../validate/PromotionValidationTools.java | 80 +++++++++++++++++- .../promote/data/PromotionManagerTest.java | 6 +- .../PromotionValidationToolsTest.java | 84 +++++++++++++++++++ 4 files changed, 185 insertions(+), 4 deletions(-) create mode 100644 addons/promote/common/src/test/java/org/commonjava/indy/promote/validate/PromotionValidationToolsTest.java diff --git a/addons/promote/common/src/main/java/org/commonjava/indy/promote/conf/PromoteConfig.java b/addons/promote/common/src/main/java/org/commonjava/indy/promote/conf/PromoteConfig.java index c27ff4552b..564ddc3ba7 100644 --- a/addons/promote/common/src/main/java/org/commonjava/indy/promote/conf/PromoteConfig.java +++ b/addons/promote/common/src/main/java/org/commonjava/indy/promote/conf/PromoteConfig.java @@ -39,6 +39,8 @@ public class PromoteConfig private static final String AUTOLOCK_HOSTED_REPOS = "autolock.hosted.repos"; + public static final int DEFAULT_PARALLELED_BATCH_SIZE = 100; + public static final long DEFAULT_LOCK_TIMEOUT_SECONDS = 30; public static final boolean DEFAULT_AUTOLOCK = true; @@ -53,6 +55,8 @@ public class PromoteConfig private Long lockTimeoutSeconds; + private Integer paralleledBatchSize; + public PromoteConfig() { } @@ -131,4 +135,19 @@ public InputStream getDefaultConfig() .getResourceAsStream( "default-promote.conf" ); } + @ConfigName( "paralleled.batch.size" ) + public void setParalleledBatchSize( Integer paralleledBatchSize ) + { + this.paralleledBatchSize = paralleledBatchSize; + } + + public int getParalleledBatchSize() + { + int ret = paralleledBatchSize == null ? DEFAULT_PARALLELED_BATCH_SIZE : paralleledBatchSize; + if ( ret <= 0 ) + { + ret = DEFAULT_PARALLELED_BATCH_SIZE; + } + return ret; + } } diff --git a/addons/promote/common/src/main/java/org/commonjava/indy/promote/validate/PromotionValidationTools.java b/addons/promote/common/src/main/java/org/commonjava/indy/promote/validate/PromotionValidationTools.java index 9ec0659fc7..72bed0f5da 100644 --- a/addons/promote/common/src/main/java/org/commonjava/indy/promote/validate/PromotionValidationTools.java +++ b/addons/promote/common/src/main/java/org/commonjava/indy/promote/validate/PromotionValidationTools.java @@ -27,6 +27,7 @@ import org.commonjava.indy.data.ArtifactStoreQuery; import org.commonjava.indy.model.core.ArtifactStore; import org.commonjava.indy.model.core.StoreKey; +import org.commonjava.indy.promote.conf.PromoteConfig; import org.commonjava.indy.promote.validate.model.ValidationRequest; import org.commonjava.indy.util.LocationUtils; import org.commonjava.atlas.maven.graph.rel.ProjectRelationship; @@ -112,6 +113,9 @@ public class PromotionValidationTools @Inject private ContentDigester contentDigester; + @Inject + private PromoteConfig promoteConfig; + @Inject @WeftManaged @ExecutorConfig( named = "promote-validation-rules-executor", threads = 8 ) @@ -124,7 +128,8 @@ protected PromotionValidationTools() public PromotionValidationTools( final ContentManager manager, final StoreDataManager storeDataManager, final MavenPomReader pomReader, final MavenMetadataReader metadataReader, final MavenModelProcessor modelProcessor, final TypeMapper typeMapper, - final TransferManager transferManager, final ContentDigester contentDigester ) + final TransferManager transferManager, final ContentDigester contentDigester, + final Executor ruleParallelExecutor, final PromoteConfig config ) { contentManager = manager; this.storeDataManager = storeDataManager; @@ -134,6 +139,8 @@ public PromotionValidationTools( final ContentManager manager, final StoreDataMa this.typeMapper = typeMapper; this.transferManager = transferManager; this.contentDigester = contentDigester; + this.ruleParallelExecutor = ruleParallelExecutor; + this.promoteConfig = config; } public StoreKey[] getValidationStoreKeys( final ValidationRequest request, final boolean includeSource ) @@ -561,6 +568,72 @@ public void paralleledEach( Map map, Closure closure ) runParallelAndWait( entries, closure, logger ); } + public void paralleledInBatch( Collection collection, Closure closure ) + { + int batchSize = promoteConfig.getParalleledBatchSize(); + logger.trace( "Exe parallel on collection {} with closure {} in batch {}", collection, closure, batchSize ); + Collection> batches = batch( collection, batchSize ); + runParallelInBatchAndWait( batches, closure, logger ); + } + + public void paralleledInBatch( T[] array, Closure closure ) + { + int batchSize = promoteConfig.getParalleledBatchSize(); + logger.trace( "Exe parallel on array {} with closure {} in batch {}", array, closure, batchSize ); + Collection> batches = batch( Arrays.asList( array ), batchSize ); + runParallelInBatchAndWait( batches, closure, logger ); + } + + public void paralleledInBatch( Map map, Closure closure ) + { + int batchSize = promoteConfig.getParalleledBatchSize(); + Set> entries = map.entrySet(); + logger.trace( "Exe parallel on map {} with closure {} in batch {}", entries, closure, batchSize ); + Collection>> batches = batch( entries, batchSize ); + runParallelInBatchAndWait( batches, closure, logger ); + } + + private void runParallelInBatchAndWait( Collection> batches, Closure closure, Logger logger ) + { + final CountDownLatch latch = new CountDownLatch( batches.size() ); + batches.forEach( batch -> ruleParallelExecutor.execute( () -> { + try + { + logger.trace( "The paralleled exe on batch {}", batch ); + batch.forEach( e -> closure.call( e ) ); + } + finally + { + latch.countDown(); + } + } ) ); + + waitForCompletion( latch ); + } + + private Collection> batch( Collection collection, int batchSize ) + { + Collection> batches = new ArrayList<>(); + Collection batch = new ArrayList<>( batchSize ); + int count = 0; + for ( T t : collection ) + { + ( (ArrayList) batch ).add( t ); + count++; + if ( count >= batchSize ) + { + ( (ArrayList>) batches ).add( batch ); + batch = new ArrayList<>( batchSize ); + count = 0; + } + } + if ( batch != null && !batch.isEmpty() ) + { + ( (ArrayList>) batches ).add( batch ); // first batch + } + return batches; + } + private void runParallelAndWait( Collection runCollection, Closure closure, Logger logger ) { Set todo = new HashSet<>( runCollection ); @@ -577,6 +650,11 @@ private void runParallelAndWait( Collection runCollection, Closure closur } } ) ); + waitForCompletion( latch ); + } + + private void waitForCompletion( CountDownLatch latch ) + { try { // true if the count reached zero and false if timeout diff --git a/addons/promote/common/src/test/java/org/commonjava/indy/promote/data/PromotionManagerTest.java b/addons/promote/common/src/test/java/org/commonjava/indy/promote/data/PromotionManagerTest.java index 1cee6b402c..d3dded9395 100644 --- a/addons/promote/common/src/test/java/org/commonjava/indy/promote/data/PromotionManagerTest.java +++ b/addons/promote/common/src/test/java/org/commonjava/indy/promote/data/PromotionManagerTest.java @@ -172,15 +172,15 @@ public void setup() WeftExecutorService validateService = new PoolWeftExecutorService( "test-validate-executor", (ThreadPoolExecutor) Executors.newCachedThreadPool(), 2, 10f, false,null, null ); MavenModelProcessor modelProcessor = new MavenModelProcessor(); + + PromoteConfig config = new PromoteConfig(); validator = new PromotionValidator( validationsManager, new PromotionValidationTools( contentManager, storeManager, galleyParts.getPomReader(), galleyParts.getMavenMetadataReader(), modelProcessor, galleyParts.getTypeMapper(), galleyParts.getTransferManager(), - contentDigester ), storeManager, downloadManager, validateService, null ); - - PromoteConfig config = new PromoteConfig(); + contentDigester, null, config ), storeManager, downloadManager, validateService, null ); WeftExecutorService svc = new PoolWeftExecutorService( "test-executor", (ThreadPoolExecutor) Executors.newCachedThreadPool(), 2, 10f, false,null, null ); diff --git a/addons/promote/common/src/test/java/org/commonjava/indy/promote/validate/PromotionValidationToolsTest.java b/addons/promote/common/src/test/java/org/commonjava/indy/promote/validate/PromotionValidationToolsTest.java new file mode 100644 index 0000000000..ba201fa5a3 --- /dev/null +++ b/addons/promote/common/src/test/java/org/commonjava/indy/promote/validate/PromotionValidationToolsTest.java @@ -0,0 +1,84 @@ +package org.commonjava.indy.promote.validate; + +import groovy.lang.Closure; +import org.commonjava.indy.promote.conf.PromoteConfig; +import org.junit.Test; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.concurrent.Executor; +import java.util.concurrent.Executors; + +import static junit.framework.TestCase.assertTrue; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.junit.Assert.assertThat; + +public class PromotionValidationToolsTest +{ + final String[] array = { "this", "is", "a", "err_weird", "test", "err_for", "paralleled", "err_in", "batch" }; + + @Test + public void testParalleledInBatch() + { + PromoteConfig config = new PromoteConfig(); + Executor executor = Executors.newCachedThreadPool(); + PromotionValidationTools tools = + new PromotionValidationTools( null, null, null, null, null, null, null, null, executor, + config ); + + List errors = Collections.synchronizedList( new ArrayList<>() ); + Closure closure = new Closure( null ) + { + @Override + public String call( Object arg ) + { + if ( ( (String) arg ).startsWith( "err_" ) ) + { + errors.add( (String) arg ); + } + return null; + } + }; + + tools.paralleledInBatch( array, closure ); + verifyIt( errors ); + } + + @Test + public void testParalleledInBatch_smallSize() + { + PromoteConfig config = new PromoteConfig(); + config.setParalleledBatchSize( 2 ); + + Executor executor = Executors.newCachedThreadPool(); + PromotionValidationTools tools = + new PromotionValidationTools( null, null, null, null, null, null, null, null, executor, + config ); + + List errors = Collections.synchronizedList( new ArrayList<>() ); + Closure closure = new Closure( null ) + { + @Override + public String call( Object arg ) + { + if ( ( (String) arg ).startsWith( "err_" ) ) + { + errors.add( (String) arg ); + } + return null; + } + }; + + tools.paralleledInBatch( array, closure ); + verifyIt( errors ); + } + + private void verifyIt( List errors ) + { + assertThat( errors.size(), equalTo( 3 ) ); + assertTrue( errors.contains( "err_weird" ) ); + assertTrue( errors.contains( "err_for" ) ); + assertTrue( errors.contains( "err_in" ) ); + } +} From dc1ba697491424d707a42004b841263138db0947 Mon Sep 17 00:00:00 2001 From: Gang Li Date: Fri, 12 Apr 2019 06:09:39 +0000 Subject: [PATCH 37/56] Update license header --- .../data/idxmodel/TrackingKey2StringMapper.java | 2 +- .../folo/data/TrackingKey2StringMapperTest.java | 2 +- .../indy/folo/model/TrackedContentEntryTest.java | 15 +++++++++++++++ .../validate/PromotionValidationToolsTest.java | 15 +++++++++++++++ .../def/metrics/DefaultStoragePathProvider.java | 2 +- .../template/fixture/MockStoragePathProvider.java | 2 +- .../infinispan/AbstractIndyKey2StringMapper.java | 2 +- .../indy/metrics/system/StoragePathProvider.java | 2 +- .../metrics/system/SystemGaugesSetProvider.java | 2 +- 9 files changed, 37 insertions(+), 7 deletions(-) diff --git a/addons/folo/common/src/main/java/org/commonjava/indy/folo/data/idxmodel/TrackingKey2StringMapper.java b/addons/folo/common/src/main/java/org/commonjava/indy/folo/data/idxmodel/TrackingKey2StringMapper.java index 2bf9f8470f..b689bc86a8 100644 --- a/addons/folo/common/src/main/java/org/commonjava/indy/folo/data/idxmodel/TrackingKey2StringMapper.java +++ b/addons/folo/common/src/main/java/org/commonjava/indy/folo/data/idxmodel/TrackingKey2StringMapper.java @@ -1,5 +1,5 @@ /** - * Copyright (C) 2013~2019 Red Hat, Inc. + * Copyright (C) 2011-2018 Red Hat, Inc. (https://github.com/Commonjava/indy) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addons/folo/common/src/test/java/org/commonjava/indy/folo/data/TrackingKey2StringMapperTest.java b/addons/folo/common/src/test/java/org/commonjava/indy/folo/data/TrackingKey2StringMapperTest.java index 1c812f5dc4..95be7f0e8b 100644 --- a/addons/folo/common/src/test/java/org/commonjava/indy/folo/data/TrackingKey2StringMapperTest.java +++ b/addons/folo/common/src/test/java/org/commonjava/indy/folo/data/TrackingKey2StringMapperTest.java @@ -1,5 +1,5 @@ /** - * Copyright (C) 2013~2019 Red Hat, Inc. + * Copyright (C) 2011-2018 Red Hat, Inc. (https://github.com/Commonjava/indy) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addons/folo/model-java/src/test/java/org/commonjava/indy/folo/model/TrackedContentEntryTest.java b/addons/folo/model-java/src/test/java/org/commonjava/indy/folo/model/TrackedContentEntryTest.java index deca4d5eaf..4018668d65 100644 --- a/addons/folo/model-java/src/test/java/org/commonjava/indy/folo/model/TrackedContentEntryTest.java +++ b/addons/folo/model-java/src/test/java/org/commonjava/indy/folo/model/TrackedContentEntryTest.java @@ -1,3 +1,18 @@ +/** + * Copyright (C) 2011-2018 Red Hat, Inc. (https://github.com/Commonjava/indy) + * + * 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. + */ package org.commonjava.indy.folo.model; import org.commonjava.indy.model.core.AccessChannel; diff --git a/addons/promote/common/src/test/java/org/commonjava/indy/promote/validate/PromotionValidationToolsTest.java b/addons/promote/common/src/test/java/org/commonjava/indy/promote/validate/PromotionValidationToolsTest.java index ba201fa5a3..351f0b5c69 100644 --- a/addons/promote/common/src/test/java/org/commonjava/indy/promote/validate/PromotionValidationToolsTest.java +++ b/addons/promote/common/src/test/java/org/commonjava/indy/promote/validate/PromotionValidationToolsTest.java @@ -1,3 +1,18 @@ +/** + * Copyright (C) 2011-2018 Red Hat, Inc. (https://github.com/Commonjava/indy) + * + * 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. + */ package org.commonjava.indy.promote.validate; import groovy.lang.Closure; diff --git a/filers/default/src/main/java/org/commonjava/indy/filer/def/metrics/DefaultStoragePathProvider.java b/filers/default/src/main/java/org/commonjava/indy/filer/def/metrics/DefaultStoragePathProvider.java index 1c6a7116b1..0c8063002e 100644 --- a/filers/default/src/main/java/org/commonjava/indy/filer/def/metrics/DefaultStoragePathProvider.java +++ b/filers/default/src/main/java/org/commonjava/indy/filer/def/metrics/DefaultStoragePathProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (C) 2013~2019 Red Hat, Inc. + * Copyright (C) 2011-2018 Red Hat, Inc. (https://github.com/Commonjava/indy) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/subsys/groovy/src/test/java/org/commonjava/indy/subsys/template/fixture/MockStoragePathProvider.java b/subsys/groovy/src/test/java/org/commonjava/indy/subsys/template/fixture/MockStoragePathProvider.java index d3f46beb88..5b70c5ded0 100644 --- a/subsys/groovy/src/test/java/org/commonjava/indy/subsys/template/fixture/MockStoragePathProvider.java +++ b/subsys/groovy/src/test/java/org/commonjava/indy/subsys/template/fixture/MockStoragePathProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (C) 2013~2019 Red Hat, Inc. + * Copyright (C) 2011-2018 Red Hat, Inc. (https://github.com/Commonjava/indy) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/subsys/infinispan/src/main/java/org/commonjava/indy/subsys/infinispan/AbstractIndyKey2StringMapper.java b/subsys/infinispan/src/main/java/org/commonjava/indy/subsys/infinispan/AbstractIndyKey2StringMapper.java index 1fc466ce70..445feb1959 100644 --- a/subsys/infinispan/src/main/java/org/commonjava/indy/subsys/infinispan/AbstractIndyKey2StringMapper.java +++ b/subsys/infinispan/src/main/java/org/commonjava/indy/subsys/infinispan/AbstractIndyKey2StringMapper.java @@ -1,5 +1,5 @@ /** - * Copyright (C) 2013~2019 Red Hat, Inc. + * Copyright (C) 2011-2018 Red Hat, Inc. (https://github.com/Commonjava/indy) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/system/StoragePathProvider.java b/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/system/StoragePathProvider.java index d8ffaae4e1..bb9572accc 100644 --- a/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/system/StoragePathProvider.java +++ b/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/system/StoragePathProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (C) 2013~2019 Red Hat, Inc. + * Copyright (C) 2011-2018 Red Hat, Inc. (https://github.com/Commonjava/indy) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/system/SystemGaugesSetProvider.java b/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/system/SystemGaugesSetProvider.java index b3f083cd9e..05b6fc2510 100644 --- a/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/system/SystemGaugesSetProvider.java +++ b/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/system/SystemGaugesSetProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (C) 2013~2019 Red Hat, Inc. + * Copyright (C) 2011-2018 Red Hat, Inc. (https://github.com/Commonjava/indy) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. From 7b719b6aa69223b5765d86bf6f93e3dba726f116 Mon Sep 17 00:00:00 2001 From: Gang Li Date: Fri, 12 Apr 2019 06:17:03 +0000 Subject: [PATCH 38/56] [maven-release-plugin] prepare release indy-parent-1.7.6 --- addons/autoprox/client-java/pom.xml | 2 +- addons/autoprox/common/pom.xml | 2 +- addons/autoprox/ftests/pom.xml | 2 +- addons/autoprox/jaxrs/pom.xml | 2 +- addons/autoprox/model-java/pom.xml | 2 +- addons/autoprox/pom.xml | 2 +- addons/content-browse/common/pom.xml | 2 +- addons/content-browse/ftests/pom.xml | 2 +- addons/content-browse/jaxrs/pom.xml | 2 +- addons/content-browse/model-java/pom.xml | 2 +- addons/content-browse/pom.xml | 2 +- addons/content-browse/ui/pom.xml | 2 +- addons/content-index/pom.xml | 2 +- addons/diagnostics/client-java/pom.xml | 2 +- addons/diagnostics/common/pom.xml | 2 +- addons/diagnostics/ftests/pom.xml | 2 +- addons/diagnostics/jaxrs/pom.xml | 2 +- addons/diagnostics/pom.xml | 2 +- addons/dot-maven/common/pom.xml | 2 +- addons/dot-maven/ftests/pom.xml | 2 +- addons/dot-maven/jaxrs/pom.xml | 2 +- addons/dot-maven/pom.xml | 2 +- addons/folo/client-java/pom.xml | 2 +- addons/folo/common/pom.xml | 2 +- addons/folo/ftests/pom.xml | 2 +- addons/folo/jaxrs/pom.xml | 2 +- addons/folo/model-java/pom.xml | 2 +- addons/folo/pom.xml | 2 +- addons/hosted-by-archive/client-java/pom.xml | 2 +- addons/hosted-by-archive/common/pom.xml | 2 +- addons/hosted-by-archive/ftests/pom.xml | 2 +- addons/hosted-by-archive/jaxrs/pom.xml | 2 +- addons/hosted-by-archive/pom.xml | 2 +- addons/httprox/common/pom.xml | 2 +- addons/httprox/ftests/pom.xml | 2 +- addons/httprox/jaxrs/pom.xml | 2 +- addons/httprox/pom.xml | 2 +- addons/implied-repos/client-java/pom.xml | 2 +- addons/implied-repos/common/pom.xml | 2 +- addons/implied-repos/ftests/pom.xml | 2 +- addons/implied-repos/model-java/pom.xml | 2 +- addons/implied-repos/pom.xml | 2 +- addons/koji/client-java/pom.xml | 2 +- addons/koji/common/pom.xml | 2 +- addons/koji/jaxrs/pom.xml | 2 +- addons/koji/model-java/pom.xml | 2 +- addons/koji/pom.xml | 2 +- addons/pkg-maven/common/pom.xml | 2 +- addons/pkg-maven/ftests/pom.xml | 2 +- addons/pkg-maven/jaxrs/pom.xml | 2 +- addons/pkg-maven/pom.xml | 2 +- addons/pkg-npm/common/pom.xml | 2 +- addons/pkg-npm/ftests/pom.xml | 2 +- addons/pkg-npm/jaxrs/pom.xml | 2 +- addons/pkg-npm/model-java/pom.xml | 2 +- addons/pkg-npm/pom.xml | 2 +- addons/pom.xml | 2 +- addons/promote/client-java/pom.xml | 2 +- addons/promote/common/pom.xml | 2 +- addons/promote/ftests/pom.xml | 2 +- addons/promote/jaxrs/pom.xml | 2 +- addons/promote/model-java/pom.xml | 2 +- addons/promote/pom.xml | 2 +- addons/relate/common/pom.xml | 2 +- addons/relate/ftests/pom.xml | 2 +- addons/relate/pom.xml | 2 +- addons/revisions/common/pom.xml | 2 +- addons/revisions/jaxrs/pom.xml | 2 +- addons/revisions/pom.xml | 2 +- addons/setback/common/pom.xml | 2 +- addons/setback/jaxrs/pom.xml | 2 +- addons/setback/pom.xml | 2 +- api/pom.xml | 2 +- bindings/jaxrs/pom.xml | 2 +- bindings/pom.xml | 2 +- boot/api/pom.xml | 2 +- boot/jaxrs/pom.xml | 2 +- boot/pom.xml | 2 +- clients/core-java/pom.xml | 2 +- clients/pom.xml | 2 +- core/pom.xml | 2 +- db/flat/pom.xml | 2 +- db/memory/pom.xml | 2 +- db/pom.xml | 2 +- deployments/cache-migrator/pom.xml | 2 +- deployments/launcher/pom.xml | 2 +- deployments/pom.xml | 2 +- embedder/pom.xml | 2 +- filers/default/pom.xml | 2 +- filers/pom.xml | 2 +- ftests/common/pom.xml | 2 +- ftests/core/pom.xml | 2 +- ftests/metrics/pom.xml | 2 +- ftests/pom.xml | 2 +- models/core-java/pom.xml | 2 +- models/pom.xml | 2 +- pom.xml | 240 +++++++++---------- rest/api/pom.xml | 2 +- rest/pom.xml | 2 +- subsys/cpool/pom.xml | 2 +- subsys/flatfile/pom.xml | 2 +- subsys/git/pom.xml | 2 +- subsys/groovy/pom.xml | 2 +- subsys/http/pom.xml | 2 +- subsys/infinispan/pom.xml | 2 +- subsys/jaxrs/pom.xml | 2 +- subsys/kafka/pom.xml | 2 +- subsys/keycloak/pom.xml | 2 +- subsys/metrics/core/pom.xml | 2 +- subsys/metrics/pom.xml | 2 +- subsys/metrics/reporter/pom.xml | 2 +- subsys/pom.xml | 2 +- subsys/prefetch/pom.xml | 2 +- test/db/pom.xml | 2 +- test/fixtures-core/pom.xml | 2 +- test/pom.xml | 2 +- test/providers-core/pom.xml | 2 +- test/utils/pom.xml | 2 +- tools/assemblies/pom.xml | 2 +- tools/pom.xml | 2 +- uis/layover/pom.xml | 2 +- uis/pom.xml | 2 +- 122 files changed, 241 insertions(+), 241 deletions(-) diff --git a/addons/autoprox/client-java/pom.xml b/addons/autoprox/client-java/pom.xml index b22f90c541..95b0e6fa0c 100644 --- a/addons/autoprox/client-java/pom.xml +++ b/addons/autoprox/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-autoprox - 1.7.6-SNAPSHOT + 1.7.6 indy-autoprox-client-java Indy :: Add-Ons :: Auto-Proxy :: Java Client diff --git a/addons/autoprox/common/pom.xml b/addons/autoprox/common/pom.xml index d95a500046..607dc43ab6 100644 --- a/addons/autoprox/common/pom.xml +++ b/addons/autoprox/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-autoprox - 1.7.6-SNAPSHOT + 1.7.6 indy-autoprox-common Indy :: Add-Ons :: Auto-Proxy :: Common diff --git a/addons/autoprox/ftests/pom.xml b/addons/autoprox/ftests/pom.xml index 128271a122..cabd0d33a6 100644 --- a/addons/autoprox/ftests/pom.xml +++ b/addons/autoprox/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-autoprox - 1.7.6-SNAPSHOT + 1.7.6 indy-ftests-autoprox diff --git a/addons/autoprox/jaxrs/pom.xml b/addons/autoprox/jaxrs/pom.xml index 7076236764..9fed736b0d 100644 --- a/addons/autoprox/jaxrs/pom.xml +++ b/addons/autoprox/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-autoprox - 1.7.6-SNAPSHOT + 1.7.6 indy-autoprox-jaxrs diff --git a/addons/autoprox/model-java/pom.xml b/addons/autoprox/model-java/pom.xml index 9363d60037..91c3cef03c 100644 --- a/addons/autoprox/model-java/pom.xml +++ b/addons/autoprox/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-autoprox - 1.7.6-SNAPSHOT + 1.7.6 indy-autoprox-model-java Indy :: Add-Ons :: Auto-Proxy :: Java Domain Model diff --git a/addons/autoprox/pom.xml b/addons/autoprox/pom.xml index 6af3f7bf00..5832334198 100644 --- a/addons/autoprox/pom.xml +++ b/addons/autoprox/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 1.7.6-SNAPSHOT + 1.7.6 indy-autoprox Indy :: Add-Ons :: Auto-Proxy :: Parent diff --git a/addons/content-browse/common/pom.xml b/addons/content-browse/common/pom.xml index 659fdc36aa..e49a48b61d 100644 --- a/addons/content-browse/common/pom.xml +++ b/addons/content-browse/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-content-browse - 1.7.6-SNAPSHOT + 1.7.6 indy-content-browse-common Indy :: Add-Ons :: Directory Content Browse :: Common diff --git a/addons/content-browse/ftests/pom.xml b/addons/content-browse/ftests/pom.xml index 87d9227e7a..4d579e224a 100644 --- a/addons/content-browse/ftests/pom.xml +++ b/addons/content-browse/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-content-browse - 1.7.6-SNAPSHOT + 1.7.6 indy-ftests-content-browse diff --git a/addons/content-browse/jaxrs/pom.xml b/addons/content-browse/jaxrs/pom.xml index 65f00aef77..e4f88d29b9 100644 --- a/addons/content-browse/jaxrs/pom.xml +++ b/addons/content-browse/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-content-browse - 1.7.6-SNAPSHOT + 1.7.6 indy-content-browse-jaxrs diff --git a/addons/content-browse/model-java/pom.xml b/addons/content-browse/model-java/pom.xml index 83ac1524f4..18d826d333 100644 --- a/addons/content-browse/model-java/pom.xml +++ b/addons/content-browse/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-content-browse - 1.7.6-SNAPSHOT + 1.7.6 indy-content-browse-model-java Indy :: Add-Ons :: Directory Content Browse :: Java Domain Model diff --git a/addons/content-browse/pom.xml b/addons/content-browse/pom.xml index 5d4fbc8201..af948eaf8b 100644 --- a/addons/content-browse/pom.xml +++ b/addons/content-browse/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 1.7.6-SNAPSHOT + 1.7.6 indy-content-browse Indy :: Add-Ons :: Directory Content Browse :: Parent diff --git a/addons/content-browse/ui/pom.xml b/addons/content-browse/ui/pom.xml index ddf2303fb9..a85b13be45 100644 --- a/addons/content-browse/ui/pom.xml +++ b/addons/content-browse/ui/pom.xml @@ -20,7 +20,7 @@ indy-content-browse org.commonjava.indy - 1.7.6-SNAPSHOT + 1.7.6 4.0.0 diff --git a/addons/content-index/pom.xml b/addons/content-index/pom.xml index 2605d3bb0a..91545ec6a2 100644 --- a/addons/content-index/pom.xml +++ b/addons/content-index/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 1.7.6-SNAPSHOT + 1.7.6 indy-content-index diff --git a/addons/diagnostics/client-java/pom.xml b/addons/diagnostics/client-java/pom.xml index 2b1ba8a82c..21d25f7f79 100644 --- a/addons/diagnostics/client-java/pom.xml +++ b/addons/diagnostics/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 1.7.6-SNAPSHOT + 1.7.6 indy-diagnostics-client-java Indy :: Add-Ons :: Diagnostic Tools :: Java Client diff --git a/addons/diagnostics/common/pom.xml b/addons/diagnostics/common/pom.xml index c1653e7f49..6091fe1d85 100644 --- a/addons/diagnostics/common/pom.xml +++ b/addons/diagnostics/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 1.7.6-SNAPSHOT + 1.7.6 indy-diagnostics-common Indy :: Add-Ons :: Diagnostic Tools :: Common diff --git a/addons/diagnostics/ftests/pom.xml b/addons/diagnostics/ftests/pom.xml index 30fdc6eec3..22434ea285 100644 --- a/addons/diagnostics/ftests/pom.xml +++ b/addons/diagnostics/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 1.7.6-SNAPSHOT + 1.7.6 indy-ftests-diagnostics diff --git a/addons/diagnostics/jaxrs/pom.xml b/addons/diagnostics/jaxrs/pom.xml index 570e5beab2..e813ad7825 100644 --- a/addons/diagnostics/jaxrs/pom.xml +++ b/addons/diagnostics/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 1.7.6-SNAPSHOT + 1.7.6 indy-diagnostics-jaxrs diff --git a/addons/diagnostics/pom.xml b/addons/diagnostics/pom.xml index 2a514b8114..f820480e35 100644 --- a/addons/diagnostics/pom.xml +++ b/addons/diagnostics/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 1.7.6-SNAPSHOT + 1.7.6 indy-diagnostics Indy :: Add-Ons :: Diagnostic Tools :: Parent diff --git a/addons/dot-maven/common/pom.xml b/addons/dot-maven/common/pom.xml index 0383f30f8f..eed3b0585e 100644 --- a/addons/dot-maven/common/pom.xml +++ b/addons/dot-maven/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-dot-maven - 1.7.6-SNAPSHOT + 1.7.6 indy-dot-maven-common Indy :: Add-Ons :: Dot-Maven (.m2 WebDAV) :: Common Core diff --git a/addons/dot-maven/ftests/pom.xml b/addons/dot-maven/ftests/pom.xml index 7da7b6452c..eb10d8b065 100644 --- a/addons/dot-maven/ftests/pom.xml +++ b/addons/dot-maven/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-dot-maven - 1.7.6-SNAPSHOT + 1.7.6 indy-ftests-dot-maven diff --git a/addons/dot-maven/jaxrs/pom.xml b/addons/dot-maven/jaxrs/pom.xml index f64d63e1d9..a48581ff3f 100644 --- a/addons/dot-maven/jaxrs/pom.xml +++ b/addons/dot-maven/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-dot-maven - 1.7.6-SNAPSHOT + 1.7.6 indy-dot-maven-jaxrs diff --git a/addons/dot-maven/pom.xml b/addons/dot-maven/pom.xml index bcb460538a..aea239c82d 100644 --- a/addons/dot-maven/pom.xml +++ b/addons/dot-maven/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 1.7.6-SNAPSHOT + 1.7.6 indy-dot-maven diff --git a/addons/folo/client-java/pom.xml b/addons/folo/client-java/pom.xml index 2471d02c83..304ac0d842 100644 --- a/addons/folo/client-java/pom.xml +++ b/addons/folo/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 1.7.6-SNAPSHOT + 1.7.6 indy-folo-client-java Indy :: Add-Ons :: Folo Usage Tracker :: Java Client diff --git a/addons/folo/common/pom.xml b/addons/folo/common/pom.xml index c6af6b1d1f..6d9c060abf 100644 --- a/addons/folo/common/pom.xml +++ b/addons/folo/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 1.7.6-SNAPSHOT + 1.7.6 indy-folo-common Indy :: Add-Ons :: Folo Usage Tracker :: Common diff --git a/addons/folo/ftests/pom.xml b/addons/folo/ftests/pom.xml index 67ebad9010..a97588dff4 100644 --- a/addons/folo/ftests/pom.xml +++ b/addons/folo/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 1.7.6-SNAPSHOT + 1.7.6 indy-ftests-folo diff --git a/addons/folo/jaxrs/pom.xml b/addons/folo/jaxrs/pom.xml index 7559688458..8366b061da 100644 --- a/addons/folo/jaxrs/pom.xml +++ b/addons/folo/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 1.7.6-SNAPSHOT + 1.7.6 indy-folo-jaxrs diff --git a/addons/folo/model-java/pom.xml b/addons/folo/model-java/pom.xml index 0287796193..3399364559 100644 --- a/addons/folo/model-java/pom.xml +++ b/addons/folo/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 1.7.6-SNAPSHOT + 1.7.6 indy-folo-model-java Indy :: Add-Ons :: Folo Usage Tracker :: Java Domain Model diff --git a/addons/folo/pom.xml b/addons/folo/pom.xml index 5962c0c61f..e0c3922a8b 100644 --- a/addons/folo/pom.xml +++ b/addons/folo/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 1.7.6-SNAPSHOT + 1.7.6 indy-folo Indy :: Add-Ons :: Folo Usage Tracker :: Parent diff --git a/addons/hosted-by-archive/client-java/pom.xml b/addons/hosted-by-archive/client-java/pom.xml index 43f593614a..ab47149e3e 100644 --- a/addons/hosted-by-archive/client-java/pom.xml +++ b/addons/hosted-by-archive/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-hosted-by-archive - 1.7.6-SNAPSHOT + 1.7.6 indy-hosted-by-archive-client-java Indy :: Add-Ons :: Hosted By Archive :: Java Client diff --git a/addons/hosted-by-archive/common/pom.xml b/addons/hosted-by-archive/common/pom.xml index cac110ab46..227eec7170 100644 --- a/addons/hosted-by-archive/common/pom.xml +++ b/addons/hosted-by-archive/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-hosted-by-archive - 1.7.6-SNAPSHOT + 1.7.6 indy-hosted-by-archive-common Indy :: Add-Ons :: Hosted By Archive :: Common diff --git a/addons/hosted-by-archive/ftests/pom.xml b/addons/hosted-by-archive/ftests/pom.xml index 14d707e8e5..d930bb7395 100644 --- a/addons/hosted-by-archive/ftests/pom.xml +++ b/addons/hosted-by-archive/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-hosted-by-archive - 1.7.6-SNAPSHOT + 1.7.6 indy-ftests-hosted-by-archive diff --git a/addons/hosted-by-archive/jaxrs/pom.xml b/addons/hosted-by-archive/jaxrs/pom.xml index 9d8be55ea0..5faef45441 100644 --- a/addons/hosted-by-archive/jaxrs/pom.xml +++ b/addons/hosted-by-archive/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-hosted-by-archive - 1.7.6-SNAPSHOT + 1.7.6 indy-hosted-by-archive-jaxrs diff --git a/addons/hosted-by-archive/pom.xml b/addons/hosted-by-archive/pom.xml index 8c4995ec4f..c83bbcba2e 100644 --- a/addons/hosted-by-archive/pom.xml +++ b/addons/hosted-by-archive/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 1.7.6-SNAPSHOT + 1.7.6 indy-hosted-by-archive Indy :: Add-Ons :: Hosted By Archive :: Parent diff --git a/addons/httprox/common/pom.xml b/addons/httprox/common/pom.xml index 5457d64523..fb45585eab 100644 --- a/addons/httprox/common/pom.xml +++ b/addons/httprox/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 1.7.6-SNAPSHOT + 1.7.6 indy-httprox-common Indy :: Add-Ons :: HTTProx (HTTP Proxy) :: Common Core diff --git a/addons/httprox/ftests/pom.xml b/addons/httprox/ftests/pom.xml index 30d0aca25e..66ab884a2f 100644 --- a/addons/httprox/ftests/pom.xml +++ b/addons/httprox/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 1.7.6-SNAPSHOT + 1.7.6 indy-ftests-httprox diff --git a/addons/httprox/jaxrs/pom.xml b/addons/httprox/jaxrs/pom.xml index 371f8a9103..f7df3712f1 100644 --- a/addons/httprox/jaxrs/pom.xml +++ b/addons/httprox/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 1.7.6-SNAPSHOT + 1.7.6 indy-httprox-jaxrs Indy :: Add-Ons :: HTTProx (HTTP Proxy) :: JAX-RS Handlers diff --git a/addons/httprox/pom.xml b/addons/httprox/pom.xml index 1eb7fc2962..214b39f1d4 100644 --- a/addons/httprox/pom.xml +++ b/addons/httprox/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 1.7.6-SNAPSHOT + 1.7.6 indy-httprox diff --git a/addons/implied-repos/client-java/pom.xml b/addons/implied-repos/client-java/pom.xml index 57ef391d11..c31783ecba 100644 --- a/addons/implied-repos/client-java/pom.xml +++ b/addons/implied-repos/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-implied-repos - 1.7.6-SNAPSHOT + 1.7.6 indy-implied-repos-client-java Indy :: Add-Ons :: Implied Repositories :: Java Client diff --git a/addons/implied-repos/common/pom.xml b/addons/implied-repos/common/pom.xml index b8b9800b81..409f8285b7 100644 --- a/addons/implied-repos/common/pom.xml +++ b/addons/implied-repos/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-implied-repos - 1.7.6-SNAPSHOT + 1.7.6 indy-implied-repos-common Indy :: Add-Ons :: Implied Repositories :: Common diff --git a/addons/implied-repos/ftests/pom.xml b/addons/implied-repos/ftests/pom.xml index e64862ac6d..58f96d210a 100644 --- a/addons/implied-repos/ftests/pom.xml +++ b/addons/implied-repos/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-implied-repos - 1.7.6-SNAPSHOT + 1.7.6 indy-ftests-implied-repos diff --git a/addons/implied-repos/model-java/pom.xml b/addons/implied-repos/model-java/pom.xml index 576c24fa54..98425a81e4 100644 --- a/addons/implied-repos/model-java/pom.xml +++ b/addons/implied-repos/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-implied-repos - 1.7.6-SNAPSHOT + 1.7.6 indy-implied-repos-model-java Indy :: Add-Ons :: Implied Repositories :: Java Domain Model diff --git a/addons/implied-repos/pom.xml b/addons/implied-repos/pom.xml index b808ad2dde..b287840acf 100644 --- a/addons/implied-repos/pom.xml +++ b/addons/implied-repos/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 1.7.6-SNAPSHOT + 1.7.6 indy-implied-repos Indy :: Add-Ons :: Implied Repositories :: Parent diff --git a/addons/koji/client-java/pom.xml b/addons/koji/client-java/pom.xml index 6f8e2f5a40..64b2811286 100644 --- a/addons/koji/client-java/pom.xml +++ b/addons/koji/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 1.7.6-SNAPSHOT + 1.7.6 indy-koji-client-java Indy :: Add-Ons :: Koji Integration :: Java Client diff --git a/addons/koji/common/pom.xml b/addons/koji/common/pom.xml index 98668ca7b2..ad4442e19f 100644 --- a/addons/koji/common/pom.xml +++ b/addons/koji/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 1.7.6-SNAPSHOT + 1.7.6 indy-koji-common Indy :: Add-Ons :: Koji Integration :: Common diff --git a/addons/koji/jaxrs/pom.xml b/addons/koji/jaxrs/pom.xml index 51eb4fd53b..aad5e95ce1 100644 --- a/addons/koji/jaxrs/pom.xml +++ b/addons/koji/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 1.7.6-SNAPSHOT + 1.7.6 indy-koji-jaxrs diff --git a/addons/koji/model-java/pom.xml b/addons/koji/model-java/pom.xml index bd1449209a..4731405709 100644 --- a/addons/koji/model-java/pom.xml +++ b/addons/koji/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 1.7.6-SNAPSHOT + 1.7.6 indy-koji-model-java Indy :: Add-Ons :: Koji Integration :: Java Domain Model diff --git a/addons/koji/pom.xml b/addons/koji/pom.xml index 4f76e616bb..782fa0171c 100644 --- a/addons/koji/pom.xml +++ b/addons/koji/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 1.7.6-SNAPSHOT + 1.7.6 indy-koji Indy :: Add-Ons :: Koji Integration :: Parent diff --git a/addons/pkg-maven/common/pom.xml b/addons/pkg-maven/common/pom.xml index f5fb47e15d..3925fc4da6 100644 --- a/addons/pkg-maven/common/pom.xml +++ b/addons/pkg-maven/common/pom.xml @@ -20,7 +20,7 @@ indy-pkg-maven org.commonjava.indy - 1.7.6-SNAPSHOT + 1.7.6 4.0.0 diff --git a/addons/pkg-maven/ftests/pom.xml b/addons/pkg-maven/ftests/pom.xml index b300248aef..67007c6ff3 100644 --- a/addons/pkg-maven/ftests/pom.xml +++ b/addons/pkg-maven/ftests/pom.xml @@ -20,7 +20,7 @@ indy-pkg-maven org.commonjava.indy - 1.7.6-SNAPSHOT + 1.7.6 4.0.0 diff --git a/addons/pkg-maven/jaxrs/pom.xml b/addons/pkg-maven/jaxrs/pom.xml index 710e9278a8..1861ee8edc 100644 --- a/addons/pkg-maven/jaxrs/pom.xml +++ b/addons/pkg-maven/jaxrs/pom.xml @@ -20,7 +20,7 @@ indy-pkg-maven org.commonjava.indy - 1.7.6-SNAPSHOT + 1.7.6 4.0.0 diff --git a/addons/pkg-maven/pom.xml b/addons/pkg-maven/pom.xml index a126fa072d..8b6643ede0 100644 --- a/addons/pkg-maven/pom.xml +++ b/addons/pkg-maven/pom.xml @@ -20,7 +20,7 @@ indy-addons org.commonjava.indy - 1.7.6-SNAPSHOT + 1.7.6 4.0.0 diff --git a/addons/pkg-npm/common/pom.xml b/addons/pkg-npm/common/pom.xml index 7786461dad..fb5a910cf1 100644 --- a/addons/pkg-npm/common/pom.xml +++ b/addons/pkg-npm/common/pom.xml @@ -20,7 +20,7 @@ indy-pkg-npm org.commonjava.indy - 1.7.6-SNAPSHOT + 1.7.6 4.0.0 diff --git a/addons/pkg-npm/ftests/pom.xml b/addons/pkg-npm/ftests/pom.xml index 1bab31ec3d..8015e4399b 100644 --- a/addons/pkg-npm/ftests/pom.xml +++ b/addons/pkg-npm/ftests/pom.xml @@ -20,7 +20,7 @@ indy-pkg-npm org.commonjava.indy - 1.7.6-SNAPSHOT + 1.7.6 4.0.0 diff --git a/addons/pkg-npm/jaxrs/pom.xml b/addons/pkg-npm/jaxrs/pom.xml index 6b6dec40bc..7fe616b9c0 100644 --- a/addons/pkg-npm/jaxrs/pom.xml +++ b/addons/pkg-npm/jaxrs/pom.xml @@ -20,7 +20,7 @@ indy-pkg-npm org.commonjava.indy - 1.7.6-SNAPSHOT + 1.7.6 4.0.0 diff --git a/addons/pkg-npm/model-java/pom.xml b/addons/pkg-npm/model-java/pom.xml index 022b8adc41..fbf4d2de64 100644 --- a/addons/pkg-npm/model-java/pom.xml +++ b/addons/pkg-npm/model-java/pom.xml @@ -20,7 +20,7 @@ indy-pkg-npm org.commonjava.indy - 1.7.6-SNAPSHOT + 1.7.6 4.0.0 diff --git a/addons/pkg-npm/pom.xml b/addons/pkg-npm/pom.xml index ef92dfb92a..a9b4ada2e7 100644 --- a/addons/pkg-npm/pom.xml +++ b/addons/pkg-npm/pom.xml @@ -20,7 +20,7 @@ indy-addons org.commonjava.indy - 1.7.6-SNAPSHOT + 1.7.6 4.0.0 diff --git a/addons/pom.xml b/addons/pom.xml index d1d099fede..5fbe861d45 100644 --- a/addons/pom.xml +++ b/addons/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-parent - 1.7.6-SNAPSHOT + 1.7.6 indy-addons diff --git a/addons/promote/client-java/pom.xml b/addons/promote/client-java/pom.xml index f3d686cdc1..ee51ea8228 100644 --- a/addons/promote/client-java/pom.xml +++ b/addons/promote/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 1.7.6-SNAPSHOT + 1.7.6 indy-promote-client-java Indy :: Add-Ons :: Artifact Promotion :: Java Client diff --git a/addons/promote/common/pom.xml b/addons/promote/common/pom.xml index 6750239579..17a89b3b19 100644 --- a/addons/promote/common/pom.xml +++ b/addons/promote/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 1.7.6-SNAPSHOT + 1.7.6 indy-promote-common Indy :: Add-Ons :: Artifact Promotion :: Common diff --git a/addons/promote/ftests/pom.xml b/addons/promote/ftests/pom.xml index 7f117c0ffd..e23fe8f0ee 100644 --- a/addons/promote/ftests/pom.xml +++ b/addons/promote/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 1.7.6-SNAPSHOT + 1.7.6 indy-ftests-promote diff --git a/addons/promote/jaxrs/pom.xml b/addons/promote/jaxrs/pom.xml index 3eb70822bc..bcb149f5c9 100644 --- a/addons/promote/jaxrs/pom.xml +++ b/addons/promote/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 1.7.6-SNAPSHOT + 1.7.6 indy-promote-jaxrs diff --git a/addons/promote/model-java/pom.xml b/addons/promote/model-java/pom.xml index 08b8f0b117..9afad67b33 100644 --- a/addons/promote/model-java/pom.xml +++ b/addons/promote/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 1.7.6-SNAPSHOT + 1.7.6 indy-promote-model-java Indy :: Add-Ons :: Artifact Promotion :: Java Domain Model diff --git a/addons/promote/pom.xml b/addons/promote/pom.xml index 0439ea4da4..e811f6bc12 100644 --- a/addons/promote/pom.xml +++ b/addons/promote/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 1.7.6-SNAPSHOT + 1.7.6 indy-promote Indy :: Add-Ons :: Artifact Promotion :: Parent diff --git a/addons/relate/common/pom.xml b/addons/relate/common/pom.xml index e1a89abacc..71ae378545 100644 --- a/addons/relate/common/pom.xml +++ b/addons/relate/common/pom.xml @@ -20,7 +20,7 @@ indy-relate org.commonjava.indy - 1.7.6-SNAPSHOT + 1.7.6 4.0.0 diff --git a/addons/relate/ftests/pom.xml b/addons/relate/ftests/pom.xml index 2021d29675..24b8c9d1fe 100644 --- a/addons/relate/ftests/pom.xml +++ b/addons/relate/ftests/pom.xml @@ -20,7 +20,7 @@ indy-relate org.commonjava.indy - 1.7.6-SNAPSHOT + 1.7.6 4.0.0 diff --git a/addons/relate/pom.xml b/addons/relate/pom.xml index 9857fe6cdb..4b07227539 100644 --- a/addons/relate/pom.xml +++ b/addons/relate/pom.xml @@ -21,7 +21,7 @@ indy-addons org.commonjava.indy - 1.7.6-SNAPSHOT + 1.7.6 indy-relate diff --git a/addons/revisions/common/pom.xml b/addons/revisions/common/pom.xml index 2c0d93654e..382c6bbd87 100644 --- a/addons/revisions/common/pom.xml +++ b/addons/revisions/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-revisions - 1.7.6-SNAPSHOT + 1.7.6 indy-revisions-common Indy :: Add-Ons :: Revisions :: Common diff --git a/addons/revisions/jaxrs/pom.xml b/addons/revisions/jaxrs/pom.xml index 59a113f019..ab21fad1f1 100644 --- a/addons/revisions/jaxrs/pom.xml +++ b/addons/revisions/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-revisions - 1.7.6-SNAPSHOT + 1.7.6 indy-revisions-jaxrs diff --git a/addons/revisions/pom.xml b/addons/revisions/pom.xml index 91d0010fc5..ae2e325aa5 100644 --- a/addons/revisions/pom.xml +++ b/addons/revisions/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 1.7.6-SNAPSHOT + 1.7.6 indy-revisions Indy :: Add-Ons :: Revisions :: Parent diff --git a/addons/setback/common/pom.xml b/addons/setback/common/pom.xml index 1a19fbd496..1e4341ee0c 100644 --- a/addons/setback/common/pom.xml +++ b/addons/setback/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-setback - 1.7.6-SNAPSHOT + 1.7.6 indy-setback-common Indy :: Add-Ons :: Set-Back :: Common diff --git a/addons/setback/jaxrs/pom.xml b/addons/setback/jaxrs/pom.xml index 81288c23f3..3dab8261d4 100644 --- a/addons/setback/jaxrs/pom.xml +++ b/addons/setback/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-setback - 1.7.6-SNAPSHOT + 1.7.6 indy-setback-jaxrs diff --git a/addons/setback/pom.xml b/addons/setback/pom.xml index dda1052627..2508f21062 100644 --- a/addons/setback/pom.xml +++ b/addons/setback/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 1.7.6-SNAPSHOT + 1.7.6 indy-setback Indy :: Add-Ons :: Set-Back :: Parent diff --git a/api/pom.xml b/api/pom.xml index dc952d41b6..c1deb210d6 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 1.7.6-SNAPSHOT + 1.7.6 indy-api diff --git a/bindings/jaxrs/pom.xml b/bindings/jaxrs/pom.xml index bb2941497a..00655a9540 100644 --- a/bindings/jaxrs/pom.xml +++ b/bindings/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-bindings - 1.7.6-SNAPSHOT + 1.7.6 indy-bindings-jaxrs diff --git a/bindings/pom.xml b/bindings/pom.xml index aa6a3d64d7..5d231fbe1f 100644 --- a/bindings/pom.xml +++ b/bindings/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-parent - 1.7.6-SNAPSHOT + 1.7.6 indy-bindings diff --git a/boot/api/pom.xml b/boot/api/pom.xml index 1995e2a87c..8165c47fd0 100644 --- a/boot/api/pom.xml +++ b/boot/api/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.boot indy-booters - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy.boot diff --git a/boot/jaxrs/pom.xml b/boot/jaxrs/pom.xml index b849c6ff9f..b76ca03c15 100644 --- a/boot/jaxrs/pom.xml +++ b/boot/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.boot indy-booters - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy.boot diff --git a/boot/pom.xml b/boot/pom.xml index d5e6d3a1a2..948549a57e 100644 --- a/boot/pom.xml +++ b/boot/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy.boot diff --git a/clients/core-java/pom.xml b/clients/core-java/pom.xml index b6d439b482..97cdd05767 100644 --- a/clients/core-java/pom.xml +++ b/clients/core-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-clients-parent - 1.7.6-SNAPSHOT + 1.7.6 indy-client-core-java diff --git a/clients/pom.xml b/clients/pom.xml index bd59c594a4..71a6c6a24b 100644 --- a/clients/pom.xml +++ b/clients/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 1.7.6-SNAPSHOT + 1.7.6 indy-clients-parent diff --git a/core/pom.xml b/core/pom.xml index 36db4fbb95..596a0fa9dc 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 1.7.6-SNAPSHOT + 1.7.6 indy-core diff --git a/db/flat/pom.xml b/db/flat/pom.xml index c03437b38b..7db390c8ab 100644 --- a/db/flat/pom.xml +++ b/db/flat/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 1.7.6-SNAPSHOT + 1.7.6 indy-db-flat diff --git a/db/memory/pom.xml b/db/memory/pom.xml index 22448c710b..caf516548c 100644 --- a/db/memory/pom.xml +++ b/db/memory/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 1.7.6-SNAPSHOT + 1.7.6 indy-db-memory diff --git a/db/pom.xml b/db/pom.xml index 50a0eea067..f6cdd17579 100644 --- a/db/pom.xml +++ b/db/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 1.7.6-SNAPSHOT + 1.7.6 indy-db diff --git a/deployments/cache-migrator/pom.xml b/deployments/cache-migrator/pom.xml index 004228418d..90bdd7de4b 100644 --- a/deployments/cache-migrator/pom.xml +++ b/deployments/cache-migrator/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-deployments - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy.launch diff --git a/deployments/launcher/pom.xml b/deployments/launcher/pom.xml index 848118715a..713ceb1126 100644 --- a/deployments/launcher/pom.xml +++ b/deployments/launcher/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-deployments - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy.launch diff --git a/deployments/pom.xml b/deployments/pom.xml index faf6542db5..df149a00d0 100644 --- a/deployments/pom.xml +++ b/deployments/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy diff --git a/embedder/pom.xml b/embedder/pom.xml index 92a49b522d..e7972173f1 100644 --- a/embedder/pom.xml +++ b/embedder/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy.embed diff --git a/filers/default/pom.xml b/filers/default/pom.xml index db03e3e305..a7a8bb1ee6 100644 --- a/filers/default/pom.xml +++ b/filers/default/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-file-managers - 1.7.6-SNAPSHOT + 1.7.6 indy-filer-default diff --git a/filers/pom.xml b/filers/pom.xml index 11e29439eb..191316c75b 100644 --- a/filers/pom.xml +++ b/filers/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 1.7.6-SNAPSHOT + 1.7.6 indy-file-managers diff --git a/ftests/common/pom.xml b/ftests/common/pom.xml index 3c01e4516b..84045f38ae 100644 --- a/ftests/common/pom.xml +++ b/ftests/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-ftests-parent - 1.7.6-SNAPSHOT + 1.7.6 indy-ftests-common diff --git a/ftests/core/pom.xml b/ftests/core/pom.xml index 7b11b07208..9b98490c92 100644 --- a/ftests/core/pom.xml +++ b/ftests/core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-ftests-parent - 1.7.6-SNAPSHOT + 1.7.6 indy-ftests-core diff --git a/ftests/metrics/pom.xml b/ftests/metrics/pom.xml index a28dac1649..171712962b 100644 --- a/ftests/metrics/pom.xml +++ b/ftests/metrics/pom.xml @@ -20,7 +20,7 @@ indy-ftests-parent org.commonjava.indy - 1.7.6-SNAPSHOT + 1.7.6 4.0.0 diff --git a/ftests/pom.xml b/ftests/pom.xml index ce7004fd38..ddea3222bf 100644 --- a/ftests/pom.xml +++ b/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 1.7.6-SNAPSHOT + 1.7.6 indy-ftests-parent diff --git a/models/core-java/pom.xml b/models/core-java/pom.xml index e279b43462..102168b16f 100644 --- a/models/core-java/pom.xml +++ b/models/core-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-models-parent - 1.7.6-SNAPSHOT + 1.7.6 indy-model-core-java diff --git a/models/pom.xml b/models/pom.xml index 4525cdc361..31fd7cb18b 100644 --- a/models/pom.xml +++ b/models/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 1.7.6-SNAPSHOT + 1.7.6 indy-models-parent diff --git a/pom.xml b/pom.xml index c2beaeba07..31b5198e75 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.commonjava.indy indy-parent - 1.7.6-SNAPSHOT + 1.7.6 pom @@ -37,7 +37,7 @@ scm:git:https://github.com/Commonjava/indy.git scm:git:git@github.com:Commonjava/indy.git http://github.com/Commonjava/indy - indy-parent-1.6.0 + indy-parent-1.7.6 @@ -151,7 +151,7 @@ org.commonjava.indy.ui indy-ui-layover - 1.7.6-SNAPSHOT + 1.7.6 runtime @@ -159,22 +159,22 @@ org.commonjava.indy indy-model-core-java - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy indy-api - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy indy-core - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy indy-core - 1.7.6-SNAPSHOT + 1.7.6 tar.gz confset provided @@ -182,17 +182,17 @@ org.commonjava.indy indy-db-flat - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy indy-bindings-jaxrs - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy.launch indy-launcher - 1.7.6-SNAPSHOT + 1.7.6 tar.gz skinny provided @@ -200,7 +200,7 @@ org.commonjava.indy.launch indy-launcher - 1.7.6-SNAPSHOT + 1.7.6 tar.gz complete provided @@ -208,7 +208,7 @@ org.commonjava.indy.launch indy-launcher - 1.7.6-SNAPSHOT + 1.7.6 tar.gz data provided @@ -216,7 +216,7 @@ org.commonjava.indy.launch indy-launcher - 1.7.6-SNAPSHOT + 1.7.6 tar.gz etc provided @@ -225,17 +225,17 @@ org.commonjava.indy indy-autoprox-jaxrs - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy indy-autoprox-common - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy indy-autoprox-common - 1.7.6-SNAPSHOT + 1.7.6 tar.gz dataset provided @@ -243,7 +243,7 @@ org.commonjava.indy indy-autoprox-common - 1.7.6-SNAPSHOT + 1.7.6 tar.gz docset provided @@ -251,7 +251,7 @@ org.commonjava.indy indy-autoprox-common - 1.7.6-SNAPSHOT + 1.7.6 tar.gz confset provided @@ -259,7 +259,7 @@ org.commonjava.indy indy-autoprox-common - 1.7.6-SNAPSHOT + 1.7.6 tar.gz uiset provided @@ -267,32 +267,32 @@ org.commonjava.indy indy-autoprox-model-java - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy indy-autoprox-client-java - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy indy-ftests-autoprox - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy indy-setback-jaxrs - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy indy-setback-common - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy indy-setback-common - 1.7.6-SNAPSHOT + 1.7.6 tar.gz dataset provided @@ -300,7 +300,7 @@ org.commonjava.indy indy-setback-common - 1.7.6-SNAPSHOT + 1.7.6 tar.gz confset provided @@ -308,17 +308,17 @@ org.commonjava.indy indy-revisions-jaxrs - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy indy-revisions-common - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy indy-revisions-common - 1.7.6-SNAPSHOT + 1.7.6 tar.gz confset provided @@ -326,7 +326,7 @@ org.commonjava.indy indy-revisions-common - 1.7.6-SNAPSHOT + 1.7.6 tar.gz uiset provided @@ -334,12 +334,12 @@ org.commonjava.indy indy-dot-maven-common - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy indy-dot-maven-common - 1.7.6-SNAPSHOT + 1.7.6 tar.gz dataset provided @@ -347,22 +347,22 @@ org.commonjava.indy indy-dot-maven-jaxrs - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy indy-ftests-dot-maven - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy indy-httprox-common - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy indy-httprox-common - 1.7.6-SNAPSHOT + 1.7.6 tar.gz confset provided @@ -370,17 +370,17 @@ org.commonjava.indy indy-ftests-httprox - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy indy-content-index - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy indy-content-index - 1.7.6-SNAPSHOT + 1.7.6 tar.gz confset provided @@ -388,123 +388,123 @@ org.commonjava.indy indy-db-memory - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy indy-test-db - 1.7.6-SNAPSHOT + 1.7.6 test org.commonjava.indy indy-test-fixtures-core - 1.7.6-SNAPSHOT + 1.7.6 test org.commonjava.indy indy-test-providers-core - 1.7.6-SNAPSHOT + 1.7.6 test org.commonjava.indy indy-test-utils - 1.7.6-SNAPSHOT + 1.7.6 test org.commonjava.indy indy-filer-default - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy indy-subsys-jaxrs - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy indy-subsys-flatfile - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy indy-subsys-infinispan - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy indy-subsys-http - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy indy-subsys-git - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy indy-subsys-groovy - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy indy-subsys-prefetch - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy indy-subsys-cpool - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy indy-client-core-java - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy indy-ftests-common - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy indy-ftests-core - 1.7.6-SNAPSHOT + 1.7.6 test org.commonjava.indy indy-folo-jaxrs - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy indy-ftests-folo - 1.7.6-SNAPSHOT + 1.7.6 test org.commonjava.indy indy-folo-client-java - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy indy-folo-model-java - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy indy-folo-common - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy indy-folo-common - 1.7.6-SNAPSHOT + 1.7.6 tar.gz dataset provided @@ -512,7 +512,7 @@ org.commonjava.indy indy-folo-common - 1.7.6-SNAPSHOT + 1.7.6 tar.gz confset provided @@ -520,33 +520,33 @@ org.commonjava.indy indy-promote-jaxrs - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy indy-ftests-promote - 1.7.6-SNAPSHOT + 1.7.6 test org.commonjava.indy indy-promote-client-java - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy indy-promote-model-java - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy indy-promote-common - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy indy-promote-common - 1.7.6-SNAPSHOT + 1.7.6 tar.gz confset provided @@ -554,7 +554,7 @@ org.commonjava.indy indy-promote-common - 1.7.6-SNAPSHOT + 1.7.6 tar.gz dataset provided @@ -562,19 +562,19 @@ org.commonjava.indy indy-promote-common - 1.7.6-SNAPSHOT + 1.7.6 dataset provided org.commonjava.indy indy-implied-repos-common - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy indy-implied-repos-common - 1.7.6-SNAPSHOT + 1.7.6 tar.gz confset provided @@ -582,27 +582,27 @@ org.commonjava.indy indy-implied-repos-model-java - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy indy-implied-repos-client-java - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy indy-ftests-implied-repos - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy indy-relate-common - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy indy-relate-common - 1.7.6-SNAPSHOT + 1.7.6 tar.gz confset provided @@ -610,32 +610,32 @@ org.commonjava.indy indy-ftests-relate - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy.embed indy-embedder - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy.boot indy-booter-api - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy.boot indy-booter-jaxrs - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy indy-subsys-keycloak - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy indy-subsys-keycloak - 1.7.6-SNAPSHOT + 1.7.6 tar.gz confset provided @@ -643,7 +643,7 @@ org.commonjava.indy indy-subsys-infinispan - 1.7.6-SNAPSHOT + 1.7.6 tar.gz confset provided @@ -651,7 +651,7 @@ org.commonjava.indy indy-subsys-prefetch - 1.7.6-SNAPSHOT + 1.7.6 tar.gz confset provided @@ -660,7 +660,7 @@ org.commonjava.indy indy-koji-common - 1.7.6-SNAPSHOT + 1.7.6 tar.gz confset provided @@ -668,22 +668,22 @@ org.commonjava.indy indy-koji-common - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy indy-koji-model-java - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy indy-koji-client-java - 1.7.6-SNAPSHOT + 1.7.6 org.commonjava.indy indy-koji-jaxrs - 1.7.6-SNAPSHOT + 1.7.6 runtime @@ -159,22 +159,22 @@ org.commonjava.indy indy-model-core-java - 1.7.6 + 1.7.7-SNAPSHOT org.commonjava.indy indy-api - 1.7.6 + 1.7.7-SNAPSHOT org.commonjava.indy indy-core - 1.7.6 + 1.7.7-SNAPSHOT org.commonjava.indy indy-core - 1.7.6 + 1.7.7-SNAPSHOT tar.gz confset provided @@ -182,17 +182,17 @@ org.commonjava.indy indy-db-flat - 1.7.6 + 1.7.7-SNAPSHOT org.commonjava.indy indy-bindings-jaxrs - 1.7.6 + 1.7.7-SNAPSHOT org.commonjava.indy.launch indy-launcher - 1.7.6 + 1.7.7-SNAPSHOT tar.gz skinny provided @@ -200,7 +200,7 @@ org.commonjava.indy.launch indy-launcher - 1.7.6 + 1.7.7-SNAPSHOT tar.gz complete provided @@ -208,7 +208,7 @@ org.commonjava.indy.launch indy-launcher - 1.7.6 + 1.7.7-SNAPSHOT tar.gz data provided @@ -216,7 +216,7 @@ org.commonjava.indy.launch indy-launcher - 1.7.6 + 1.7.7-SNAPSHOT tar.gz etc provided @@ -225,17 +225,17 @@ org.commonjava.indy indy-autoprox-jaxrs - 1.7.6 + 1.7.7-SNAPSHOT org.commonjava.indy indy-autoprox-common - 1.7.6 + 1.7.7-SNAPSHOT org.commonjava.indy indy-autoprox-common - 1.7.6 + 1.7.7-SNAPSHOT tar.gz dataset provided @@ -243,7 +243,7 @@ org.commonjava.indy indy-autoprox-common - 1.7.6 + 1.7.7-SNAPSHOT tar.gz docset provided @@ -251,7 +251,7 @@ org.commonjava.indy indy-autoprox-common - 1.7.6 + 1.7.7-SNAPSHOT tar.gz confset provided @@ -259,7 +259,7 @@ org.commonjava.indy indy-autoprox-common - 1.7.6 + 1.7.7-SNAPSHOT tar.gz uiset provided @@ -267,32 +267,32 @@ org.commonjava.indy indy-autoprox-model-java - 1.7.6 + 1.7.7-SNAPSHOT org.commonjava.indy indy-autoprox-client-java - 1.7.6 + 1.7.7-SNAPSHOT org.commonjava.indy indy-ftests-autoprox - 1.7.6 + 1.7.7-SNAPSHOT org.commonjava.indy indy-setback-jaxrs - 1.7.6 + 1.7.7-SNAPSHOT org.commonjava.indy indy-setback-common - 1.7.6 + 1.7.7-SNAPSHOT org.commonjava.indy indy-setback-common - 1.7.6 + 1.7.7-SNAPSHOT tar.gz dataset provided @@ -300,7 +300,7 @@ org.commonjava.indy indy-setback-common - 1.7.6 + 1.7.7-SNAPSHOT tar.gz confset provided @@ -308,17 +308,17 @@ org.commonjava.indy indy-revisions-jaxrs - 1.7.6 + 1.7.7-SNAPSHOT org.commonjava.indy indy-revisions-common - 1.7.6 + 1.7.7-SNAPSHOT org.commonjava.indy indy-revisions-common - 1.7.6 + 1.7.7-SNAPSHOT tar.gz confset provided @@ -326,7 +326,7 @@ org.commonjava.indy indy-revisions-common - 1.7.6 + 1.7.7-SNAPSHOT tar.gz uiset provided @@ -334,12 +334,12 @@ org.commonjava.indy indy-dot-maven-common - 1.7.6 + 1.7.7-SNAPSHOT org.commonjava.indy indy-dot-maven-common - 1.7.6 + 1.7.7-SNAPSHOT tar.gz dataset provided @@ -347,22 +347,22 @@ org.commonjava.indy indy-dot-maven-jaxrs - 1.7.6 + 1.7.7-SNAPSHOT org.commonjava.indy indy-ftests-dot-maven - 1.7.6 + 1.7.7-SNAPSHOT org.commonjava.indy indy-httprox-common - 1.7.6 + 1.7.7-SNAPSHOT org.commonjava.indy indy-httprox-common - 1.7.6 + 1.7.7-SNAPSHOT tar.gz confset provided @@ -370,17 +370,17 @@ org.commonjava.indy indy-ftests-httprox - 1.7.6 + 1.7.7-SNAPSHOT org.commonjava.indy indy-content-index - 1.7.6 + 1.7.7-SNAPSHOT org.commonjava.indy indy-content-index - 1.7.6 + 1.7.7-SNAPSHOT tar.gz confset provided @@ -388,123 +388,123 @@ org.commonjava.indy indy-db-memory - 1.7.6 + 1.7.7-SNAPSHOT org.commonjava.indy indy-test-db - 1.7.6 + 1.7.7-SNAPSHOT test org.commonjava.indy indy-test-fixtures-core - 1.7.6 + 1.7.7-SNAPSHOT test org.commonjava.indy indy-test-providers-core - 1.7.6 + 1.7.7-SNAPSHOT test org.commonjava.indy indy-test-utils - 1.7.6 + 1.7.7-SNAPSHOT test org.commonjava.indy indy-filer-default - 1.7.6 + 1.7.7-SNAPSHOT org.commonjava.indy indy-subsys-jaxrs - 1.7.6 + 1.7.7-SNAPSHOT org.commonjava.indy indy-subsys-flatfile - 1.7.6 + 1.7.7-SNAPSHOT org.commonjava.indy indy-subsys-infinispan - 1.7.6 + 1.7.7-SNAPSHOT org.commonjava.indy indy-subsys-http - 1.7.6 + 1.7.7-SNAPSHOT org.commonjava.indy indy-subsys-git - 1.7.6 + 1.7.7-SNAPSHOT org.commonjava.indy indy-subsys-groovy - 1.7.6 + 1.7.7-SNAPSHOT org.commonjava.indy indy-subsys-prefetch - 1.7.6 + 1.7.7-SNAPSHOT org.commonjava.indy indy-subsys-cpool - 1.7.6 + 1.7.7-SNAPSHOT org.commonjava.indy indy-client-core-java - 1.7.6 + 1.7.7-SNAPSHOT org.commonjava.indy indy-ftests-common - 1.7.6 + 1.7.7-SNAPSHOT org.commonjava.indy indy-ftests-core - 1.7.6 + 1.7.7-SNAPSHOT test org.commonjava.indy indy-folo-jaxrs - 1.7.6 + 1.7.7-SNAPSHOT org.commonjava.indy indy-ftests-folo - 1.7.6 + 1.7.7-SNAPSHOT test org.commonjava.indy indy-folo-client-java - 1.7.6 + 1.7.7-SNAPSHOT org.commonjava.indy indy-folo-model-java - 1.7.6 + 1.7.7-SNAPSHOT org.commonjava.indy indy-folo-common - 1.7.6 + 1.7.7-SNAPSHOT org.commonjava.indy indy-folo-common - 1.7.6 + 1.7.7-SNAPSHOT tar.gz dataset provided @@ -512,7 +512,7 @@ org.commonjava.indy indy-folo-common - 1.7.6 + 1.7.7-SNAPSHOT tar.gz confset provided @@ -520,33 +520,33 @@ org.commonjava.indy indy-promote-jaxrs - 1.7.6 + 1.7.7-SNAPSHOT org.commonjava.indy indy-ftests-promote - 1.7.6 + 1.7.7-SNAPSHOT test org.commonjava.indy indy-promote-client-java - 1.7.6 + 1.7.7-SNAPSHOT org.commonjava.indy indy-promote-model-java - 1.7.6 + 1.7.7-SNAPSHOT org.commonjava.indy indy-promote-common - 1.7.6 + 1.7.7-SNAPSHOT org.commonjava.indy indy-promote-common - 1.7.6 + 1.7.7-SNAPSHOT tar.gz confset provided @@ -554,7 +554,7 @@ org.commonjava.indy indy-promote-common - 1.7.6 + 1.7.7-SNAPSHOT tar.gz dataset provided @@ -562,19 +562,19 @@ org.commonjava.indy indy-promote-common - 1.7.6 + 1.7.7-SNAPSHOT dataset provided org.commonjava.indy indy-implied-repos-common - 1.7.6 + 1.7.7-SNAPSHOT org.commonjava.indy indy-implied-repos-common - 1.7.6 + 1.7.7-SNAPSHOT tar.gz confset provided @@ -582,27 +582,27 @@ org.commonjava.indy indy-implied-repos-model-java - 1.7.6 + 1.7.7-SNAPSHOT org.commonjava.indy indy-implied-repos-client-java - 1.7.6 + 1.7.7-SNAPSHOT org.commonjava.indy indy-ftests-implied-repos - 1.7.6 + 1.7.7-SNAPSHOT org.commonjava.indy indy-relate-common - 1.7.6 + 1.7.7-SNAPSHOT org.commonjava.indy indy-relate-common - 1.7.6 + 1.7.7-SNAPSHOT tar.gz confset provided @@ -610,32 +610,32 @@ org.commonjava.indy indy-ftests-relate - 1.7.6 + 1.7.7-SNAPSHOT org.commonjava.indy.embed indy-embedder - 1.7.6 + 1.7.7-SNAPSHOT org.commonjava.indy.boot indy-booter-api - 1.7.6 + 1.7.7-SNAPSHOT org.commonjava.indy.boot indy-booter-jaxrs - 1.7.6 + 1.7.7-SNAPSHOT org.commonjava.indy indy-subsys-keycloak - 1.7.6 + 1.7.7-SNAPSHOT org.commonjava.indy indy-subsys-keycloak - 1.7.6 + 1.7.7-SNAPSHOT tar.gz confset provided @@ -643,7 +643,7 @@ org.commonjava.indy indy-subsys-infinispan - 1.7.6 + 1.7.7-SNAPSHOT tar.gz confset provided @@ -651,7 +651,7 @@ org.commonjava.indy indy-subsys-prefetch - 1.7.6 + 1.7.7-SNAPSHOT tar.gz confset provided @@ -660,7 +660,7 @@ org.commonjava.indy indy-koji-common - 1.7.6 + 1.7.7-SNAPSHOT tar.gz confset provided @@ -668,22 +668,22 @@ org.commonjava.indy indy-koji-common - 1.7.6 + 1.7.7-SNAPSHOT org.commonjava.indy indy-koji-model-java - 1.7.6 + 1.7.7-SNAPSHOT org.commonjava.indy indy-koji-client-java - 1.7.6 + 1.7.7-SNAPSHOT org.commonjava.indy indy-koji-jaxrs - 1.7.6 + 1.7.7-SNAPSHOT