From 9a89187eb6ef5539237a0448558e39251b50d695 Mon Sep 17 00:00:00 2001 From: Rui Han Date: Thu, 2 Apr 2020 11:41:24 +0800 Subject: [PATCH 01/50] Cherry pick latency fixes from master to maint (#1563) * Add PathMapped/Custom GroupRepositoryFilter to exclude irrelevant repos (#1558) * Add PathMapped/Custom GroupRepositoryFilter to exclude irrelevant repos * Remove unnecessary filterForFirstMatch api * Fix NPM ftests * Add config to enable/disable filters * Improve by pre compile patterns * Fine control pathDB metrics (#1560) * Remove abandoned indy-subsys-pathmapped (#1561) * Set default thread error handler (#1562) * Change path-mapped version to 1.2 Co-authored-by: Gang Li --- .../IndexingContentManagerDecorator.java | 50 +++++ .../PathMappedGroupRepositoryFilter.java | 129 +++++++++++++ .../maven/content/MavenMetadataGenerator.java | 10 +- .../indy/conf/DefaultIndyConfiguration.java | 14 ++ .../indy/conf/IndyConfiguration.java | 2 + .../indy/content/GroupRepositoryFilter.java | 29 +++ .../indy/boot/jaxrs/JaxRsBooter.java | 25 ++- .../core/content/DefaultContentManager.java | 132 +++++-------- .../group/AbstractGroupRepositoryFilter.java | 41 +++++ .../group/GroupRepositoryFilterManager.java | 160 ++++++++++++++++ ...versePatternNameGroupRepositoryFilter.java | 42 +++++ core/src/main/resources/default-main.conf | 4 + .../launcher/src/main/etc/indy/main.conf | 4 + embedder/pom.xml | 1 + .../def/DefaultGalleyStorageProvider.java | 23 ++- .../core/AbstractIndyFunctionalTest.java | 3 +- .../core/content/RepositoryFilterTest.java | 174 ++++++++++++++++++ .../repofilter/rh-pattern-repofilter.groovy | 22 +++ pom.xml | 7 +- .../core/src/main/conf/conf.d/metrics.conf | 8 + .../src/main/conf/conf.d/metrics.conf | 8 + .../indy/metrics/conf/IndyMetricsConfig.java | 30 +++ .../src/main/resources/default-metrics.conf | 8 + 23 files changed, 822 insertions(+), 104 deletions(-) create mode 100644 addons/path-mapped/common/src/main/java/org/commonjava/indy/pathmapped/inject/PathMappedGroupRepositoryFilter.java create mode 100644 api/src/main/java/org/commonjava/indy/content/GroupRepositoryFilter.java create mode 100644 core/src/main/java/org/commonjava/indy/core/content/group/AbstractGroupRepositoryFilter.java create mode 100644 core/src/main/java/org/commonjava/indy/core/content/group/GroupRepositoryFilterManager.java create mode 100644 core/src/main/java/org/commonjava/indy/core/content/group/ReversePatternNameGroupRepositoryFilter.java create mode 100644 ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/RepositoryFilterTest.java create mode 100644 ftests/core/src/main/resources/repofilter/rh-pattern-repofilter.groovy diff --git a/addons/content-index/src/main/java/org/commonjava/indy/content/index/IndexingContentManagerDecorator.java b/addons/content-index/src/main/java/org/commonjava/indy/content/index/IndexingContentManagerDecorator.java index 6c786648de..70436bef45 100644 --- a/addons/content-index/src/main/java/org/commonjava/indy/content/index/IndexingContentManagerDecorator.java +++ b/addons/content-index/src/main/java/org/commonjava/indy/content/index/IndexingContentManagerDecorator.java @@ -132,6 +132,11 @@ public Transfer retrieveFirst( final List stores, final final EventMetadata eventMetadata ) throws IndyWorkflowException { + if ( !indexCfg.isEnabled() ) + { + return delegate.retrieveFirst( stores, path, eventMetadata ); + } + Transfer transfer = null; for ( ArtifactStore store : stores ) { @@ -157,6 +162,11 @@ public List retrieveAll( final List stores, f final EventMetadata eventMetadata ) throws IndyWorkflowException { + if ( !indexCfg.isEnabled() ) + { + return delegate.retrieveAll( stores, path, eventMetadata ); + } + List results = new ArrayList<>(); stores.stream().map( ( store ) -> { try @@ -187,6 +197,11 @@ public Transfer retrieve( final ArtifactStore store, final String path ) public Transfer retrieve( final ArtifactStore store, final String path, final EventMetadata eventMetadata ) throws IndyWorkflowException { + if ( !indexCfg.isEnabled() ) + { + return delegate.retrieve( store, path, eventMetadata ); + } + if ( store == null ) { return null; @@ -453,6 +468,11 @@ public Transfer getIndexedTransfer( final StoreKey storeKey, final StoreKey topK public Transfer getTransfer( final ArtifactStore store, final String path, final TransferOperation op ) throws IndyWorkflowException { + if ( !indexCfg.isEnabled() ) + { + return delegate.getTransfer( store, path, op ); + } + Transfer transfer = getIndexedTransfer( store.getKey(), null, path, TransferOperation.DOWNLOAD, new EventMetadata( ) ); if ( exists( transfer ) ) { @@ -585,6 +605,11 @@ else if ( StoreType.group == key.getType() ) public Transfer getTransfer( final StoreKey storeKey, final String path, final TransferOperation op ) throws IndyWorkflowException { + if ( !indexCfg.isEnabled() ) + { + return delegate.getTransfer( storeKey, path, op ); + } + Transfer transfer = getIndexedTransfer( storeKey, null, path, TransferOperation.DOWNLOAD, new EventMetadata( ) ); if ( exists( transfer ) ) { @@ -670,6 +695,11 @@ private void nfcForGroup( final ArtifactStore store, final Transfer transfer, fi public Transfer getTransfer( final List stores, final String path, final TransferOperation op ) throws IndyWorkflowException { + if ( !indexCfg.isEnabled() ) + { + return delegate.getTransfer( stores, path, op ); + } + Transfer transfer = null; for ( ArtifactStore store : stores ) { @@ -697,6 +727,11 @@ public Transfer store( final ArtifactStore store, final String path, final Input final TransferOperation op, final EventMetadata eventMetadata ) throws IndyWorkflowException { + if ( !indexCfg.isEnabled() ) + { + return delegate.store( store, path, stream, op, eventMetadata ); + } + Logger logger = LoggerFactory.getLogger( getClass() ); logger.trace( "Storing: {} in: {} from indexing level", path, store.getKey() ); Transfer transfer = delegate.store( store, path, stream, op, eventMetadata ); @@ -748,6 +783,11 @@ public Transfer store( final List stores, final StoreKe final InputStream stream, final TransferOperation op, final EventMetadata eventMetadata ) throws IndyWorkflowException { + if ( !indexCfg.isEnabled() ) + { + return delegate.store( stores, topKey, path, stream, op, eventMetadata ); + } + Transfer transfer = delegate.store( stores, topKey, path, stream, op, eventMetadata ); if ( transfer != null ) { @@ -790,6 +830,11 @@ public boolean delete( final ArtifactStore store, final String path ) public boolean delete( final ArtifactStore store, final String path, final EventMetadata eventMetadata ) throws IndyWorkflowException { + if ( !indexCfg.isEnabled() ) + { + return delegate.delete( store, path, eventMetadata ); + } + boolean result = delegate.delete( store, path, eventMetadata ); if ( result && indexCfg.isEnabled() ) { @@ -811,6 +856,11 @@ public boolean deleteAll( final List stores, final Stri final EventMetadata eventMetadata ) throws IndyWorkflowException { + if ( !indexCfg.isEnabled() ) + { + return delegate.deleteAll( stores, path, eventMetadata ); + } + boolean result = false; for ( ArtifactStore store : stores ) { diff --git a/addons/path-mapped/common/src/main/java/org/commonjava/indy/pathmapped/inject/PathMappedGroupRepositoryFilter.java b/addons/path-mapped/common/src/main/java/org/commonjava/indy/pathmapped/inject/PathMappedGroupRepositoryFilter.java new file mode 100644 index 0000000000..b1bbd62636 --- /dev/null +++ b/addons/path-mapped/common/src/main/java/org/commonjava/indy/pathmapped/inject/PathMappedGroupRepositoryFilter.java @@ -0,0 +1,129 @@ +package org.commonjava.indy.pathmapped.inject; + +import org.commonjava.indy.core.content.group.AbstractGroupRepositoryFilter; +import org.commonjava.indy.model.core.ArtifactStore; +import org.commonjava.indy.model.core.Group; +import org.commonjava.indy.model.core.StoreKey; +import org.commonjava.indy.model.core.StoreType; +import org.commonjava.maven.galley.cache.pathmapped.PathMappedCacheProvider; +import org.commonjava.maven.galley.spi.cache.CacheProvider; +import org.commonjava.storage.pathmapped.core.PathMappedFileManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.annotation.PostConstruct; +import javax.enterprise.context.ApplicationScoped; +import javax.inject.Inject; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + +import static org.commonjava.indy.pkg.maven.model.MavenPackageTypeDescriptor.MAVEN_PKG_KEY; +import static org.commonjava.indy.pkg.npm.model.NPMPackageTypeDescriptor.NPM_PKG_KEY; + +@ApplicationScoped +public class PathMappedGroupRepositoryFilter + extends AbstractGroupRepositoryFilter +{ + private final Logger logger = LoggerFactory.getLogger( getClass() ); + + @Inject + private CacheProvider cacheProvider; + + private PathMappedFileManager pathMappedFileManager; + + @PostConstruct + void setup() + { + if ( cacheProvider instanceof PathMappedCacheProvider ) + { + pathMappedFileManager = ( (PathMappedCacheProvider) cacheProvider ).getPathMappedFileManager(); + } + } + + @Override + public int getPriority() + { + return 0; + } + + @Override + public boolean canProcess( String path, Group group ) + { + if ( pathMappedFileManager != null ) + { + return true; + } + return false; + } + + /** + * Filter for remote repos plus hosted repos which contains the target path. Because caller may try to + * download the target path from remote repositories. + */ + @Override + public List filter( String path, Group group, List concreteStores ) + { + List candidates = getCandidates( concreteStores ); + if ( candidates.isEmpty() ) + { + logger.debug( "No candidate matches, skip" ); + return concreteStores; + } + + String strategyPath = getStrategyPath( group.getKey(), path ); + if ( strategyPath == null ) + { + logger.debug( "Can not get strategy path, group: {}, path: {}", group.getKey(), path ); + return concreteStores; + } + + Set ret = pathMappedFileManager.getFileSystemContainingDirectory( candidates, strategyPath ); + + return concreteStores.stream() + .filter( store -> store.getType() == StoreType.remote || ret.contains( + store.getKey().toString() ) ) + .collect( Collectors.toList() ); + } + + /** + * Get hosted repos + */ + private List getCandidates( List concreteStores ) + { + return concreteStores.stream() + .filter( store -> store.getType() == StoreType.hosted ) + .map( store -> store.getKey().toString() ) + .collect( Collectors.toList() ); + } + + private String getStrategyPath( final StoreKey key, final String rawPath ) + { + if ( key.getPackageType().equals( MAVEN_PKG_KEY ) ) + { + // Use parent path because 1. maven metadata generator need to list it, 2. it is supper set of file path + return Paths.get( rawPath ).getParent().toString(); + } + else if ( key.getPackageType().equals( NPM_PKG_KEY ) ) + { + /* + * E.g, + * jquery/-/jquery-1.5.1.tgz -> jquery/-/, jquery-1.5.1.tgz + * jquery -> jquery/, package.json + */ + Path parent = Paths.get( rawPath ).getParent(); + if ( parent == null ) + { + return rawPath; + } + else + { + return parent.toString(); + } + } + return null; + } + +} 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 7b0b0d89c8..835d649495 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 @@ -504,16 +504,14 @@ private String writeGroupMergeInfo( final Metadata md, final Group group, final } /** - * Will generate group related files(e.g maven-metadata.xml) from cache level, which means all the generation of the - * files will be cached. In terms of cache clearing, see #{@link MetadataMergeListener} + * Generate group related files (e.g maven-metadata.xml) from three levels. + * 1. cache, which means all the generation of the files will be cached. In terms of cache clearing, see #{@link MetadataMergeListener} + * 2. read cached from member hosted repos and try to download from member remote repos + * 3. generate by member hosted repos (list dir trying to find version directories) * * @param group * @param members concrete store in group * @param path - * - * @return - * - * @throws IndyWorkflowException */ private Metadata generateGroupMetadata( final Group group, final List members, final List contributingMembers, final String path ) diff --git a/api/src/main/java/org/commonjava/indy/conf/DefaultIndyConfiguration.java b/api/src/main/java/org/commonjava/indy/conf/DefaultIndyConfiguration.java index 2ea2b9fd80..aa1f2d07ae 100644 --- a/api/src/main/java/org/commonjava/indy/conf/DefaultIndyConfiguration.java +++ b/api/src/main/java/org/commonjava/indy/conf/DefaultIndyConfiguration.java @@ -92,6 +92,8 @@ public class DefaultIndyConfiguration private Boolean standalone; + private boolean repositoryFilterEnabled; + public DefaultIndyConfiguration() { } @@ -327,6 +329,18 @@ public Boolean isStandalone() return this.standalone == null ? DEFAULT_STANDALONE : this.standalone; } + @ConfigName( "repository.filter.enabled" ) + public void setRepositoryFilterEnabled( boolean repositoryFilterEnabled ) + { + this.repositoryFilterEnabled = repositoryFilterEnabled; + } + + @Override + public boolean isRepositoryFilterEnabled() + { + return repositoryFilterEnabled; + } + @ConfigName( "standalone" ) public void setStandalone( Boolean standalone ) { diff --git a/api/src/main/java/org/commonjava/indy/conf/IndyConfiguration.java b/api/src/main/java/org/commonjava/indy/conf/IndyConfiguration.java index 2fd2b11040..09f98f9b38 100644 --- a/api/src/main/java/org/commonjava/indy/conf/IndyConfiguration.java +++ b/api/src/main/java/org/commonjava/indy/conf/IndyConfiguration.java @@ -94,4 +94,6 @@ public interface IndyConfiguration * @since 2.0.0 */ Boolean isStandalone(); + + boolean isRepositoryFilterEnabled(); } diff --git a/api/src/main/java/org/commonjava/indy/content/GroupRepositoryFilter.java b/api/src/main/java/org/commonjava/indy/content/GroupRepositoryFilter.java new file mode 100644 index 0000000000..785066f72a --- /dev/null +++ b/api/src/main/java/org/commonjava/indy/content/GroupRepositoryFilter.java @@ -0,0 +1,29 @@ +package org.commonjava.indy.content; + +import org.commonjava.indy.model.core.ArtifactStore; +import org.commonjava.indy.model.core.Group; + +import java.util.List; + +public interface GroupRepositoryFilter + extends Comparable +{ + /** + * Higher priority filter get executed first. + * @return priority + */ + int getPriority(); + + boolean canProcess( String path, Group group ); + + /** + * Get all concrete stores that may contain the target path. + * + * @param path + * @param group + * @param concreteStores in target group ( include stores in sub groups ) + * @return + */ + List filter( String path, Group group, List concreteStores ); + +} diff --git a/boot/jaxrs/src/main/java/org/commonjava/indy/boot/jaxrs/JaxRsBooter.java b/boot/jaxrs/src/main/java/org/commonjava/indy/boot/jaxrs/JaxRsBooter.java index 623cecc3c8..73d39da54b 100644 --- a/boot/jaxrs/src/main/java/org/commonjava/indy/boot/jaxrs/JaxRsBooter.java +++ b/boot/jaxrs/src/main/java/org/commonjava/indy/boot/jaxrs/JaxRsBooter.java @@ -28,6 +28,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.lang.reflect.InvocationTargetException; + import static org.commonjava.propulsor.boot.BootStatus.ERR_LOAD_BOOT_OPTIONS; import static org.commonjava.propulsor.boot.BootStatus.ERR_START; @@ -42,7 +44,7 @@ public class JaxRsBooter public static void main( final String[] args ) { - setUncaughtExceptionHandler(); + setDefaultUncaughtExceptionHandler(); BootOptions boot; try { @@ -72,6 +74,27 @@ public static void main( final String[] args ) } } + private static void setDefaultUncaughtExceptionHandler() + { + Thread.setDefaultUncaughtExceptionHandler( ( thread, error ) -> { + if ( error instanceof InvocationTargetException ) + { + final InvocationTargetException ite = (InvocationTargetException) error; + System.err.println( "In: " + thread.getName() + "(" + thread.getId() + + "), caught InvocationTargetException:" ); + ite.getTargetException().printStackTrace(); + + System.err.println( "...via:" ); + error.printStackTrace(); + } + else + { + System.err.println( "In: " + thread.getName() + "(" + thread.getId() + ") Uncaught error:" ); + error.printStackTrace(); + } + } ); + } + private final Logger logger = LoggerFactory.getLogger( getClass() ); @Override diff --git a/core/src/main/java/org/commonjava/indy/core/content/DefaultContentManager.java b/core/src/main/java/org/commonjava/indy/core/content/DefaultContentManager.java index 38d13d0916..4c19aec9d9 100644 --- a/core/src/main/java/org/commonjava/indy/core/content/DefaultContentManager.java +++ b/core/src/main/java/org/commonjava/indy/core/content/DefaultContentManager.java @@ -23,6 +23,7 @@ import org.commonjava.indy.content.ContentManager; import org.commonjava.indy.content.DownloadManager; import org.commonjava.indy.content.StoreResource; +import org.commonjava.indy.core.content.group.GroupRepositoryFilterManager; import org.commonjava.indy.data.IndyDataException; import org.commonjava.indy.data.StoreDataManager; import org.commonjava.indy.measure.annotation.Measure; @@ -66,7 +67,7 @@ public class DefaultContentManager implements ContentManager { - private final Logger logger = LoggerFactory.getLogger( DefaultContentManager.class.getName() ); + private final Logger logger = LoggerFactory.getLogger( getClass() ); @Inject private ContentGeneratorManager contentGeneratorManager; @@ -92,6 +93,9 @@ public class DefaultContentManager @Inject private IndyConfiguration indyConfig; + @Inject + private GroupRepositoryFilterManager repositoryFilterManager; + protected DefaultContentManager() { } @@ -154,19 +158,7 @@ public List retrieveAll( final List stores, f { if ( group == store.getKey().getType() ) { - List members; - try - { - members = storeManager.query() - .packageType( store.getPackageType() ) - .enabledState( true ) - .getOrderedConcreteStoresInGroup( store.getName() ); - } - catch ( final IndyDataException e ) - { - throw new IndyWorkflowException( "Failed to lookup concrete members of: %s. Reason: %s", e, store, - e.getMessage() ); - } + List members = getOrderedConcreteStoresAndFilter( (Group) store, path ); final List storeTransfers = new ArrayList<>(); contentGeneratorManager.generateGroupFileContentAnd( (Group) store, members, path, eventMetadata, @@ -218,23 +210,11 @@ public Transfer retrieve( final ArtifactStore store, final String path, final Ev Transfer item; if ( group == store.getKey().getType() ) { - List members; - try - { - members = storeManager.query() - .packageType( store.getPackageType() ) - .enabledState( true ) - .getOrderedConcreteStoresInGroup( store.getName() ); - } - catch ( final IndyDataException e ) - { - throw new IndyWorkflowException( "Failed to lookup concrete members of: %s. Reason: %s", e, store, - e.getMessage() ); - } - - if ( logger.isTraceEnabled() ) + List members = getOrderedConcreteStoresAndFilter( (Group) store, path ); + if ( logger.isDebugEnabled() ) { - logger.trace( "{} is a group. Attempting downloads from (in order):\n {}", store.getKey(), StringUtils.join(members, "\n ") ); + logger.debug( "{} is a group. Attempting downloads from (in order):\n {}", store.getKey(), + StringUtils.join( members, "\n " ) ); } item = contentGeneratorManager.generateGroupFileContent( (Group) store, members, path, eventMetadata ); @@ -281,6 +261,26 @@ public Transfer retrieve( final ArtifactStore store, final String path, final Ev return item; } + private List getOrderedConcreteStoresAndFilter( Group group, String path ) throws IndyWorkflowException + { + List members; + try + { + members = storeManager.query() + .packageType( group.getPackageType() ) + .enabledState( true ) + .getOrderedConcreteStoresInGroup( group.getName() ); + } + catch ( final IndyDataException e ) + { + throw new IndyWorkflowException( "Failed to lookup concrete members of: %s. Reason: %s", e, group, + e.getMessage() ); + } + + members = repositoryFilterManager.filter( path, group, members ); + return members; + } + private Transfer doRetrieve( final ArtifactStore store, final String path, final EventMetadata eventMetadata ) throws IndyWorkflowException { @@ -475,15 +475,7 @@ public boolean delete( final ArtifactStore store, final String path, final Event { if ( Boolean.TRUE.equals( eventMetadata.get( CASCADE ) ) ) { - List members; - try - { - members = storeManager.query().packageType( store.getPackageType() ).enabledState( true ).getOrderedConcreteStoresInGroup( store.getName() ); - } - catch ( final IndyDataException e ) - { - throw new IndyWorkflowException( "Failed to lookup concrete members of: %s. Reason: %s", e, store, e.getMessage() ); - } + List members = getOrderedConcreteStoresAndFilter( (Group) store, path ); for ( final ArtifactStore member : members ) { @@ -574,19 +566,7 @@ public List list( final ArtifactStore store, final String path, f List listed; if ( group == store.getKey().getType() ) { - List members; - try - { - members = storeManager.query() - .packageType( store.getPackageType() ) - .enabledState( true ) - .getOrderedConcreteStoresInGroup( store.getName() ); - } - catch ( final IndyDataException e ) - { - throw new IndyWorkflowException( "Failed to lookup concrete members of: %s. Reason: %s", e, store, - e.getMessage() ); - } + List members = getOrderedConcreteStoresAndFilter( (Group) store, path ); listed = new ArrayList<>(); contentGeneratorManager.generateGroupDirectoryContentAnd( (Group) store, members, path, eventMetadata, @@ -692,23 +672,11 @@ public Transfer getTransfer( final ArtifactStore store, final String path, final SpecialPathInfo spInfo = specialPathManager.getSpecialPathInfo( location, path, store.getPackageType() ); if ( spInfo == null || !spInfo.isMergable() ) { - try - { - final List allMembers = storeManager.query() - .packageType( store.getPackageType() ) - .enabledState( true ) - .getOrderedConcreteStoresInGroup( store.getName() ); + List members = getOrderedConcreteStoresAndFilter( (Group) store, path ); - logger.trace( "Trying to retrieve suitable transfer for: {} in group: {}", path, store.getName() ); - logger.trace( "Members in group {}: {}", store.getName(), allMembers ); - - return getTransfer( allMembers, path, op ); - } - catch ( final IndyDataException e ) - { - throw new IndyWorkflowException( "Failed to lookup concrete members of: %s. Reason: %s", e, store, - e.getMessage() ); - } + logger.trace( "Trying to retrieve suitable transfer for: {} in group: {}", path, store.getName() ); + logger.trace( "Members in group {}: {}", store.getName(), members ); + return getTransfer( members, path, op ); } else { @@ -768,31 +736,19 @@ public boolean exists(ArtifactStore store, String path) logger.trace( "Checking existence of: {} in: {}", path, store.getKey() ); if ( store instanceof Group ) { - try - { - final List allMembers = storeManager.query() - .packageType( store.getPackageType() ) - .enabledState( true ) - .getOrderedConcreteStoresInGroup( store.getName() ); + List members = getOrderedConcreteStoresAndFilter( (Group) store, path ); - logger.trace( "Trying to retrieve suitable transfer for: {} in group: {}", path, store.getName() ); - logger.trace( "Members in group {}: {}", store.getName(), allMembers ); + logger.trace( "Trying to retrieve suitable transfer for: {} in group: {}", path, store.getName() ); + logger.trace( "Members in group {}: {}", store.getName(), members ); - for ( ArtifactStore member : allMembers ) + for ( ArtifactStore member : members ) + { + if ( exists( member, path ) ) { - if ( exists( member, path ) ) - { - return true; - } + return true; } - - return false; - } - catch ( final IndyDataException e ) - { - throw new IndyWorkflowException( "Failed to lookup concrete members of: %s. Reason: %s", e, store, - e.getMessage() ); } + return false; } else { diff --git a/core/src/main/java/org/commonjava/indy/core/content/group/AbstractGroupRepositoryFilter.java b/core/src/main/java/org/commonjava/indy/core/content/group/AbstractGroupRepositoryFilter.java new file mode 100644 index 0000000000..e37a2e4cf2 --- /dev/null +++ b/core/src/main/java/org/commonjava/indy/core/content/group/AbstractGroupRepositoryFilter.java @@ -0,0 +1,41 @@ +package org.commonjava.indy.core.content.group; + +import org.commonjava.indy.content.GroupRepositoryFilter; +import org.commonjava.indy.model.core.ArtifactStore; +import org.commonjava.indy.model.core.Group; + +import java.util.List; + +public abstract class AbstractGroupRepositoryFilter + implements GroupRepositoryFilter +{ + @Override + public boolean canProcess( String path, Group group ) + { + return true; + } + + @Override + public List filter( String path, Group group, List concreteStores ) + { + return concreteStores; + } + + @Override + public int compareTo( GroupRepositoryFilter groupRepositoryFilter ) + { + int other = groupRepositoryFilter.getPriority(); + if ( getPriority() > other ) + { + return 1; + } + else if ( getPriority() < other ) + { + return -1; + } + else + { + return 0; + } + } +} diff --git a/core/src/main/java/org/commonjava/indy/core/content/group/GroupRepositoryFilterManager.java b/core/src/main/java/org/commonjava/indy/core/content/group/GroupRepositoryFilterManager.java new file mode 100644 index 0000000000..532f0248b2 --- /dev/null +++ b/core/src/main/java/org/commonjava/indy/core/content/group/GroupRepositoryFilterManager.java @@ -0,0 +1,160 @@ +package org.commonjava.indy.core.content.group; + +import org.apache.commons.lang.StringUtils; +import org.commonjava.indy.conf.IndyConfiguration; +import org.commonjava.indy.content.GroupRepositoryFilter; +import org.commonjava.indy.model.core.ArtifactStore; +import org.commonjava.indy.model.core.Group; +import org.commonjava.indy.subsys.datafile.DataFile; +import org.commonjava.indy.subsys.datafile.DataFileManager; +import org.commonjava.indy.subsys.template.ScriptEngine; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.annotation.PostConstruct; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Instance; +import javax.inject.Inject; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; + +import static org.commonjava.indy.subsys.template.ScriptEngine.SCRIPTS_SUBDIR; + +@ApplicationScoped +public class GroupRepositoryFilterManager +{ + private final Logger logger = LoggerFactory.getLogger( getClass() ); + + public static final String REPO_FILTER = "repofilter"; // groovy scripts are under "data/scripts/repofilter" + + @Inject + private DataFileManager dataFileManager; + + @Inject + private IndyConfiguration indyConfiguration; + + @Inject + private ScriptEngine scriptEngine; + + @Inject + private Instance filters; + + private List groupRepositoryFilters = new ArrayList<>(); + + public GroupRepositoryFilterManager() + { + } + + @PostConstruct + void setup() + { + if ( !indyConfiguration.isRepositoryFilterEnabled() ) + { + logger.info( "Repository filters disabled" ); + return; + } + + if ( filters != null ) + { + filters.forEach( f -> groupRepositoryFilters.add( f ) ); + } + loadFilterScripts(); + Collections.sort( groupRepositoryFilters, Collections.reverseOrder() ); // priority is important + logger.info( "Set up group repository filters: {}", groupRepositoryFilters ); + } + + private void loadFilterScripts() + { + DataFile filtersDir = dataFileManager.getDataFile( SCRIPTS_SUBDIR, REPO_FILTER ); + logger.info( "Scanning for repo filters, filtersDir: {}", filtersDir ); + if ( filtersDir.exists() ) + { + DataFile[] scripts = filtersDir.listFiles( ( file ) -> file.getName().endsWith( ".groovy" ) ); + if ( scripts != null && scripts.length > 0 ) + { + for ( final DataFile script : scripts ) + { + logger.info( "Loading repo filter: {}", script ); + GroupRepositoryFilter filter = parseFilter( script ); + if ( filter != null ) + { + groupRepositoryFilters.add( filter ); + } + } + } + else + { + logger.info( "No repo filter scripts found in {}", filtersDir.getPath() ); + } + } + } + + private GroupRepositoryFilter parseFilter( DataFile script ) + { + try + { + String spec = script.readString(); + return scriptEngine.parseScriptInstance( spec, GroupRepositoryFilter.class ); + } + catch ( Exception e ) + { + logger.error( "Parse repo filter failed", e ); + return null; + } + } + + /** + * Get member repositories that might contain the specified path. + * + * @param path + * @param group + * @param orderedConcreteStores concrete stores in this group and sub groups + */ + public List filter( String path, Group group, List orderedConcreteStores ) + { + if ( !indyConfiguration.isRepositoryFilterEnabled() ) + { + return orderedConcreteStores; + } + + if ( logger.isDebugEnabled() ) + { + logger.debug( "Filter group members, group: {}, orderedConcreteStores: {}", group.getName(), + format( orderedConcreteStores ) ); + } + + List ret = orderedConcreteStores; + for ( GroupRepositoryFilter repositoryFilter : groupRepositoryFilters ) + { + logger.debug( "Try filter: {}", repositoryFilter.getClass().getSimpleName() ); + long begin = System.currentTimeMillis(); + if ( repositoryFilter.canProcess( path, group ) ) + { + ret = repositoryFilter.filter( path, group, ret ); + if ( logger.isDebugEnabled() ) + { + logger.debug( "Filter processed, filter: {}, elapse: {}, ret: {}", + repositoryFilter.getClass().getSimpleName(), ( System.currentTimeMillis() - begin ), + format( ret ) ); + } + } + else + { + logger.debug( "Can not process, filter: {}", repositoryFilter.getClass().getSimpleName() ); + } + } + return ret; + } + + private String format( List stores ) + { + if ( stores == null ) + { + return "null"; + } + return stores.stream().map( store -> store.getKey().toString() ).collect( Collectors.toList() ).toString(); + } + +} diff --git a/core/src/main/java/org/commonjava/indy/core/content/group/ReversePatternNameGroupRepositoryFilter.java b/core/src/main/java/org/commonjava/indy/core/content/group/ReversePatternNameGroupRepositoryFilter.java new file mode 100644 index 0000000000..d244831388 --- /dev/null +++ b/core/src/main/java/org/commonjava/indy/core/content/group/ReversePatternNameGroupRepositoryFilter.java @@ -0,0 +1,42 @@ +package org.commonjava.indy.core.content.group; + +import org.commonjava.indy.model.core.ArtifactStore; +import org.commonjava.indy.model.core.Group; +import org.commonjava.indy.model.core.StoreType; + +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import java.util.stream.Collectors; + +/** + * Reverse pattern is specifically useful. It excludes repos matching the filterPattern if pathPattern not matches. + * e.g, if path not contains '-rh', exclude those with name like 'rh-build'. + */ +public abstract class ReversePatternNameGroupRepositoryFilter + extends AbstractGroupRepositoryFilter +{ + protected Pattern pathPattern; + + protected Pattern filterPattern; + + public ReversePatternNameGroupRepositoryFilter( String pathPattern, String filterPattern ) + { + this.pathPattern = Pattern.compile( pathPattern ); + this.filterPattern = Pattern.compile( filterPattern ); + } + + @Override + public List filter( String path, Group group, List concreteStores ) + { + Matcher matcher = pathPattern.matcher( path ); + if ( !matcher.matches() ) + { + return concreteStores.stream() + .filter( store -> store.getType() == StoreType.remote || !filterPattern.matcher( + store.getName() ).matches() ) + .collect( Collectors.toList() ); + } + return concreteStores; + } +} diff --git a/core/src/main/resources/default-main.conf b/core/src/main/resources/default-main.conf index 28f31dff83..619e4ef09b 100644 --- a/core/src/main/resources/default-main.conf +++ b/core/src/main/resources/default-main.conf @@ -11,6 +11,10 @@ # #affected.groups.exclude=^build-\d+ +# Group repository filters to improve artifact retrieval (default false) +# +#repository.filter.enabled=true + [ssl] ###################################################################### # Indy will require SSL connections to remote repositories by default. diff --git a/deployments/launcher/src/main/etc/indy/main.conf b/deployments/launcher/src/main/etc/indy/main.conf index 7566097bda..20573feeff 100644 --- a/deployments/launcher/src/main/etc/indy/main.conf +++ b/deployments/launcher/src/main/etc/indy/main.conf @@ -16,6 +16,10 @@ # #affected.groups.exclude=^build-\d+ +# Group repository filters to improve artifact retrieval (default false) +# +#repository.filter.enabled=true + [ssl] ###################################################################### # Indy will require SSL connections to remote repositories by default. diff --git a/embedder/pom.xml b/embedder/pom.xml index 9a33284a92..594ea9c573 100644 --- a/embedder/pom.xml +++ b/embedder/pom.xml @@ -285,6 +285,7 @@ org.commonjava.indy indy-ftests-core + test org.commonjava.indy diff --git a/filers/default/src/main/java/org/commonjava/indy/filer/def/DefaultGalleyStorageProvider.java b/filers/default/src/main/java/org/commonjava/indy/filer/def/DefaultGalleyStorageProvider.java index 6792ccd34f..c6a0916e0b 100644 --- a/filers/default/src/main/java/org/commonjava/indy/filer/def/DefaultGalleyStorageProvider.java +++ b/filers/default/src/main/java/org/commonjava/indy/filer/def/DefaultGalleyStorageProvider.java @@ -26,6 +26,7 @@ import org.commonjava.indy.content.SpecialPathSetProducer; import org.commonjava.indy.filer.def.conf.DefaultStorageProviderConfiguration; import org.commonjava.indy.metrics.IndyMetricsManager; +import org.commonjava.indy.metrics.conf.IndyMetricsConfig; import org.commonjava.indy.subsys.cassandra.CassandraClient; import org.commonjava.indy.subsys.cassandra.config.CassandraConfig; import org.commonjava.maven.galley.GalleyInitException; @@ -78,6 +79,7 @@ import java.util.function.BiConsumer; import java.util.function.Function; +import static org.apache.commons.lang3.StringUtils.isBlank; import static org.commonjava.indy.metrics.IndyMetricsConstants.getSupername; import static org.commonjava.maven.galley.io.checksum.ChecksummingDecoratorAdvisor.ChecksumAdvice.CALCULATE_AND_WRITE; import static org.commonjava.maven.galley.io.checksum.ChecksummingDecoratorAdvisor.ChecksumAdvice.NO_DECORATE; @@ -205,12 +207,29 @@ private void setupCacheProviderFactory() if ( pathDB != null ) { - String prefix = metricsManager.getConfig().getNodePrefix(); - pathDB = new MeasuredPathDB( pathDB, metricsManager.getMetricRegistry(), getSupername( prefix, "pathDB" ) ); + final IndyMetricsConfig metricsConfig = metricsManager.getConfig(); + if ( metricsConfig.isPathDBMetricsEnabled() ) + { + final String operations = metricsConfig.getPathDBMetricsOperations(); + logger.info( "Create measured PathDB, operations: {}" ); + pathDB = new MeasuredPathDB( pathDB, metricsManager.getMetricRegistry(), getSupername( "pathDB" ) ) + { + @Override + protected boolean isMetricEnabled( String metricName ) + { + if ( isBlank( operations ) || operations.contains( metricName ) ) + { + return true; + } + return false; + } + }; + } } PhysicalStore physicalStore = new LegacyReadonlyPhysicalStore( storeRoot ); + logger.info( "Create cacheProviderFactory, pathDB: {}, physicalStore: {}", pathDB, physicalStore ); cacheProviderFactory = new PathMappedCacheProviderFactory( storeRoot, deleteExecutor, pathMappedStorageConfig, pathDB, physicalStore ); diff --git a/ftests/common/src/main/java/org/commonjava/indy/ftest/core/AbstractIndyFunctionalTest.java b/ftests/common/src/main/java/org/commonjava/indy/ftest/core/AbstractIndyFunctionalTest.java index 5a995c620a..40fe64a8f8 100644 --- a/ftests/common/src/main/java/org/commonjava/indy/ftest/core/AbstractIndyFunctionalTest.java +++ b/ftests/common/src/main/java/org/commonjava/indy/ftest/core/AbstractIndyFunctionalTest.java @@ -281,7 +281,8 @@ protected void initTestData( CoreServerFixture fixture ) protected void initBaseTestConfig( CoreServerFixture fixture ) throws IOException { - writeConfigFile( "conf.d/default.conf", "[default]\ncache.keyspace=" + getKeyspace( "cache_" ) + "\naffected.groups.exclude=^build-\\d+"); + writeConfigFile( "conf.d/default.conf", "[default]\ncache.keyspace=" + getKeyspace( "cache_" ) + + "\naffected.groups.exclude=^build-\\d+" + "\nrepository.filter.enabled=true" ); writeConfigFile( "conf.d/storage.conf", "[storage-default]\n" + "storage.dir=" + fixture.getBootOptions().getHomeDir() + "/var/lib/indy/storage\n" + "storage.gc.graceperiodinhours=0\n" diff --git a/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/RepositoryFilterTest.java b/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/RepositoryFilterTest.java new file mode 100644 index 0000000000..c248f4d43b --- /dev/null +++ b/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/RepositoryFilterTest.java @@ -0,0 +1,174 @@ +package org.commonjava.indy.ftest.core.content; + +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang.StringUtils; +import org.commonjava.indy.ftest.core.AbstractContentManagementTest; +import org.commonjava.indy.model.core.Group; +import org.commonjava.indy.model.core.HostedRepository; +import org.commonjava.indy.model.core.RemoteRepository; +import org.commonjava.indy.model.core.StoreKey; +import org.commonjava.indy.test.fixture.core.CoreServerFixture; +import org.commonjava.test.http.expect.ExpectationServer; +import org.junit.Rule; +import org.junit.Test; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.List; + +import static org.commonjava.indy.core.content.group.GroupRepositoryFilterManager.REPO_FILTER; +import static org.commonjava.indy.pkg.maven.model.MavenPackageTypeDescriptor.MAVEN_PKG_KEY; +import static org.commonjava.indy.subsys.template.ScriptEngine.SCRIPTS_SUBDIR; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.junit.Assert.assertThat; + +/** + * Given: + * - Custom filter rh-pattern-repofilter.groovy + * - Exclude 'build-\d' if path is normal (ie. not match -rh*) + * - Do filter only if path is normal file, not metadata + * + * Given: + * - Remote repo R + * - Remote repo R contains normal path P1 + * - Remote repo R contains metadata M1 + * - Hosted repo build-1 + * - Hosted repo build-1 contains path P1 (to confuse retrieval process) + * - Hosted repo build-1 contains path P2 (match -rh* pattern) + * - Hosted repo build-1 contains metadata M1 + * - Group G contains build-1, R + * - Some other hosted build-x repos without content (to confuse it, we add it before build-1) + * + * When: + * - Get path P1 from group G + * + * Then: + * - Ignore the hosted build-1 and get the content from remote R + * + * When: + * - Get path P2 from group G + * + * Then: + * - Get content from hosted build-1 + * + * When: + * - Get metadata M1 from group G + * + * Then: + * - Get merged content from R and build-1 + */ +public class RepositoryFilterTest + extends AbstractContentManagementTest +{ + + @Rule + public ExpectationServer server = new ExpectationServer(); + + /* @formatter:off */ + private static final String METADATA_TEMPLATE = "\n" + + "\n" + + " org.foo\n" + + " bar\n" + + " \n" + + " %version%\n" + + " %version%\n" + + " \n" + + " %version%\n" + + " \n" + + " \n" + + "\n"; + /* @formatter:on */ + + @Test + public void run() throws Exception + { + final String path_1 = "org/foo/bar/1.0/bar-1.0.pom"; + final String content_1_remote = "This is a test from remote"; + final String content_1 = "This is a test"; + + final String path_2 = "org/foo/bar/1.0-rh-0001/bar-1.0-rh-0001.pom"; + final String content_2 = "This is a rh test"; + + final String remoteR = "R"; + final String hostedBuild_1 = "build-1"; + final String groupG = "G"; + + final String metadataPath = "org/foo/bar/maven-metadata.xml"; + + server.expect( server.formatUrl( remoteR, path_1 ), 200, content_1_remote ); + server.expect( server.formatUrl( remoteR, metadataPath ), 200, + METADATA_TEMPLATE.replaceAll( "%version%", "1.0" ) ); + + RemoteRepository remote = client.stores() + .create( new RemoteRepository( MAVEN_PKG_KEY, remoteR, + server.formatUrl( remoteR ) ), "Add remote", + RemoteRepository.class ); + + HostedRepository hosted = client.stores() + .create( new HostedRepository( MAVEN_PKG_KEY, hostedBuild_1 ), "Add hosted", + HostedRepository.class ); + + client.content().store( hosted.getKey(), path_1, new ByteArrayInputStream( content_1.getBytes() ) ); + client.content().store( hosted.getKey(), path_2, new ByteArrayInputStream( content_2.getBytes() ) ); + client.content() + .store( hosted.getKey(), metadataPath, new ByteArrayInputStream( + METADATA_TEMPLATE.replaceAll( "%version%", "1.0-rh-0001" ).getBytes() ) ); + + // add confusing repos, hope it is not confused + List storeKeys = new ArrayList<>(); + for ( int i = 100; i < 200; i++ ) + { + HostedRepository h = client.stores() + .create( new HostedRepository( MAVEN_PKG_KEY, "build-" + i ), "Add hosted", + HostedRepository.class ); + storeKeys.add( h.getKey() ); + } + + storeKeys.add( hosted.getKey() ); + storeKeys.add( remote.getKey() ); + + // create group + StoreKey[] keyArray = new StoreKey[storeKeys.size()]; + Group g = client.stores() + .create( new Group( MAVEN_PKG_KEY, groupG, storeKeys.toArray( keyArray ) ), "Add group", + Group.class ); + + System.out.printf( "\n\nGroup constituents are:\n %s\n\n", StringUtils.join( g.getConstituents(), "\n " ) ); + + // get + try (InputStream stream = client.content().get( g.getKey(), path_1 )) + { + String str = IOUtils.toString( stream ); + assertThat( str, equalTo( content_1_remote ) ); + } + + try (InputStream stream = client.content().get( g.getKey(), path_2 )) + { + String str = IOUtils.toString( stream ); + assertThat( str, equalTo( content_2 ) ); + } + + try (InputStream stream = client.content().get( g.getKey(), metadataPath )) + { + String str = IOUtils.toString( stream ); + assertThat( str, containsString( "1.0" ) ); + assertThat( str, containsString( "1.0-rh-0001" ) ); + } + } + + @Override + protected void initTestData( CoreServerFixture fixture ) throws IOException + { + String filterFile = "rh-pattern-repofilter.groovy"; + copyToDataFile( "repofilter/" + filterFile, SCRIPTS_SUBDIR + "/" + REPO_FILTER + "/" + filterFile ); + } + + @Override + protected boolean createStandardTestStructures() + { + return false; + } +} diff --git a/ftests/core/src/main/resources/repofilter/rh-pattern-repofilter.groovy b/ftests/core/src/main/resources/repofilter/rh-pattern-repofilter.groovy new file mode 100644 index 0000000000..ab77bc4397 --- /dev/null +++ b/ftests/core/src/main/resources/repofilter/rh-pattern-repofilter.groovy @@ -0,0 +1,22 @@ +package org.commonjava.indy.core.content.group + +import org.commonjava.indy.model.core.Group +import java.util.regex.Pattern + +class RHPatternNameGroupRepositoryFilter extends ReversePatternNameGroupRepositoryFilter { + def canProcessPattern = Pattern.compile(".+\\.(pom|jar|gz|zip|md5|sha1|sha256)\$") + + @Override + boolean canProcess(String path, Group group) { + return group.getPackageType().equals("maven") && canProcessPattern.matcher(path).matches() + } + + RHPatternNameGroupRepositoryFilter() { + super(".+-rh.+", "^build-\\d+") + } + + @Override + int getPriority() { + return 10 + } +} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 6a004eda67..becfe75b11 100644 --- a/pom.xml +++ b/pom.xml @@ -80,7 +80,7 @@ 1.1.0 3.7.1.0 3.7.2 - 1.1 + 1.2 1.1.0 @@ -418,11 +418,6 @@ confset provided - - org.commonjava.indy - indy-subsys-pathmapped - 2.0-SNAPSHOT - org.commonjava.indy indy-subsys-infinispan diff --git a/subsys/metrics/core/src/main/conf/conf.d/metrics.conf b/subsys/metrics/core/src/main/conf/conf.d/metrics.conf index 37471aa44c..09c4a87af8 100644 --- a/subsys/metrics/core/src/main/conf/conf.d/metrics.conf +++ b/subsys/metrics/core/src/main/conf/conf.d/metrics.conf @@ -19,6 +19,14 @@ ispn.enabled = true #ispn.gauges = CurrentNumberOfEntries,CurrentNumberOfEntriesInMemory,\ #TotalNumberOfEntries,Hits,Misses,Retrievals,Evictions +# Enable pathDB metrics. Default true. +# +#pathdb.enabled = true + +# Specify pathDB operations. Default all. +# +#pathdb.operations = exists,getStorageFile,getFileSystemContaining + # Enable Galley to measure artifact downloading time. Default false. # measure.transport = true diff --git a/subsys/metrics/reporter/src/main/conf/conf.d/metrics.conf b/subsys/metrics/reporter/src/main/conf/conf.d/metrics.conf index 37471aa44c..09c4a87af8 100644 --- a/subsys/metrics/reporter/src/main/conf/conf.d/metrics.conf +++ b/subsys/metrics/reporter/src/main/conf/conf.d/metrics.conf @@ -19,6 +19,14 @@ ispn.enabled = true #ispn.gauges = CurrentNumberOfEntries,CurrentNumberOfEntriesInMemory,\ #TotalNumberOfEntries,Hits,Misses,Retrievals,Evictions +# Enable pathDB metrics. Default true. +# +#pathdb.enabled = true + +# Specify pathDB operations. Default all. +# +#pathdb.operations = exists,getStorageFile,getFileSystemContaining + # Enable Galley to measure artifact downloading time. Default false. # measure.transport = true diff --git a/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/conf/IndyMetricsConfig.java b/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/conf/IndyMetricsConfig.java index ee480d4891..7342dbba79 100644 --- a/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/conf/IndyMetricsConfig.java +++ b/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/conf/IndyMetricsConfig.java @@ -102,10 +102,18 @@ public class IndyMetricsConfig private final static String INDY_METRICS_KOJI_ENABLED = "koji.enabled"; + private final static String INDY_METRICS_PATH_DB_ENABLED = "pathdb.enabled"; + + private final static String INDY_METRICS_PATH_DB_OPERATIONS = "pathdb.operations"; + private static final int DEFAULT_METER_RATIO = 1; private boolean ispnMetricsEnabled; + private boolean pathDBMetricsEnabled = true; // default + + private String pathDBMetricsOperations; + private String ispnGauges; private boolean measureTransport; @@ -510,6 +518,28 @@ public boolean isKojiMetricEnabled() return kojiMetricEnabled; } + public boolean isPathDBMetricsEnabled() + { + return pathDBMetricsEnabled; + } + + @ConfigName( INDY_METRICS_PATH_DB_ENABLED ) + public void setPathDBMetricsEnabled( boolean pathDBMetricsEnabled ) + { + this.pathDBMetricsEnabled = pathDBMetricsEnabled; + } + + public String getPathDBMetricsOperations() + { + return pathDBMetricsOperations; + } + + @ConfigName( INDY_METRICS_PATH_DB_OPERATIONS ) + public void setPathDBMetricsOperations( String pathDBMetricsOperations ) + { + this.pathDBMetricsOperations = pathDBMetricsOperations; + } + @ConfigName( INDY_METRICS_ISPN_ENABLED ) public void setIspnMetricsEnabled( boolean ispnMetricsEnabled ) { diff --git a/subsys/metrics/reporter/src/main/resources/default-metrics.conf b/subsys/metrics/reporter/src/main/resources/default-metrics.conf index 741216c0b7..57c12f43fa 100644 --- a/subsys/metrics/reporter/src/main/resources/default-metrics.conf +++ b/subsys/metrics/reporter/src/main/resources/default-metrics.conf @@ -19,6 +19,14 @@ ispn.enabled = true #ispn.gauges = CurrentNumberOfEntries,CurrentNumberOfEntriesInMemory,\ #TotalNumberOfEntries,Hits,Misses,Retrievals,Evictions +# Enable pathDB metrics. Default true. +# +#pathdb.enabled = true + +# Specify pathDB operations. Default all. +# +#pathdb.operations = exists,getStorageFile,getFileSystemContaining + # Enable Galley to measure artifact downloading time. Default false. # measure.transport = true From 8f3814d90b7fa4917fe232ad8f475d02b411e959 Mon Sep 17 00:00:00 2001 From: Rui Han Date: Wed, 8 Apr 2020 12:51:03 +0800 Subject: [PATCH 02/50] Add debug log to DefaultContentDigester (#1574) --- .../commonjava/indy/core/content/DefaultContentDigester.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/src/main/java/org/commonjava/indy/core/content/DefaultContentDigester.java b/core/src/main/java/org/commonjava/indy/core/content/DefaultContentDigester.java index 51cca83a1a..5a86f7dea7 100644 --- a/core/src/main/java/org/commonjava/indy/core/content/DefaultContentDigester.java +++ b/core/src/main/java/org/commonjava/indy/core/content/DefaultContentDigester.java @@ -123,12 +123,14 @@ public TransferMetadata digest( final StoreKey key, final String path, final Eve final Transfer transfer = directContentAccess.getTransfer( key, path ); if ( transfer == null || !transfer.exists() ) { + logger.error( "No transfer to digest, store: {}, path: {}, transfer: {}", key, path, transfer ); return new TransferMetadata( Collections.emptyMap(), 0L ); } TransferMetadata meta = getContentMetadata( transfer ); if ( meta != null ) { + logger.debug( "Get transferMetadata: {}", meta ); return meta; } From 7765f3ef2a661c401503b20bf7edb7365435bf1c Mon Sep 17 00:00:00 2001 From: liyu Date: Wed, 8 Apr 2020 17:33:48 +0800 Subject: [PATCH 03/50] bump up version of path-mapped-storage --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index becfe75b11..6dc6ac71f1 100644 --- a/pom.xml +++ b/pom.xml @@ -80,7 +80,7 @@ 1.1.0 3.7.1.0 3.7.2 - 1.2 + 1.3 1.1.0 From 1bf854ef20fbbcf363aa07d05e7d8e6ed32bd4fd Mon Sep 17 00:00:00 2001 From: liyu Date: Wed, 8 Apr 2020 17:48:51 +0800 Subject: [PATCH 04/50] bump next version to 2.1.0-snapshot --- addons/changelog/client-java/pom.xml | 2 +- addons/changelog/common/pom.xml | 2 +- addons/changelog/ftests/pom.xml | 2 +- addons/changelog/jaxrs/pom.xml | 2 +- addons/changelog/pom.xml | 2 +- addons/content-browse/client-java/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/event-audit/common/pom.xml | 2 +- addons/event-audit/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/path-mapped/common/pom.xml | 2 +- addons/path-mapped/jaxrs/pom.xml | 2 +- addons/path-mapped/model-java/pom.xml | 2 +- addons/path-mapped/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/revisions/common/pom.xml | 2 +- addons/revisions/jaxrs/pom.xml | 2 +- addons/revisions/pom.xml | 2 +- addons/sli/pom.xml | 2 +- api/pom.xml | 2 +- bindings/jaxrs/pom.xml | 2 +- bindings/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/common/pom.xml | 2 +- db/flat/pom.xml | 2 +- db/infinispan/pom.xml | 2 +- db/memory/pom.xml | 2 +- db/metrics/pom.xml | 2 +- db/pom.xml | 2 +- deployments/docker/pom.xml | 2 +- deployments/launcher/pom.xml | 2 +- deployments/pom.xml | 2 +- deployments/standalone/launcher/pom.xml | 2 +- deployments/standalone/pom.xml | 2 +- embedder-tests/pom.xml | 2 +- embedder-tests/sonar-report/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 | 244 +++++++++---------- rest/api/pom.xml | 2 +- rest/pom.xml | 2 +- subsys/cassandra/pom.xml | 2 +- subsys/cpool/pom.xml | 2 +- subsys/flatfile/pom.xml | 2 +- subsys/git/pom.xml | 2 +- subsys/groovy/pom.xml | 2 +- subsys/honeycomb/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/prometheus/pom.xml | 2 +- subsys/metrics/reporter/pom.xml | 2 +- subsys/pom.xml | 2 +- subsys/prefetch/pom.xml | 2 +- test/db/pom.xml | 2 +- test/docker/gogs-test-appliance/pom.xml | 2 +- test/docker/keycloak-test-appliance/pom.xml | 2 +- test/docker/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 +- 135 files changed, 256 insertions(+), 256 deletions(-) diff --git a/addons/changelog/client-java/pom.xml b/addons/changelog/client-java/pom.xml index b63f9a2c50..e157e17047 100644 --- a/addons/changelog/client-java/pom.xml +++ b/addons/changelog/client-java/pom.xml @@ -20,7 +20,7 @@ indy-changelog org.commonjava.indy - 2.0.0 + 2.1.0-SNAPSHOT 4.0.0 diff --git a/addons/changelog/common/pom.xml b/addons/changelog/common/pom.xml index 5ab1d4fd4a..172c02d645 100644 --- a/addons/changelog/common/pom.xml +++ b/addons/changelog/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.0.0 + 2.1.0-SNAPSHOT indy-changelog-common Indy :: Add-Ons :: ChangeLog :: Common diff --git a/addons/changelog/ftests/pom.xml b/addons/changelog/ftests/pom.xml index ce89d5ce82..6afdb4e9d4 100644 --- a/addons/changelog/ftests/pom.xml +++ b/addons/changelog/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.0.0 + 2.1.0-SNAPSHOT indy-ftests-changelog diff --git a/addons/changelog/jaxrs/pom.xml b/addons/changelog/jaxrs/pom.xml index 098aebea15..83911121a1 100644 --- a/addons/changelog/jaxrs/pom.xml +++ b/addons/changelog/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.0.0 + 2.1.0-SNAPSHOT indy-changelog-jaxrs diff --git a/addons/changelog/pom.xml b/addons/changelog/pom.xml index abd9daac53..7852d2301b 100644 --- a/addons/changelog/pom.xml +++ b/addons/changelog/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.0.0 + 2.1.0-SNAPSHOT indy-changelog Indy :: Add-Ons :: ChangeLog :: Parent diff --git a/addons/content-browse/client-java/pom.xml b/addons/content-browse/client-java/pom.xml index f99f4d2eb6..7cff5ad210 100644 --- a/addons/content-browse/client-java/pom.xml +++ b/addons/content-browse/client-java/pom.xml @@ -20,7 +20,7 @@ indy-content-browse org.commonjava.indy - 2.0.0 + 2.1.0-SNAPSHOT 4.0.0 diff --git a/addons/content-browse/common/pom.xml b/addons/content-browse/common/pom.xml index aa2c8acb53..adb0f51206 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 - 2.0.0 + 2.1.0-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 c5de19eab4..a34190e775 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 - 2.0.0 + 2.1.0-SNAPSHOT indy-ftests-content-browse diff --git a/addons/content-browse/jaxrs/pom.xml b/addons/content-browse/jaxrs/pom.xml index 0ab71448ff..62aa4d259a 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 - 2.0.0 + 2.1.0-SNAPSHOT indy-content-browse-jaxrs diff --git a/addons/content-browse/model-java/pom.xml b/addons/content-browse/model-java/pom.xml index dc55c1ede7..688924a66a 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 - 2.0.0 + 2.1.0-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 026613fa0b..ae6fe0085a 100644 --- a/addons/content-browse/pom.xml +++ b/addons/content-browse/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.0.0 + 2.1.0-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 6d4d126756..1199b2f479 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 - 2.0.0 + 2.1.0-SNAPSHOT 4.0.0 diff --git a/addons/content-index/pom.xml b/addons/content-index/pom.xml index ce69e5651b..3a8530cb56 100644 --- a/addons/content-index/pom.xml +++ b/addons/content-index/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.0.0 + 2.1.0-SNAPSHOT indy-content-index diff --git a/addons/diagnostics/client-java/pom.xml b/addons/diagnostics/client-java/pom.xml index 88b00c6875..3803e5c089 100644 --- a/addons/diagnostics/client-java/pom.xml +++ b/addons/diagnostics/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.0.0 + 2.1.0-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 14b8f956f2..a540f80ef6 100644 --- a/addons/diagnostics/common/pom.xml +++ b/addons/diagnostics/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.0.0 + 2.1.0-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 d9437d9c7e..9a5fe5bdbf 100644 --- a/addons/diagnostics/ftests/pom.xml +++ b/addons/diagnostics/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.0.0 + 2.1.0-SNAPSHOT indy-ftests-diagnostics diff --git a/addons/diagnostics/jaxrs/pom.xml b/addons/diagnostics/jaxrs/pom.xml index c834cdbe01..c8d415ed4e 100644 --- a/addons/diagnostics/jaxrs/pom.xml +++ b/addons/diagnostics/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.0.0 + 2.1.0-SNAPSHOT indy-diagnostics-jaxrs diff --git a/addons/diagnostics/pom.xml b/addons/diagnostics/pom.xml index b8a7ed118a..a7bdce606f 100644 --- a/addons/diagnostics/pom.xml +++ b/addons/diagnostics/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.0.0 + 2.1.0-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 4d00708e61..f623621878 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 - 2.0.0 + 2.1.0-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 fd7cfbe497..743acdecb6 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 - 2.0.0 + 2.1.0-SNAPSHOT indy-ftests-dot-maven diff --git a/addons/dot-maven/jaxrs/pom.xml b/addons/dot-maven/jaxrs/pom.xml index 6e93e0e131..3fcabf1a63 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 - 2.0.0 + 2.1.0-SNAPSHOT indy-dot-maven-jaxrs diff --git a/addons/dot-maven/pom.xml b/addons/dot-maven/pom.xml index 9f592fbcaf..6160e75f52 100644 --- a/addons/dot-maven/pom.xml +++ b/addons/dot-maven/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.0.0 + 2.1.0-SNAPSHOT indy-dot-maven diff --git a/addons/event-audit/common/pom.xml b/addons/event-audit/common/pom.xml index 910d1b4f79..5fd8a9f21d 100644 --- a/addons/event-audit/common/pom.xml +++ b/addons/event-audit/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-event-audit - 2.0.0 + 2.1.0-SNAPSHOT indy-event-audit-common diff --git a/addons/event-audit/pom.xml b/addons/event-audit/pom.xml index b213afc055..289d3e502c 100644 --- a/addons/event-audit/pom.xml +++ b/addons/event-audit/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.0.0 + 2.1.0-SNAPSHOT indy-event-audit diff --git a/addons/folo/client-java/pom.xml b/addons/folo/client-java/pom.xml index 8f207717bb..23f6acc08d 100644 --- a/addons/folo/client-java/pom.xml +++ b/addons/folo/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.0.0 + 2.1.0-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 5ad83a8b6c..e86a20298a 100644 --- a/addons/folo/common/pom.xml +++ b/addons/folo/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.0.0 + 2.1.0-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 12cf55de59..dad863ddf0 100644 --- a/addons/folo/ftests/pom.xml +++ b/addons/folo/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.0.0 + 2.1.0-SNAPSHOT indy-ftests-folo diff --git a/addons/folo/jaxrs/pom.xml b/addons/folo/jaxrs/pom.xml index 0e89ef6922..037e4fe956 100644 --- a/addons/folo/jaxrs/pom.xml +++ b/addons/folo/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.0.0 + 2.1.0-SNAPSHOT indy-folo-jaxrs diff --git a/addons/folo/model-java/pom.xml b/addons/folo/model-java/pom.xml index 5398d2b337..0d25f71c3a 100644 --- a/addons/folo/model-java/pom.xml +++ b/addons/folo/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.0.0 + 2.1.0-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 555e57f417..0d1bbe4dea 100644 --- a/addons/folo/pom.xml +++ b/addons/folo/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.0.0 + 2.1.0-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 a5ccb4be0d..ab0fa147a0 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 - 2.0.0 + 2.1.0-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 509c0d041e..ac725b5c14 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 - 2.0.0 + 2.1.0-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 f327447970..4b5f705410 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 - 2.0.0 + 2.1.0-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 85faadf098..850d0435b3 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 - 2.0.0 + 2.1.0-SNAPSHOT indy-hosted-by-archive-jaxrs diff --git a/addons/hosted-by-archive/pom.xml b/addons/hosted-by-archive/pom.xml index 60ec863ed5..82f1b25c1a 100644 --- a/addons/hosted-by-archive/pom.xml +++ b/addons/hosted-by-archive/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.0.0 + 2.1.0-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 01e578c0ef..ee7de5090a 100644 --- a/addons/httprox/common/pom.xml +++ b/addons/httprox/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.0.0 + 2.1.0-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 1f446e0e77..d7879ef278 100644 --- a/addons/httprox/ftests/pom.xml +++ b/addons/httprox/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.0.0 + 2.1.0-SNAPSHOT indy-ftests-httprox diff --git a/addons/httprox/jaxrs/pom.xml b/addons/httprox/jaxrs/pom.xml index 53dc184794..ca747336dd 100644 --- a/addons/httprox/jaxrs/pom.xml +++ b/addons/httprox/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.0.0 + 2.1.0-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 e855e3a634..749e459db9 100644 --- a/addons/httprox/pom.xml +++ b/addons/httprox/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.0.0 + 2.1.0-SNAPSHOT indy-httprox diff --git a/addons/implied-repos/client-java/pom.xml b/addons/implied-repos/client-java/pom.xml index da02e45823..2ea84d8f74 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 - 2.0.0 + 2.1.0-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 4538ef2f3f..5173fe397a 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 - 2.0.0 + 2.1.0-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 ef7c481431..b5fc440540 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 - 2.0.0 + 2.1.0-SNAPSHOT indy-ftests-implied-repos diff --git a/addons/implied-repos/model-java/pom.xml b/addons/implied-repos/model-java/pom.xml index d9fb112528..8351b8b040 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 - 2.0.0 + 2.1.0-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 b884655921..d7e7ac9f55 100644 --- a/addons/implied-repos/pom.xml +++ b/addons/implied-repos/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.0.0 + 2.1.0-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 8a629b3f45..e44d50e6d2 100644 --- a/addons/koji/client-java/pom.xml +++ b/addons/koji/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.0.0 + 2.1.0-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 95743fcc09..0f97b2c42f 100644 --- a/addons/koji/common/pom.xml +++ b/addons/koji/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.0.0 + 2.1.0-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 8e3b64a396..d1e486fff5 100644 --- a/addons/koji/jaxrs/pom.xml +++ b/addons/koji/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.0.0 + 2.1.0-SNAPSHOT indy-koji-jaxrs diff --git a/addons/koji/model-java/pom.xml b/addons/koji/model-java/pom.xml index f5c606faa2..6f773d7294 100644 --- a/addons/koji/model-java/pom.xml +++ b/addons/koji/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.0.0 + 2.1.0-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 ed3a68a6ee..4941500cbb 100644 --- a/addons/koji/pom.xml +++ b/addons/koji/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.0.0 + 2.1.0-SNAPSHOT indy-koji Indy :: Add-Ons :: Koji Integration :: Parent diff --git a/addons/path-mapped/common/pom.xml b/addons/path-mapped/common/pom.xml index c460b8e9d7..5cb140fdfb 100644 --- a/addons/path-mapped/common/pom.xml +++ b/addons/path-mapped/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.0.0 + 2.1.0-SNAPSHOT indy-path-mapped-common diff --git a/addons/path-mapped/jaxrs/pom.xml b/addons/path-mapped/jaxrs/pom.xml index e95c9d5e8f..e3094ac211 100644 --- a/addons/path-mapped/jaxrs/pom.xml +++ b/addons/path-mapped/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.0.0 + 2.1.0-SNAPSHOT indy-path-mapped-jaxrs diff --git a/addons/path-mapped/model-java/pom.xml b/addons/path-mapped/model-java/pom.xml index 6ffc116afc..f389b30207 100644 --- a/addons/path-mapped/model-java/pom.xml +++ b/addons/path-mapped/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.0.0 + 2.1.0-SNAPSHOT indy-path-mapped-model-java diff --git a/addons/path-mapped/pom.xml b/addons/path-mapped/pom.xml index 2dc79e4857..8f3554c934 100644 --- a/addons/path-mapped/pom.xml +++ b/addons/path-mapped/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.0.0 + 2.1.0-SNAPSHOT indy-path-mapped Indy :: Add-Ons :: Path Mapped :: Parent diff --git a/addons/pkg-maven/common/pom.xml b/addons/pkg-maven/common/pom.xml index 89fa294068..737e71de3f 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 - 2.0.0 + 2.1.0-SNAPSHOT 4.0.0 diff --git a/addons/pkg-maven/ftests/pom.xml b/addons/pkg-maven/ftests/pom.xml index 0b8eb64e81..e46ed1bdac 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 - 2.0.0 + 2.1.0-SNAPSHOT 4.0.0 diff --git a/addons/pkg-maven/jaxrs/pom.xml b/addons/pkg-maven/jaxrs/pom.xml index 95be332b3a..f838cf88ce 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 - 2.0.0 + 2.1.0-SNAPSHOT 4.0.0 diff --git a/addons/pkg-maven/pom.xml b/addons/pkg-maven/pom.xml index 1860944231..31d64b2682 100644 --- a/addons/pkg-maven/pom.xml +++ b/addons/pkg-maven/pom.xml @@ -20,7 +20,7 @@ indy-addons org.commonjava.indy - 2.0.0 + 2.1.0-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/common/pom.xml b/addons/pkg-npm/common/pom.xml index 5b79f2324d..e8a525bd96 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 - 2.0.0 + 2.1.0-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/ftests/pom.xml b/addons/pkg-npm/ftests/pom.xml index 89dfea51a2..524626d197 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 - 2.0.0 + 2.1.0-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/jaxrs/pom.xml b/addons/pkg-npm/jaxrs/pom.xml index be787eb4c8..82fc45e540 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 - 2.0.0 + 2.1.0-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/model-java/pom.xml b/addons/pkg-npm/model-java/pom.xml index 40dc6cf31b..aabae7baf8 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 - 2.0.0 + 2.1.0-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/pom.xml b/addons/pkg-npm/pom.xml index 59de5baff4..891ca372a0 100644 --- a/addons/pkg-npm/pom.xml +++ b/addons/pkg-npm/pom.xml @@ -20,7 +20,7 @@ indy-addons org.commonjava.indy - 2.0.0 + 2.1.0-SNAPSHOT 4.0.0 diff --git a/addons/pom.xml b/addons/pom.xml index 5ee72e760e..d89f24c692 100644 --- a/addons/pom.xml +++ b/addons/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-parent - 2.0.0 + 2.1.0-SNAPSHOT indy-addons diff --git a/addons/promote/client-java/pom.xml b/addons/promote/client-java/pom.xml index 0ba4faa08d..3c7c226b41 100644 --- a/addons/promote/client-java/pom.xml +++ b/addons/promote/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.0.0 + 2.1.0-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 cee7f725a8..cec8dc8ba0 100644 --- a/addons/promote/common/pom.xml +++ b/addons/promote/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.0.0 + 2.1.0-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 9d88773a8a..f6c1bea6de 100644 --- a/addons/promote/ftests/pom.xml +++ b/addons/promote/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.0.0 + 2.1.0-SNAPSHOT indy-ftests-promote diff --git a/addons/promote/jaxrs/pom.xml b/addons/promote/jaxrs/pom.xml index 688420dc84..9a418b74b2 100644 --- a/addons/promote/jaxrs/pom.xml +++ b/addons/promote/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.0.0 + 2.1.0-SNAPSHOT indy-promote-jaxrs diff --git a/addons/promote/model-java/pom.xml b/addons/promote/model-java/pom.xml index 807a4ab6c3..f051de3521 100644 --- a/addons/promote/model-java/pom.xml +++ b/addons/promote/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.0.0 + 2.1.0-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 4378b54d10..c993ad2bf3 100644 --- a/addons/promote/pom.xml +++ b/addons/promote/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.0.0 + 2.1.0-SNAPSHOT indy-promote Indy :: Add-Ons :: Artifact Promotion :: Parent diff --git a/addons/revisions/common/pom.xml b/addons/revisions/common/pom.xml index 06f139cf98..0a08d71390 100644 --- a/addons/revisions/common/pom.xml +++ b/addons/revisions/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-revisions - 2.0.0 + 2.1.0-SNAPSHOT indy-revisions-common Indy :: Add-Ons :: Revisions :: Common diff --git a/addons/revisions/jaxrs/pom.xml b/addons/revisions/jaxrs/pom.xml index c88bca9b95..c1c84a2242 100644 --- a/addons/revisions/jaxrs/pom.xml +++ b/addons/revisions/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-revisions - 2.0.0 + 2.1.0-SNAPSHOT indy-revisions-jaxrs diff --git a/addons/revisions/pom.xml b/addons/revisions/pom.xml index d56831886d..ed25ca3df7 100644 --- a/addons/revisions/pom.xml +++ b/addons/revisions/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.0.0 + 2.1.0-SNAPSHOT indy-revisions Indy :: Add-Ons :: Revisions :: Parent diff --git a/addons/sli/pom.xml b/addons/sli/pom.xml index f264177ad3..b6967b81d4 100644 --- a/addons/sli/pom.xml +++ b/addons/sli/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.0.0 + 2.1.0-SNAPSHOT indy-sli Indy :: Add-Ons :: Service Level Indicators Reporting :: JAX-RS diff --git a/api/pom.xml b/api/pom.xml index bc173eb88a..7af092806a 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.0.0 + 2.1.0-SNAPSHOT indy-api diff --git a/bindings/jaxrs/pom.xml b/bindings/jaxrs/pom.xml index cbe0a1f7a0..75a99849be 100644 --- a/bindings/jaxrs/pom.xml +++ b/bindings/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-bindings - 2.0.0 + 2.1.0-SNAPSHOT indy-bindings-jaxrs diff --git a/bindings/pom.xml b/bindings/pom.xml index 143bc79fd4..c22e50324f 100644 --- a/bindings/pom.xml +++ b/bindings/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-parent - 2.0.0 + 2.1.0-SNAPSHOT indy-bindings diff --git a/boot/jaxrs/pom.xml b/boot/jaxrs/pom.xml index 672f1d3d82..dbbe47c098 100644 --- a/boot/jaxrs/pom.xml +++ b/boot/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.boot indy-booters - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy.boot diff --git a/boot/pom.xml b/boot/pom.xml index da513ff583..f921da5e48 100644 --- a/boot/pom.xml +++ b/boot/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy.boot diff --git a/clients/core-java/pom.xml b/clients/core-java/pom.xml index a354784d2e..d19dd3e9f1 100644 --- a/clients/core-java/pom.xml +++ b/clients/core-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-clients-parent - 2.0.0 + 2.1.0-SNAPSHOT indy-client-core-java diff --git a/clients/pom.xml b/clients/pom.xml index 5c0abbd777..19f0c8665a 100644 --- a/clients/pom.xml +++ b/clients/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.0.0 + 2.1.0-SNAPSHOT indy-clients-parent diff --git a/core/pom.xml b/core/pom.xml index 1c5bba4a18..5a6e82affe 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.0.0 + 2.1.0-SNAPSHOT indy-core diff --git a/db/common/pom.xml b/db/common/pom.xml index d5631b99fc..feb33fcf42 100644 --- a/db/common/pom.xml +++ b/db/common/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-db - 2.0.0 + 2.1.0-SNAPSHOT indy-db-common diff --git a/db/flat/pom.xml b/db/flat/pom.xml index 815866c519..e37d69ac7e 100644 --- a/db/flat/pom.xml +++ b/db/flat/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.0.0 + 2.1.0-SNAPSHOT indy-db-flat diff --git a/db/infinispan/pom.xml b/db/infinispan/pom.xml index f2fa774008..480fc74aab 100644 --- a/db/infinispan/pom.xml +++ b/db/infinispan/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-db - 2.0.0 + 2.1.0-SNAPSHOT indy-db-infinispan diff --git a/db/memory/pom.xml b/db/memory/pom.xml index 5d74c73228..1282b02b77 100644 --- a/db/memory/pom.xml +++ b/db/memory/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.0.0 + 2.1.0-SNAPSHOT indy-db-memory diff --git a/db/metrics/pom.xml b/db/metrics/pom.xml index 762b1ac7e3..dcb11218cd 100644 --- a/db/metrics/pom.xml +++ b/db/metrics/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.0.0 + 2.1.0-SNAPSHOT indy-db-metrics diff --git a/db/pom.xml b/db/pom.xml index b1f7dadcac..aa24c3db35 100644 --- a/db/pom.xml +++ b/db/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.0.0 + 2.1.0-SNAPSHOT indy-db diff --git a/deployments/docker/pom.xml b/deployments/docker/pom.xml index 71f18c41a5..d03ceb141e 100644 --- a/deployments/docker/pom.xml +++ b/deployments/docker/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-deployments - 2.0-SNAPSHOT + 2.1.0-SNAPSHOT org.commonjava.indy.docker diff --git a/deployments/launcher/pom.xml b/deployments/launcher/pom.xml index d546bc277d..5e8f2245dc 100644 --- a/deployments/launcher/pom.xml +++ b/deployments/launcher/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-deployments - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy.launch diff --git a/deployments/pom.xml b/deployments/pom.xml index edad391546..0c535d5087 100644 --- a/deployments/pom.xml +++ b/deployments/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.0.0 + 2.1.0-SNAPSHOT indy-deployments diff --git a/deployments/standalone/launcher/pom.xml b/deployments/standalone/launcher/pom.xml index 5d58c39b7a..f52bdf3c0e 100644 --- a/deployments/standalone/launcher/pom.xml +++ b/deployments/standalone/launcher/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-standalone - 2.0-SNAPSHOT + 2.1.0-SNAPSHOT indy-standalone-launcher diff --git a/deployments/standalone/pom.xml b/deployments/standalone/pom.xml index 44bddf7cf9..34b26bd26b 100644 --- a/deployments/standalone/pom.xml +++ b/deployments/standalone/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-deployments - 2.0-SNAPSHOT + 2.1.0-SNAPSHOT indy-standalone diff --git a/embedder-tests/pom.xml b/embedder-tests/pom.xml index 172ec448d2..7d0f6f1fc9 100644 --- a/embedder-tests/pom.xml +++ b/embedder-tests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 1.9.0-SNAPSHOT + 2.1.0-SNAPSHOT org.commonjava.indy.embed.test diff --git a/embedder-tests/sonar-report/pom.xml b/embedder-tests/sonar-report/pom.xml index eecc35fc32..7863efbcdb 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.9.0-SNAPSHOT + 2.1.0-SNAPSHOT 4.0.0 diff --git a/embedder/pom.xml b/embedder/pom.xml index 594ea9c573..f968dec7e5 100644 --- a/embedder/pom.xml +++ b/embedder/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy.embed diff --git a/filers/default/pom.xml b/filers/default/pom.xml index fecc18596f..99f30e18b5 100644 --- a/filers/default/pom.xml +++ b/filers/default/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-file-managers - 2.0.0 + 2.1.0-SNAPSHOT indy-filer-default diff --git a/filers/pom.xml b/filers/pom.xml index 38ab864ccc..6a45268673 100644 --- a/filers/pom.xml +++ b/filers/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.0.0 + 2.1.0-SNAPSHOT indy-file-managers diff --git a/ftests/common/pom.xml b/ftests/common/pom.xml index 1f42c349e4..4884e0caa8 100644 --- a/ftests/common/pom.xml +++ b/ftests/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-ftests-parent - 2.0.0 + 2.1.0-SNAPSHOT indy-ftests-common diff --git a/ftests/core/pom.xml b/ftests/core/pom.xml index 90d9af7267..e66dcf6dd9 100644 --- a/ftests/core/pom.xml +++ b/ftests/core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-ftests-parent - 2.0.0 + 2.1.0-SNAPSHOT indy-ftests-core diff --git a/ftests/metrics/pom.xml b/ftests/metrics/pom.xml index be2e628ffd..f1ad0cb747 100644 --- a/ftests/metrics/pom.xml +++ b/ftests/metrics/pom.xml @@ -20,7 +20,7 @@ indy-ftests-parent org.commonjava.indy - 2.0.0 + 2.1.0-SNAPSHOT 4.0.0 diff --git a/ftests/pom.xml b/ftests/pom.xml index c045437e8a..bc27acb217 100644 --- a/ftests/pom.xml +++ b/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.0.0 + 2.1.0-SNAPSHOT indy-ftests-parent diff --git a/models/core-java/pom.xml b/models/core-java/pom.xml index 9f34136e7c..8f1b1de4d3 100644 --- a/models/core-java/pom.xml +++ b/models/core-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-models-parent - 2.0.0 + 2.1.0-SNAPSHOT indy-model-core-java diff --git a/models/pom.xml b/models/pom.xml index 3c18f04cb3..2cf2d2f82b 100644 --- a/models/pom.xml +++ b/models/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.0.0 + 2.1.0-SNAPSHOT indy-models-parent diff --git a/pom.xml b/pom.xml index 6dc6ac71f1..3770a5465e 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.commonjava.indy indy-parent - 2.0.0 + 2.1.0-SNAPSHOT pom @@ -182,7 +182,7 @@ org.commonjava.indy.ui indy-ui-layover - 2.0.0 + 2.1.0-SNAPSHOT runtime @@ -190,22 +190,22 @@ org.commonjava.indy indy-model-core-java - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-api - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-core - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-core - 2.0.0 + 2.1.0-SNAPSHOT tar.gz confset provided @@ -213,32 +213,32 @@ org.commonjava.indy indy-db-flat - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-db-metrics - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-db-common - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-db-infinispan - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-bindings-jaxrs - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy.launch indy-launcher - 2.0.0 + 2.1.0-SNAPSHOT tar.gz skinny provided @@ -246,7 +246,7 @@ org.commonjava.indy.launch indy-launcher - 2.0.0 + 2.1.0-SNAPSHOT tar.gz complete provided @@ -254,7 +254,7 @@ org.commonjava.indy.launch indy-launcher - 2.0.0 + 2.1.0-SNAPSHOT tar.gz data provided @@ -262,7 +262,7 @@ org.commonjava.indy.launch indy-launcher - 2.0.0 + 2.1.0-SNAPSHOT tar.gz etc provided @@ -271,17 +271,17 @@ org.commonjava.indy indy-revisions-jaxrs - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-revisions-common - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-revisions-common - 2.0.0 + 2.1.0-SNAPSHOT tar.gz confset provided @@ -289,7 +289,7 @@ org.commonjava.indy indy-revisions-common - 2.0.0 + 2.1.0-SNAPSHOT tar.gz uiset provided @@ -297,12 +297,12 @@ org.commonjava.indy indy-dot-maven-common - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-dot-maven-common - 2.0.0 + 2.1.0-SNAPSHOT tar.gz dataset provided @@ -310,22 +310,22 @@ org.commonjava.indy indy-dot-maven-jaxrs - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-ftests-dot-maven - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-httprox-common - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-httprox-common - 2.0.0 + 2.1.0-SNAPSHOT tar.gz confset provided @@ -333,17 +333,17 @@ org.commonjava.indy indy-ftests-httprox - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-content-index - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-content-index - 2.0.0 + 2.1.0-SNAPSHOT tar.gz confset provided @@ -351,51 +351,51 @@ org.commonjava.indy indy-db-memory - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-test-db - 2.0.0 + 2.1.0-SNAPSHOT test org.commonjava.indy indy-test-fixtures-core - 2.0.0 + 2.1.0-SNAPSHOT test org.commonjava.indy indy-test-providers-core - 2.0.0 + 2.1.0-SNAPSHOT test org.commonjava.indy indy-test-utils - 2.0.0 + 2.1.0-SNAPSHOT test org.commonjava.indy indy-filer-default - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-subsys-jaxrs - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-subsys-honeycomb - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-subsys-honeycomb - 2.0.0 + 2.1.0-SNAPSHOT tar.gz confset provided @@ -403,17 +403,17 @@ org.commonjava.indy indy-subsys-flatfile - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-subsys-cassandra - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-subsys-cassandra - 2.0.0 + 2.1.0-SNAPSHOT tar.gz confset provided @@ -421,79 +421,79 @@ org.commonjava.indy indy-subsys-infinispan - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-subsys-http - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-subsys-git - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-subsys-groovy - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-subsys-prefetch - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-subsys-cpool - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-client-core-java - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-ftests-common - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-ftests-core - 2.0.0 + 2.1.0-SNAPSHOT test org.commonjava.indy indy-folo-jaxrs - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-ftests-folo - 2.0.0 + 2.1.0-SNAPSHOT test org.commonjava.indy indy-folo-client-java - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-folo-model-java - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-folo-common - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-folo-common - 2.0.0 + 2.1.0-SNAPSHOT tar.gz dataset provided @@ -501,7 +501,7 @@ org.commonjava.indy indy-folo-common - 2.0.0 + 2.1.0-SNAPSHOT tar.gz confset provided @@ -509,33 +509,33 @@ org.commonjava.indy indy-promote-jaxrs - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-ftests-promote - 2.0.0 + 2.1.0-SNAPSHOT test org.commonjava.indy indy-promote-client-java - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-promote-model-java - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-promote-common - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-promote-common - 2.0.0 + 2.1.0-SNAPSHOT tar.gz confset provided @@ -543,7 +543,7 @@ org.commonjava.indy indy-promote-common - 2.0.0 + 2.1.0-SNAPSHOT tar.gz dataset provided @@ -551,19 +551,19 @@ org.commonjava.indy indy-promote-common - 2.0.0 + 2.1.0-SNAPSHOT dataset provided org.commonjava.indy indy-implied-repos-common - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-implied-repos-common - 2.0.0 + 2.1.0-SNAPSHOT tar.gz confset provided @@ -571,37 +571,37 @@ org.commonjava.indy indy-implied-repos-model-java - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-implied-repos-client-java - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-ftests-implied-repos - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy.embed indy-embedder - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy.boot indy-booter-jaxrs - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-subsys-keycloak - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-subsys-keycloak - 2.0.0 + 2.1.0-SNAPSHOT tar.gz confset provided @@ -609,7 +609,7 @@ org.commonjava.indy indy-subsys-infinispan - 2.0.0 + 2.1.0-SNAPSHOT tar.gz confset provided @@ -617,7 +617,7 @@ org.commonjava.indy indy-subsys-prefetch - 2.0.0 + 2.1.0-SNAPSHOT tar.gz confset provided @@ -626,7 +626,7 @@ org.commonjava.indy indy-koji-common - 2.0.0 + 2.1.0-SNAPSHOT tar.gz confset provided @@ -634,103 +634,103 @@ org.commonjava.indy indy-koji-common - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-koji-model-java - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-koji-client-java - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-koji-jaxrs - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-path-mapped-common - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-path-mapped-model-java - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-path-mapped-jaxrs - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-pkg-maven-common - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-pkg-maven-jaxrs - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-pkg-npm-jaxrs - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-ftests-pkg-maven - 2.0.0 + 2.1.0-SNAPSHOT test org.commonjava.indy indy-ftests-pkg-npm - 2.0.0 + 2.1.0-SNAPSHOT test org.commonjava.indy indy-pkg-npm-common - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-pkg-npm-model-java - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-diagnostics-jaxrs - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-diagnostics-client-java - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-diagnostics-common - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-ftests-diagnostics - 2.0.0 + 2.1.0-SNAPSHOT test org.commonjava.indy indy-diagnostics-common - 2.0.0 + 2.1.0-SNAPSHOT confset tar.gz provided @@ -738,28 +738,28 @@ org.commonjava.indy indy-hosted-by-archive-common - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-hosted-by-archive-client-java - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-ftests-hosted-by-archive - 2.0.0 + 2.1.0-SNAPSHOT test org.commonjava.indy indy-hosted-by-archive-jaxrs - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-hosted-by-archive-common - 2.0.0 + 2.1.0-SNAPSHOT confset tar.gz @@ -767,22 +767,22 @@ org.commonjava.indy indy-subsys-metrics-core - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-subsys-metrics-reporter - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-subsys-metrics-prometheus - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-subsys-metrics-reporter - 2.0.0 + 2.1.0-SNAPSHOT confset tar.gz provided @@ -791,28 +791,28 @@ org.commonjava.indy indy-ftests-metrics - 2.0.0 + 2.1.0-SNAPSHOT test org.commonjava.indy indy-sli - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy.rest indy-rest-api yaml - 2.0.0 + 2.1.0-SNAPSHOT provided org.commonjava.indy.rest indy-rest-api json - 2.0.0 + 2.1.0-SNAPSHOT provided @@ -846,33 +846,33 @@ org.commonjava.indy indy-content-browse-common - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-content-browse-jaxrs - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-ftests-content-browse - 2.0.0 + 2.1.0-SNAPSHOT test org.commonjava.indy indy-content-browse-model-java - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-content-browse-client-java - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-content-browse-common - 2.0.0 + 2.1.0-SNAPSHOT confset tar.gz provided @@ -880,35 +880,35 @@ org.commonjava.indy indy-content-browse-ui - 2.0.0 + 2.1.0-SNAPSHOT reactui tar.gz org.commonjava.indy indy-changelog-common - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-changelog-client-java - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-ftests-changelog - 2.0.0 + 2.1.0-SNAPSHOT test org.commonjava.indy indy-changelog-jaxrs - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-changelog-common - 2.0.0 + 2.1.0-SNAPSHOT confset tar.gz @@ -926,12 +926,12 @@ org.commonjava.indy indy-event-audit-common - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy indy-event-audit-common - 2.0.0 + 2.1.0-SNAPSHOT confset tar.gz provided diff --git a/rest/api/pom.xml b/rest/api/pom.xml index a2d8155e9b..da9dce5621 100644 --- a/rest/api/pom.xml +++ b/rest/api/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.rest indy-rest-parent - 2.0.0 + 2.1.0-SNAPSHOT indy-rest-api diff --git a/rest/pom.xml b/rest/pom.xml index a385c0ed81..a9740cf6a3 100644 --- a/rest/pom.xml +++ b/rest/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy.rest diff --git a/subsys/cassandra/pom.xml b/subsys/cassandra/pom.xml index 4f9d1f4b47..be68979851 100644 --- a/subsys/cassandra/pom.xml +++ b/subsys/cassandra/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-subsystems - 2.0.0 + 2.1.0-SNAPSHOT indy-subsys-cassandra diff --git a/subsys/cpool/pom.xml b/subsys/cpool/pom.xml index 2ce9ea8fb3..a47ee62975 100644 --- a/subsys/cpool/pom.xml +++ b/subsys/cpool/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.0.0 + 2.1.0-SNAPSHOT indy-subsys-cpool diff --git a/subsys/flatfile/pom.xml b/subsys/flatfile/pom.xml index f1ff13b097..9bd13fd8bd 100644 --- a/subsys/flatfile/pom.xml +++ b/subsys/flatfile/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.0.0 + 2.1.0-SNAPSHOT indy-subsys-flatfile diff --git a/subsys/git/pom.xml b/subsys/git/pom.xml index 9ec22877f3..ff0b5b690e 100644 --- a/subsys/git/pom.xml +++ b/subsys/git/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.0.0 + 2.1.0-SNAPSHOT indy-subsys-git diff --git a/subsys/groovy/pom.xml b/subsys/groovy/pom.xml index d85a8c1912..1505e9193a 100644 --- a/subsys/groovy/pom.xml +++ b/subsys/groovy/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.0.0 + 2.1.0-SNAPSHOT indy-subsys-groovy diff --git a/subsys/honeycomb/pom.xml b/subsys/honeycomb/pom.xml index 3f13906f9b..20fab3aab8 100644 --- a/subsys/honeycomb/pom.xml +++ b/subsys/honeycomb/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.0.0 + 2.1.0-SNAPSHOT 4.0.0 diff --git a/subsys/http/pom.xml b/subsys/http/pom.xml index 831895e843..64b2ea6a3d 100644 --- a/subsys/http/pom.xml +++ b/subsys/http/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.0.0 + 2.1.0-SNAPSHOT indy-subsys-http diff --git a/subsys/infinispan/pom.xml b/subsys/infinispan/pom.xml index 8904ba648a..f045a0da9e 100644 --- a/subsys/infinispan/pom.xml +++ b/subsys/infinispan/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.0.0 + 2.1.0-SNAPSHOT indy-subsys-infinispan diff --git a/subsys/jaxrs/pom.xml b/subsys/jaxrs/pom.xml index b4fc1d927a..35ca289498 100644 --- a/subsys/jaxrs/pom.xml +++ b/subsys/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.0.0 + 2.1.0-SNAPSHOT indy-subsys-jaxrs diff --git a/subsys/kafka/pom.xml b/subsys/kafka/pom.xml index cc0c62bd3a..ad4d2107a1 100644 --- a/subsys/kafka/pom.xml +++ b/subsys/kafka/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.0.0 + 2.1.0-SNAPSHOT 4.0.0 diff --git a/subsys/keycloak/pom.xml b/subsys/keycloak/pom.xml index fdb0f975d3..6f15d48902 100644 --- a/subsys/keycloak/pom.xml +++ b/subsys/keycloak/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.0.0 + 2.1.0-SNAPSHOT indy-subsys-keycloak Indy :: Subsystems :: Keycloak diff --git a/subsys/metrics/core/pom.xml b/subsys/metrics/core/pom.xml index 743b129091..7c39667fc1 100644 --- a/subsys/metrics/core/pom.xml +++ b/subsys/metrics/core/pom.xml @@ -20,7 +20,7 @@ indy-subsys-metrics org.commonjava.indy - 2.0.0 + 2.1.0-SNAPSHOT 4.0.0 diff --git a/subsys/metrics/pom.xml b/subsys/metrics/pom.xml index 9ffb2d1bf5..ab86a24352 100644 --- a/subsys/metrics/pom.xml +++ b/subsys/metrics/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.0.0 + 2.1.0-SNAPSHOT 4.0.0 diff --git a/subsys/metrics/prometheus/pom.xml b/subsys/metrics/prometheus/pom.xml index 6229e9c805..ccd847c7e6 100644 --- a/subsys/metrics/prometheus/pom.xml +++ b/subsys/metrics/prometheus/pom.xml @@ -20,7 +20,7 @@ indy-subsys-metrics org.commonjava.indy - 2.0.0 + 2.1.0-SNAPSHOT 4.0.0 diff --git a/subsys/metrics/reporter/pom.xml b/subsys/metrics/reporter/pom.xml index cb1996bc35..555e710267 100644 --- a/subsys/metrics/reporter/pom.xml +++ b/subsys/metrics/reporter/pom.xml @@ -20,7 +20,7 @@ indy-subsys-metrics org.commonjava.indy - 2.0.0 + 2.1.0-SNAPSHOT 4.0.0 diff --git a/subsys/pom.xml b/subsys/pom.xml index 9af2357b2b..f318d98c8e 100644 --- a/subsys/pom.xml +++ b/subsys/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.0.0 + 2.1.0-SNAPSHOT indy-subsystems diff --git a/subsys/prefetch/pom.xml b/subsys/prefetch/pom.xml index 31c52e262a..7fba54aabc 100644 --- a/subsys/prefetch/pom.xml +++ b/subsys/prefetch/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.0.0 + 2.1.0-SNAPSHOT 4.0.0 diff --git a/test/db/pom.xml b/test/db/pom.xml index 452d9bb028..89794d1dd3 100644 --- a/test/db/pom.xml +++ b/test/db/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.0.0 + 2.1.0-SNAPSHOT indy-test-db diff --git a/test/docker/gogs-test-appliance/pom.xml b/test/docker/gogs-test-appliance/pom.xml index 1fbd80b0b4..500170df99 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.9.0-SNAPSHOT + 2.1.0-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 e653bacdc9..e71d5f75df 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.9.0-SNAPSHOT + 2.1.0-SNAPSHOT indy-docker-keycloak-test-appliance diff --git a/test/docker/pom.xml b/test/docker/pom.xml index 0aec23e550..2f6e0815ae 100644 --- a/test/docker/pom.xml +++ b/test/docker/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 1.9.0-SNAPSHOT + 2.1.0-SNAPSHOT org.commonjava.indy.docker diff --git a/test/fixtures-core/pom.xml b/test/fixtures-core/pom.xml index a8f16541df..6f5323d4fb 100644 --- a/test/fixtures-core/pom.xml +++ b/test/fixtures-core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.0.0 + 2.1.0-SNAPSHOT indy-test-fixtures-core diff --git a/test/pom.xml b/test/pom.xml index 7fa1cb3328..b741a3212b 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.0.0 + 2.1.0-SNAPSHOT indy-test diff --git a/test/providers-core/pom.xml b/test/providers-core/pom.xml index c3d7fe3406..96fc391a19 100644 --- a/test/providers-core/pom.xml +++ b/test/providers-core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.0.0 + 2.1.0-SNAPSHOT indy-test-providers-core diff --git a/test/utils/pom.xml b/test/utils/pom.xml index be3056013d..aa89f8b83e 100644 --- a/test/utils/pom.xml +++ b/test/utils/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.0.0 + 2.1.0-SNAPSHOT indy-test-utils diff --git a/tools/assemblies/pom.xml b/tools/assemblies/pom.xml index d6e63e0a5b..7f65c02807 100644 --- a/tools/assemblies/pom.xml +++ b/tools/assemblies/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.tools indy-tools - 2.0.0 + 2.1.0-SNAPSHOT indy-assemblies diff --git a/tools/pom.xml b/tools/pom.xml index 6720cc8b3e..a8cc26f881 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy.tools diff --git a/uis/layover/pom.xml b/uis/layover/pom.xml index 808ed1c7ce..9abc3c07f1 100644 --- a/uis/layover/pom.xml +++ b/uis/layover/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.ui indy-uis - 2.0.0 + 2.1.0-SNAPSHOT indy-ui-layover diff --git a/uis/pom.xml b/uis/pom.xml index 610a1c8ec7..de30dd8cb7 100644 --- a/uis/pom.xml +++ b/uis/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.0.0 + 2.1.0-SNAPSHOT org.commonjava.indy.ui From 4317f9d987f82c818cc277479752a6a7e11be21f Mon Sep 17 00:00:00 2001 From: liyu Date: Wed, 8 Apr 2020 18:17:31 +0800 Subject: [PATCH 05/50] add license headers to files that missing it --- .../inject/PathMappedGroupRepositoryFilter.java | 15 +++++++++++++++ .../indy/content/GroupRepositoryFilter.java | 15 +++++++++++++++ .../group/AbstractGroupRepositoryFilter.java | 15 +++++++++++++++ .../group/GroupRepositoryFilterManager.java | 15 +++++++++++++++ .../ReversePatternNameGroupRepositoryFilter.java | 15 +++++++++++++++ .../ftest/core/content/RepositoryFilterTest.java | 15 +++++++++++++++ 6 files changed, 90 insertions(+) diff --git a/addons/path-mapped/common/src/main/java/org/commonjava/indy/pathmapped/inject/PathMappedGroupRepositoryFilter.java b/addons/path-mapped/common/src/main/java/org/commonjava/indy/pathmapped/inject/PathMappedGroupRepositoryFilter.java index b1bbd62636..beeebd6c27 100644 --- a/addons/path-mapped/common/src/main/java/org/commonjava/indy/pathmapped/inject/PathMappedGroupRepositoryFilter.java +++ b/addons/path-mapped/common/src/main/java/org/commonjava/indy/pathmapped/inject/PathMappedGroupRepositoryFilter.java @@ -1,3 +1,18 @@ +/** + * Copyright (C) 2011-2020 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.pathmapped.inject; import org.commonjava.indy.core.content.group.AbstractGroupRepositoryFilter; diff --git a/api/src/main/java/org/commonjava/indy/content/GroupRepositoryFilter.java b/api/src/main/java/org/commonjava/indy/content/GroupRepositoryFilter.java index 785066f72a..528344f749 100644 --- a/api/src/main/java/org/commonjava/indy/content/GroupRepositoryFilter.java +++ b/api/src/main/java/org/commonjava/indy/content/GroupRepositoryFilter.java @@ -1,3 +1,18 @@ +/** + * Copyright (C) 2011-2020 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.content; import org.commonjava.indy.model.core.ArtifactStore; diff --git a/core/src/main/java/org/commonjava/indy/core/content/group/AbstractGroupRepositoryFilter.java b/core/src/main/java/org/commonjava/indy/core/content/group/AbstractGroupRepositoryFilter.java index e37a2e4cf2..8638cbadb6 100644 --- a/core/src/main/java/org/commonjava/indy/core/content/group/AbstractGroupRepositoryFilter.java +++ b/core/src/main/java/org/commonjava/indy/core/content/group/AbstractGroupRepositoryFilter.java @@ -1,3 +1,18 @@ +/** + * Copyright (C) 2011-2020 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.content.group; import org.commonjava.indy.content.GroupRepositoryFilter; diff --git a/core/src/main/java/org/commonjava/indy/core/content/group/GroupRepositoryFilterManager.java b/core/src/main/java/org/commonjava/indy/core/content/group/GroupRepositoryFilterManager.java index 532f0248b2..7376ffc961 100644 --- a/core/src/main/java/org/commonjava/indy/core/content/group/GroupRepositoryFilterManager.java +++ b/core/src/main/java/org/commonjava/indy/core/content/group/GroupRepositoryFilterManager.java @@ -1,3 +1,18 @@ +/** + * Copyright (C) 2011-2020 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.content.group; import org.apache.commons.lang.StringUtils; diff --git a/core/src/main/java/org/commonjava/indy/core/content/group/ReversePatternNameGroupRepositoryFilter.java b/core/src/main/java/org/commonjava/indy/core/content/group/ReversePatternNameGroupRepositoryFilter.java index d244831388..aa6b6f66bf 100644 --- a/core/src/main/java/org/commonjava/indy/core/content/group/ReversePatternNameGroupRepositoryFilter.java +++ b/core/src/main/java/org/commonjava/indy/core/content/group/ReversePatternNameGroupRepositoryFilter.java @@ -1,3 +1,18 @@ +/** + * Copyright (C) 2011-2020 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.content.group; import org.commonjava.indy.model.core.ArtifactStore; diff --git a/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/RepositoryFilterTest.java b/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/RepositoryFilterTest.java index c248f4d43b..07f693b1c2 100644 --- a/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/RepositoryFilterTest.java +++ b/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/RepositoryFilterTest.java @@ -1,3 +1,18 @@ +/** + * Copyright (C) 2011-2020 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.ftest.core.content; import org.apache.commons.io.IOUtils; From 98f15bb60e7642a8e22413348f48bdaaece8bd12 Mon Sep 17 00:00:00 2001 From: liyu Date: Thu, 9 Apr 2020 01:45:11 +0800 Subject: [PATCH 06/50] exclude cql file from release process --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 3770a5465e..16ce379e78 100644 --- a/pom.xml +++ b/pom.xml @@ -1871,6 +1871,7 @@ **/.pydevproject **/Jenkinsfile **/MAVEN_ENV + **/*.cql From 43e0aebf4c30acbe02b0d52d2844314ac3c23738 Mon Sep 17 00:00:00 2001 From: liyu Date: Thu, 9 Apr 2020 01:54:24 +0800 Subject: [PATCH 07/50] [maven-release-plugin] prepare release indy-parent-2.1.0 --- addons/changelog/client-java/pom.xml | 2 +- addons/changelog/common/pom.xml | 2 +- addons/changelog/ftests/pom.xml | 2 +- addons/changelog/jaxrs/pom.xml | 2 +- addons/changelog/pom.xml | 2 +- addons/content-browse/client-java/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/event-audit/common/pom.xml | 2 +- addons/event-audit/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/path-mapped/common/pom.xml | 2 +- addons/path-mapped/jaxrs/pom.xml | 2 +- addons/path-mapped/model-java/pom.xml | 2 +- addons/path-mapped/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/revisions/common/pom.xml | 2 +- addons/revisions/jaxrs/pom.xml | 2 +- addons/revisions/pom.xml | 2 +- addons/sli/pom.xml | 2 +- api/pom.xml | 2 +- bindings/jaxrs/pom.xml | 2 +- bindings/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/common/pom.xml | 2 +- db/flat/pom.xml | 2 +- db/infinispan/pom.xml | 2 +- db/memory/pom.xml | 2 +- db/metrics/pom.xml | 2 +- db/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 | 246 +++++++++---------- rest/api/pom.xml | 2 +- rest/pom.xml | 2 +- subsys/cassandra/pom.xml | 2 +- subsys/cpool/pom.xml | 2 +- subsys/flatfile/pom.xml | 2 +- subsys/git/pom.xml | 2 +- subsys/groovy/pom.xml | 2 +- subsys/honeycomb/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/prometheus/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 +- 127 files changed, 249 insertions(+), 249 deletions(-) diff --git a/addons/changelog/client-java/pom.xml b/addons/changelog/client-java/pom.xml index e157e17047..741ce90f47 100644 --- a/addons/changelog/client-java/pom.xml +++ b/addons/changelog/client-java/pom.xml @@ -20,7 +20,7 @@ indy-changelog org.commonjava.indy - 2.1.0-SNAPSHOT + 2.1.0 4.0.0 diff --git a/addons/changelog/common/pom.xml b/addons/changelog/common/pom.xml index 172c02d645..f4d9311a5f 100644 --- a/addons/changelog/common/pom.xml +++ b/addons/changelog/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.1.0-SNAPSHOT + 2.1.0 indy-changelog-common Indy :: Add-Ons :: ChangeLog :: Common diff --git a/addons/changelog/ftests/pom.xml b/addons/changelog/ftests/pom.xml index 6afdb4e9d4..7a73b22798 100644 --- a/addons/changelog/ftests/pom.xml +++ b/addons/changelog/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.1.0-SNAPSHOT + 2.1.0 indy-ftests-changelog diff --git a/addons/changelog/jaxrs/pom.xml b/addons/changelog/jaxrs/pom.xml index 83911121a1..de30486fa3 100644 --- a/addons/changelog/jaxrs/pom.xml +++ b/addons/changelog/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.1.0-SNAPSHOT + 2.1.0 indy-changelog-jaxrs diff --git a/addons/changelog/pom.xml b/addons/changelog/pom.xml index 7852d2301b..1a1bc3f05d 100644 --- a/addons/changelog/pom.xml +++ b/addons/changelog/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.1.0-SNAPSHOT + 2.1.0 indy-changelog Indy :: Add-Ons :: ChangeLog :: Parent diff --git a/addons/content-browse/client-java/pom.xml b/addons/content-browse/client-java/pom.xml index 7cff5ad210..83ce834275 100644 --- a/addons/content-browse/client-java/pom.xml +++ b/addons/content-browse/client-java/pom.xml @@ -20,7 +20,7 @@ indy-content-browse org.commonjava.indy - 2.1.0-SNAPSHOT + 2.1.0 4.0.0 diff --git a/addons/content-browse/common/pom.xml b/addons/content-browse/common/pom.xml index adb0f51206..c77ecd78d0 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 - 2.1.0-SNAPSHOT + 2.1.0 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 a34190e775..631ddd8145 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 - 2.1.0-SNAPSHOT + 2.1.0 indy-ftests-content-browse diff --git a/addons/content-browse/jaxrs/pom.xml b/addons/content-browse/jaxrs/pom.xml index 62aa4d259a..43a40162af 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 - 2.1.0-SNAPSHOT + 2.1.0 indy-content-browse-jaxrs diff --git a/addons/content-browse/model-java/pom.xml b/addons/content-browse/model-java/pom.xml index 688924a66a..6e6ee47e07 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 - 2.1.0-SNAPSHOT + 2.1.0 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 ae6fe0085a..44fd7137ab 100644 --- a/addons/content-browse/pom.xml +++ b/addons/content-browse/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.1.0-SNAPSHOT + 2.1.0 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 1199b2f479..75842d701b 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 - 2.1.0-SNAPSHOT + 2.1.0 4.0.0 diff --git a/addons/content-index/pom.xml b/addons/content-index/pom.xml index 3a8530cb56..754bdee4d3 100644 --- a/addons/content-index/pom.xml +++ b/addons/content-index/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.1.0-SNAPSHOT + 2.1.0 indy-content-index diff --git a/addons/diagnostics/client-java/pom.xml b/addons/diagnostics/client-java/pom.xml index 3803e5c089..33ec20093c 100644 --- a/addons/diagnostics/client-java/pom.xml +++ b/addons/diagnostics/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.1.0-SNAPSHOT + 2.1.0 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 a540f80ef6..3e7681d1c0 100644 --- a/addons/diagnostics/common/pom.xml +++ b/addons/diagnostics/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.1.0-SNAPSHOT + 2.1.0 indy-diagnostics-common Indy :: Add-Ons :: Diagnostic Tools :: Common diff --git a/addons/diagnostics/ftests/pom.xml b/addons/diagnostics/ftests/pom.xml index 9a5fe5bdbf..c6e9c0e3f9 100644 --- a/addons/diagnostics/ftests/pom.xml +++ b/addons/diagnostics/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.1.0-SNAPSHOT + 2.1.0 indy-ftests-diagnostics diff --git a/addons/diagnostics/jaxrs/pom.xml b/addons/diagnostics/jaxrs/pom.xml index c8d415ed4e..354ffe34de 100644 --- a/addons/diagnostics/jaxrs/pom.xml +++ b/addons/diagnostics/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.1.0-SNAPSHOT + 2.1.0 indy-diagnostics-jaxrs diff --git a/addons/diagnostics/pom.xml b/addons/diagnostics/pom.xml index a7bdce606f..a954a16538 100644 --- a/addons/diagnostics/pom.xml +++ b/addons/diagnostics/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.1.0-SNAPSHOT + 2.1.0 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 f623621878..40923ea75b 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 - 2.1.0-SNAPSHOT + 2.1.0 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 743acdecb6..f9924ce113 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 - 2.1.0-SNAPSHOT + 2.1.0 indy-ftests-dot-maven diff --git a/addons/dot-maven/jaxrs/pom.xml b/addons/dot-maven/jaxrs/pom.xml index 3fcabf1a63..775e3d827f 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 - 2.1.0-SNAPSHOT + 2.1.0 indy-dot-maven-jaxrs diff --git a/addons/dot-maven/pom.xml b/addons/dot-maven/pom.xml index 6160e75f52..1430746041 100644 --- a/addons/dot-maven/pom.xml +++ b/addons/dot-maven/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.1.0-SNAPSHOT + 2.1.0 indy-dot-maven diff --git a/addons/event-audit/common/pom.xml b/addons/event-audit/common/pom.xml index 5fd8a9f21d..8a39fcc3d9 100644 --- a/addons/event-audit/common/pom.xml +++ b/addons/event-audit/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-event-audit - 2.1.0-SNAPSHOT + 2.1.0 indy-event-audit-common diff --git a/addons/event-audit/pom.xml b/addons/event-audit/pom.xml index 289d3e502c..375216e506 100644 --- a/addons/event-audit/pom.xml +++ b/addons/event-audit/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.1.0-SNAPSHOT + 2.1.0 indy-event-audit diff --git a/addons/folo/client-java/pom.xml b/addons/folo/client-java/pom.xml index 23f6acc08d..8a1c7781d3 100644 --- a/addons/folo/client-java/pom.xml +++ b/addons/folo/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.1.0-SNAPSHOT + 2.1.0 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 e86a20298a..bcd9a2416d 100644 --- a/addons/folo/common/pom.xml +++ b/addons/folo/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.1.0-SNAPSHOT + 2.1.0 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 dad863ddf0..4cd423c4f2 100644 --- a/addons/folo/ftests/pom.xml +++ b/addons/folo/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.1.0-SNAPSHOT + 2.1.0 indy-ftests-folo diff --git a/addons/folo/jaxrs/pom.xml b/addons/folo/jaxrs/pom.xml index 037e4fe956..4a1422d1cd 100644 --- a/addons/folo/jaxrs/pom.xml +++ b/addons/folo/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.1.0-SNAPSHOT + 2.1.0 indy-folo-jaxrs diff --git a/addons/folo/model-java/pom.xml b/addons/folo/model-java/pom.xml index 0d25f71c3a..e3faefe986 100644 --- a/addons/folo/model-java/pom.xml +++ b/addons/folo/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.1.0-SNAPSHOT + 2.1.0 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 0d1bbe4dea..4c76bb4b86 100644 --- a/addons/folo/pom.xml +++ b/addons/folo/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.1.0-SNAPSHOT + 2.1.0 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 ab0fa147a0..924997c77c 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 - 2.1.0-SNAPSHOT + 2.1.0 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 ac725b5c14..6f277097cb 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 - 2.1.0-SNAPSHOT + 2.1.0 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 4b5f705410..bbdd6fbb8a 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 - 2.1.0-SNAPSHOT + 2.1.0 indy-ftests-hosted-by-archive diff --git a/addons/hosted-by-archive/jaxrs/pom.xml b/addons/hosted-by-archive/jaxrs/pom.xml index 850d0435b3..f58339da0d 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 - 2.1.0-SNAPSHOT + 2.1.0 indy-hosted-by-archive-jaxrs diff --git a/addons/hosted-by-archive/pom.xml b/addons/hosted-by-archive/pom.xml index 82f1b25c1a..564768ff04 100644 --- a/addons/hosted-by-archive/pom.xml +++ b/addons/hosted-by-archive/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.1.0-SNAPSHOT + 2.1.0 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 ee7de5090a..32711593c0 100644 --- a/addons/httprox/common/pom.xml +++ b/addons/httprox/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.1.0-SNAPSHOT + 2.1.0 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 d7879ef278..c27f42abfc 100644 --- a/addons/httprox/ftests/pom.xml +++ b/addons/httprox/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.1.0-SNAPSHOT + 2.1.0 indy-ftests-httprox diff --git a/addons/httprox/jaxrs/pom.xml b/addons/httprox/jaxrs/pom.xml index ca747336dd..7567dc7892 100644 --- a/addons/httprox/jaxrs/pom.xml +++ b/addons/httprox/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.1.0-SNAPSHOT + 2.1.0 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 749e459db9..1d68ecd3aa 100644 --- a/addons/httprox/pom.xml +++ b/addons/httprox/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.1.0-SNAPSHOT + 2.1.0 indy-httprox diff --git a/addons/implied-repos/client-java/pom.xml b/addons/implied-repos/client-java/pom.xml index 2ea84d8f74..f749a50e8f 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 - 2.1.0-SNAPSHOT + 2.1.0 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 5173fe397a..c8c787c039 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 - 2.1.0-SNAPSHOT + 2.1.0 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 b5fc440540..3de86326c1 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 - 2.1.0-SNAPSHOT + 2.1.0 indy-ftests-implied-repos diff --git a/addons/implied-repos/model-java/pom.xml b/addons/implied-repos/model-java/pom.xml index 8351b8b040..2dade197cd 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 - 2.1.0-SNAPSHOT + 2.1.0 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 d7e7ac9f55..a1f24d18e9 100644 --- a/addons/implied-repos/pom.xml +++ b/addons/implied-repos/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.1.0-SNAPSHOT + 2.1.0 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 e44d50e6d2..10dcf6517f 100644 --- a/addons/koji/client-java/pom.xml +++ b/addons/koji/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.1.0-SNAPSHOT + 2.1.0 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 0f97b2c42f..8b85a1bb64 100644 --- a/addons/koji/common/pom.xml +++ b/addons/koji/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.1.0-SNAPSHOT + 2.1.0 indy-koji-common Indy :: Add-Ons :: Koji Integration :: Common diff --git a/addons/koji/jaxrs/pom.xml b/addons/koji/jaxrs/pom.xml index d1e486fff5..fe1c37d07d 100644 --- a/addons/koji/jaxrs/pom.xml +++ b/addons/koji/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.1.0-SNAPSHOT + 2.1.0 indy-koji-jaxrs diff --git a/addons/koji/model-java/pom.xml b/addons/koji/model-java/pom.xml index 6f773d7294..a3289d40b6 100644 --- a/addons/koji/model-java/pom.xml +++ b/addons/koji/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.1.0-SNAPSHOT + 2.1.0 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 4941500cbb..1a264e3457 100644 --- a/addons/koji/pom.xml +++ b/addons/koji/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.1.0-SNAPSHOT + 2.1.0 indy-koji Indy :: Add-Ons :: Koji Integration :: Parent diff --git a/addons/path-mapped/common/pom.xml b/addons/path-mapped/common/pom.xml index 5cb140fdfb..e4bd7f69eb 100644 --- a/addons/path-mapped/common/pom.xml +++ b/addons/path-mapped/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.1.0-SNAPSHOT + 2.1.0 indy-path-mapped-common diff --git a/addons/path-mapped/jaxrs/pom.xml b/addons/path-mapped/jaxrs/pom.xml index e3094ac211..a4de3dd09d 100644 --- a/addons/path-mapped/jaxrs/pom.xml +++ b/addons/path-mapped/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.1.0-SNAPSHOT + 2.1.0 indy-path-mapped-jaxrs diff --git a/addons/path-mapped/model-java/pom.xml b/addons/path-mapped/model-java/pom.xml index f389b30207..7b904a15e4 100644 --- a/addons/path-mapped/model-java/pom.xml +++ b/addons/path-mapped/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.1.0-SNAPSHOT + 2.1.0 indy-path-mapped-model-java diff --git a/addons/path-mapped/pom.xml b/addons/path-mapped/pom.xml index 8f3554c934..90b5e641f7 100644 --- a/addons/path-mapped/pom.xml +++ b/addons/path-mapped/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.1.0-SNAPSHOT + 2.1.0 indy-path-mapped Indy :: Add-Ons :: Path Mapped :: Parent diff --git a/addons/pkg-maven/common/pom.xml b/addons/pkg-maven/common/pom.xml index 737e71de3f..6ef1ea03ad 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 - 2.1.0-SNAPSHOT + 2.1.0 4.0.0 diff --git a/addons/pkg-maven/ftests/pom.xml b/addons/pkg-maven/ftests/pom.xml index e46ed1bdac..f37de83653 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 - 2.1.0-SNAPSHOT + 2.1.0 4.0.0 diff --git a/addons/pkg-maven/jaxrs/pom.xml b/addons/pkg-maven/jaxrs/pom.xml index f838cf88ce..c0a8c2cf97 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 - 2.1.0-SNAPSHOT + 2.1.0 4.0.0 diff --git a/addons/pkg-maven/pom.xml b/addons/pkg-maven/pom.xml index 31d64b2682..8cd083f873 100644 --- a/addons/pkg-maven/pom.xml +++ b/addons/pkg-maven/pom.xml @@ -20,7 +20,7 @@ indy-addons org.commonjava.indy - 2.1.0-SNAPSHOT + 2.1.0 4.0.0 diff --git a/addons/pkg-npm/common/pom.xml b/addons/pkg-npm/common/pom.xml index e8a525bd96..f925704ee1 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 - 2.1.0-SNAPSHOT + 2.1.0 4.0.0 diff --git a/addons/pkg-npm/ftests/pom.xml b/addons/pkg-npm/ftests/pom.xml index 524626d197..208cb186d5 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 - 2.1.0-SNAPSHOT + 2.1.0 4.0.0 diff --git a/addons/pkg-npm/jaxrs/pom.xml b/addons/pkg-npm/jaxrs/pom.xml index 82fc45e540..a85051482e 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 - 2.1.0-SNAPSHOT + 2.1.0 4.0.0 diff --git a/addons/pkg-npm/model-java/pom.xml b/addons/pkg-npm/model-java/pom.xml index aabae7baf8..a6e0bd088e 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 - 2.1.0-SNAPSHOT + 2.1.0 4.0.0 diff --git a/addons/pkg-npm/pom.xml b/addons/pkg-npm/pom.xml index 891ca372a0..865120eb25 100644 --- a/addons/pkg-npm/pom.xml +++ b/addons/pkg-npm/pom.xml @@ -20,7 +20,7 @@ indy-addons org.commonjava.indy - 2.1.0-SNAPSHOT + 2.1.0 4.0.0 diff --git a/addons/pom.xml b/addons/pom.xml index d89f24c692..b963e94b90 100644 --- a/addons/pom.xml +++ b/addons/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-parent - 2.1.0-SNAPSHOT + 2.1.0 indy-addons diff --git a/addons/promote/client-java/pom.xml b/addons/promote/client-java/pom.xml index 3c7c226b41..b2df280dc1 100644 --- a/addons/promote/client-java/pom.xml +++ b/addons/promote/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.1.0-SNAPSHOT + 2.1.0 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 cec8dc8ba0..86de643a2f 100644 --- a/addons/promote/common/pom.xml +++ b/addons/promote/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.1.0-SNAPSHOT + 2.1.0 indy-promote-common Indy :: Add-Ons :: Artifact Promotion :: Common diff --git a/addons/promote/ftests/pom.xml b/addons/promote/ftests/pom.xml index f6c1bea6de..0234d043eb 100644 --- a/addons/promote/ftests/pom.xml +++ b/addons/promote/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.1.0-SNAPSHOT + 2.1.0 indy-ftests-promote diff --git a/addons/promote/jaxrs/pom.xml b/addons/promote/jaxrs/pom.xml index 9a418b74b2..9b50caa6b9 100644 --- a/addons/promote/jaxrs/pom.xml +++ b/addons/promote/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.1.0-SNAPSHOT + 2.1.0 indy-promote-jaxrs diff --git a/addons/promote/model-java/pom.xml b/addons/promote/model-java/pom.xml index f051de3521..9c204fc1ca 100644 --- a/addons/promote/model-java/pom.xml +++ b/addons/promote/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.1.0-SNAPSHOT + 2.1.0 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 c993ad2bf3..abe09c508b 100644 --- a/addons/promote/pom.xml +++ b/addons/promote/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.1.0-SNAPSHOT + 2.1.0 indy-promote Indy :: Add-Ons :: Artifact Promotion :: Parent diff --git a/addons/revisions/common/pom.xml b/addons/revisions/common/pom.xml index 0a08d71390..000da2bd24 100644 --- a/addons/revisions/common/pom.xml +++ b/addons/revisions/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-revisions - 2.1.0-SNAPSHOT + 2.1.0 indy-revisions-common Indy :: Add-Ons :: Revisions :: Common diff --git a/addons/revisions/jaxrs/pom.xml b/addons/revisions/jaxrs/pom.xml index c1c84a2242..afdd673e1a 100644 --- a/addons/revisions/jaxrs/pom.xml +++ b/addons/revisions/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-revisions - 2.1.0-SNAPSHOT + 2.1.0 indy-revisions-jaxrs diff --git a/addons/revisions/pom.xml b/addons/revisions/pom.xml index ed25ca3df7..8c2a72dfff 100644 --- a/addons/revisions/pom.xml +++ b/addons/revisions/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.1.0-SNAPSHOT + 2.1.0 indy-revisions Indy :: Add-Ons :: Revisions :: Parent diff --git a/addons/sli/pom.xml b/addons/sli/pom.xml index b6967b81d4..2288f019cd 100644 --- a/addons/sli/pom.xml +++ b/addons/sli/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.1.0-SNAPSHOT + 2.1.0 indy-sli Indy :: Add-Ons :: Service Level Indicators Reporting :: JAX-RS diff --git a/api/pom.xml b/api/pom.xml index 7af092806a..9af794ba78 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.1.0-SNAPSHOT + 2.1.0 indy-api diff --git a/bindings/jaxrs/pom.xml b/bindings/jaxrs/pom.xml index 75a99849be..04f3def788 100644 --- a/bindings/jaxrs/pom.xml +++ b/bindings/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-bindings - 2.1.0-SNAPSHOT + 2.1.0 indy-bindings-jaxrs diff --git a/bindings/pom.xml b/bindings/pom.xml index c22e50324f..c032b376e0 100644 --- a/bindings/pom.xml +++ b/bindings/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-parent - 2.1.0-SNAPSHOT + 2.1.0 indy-bindings diff --git a/boot/jaxrs/pom.xml b/boot/jaxrs/pom.xml index dbbe47c098..c1d8ade220 100644 --- a/boot/jaxrs/pom.xml +++ b/boot/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.boot indy-booters - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy.boot diff --git a/boot/pom.xml b/boot/pom.xml index f921da5e48..2da8ef5e00 100644 --- a/boot/pom.xml +++ b/boot/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy.boot diff --git a/clients/core-java/pom.xml b/clients/core-java/pom.xml index d19dd3e9f1..684e09d787 100644 --- a/clients/core-java/pom.xml +++ b/clients/core-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-clients-parent - 2.1.0-SNAPSHOT + 2.1.0 indy-client-core-java diff --git a/clients/pom.xml b/clients/pom.xml index 19f0c8665a..af6990d9a6 100644 --- a/clients/pom.xml +++ b/clients/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.1.0-SNAPSHOT + 2.1.0 indy-clients-parent diff --git a/core/pom.xml b/core/pom.xml index 5a6e82affe..79f0ec08be 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.1.0-SNAPSHOT + 2.1.0 indy-core diff --git a/db/common/pom.xml b/db/common/pom.xml index feb33fcf42..78a33b84cf 100644 --- a/db/common/pom.xml +++ b/db/common/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-db - 2.1.0-SNAPSHOT + 2.1.0 indy-db-common diff --git a/db/flat/pom.xml b/db/flat/pom.xml index e37d69ac7e..aba03a8fee 100644 --- a/db/flat/pom.xml +++ b/db/flat/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.1.0-SNAPSHOT + 2.1.0 indy-db-flat diff --git a/db/infinispan/pom.xml b/db/infinispan/pom.xml index 480fc74aab..3dd66d1fa5 100644 --- a/db/infinispan/pom.xml +++ b/db/infinispan/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-db - 2.1.0-SNAPSHOT + 2.1.0 indy-db-infinispan diff --git a/db/memory/pom.xml b/db/memory/pom.xml index 1282b02b77..cef0ad364d 100644 --- a/db/memory/pom.xml +++ b/db/memory/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.1.0-SNAPSHOT + 2.1.0 indy-db-memory diff --git a/db/metrics/pom.xml b/db/metrics/pom.xml index dcb11218cd..ff2495dc6d 100644 --- a/db/metrics/pom.xml +++ b/db/metrics/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.1.0-SNAPSHOT + 2.1.0 indy-db-metrics diff --git a/db/pom.xml b/db/pom.xml index aa24c3db35..f1d5b85e67 100644 --- a/db/pom.xml +++ b/db/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.1.0-SNAPSHOT + 2.1.0 indy-db diff --git a/deployments/launcher/pom.xml b/deployments/launcher/pom.xml index 5e8f2245dc..a3e6b9a58a 100644 --- a/deployments/launcher/pom.xml +++ b/deployments/launcher/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-deployments - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy.launch diff --git a/deployments/pom.xml b/deployments/pom.xml index 0c535d5087..949ff2de4d 100644 --- a/deployments/pom.xml +++ b/deployments/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.1.0-SNAPSHOT + 2.1.0 indy-deployments diff --git a/embedder/pom.xml b/embedder/pom.xml index f968dec7e5..46971fdbb5 100644 --- a/embedder/pom.xml +++ b/embedder/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy.embed diff --git a/filers/default/pom.xml b/filers/default/pom.xml index 99f30e18b5..68d371fb8c 100644 --- a/filers/default/pom.xml +++ b/filers/default/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-file-managers - 2.1.0-SNAPSHOT + 2.1.0 indy-filer-default diff --git a/filers/pom.xml b/filers/pom.xml index 6a45268673..93650978de 100644 --- a/filers/pom.xml +++ b/filers/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.1.0-SNAPSHOT + 2.1.0 indy-file-managers diff --git a/ftests/common/pom.xml b/ftests/common/pom.xml index 4884e0caa8..f4ac31d69a 100644 --- a/ftests/common/pom.xml +++ b/ftests/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-ftests-parent - 2.1.0-SNAPSHOT + 2.1.0 indy-ftests-common diff --git a/ftests/core/pom.xml b/ftests/core/pom.xml index e66dcf6dd9..aa0944fc19 100644 --- a/ftests/core/pom.xml +++ b/ftests/core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-ftests-parent - 2.1.0-SNAPSHOT + 2.1.0 indy-ftests-core diff --git a/ftests/metrics/pom.xml b/ftests/metrics/pom.xml index f1ad0cb747..510fd0ed97 100644 --- a/ftests/metrics/pom.xml +++ b/ftests/metrics/pom.xml @@ -20,7 +20,7 @@ indy-ftests-parent org.commonjava.indy - 2.1.0-SNAPSHOT + 2.1.0 4.0.0 diff --git a/ftests/pom.xml b/ftests/pom.xml index bc27acb217..98fae85587 100644 --- a/ftests/pom.xml +++ b/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.1.0-SNAPSHOT + 2.1.0 indy-ftests-parent diff --git a/models/core-java/pom.xml b/models/core-java/pom.xml index 8f1b1de4d3..22434a018b 100644 --- a/models/core-java/pom.xml +++ b/models/core-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-models-parent - 2.1.0-SNAPSHOT + 2.1.0 indy-model-core-java diff --git a/models/pom.xml b/models/pom.xml index 2cf2d2f82b..84fc50496e 100644 --- a/models/pom.xml +++ b/models/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.1.0-SNAPSHOT + 2.1.0 indy-models-parent diff --git a/pom.xml b/pom.xml index 16ce379e78..96fa4b904f 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.commonjava.indy indy-parent - 2.1.0-SNAPSHOT + 2.1.0 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-2.0.0 + indy-parent-2.1.0 @@ -182,7 +182,7 @@ org.commonjava.indy.ui indy-ui-layover - 2.1.0-SNAPSHOT + 2.1.0 runtime @@ -190,22 +190,22 @@ org.commonjava.indy indy-model-core-java - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-api - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-core - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-core - 2.1.0-SNAPSHOT + 2.1.0 tar.gz confset provided @@ -213,32 +213,32 @@ org.commonjava.indy indy-db-flat - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-db-metrics - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-db-common - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-db-infinispan - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-bindings-jaxrs - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy.launch indy-launcher - 2.1.0-SNAPSHOT + 2.1.0 tar.gz skinny provided @@ -246,7 +246,7 @@ org.commonjava.indy.launch indy-launcher - 2.1.0-SNAPSHOT + 2.1.0 tar.gz complete provided @@ -254,7 +254,7 @@ org.commonjava.indy.launch indy-launcher - 2.1.0-SNAPSHOT + 2.1.0 tar.gz data provided @@ -262,7 +262,7 @@ org.commonjava.indy.launch indy-launcher - 2.1.0-SNAPSHOT + 2.1.0 tar.gz etc provided @@ -271,17 +271,17 @@ org.commonjava.indy indy-revisions-jaxrs - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-revisions-common - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-revisions-common - 2.1.0-SNAPSHOT + 2.1.0 tar.gz confset provided @@ -289,7 +289,7 @@ org.commonjava.indy indy-revisions-common - 2.1.0-SNAPSHOT + 2.1.0 tar.gz uiset provided @@ -297,12 +297,12 @@ org.commonjava.indy indy-dot-maven-common - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-dot-maven-common - 2.1.0-SNAPSHOT + 2.1.0 tar.gz dataset provided @@ -310,22 +310,22 @@ org.commonjava.indy indy-dot-maven-jaxrs - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-ftests-dot-maven - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-httprox-common - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-httprox-common - 2.1.0-SNAPSHOT + 2.1.0 tar.gz confset provided @@ -333,17 +333,17 @@ org.commonjava.indy indy-ftests-httprox - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-content-index - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-content-index - 2.1.0-SNAPSHOT + 2.1.0 tar.gz confset provided @@ -351,51 +351,51 @@ org.commonjava.indy indy-db-memory - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-test-db - 2.1.0-SNAPSHOT + 2.1.0 test org.commonjava.indy indy-test-fixtures-core - 2.1.0-SNAPSHOT + 2.1.0 test org.commonjava.indy indy-test-providers-core - 2.1.0-SNAPSHOT + 2.1.0 test org.commonjava.indy indy-test-utils - 2.1.0-SNAPSHOT + 2.1.0 test org.commonjava.indy indy-filer-default - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-subsys-jaxrs - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-subsys-honeycomb - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-subsys-honeycomb - 2.1.0-SNAPSHOT + 2.1.0 tar.gz confset provided @@ -403,17 +403,17 @@ org.commonjava.indy indy-subsys-flatfile - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-subsys-cassandra - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-subsys-cassandra - 2.1.0-SNAPSHOT + 2.1.0 tar.gz confset provided @@ -421,79 +421,79 @@ org.commonjava.indy indy-subsys-infinispan - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-subsys-http - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-subsys-git - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-subsys-groovy - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-subsys-prefetch - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-subsys-cpool - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-client-core-java - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-ftests-common - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-ftests-core - 2.1.0-SNAPSHOT + 2.1.0 test org.commonjava.indy indy-folo-jaxrs - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-ftests-folo - 2.1.0-SNAPSHOT + 2.1.0 test org.commonjava.indy indy-folo-client-java - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-folo-model-java - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-folo-common - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-folo-common - 2.1.0-SNAPSHOT + 2.1.0 tar.gz dataset provided @@ -501,7 +501,7 @@ org.commonjava.indy indy-folo-common - 2.1.0-SNAPSHOT + 2.1.0 tar.gz confset provided @@ -509,33 +509,33 @@ org.commonjava.indy indy-promote-jaxrs - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-ftests-promote - 2.1.0-SNAPSHOT + 2.1.0 test org.commonjava.indy indy-promote-client-java - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-promote-model-java - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-promote-common - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-promote-common - 2.1.0-SNAPSHOT + 2.1.0 tar.gz confset provided @@ -543,7 +543,7 @@ org.commonjava.indy indy-promote-common - 2.1.0-SNAPSHOT + 2.1.0 tar.gz dataset provided @@ -551,19 +551,19 @@ org.commonjava.indy indy-promote-common - 2.1.0-SNAPSHOT + 2.1.0 dataset provided org.commonjava.indy indy-implied-repos-common - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-implied-repos-common - 2.1.0-SNAPSHOT + 2.1.0 tar.gz confset provided @@ -571,37 +571,37 @@ org.commonjava.indy indy-implied-repos-model-java - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-implied-repos-client-java - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-ftests-implied-repos - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy.embed indy-embedder - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy.boot indy-booter-jaxrs - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-subsys-keycloak - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-subsys-keycloak - 2.1.0-SNAPSHOT + 2.1.0 tar.gz confset provided @@ -609,7 +609,7 @@ org.commonjava.indy indy-subsys-infinispan - 2.1.0-SNAPSHOT + 2.1.0 tar.gz confset provided @@ -617,7 +617,7 @@ org.commonjava.indy indy-subsys-prefetch - 2.1.0-SNAPSHOT + 2.1.0 tar.gz confset provided @@ -626,7 +626,7 @@ org.commonjava.indy indy-koji-common - 2.1.0-SNAPSHOT + 2.1.0 tar.gz confset provided @@ -634,103 +634,103 @@ org.commonjava.indy indy-koji-common - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-koji-model-java - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-koji-client-java - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-koji-jaxrs - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-path-mapped-common - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-path-mapped-model-java - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-path-mapped-jaxrs - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-pkg-maven-common - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-pkg-maven-jaxrs - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-pkg-npm-jaxrs - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-ftests-pkg-maven - 2.1.0-SNAPSHOT + 2.1.0 test org.commonjava.indy indy-ftests-pkg-npm - 2.1.0-SNAPSHOT + 2.1.0 test org.commonjava.indy indy-pkg-npm-common - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-pkg-npm-model-java - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-diagnostics-jaxrs - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-diagnostics-client-java - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-diagnostics-common - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-ftests-diagnostics - 2.1.0-SNAPSHOT + 2.1.0 test org.commonjava.indy indy-diagnostics-common - 2.1.0-SNAPSHOT + 2.1.0 confset tar.gz provided @@ -738,28 +738,28 @@ org.commonjava.indy indy-hosted-by-archive-common - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-hosted-by-archive-client-java - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-ftests-hosted-by-archive - 2.1.0-SNAPSHOT + 2.1.0 test org.commonjava.indy indy-hosted-by-archive-jaxrs - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-hosted-by-archive-common - 2.1.0-SNAPSHOT + 2.1.0 confset tar.gz @@ -767,22 +767,22 @@ org.commonjava.indy indy-subsys-metrics-core - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-subsys-metrics-reporter - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-subsys-metrics-prometheus - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-subsys-metrics-reporter - 2.1.0-SNAPSHOT + 2.1.0 confset tar.gz provided @@ -791,28 +791,28 @@ org.commonjava.indy indy-ftests-metrics - 2.1.0-SNAPSHOT + 2.1.0 test org.commonjava.indy indy-sli - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy.rest indy-rest-api yaml - 2.1.0-SNAPSHOT + 2.1.0 provided org.commonjava.indy.rest indy-rest-api json - 2.1.0-SNAPSHOT + 2.1.0 provided @@ -846,33 +846,33 @@ org.commonjava.indy indy-content-browse-common - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-content-browse-jaxrs - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-ftests-content-browse - 2.1.0-SNAPSHOT + 2.1.0 test org.commonjava.indy indy-content-browse-model-java - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-content-browse-client-java - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-content-browse-common - 2.1.0-SNAPSHOT + 2.1.0 confset tar.gz provided @@ -880,35 +880,35 @@ org.commonjava.indy indy-content-browse-ui - 2.1.0-SNAPSHOT + 2.1.0 reactui tar.gz org.commonjava.indy indy-changelog-common - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-changelog-client-java - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-ftests-changelog - 2.1.0-SNAPSHOT + 2.1.0 test org.commonjava.indy indy-changelog-jaxrs - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-changelog-common - 2.1.0-SNAPSHOT + 2.1.0 confset tar.gz @@ -926,12 +926,12 @@ org.commonjava.indy indy-event-audit-common - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy indy-event-audit-common - 2.1.0-SNAPSHOT + 2.1.0 confset tar.gz provided diff --git a/rest/api/pom.xml b/rest/api/pom.xml index da9dce5621..45d3801226 100644 --- a/rest/api/pom.xml +++ b/rest/api/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.rest indy-rest-parent - 2.1.0-SNAPSHOT + 2.1.0 indy-rest-api diff --git a/rest/pom.xml b/rest/pom.xml index a9740cf6a3..92f5c88bf9 100644 --- a/rest/pom.xml +++ b/rest/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy.rest diff --git a/subsys/cassandra/pom.xml b/subsys/cassandra/pom.xml index be68979851..b5b4afdeb2 100644 --- a/subsys/cassandra/pom.xml +++ b/subsys/cassandra/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-subsystems - 2.1.0-SNAPSHOT + 2.1.0 indy-subsys-cassandra diff --git a/subsys/cpool/pom.xml b/subsys/cpool/pom.xml index a47ee62975..301720ab65 100644 --- a/subsys/cpool/pom.xml +++ b/subsys/cpool/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.1.0-SNAPSHOT + 2.1.0 indy-subsys-cpool diff --git a/subsys/flatfile/pom.xml b/subsys/flatfile/pom.xml index 9bd13fd8bd..e5438732aa 100644 --- a/subsys/flatfile/pom.xml +++ b/subsys/flatfile/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.1.0-SNAPSHOT + 2.1.0 indy-subsys-flatfile diff --git a/subsys/git/pom.xml b/subsys/git/pom.xml index ff0b5b690e..2819f36b73 100644 --- a/subsys/git/pom.xml +++ b/subsys/git/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.1.0-SNAPSHOT + 2.1.0 indy-subsys-git diff --git a/subsys/groovy/pom.xml b/subsys/groovy/pom.xml index 1505e9193a..a6281ea96d 100644 --- a/subsys/groovy/pom.xml +++ b/subsys/groovy/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.1.0-SNAPSHOT + 2.1.0 indy-subsys-groovy diff --git a/subsys/honeycomb/pom.xml b/subsys/honeycomb/pom.xml index 20fab3aab8..cb9fad8142 100644 --- a/subsys/honeycomb/pom.xml +++ b/subsys/honeycomb/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.1.0-SNAPSHOT + 2.1.0 4.0.0 diff --git a/subsys/http/pom.xml b/subsys/http/pom.xml index 64b2ea6a3d..9b30ea300d 100644 --- a/subsys/http/pom.xml +++ b/subsys/http/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.1.0-SNAPSHOT + 2.1.0 indy-subsys-http diff --git a/subsys/infinispan/pom.xml b/subsys/infinispan/pom.xml index f045a0da9e..74d405f98b 100644 --- a/subsys/infinispan/pom.xml +++ b/subsys/infinispan/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.1.0-SNAPSHOT + 2.1.0 indy-subsys-infinispan diff --git a/subsys/jaxrs/pom.xml b/subsys/jaxrs/pom.xml index 35ca289498..4e1c8fd38c 100644 --- a/subsys/jaxrs/pom.xml +++ b/subsys/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.1.0-SNAPSHOT + 2.1.0 indy-subsys-jaxrs diff --git a/subsys/kafka/pom.xml b/subsys/kafka/pom.xml index ad4d2107a1..fb846b9205 100644 --- a/subsys/kafka/pom.xml +++ b/subsys/kafka/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.1.0-SNAPSHOT + 2.1.0 4.0.0 diff --git a/subsys/keycloak/pom.xml b/subsys/keycloak/pom.xml index 6f15d48902..af78b78635 100644 --- a/subsys/keycloak/pom.xml +++ b/subsys/keycloak/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.1.0-SNAPSHOT + 2.1.0 indy-subsys-keycloak Indy :: Subsystems :: Keycloak diff --git a/subsys/metrics/core/pom.xml b/subsys/metrics/core/pom.xml index 7c39667fc1..c3068bda1a 100644 --- a/subsys/metrics/core/pom.xml +++ b/subsys/metrics/core/pom.xml @@ -20,7 +20,7 @@ indy-subsys-metrics org.commonjava.indy - 2.1.0-SNAPSHOT + 2.1.0 4.0.0 diff --git a/subsys/metrics/pom.xml b/subsys/metrics/pom.xml index ab86a24352..29c0d3732b 100644 --- a/subsys/metrics/pom.xml +++ b/subsys/metrics/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.1.0-SNAPSHOT + 2.1.0 4.0.0 diff --git a/subsys/metrics/prometheus/pom.xml b/subsys/metrics/prometheus/pom.xml index ccd847c7e6..dd75e16940 100644 --- a/subsys/metrics/prometheus/pom.xml +++ b/subsys/metrics/prometheus/pom.xml @@ -20,7 +20,7 @@ indy-subsys-metrics org.commonjava.indy - 2.1.0-SNAPSHOT + 2.1.0 4.0.0 diff --git a/subsys/metrics/reporter/pom.xml b/subsys/metrics/reporter/pom.xml index 555e710267..554109eef7 100644 --- a/subsys/metrics/reporter/pom.xml +++ b/subsys/metrics/reporter/pom.xml @@ -20,7 +20,7 @@ indy-subsys-metrics org.commonjava.indy - 2.1.0-SNAPSHOT + 2.1.0 4.0.0 diff --git a/subsys/pom.xml b/subsys/pom.xml index f318d98c8e..0e4eb58708 100644 --- a/subsys/pom.xml +++ b/subsys/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.1.0-SNAPSHOT + 2.1.0 indy-subsystems diff --git a/subsys/prefetch/pom.xml b/subsys/prefetch/pom.xml index 7fba54aabc..e74ff2b40c 100644 --- a/subsys/prefetch/pom.xml +++ b/subsys/prefetch/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.1.0-SNAPSHOT + 2.1.0 4.0.0 diff --git a/test/db/pom.xml b/test/db/pom.xml index 89794d1dd3..383a071d14 100644 --- a/test/db/pom.xml +++ b/test/db/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.1.0-SNAPSHOT + 2.1.0 indy-test-db diff --git a/test/fixtures-core/pom.xml b/test/fixtures-core/pom.xml index 6f5323d4fb..594f3bdb30 100644 --- a/test/fixtures-core/pom.xml +++ b/test/fixtures-core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.1.0-SNAPSHOT + 2.1.0 indy-test-fixtures-core diff --git a/test/pom.xml b/test/pom.xml index b741a3212b..22a3f88af2 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.1.0-SNAPSHOT + 2.1.0 indy-test diff --git a/test/providers-core/pom.xml b/test/providers-core/pom.xml index 96fc391a19..16fba9436f 100644 --- a/test/providers-core/pom.xml +++ b/test/providers-core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.1.0-SNAPSHOT + 2.1.0 indy-test-providers-core diff --git a/test/utils/pom.xml b/test/utils/pom.xml index aa89f8b83e..7cb82ebba0 100644 --- a/test/utils/pom.xml +++ b/test/utils/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.1.0-SNAPSHOT + 2.1.0 indy-test-utils diff --git a/tools/assemblies/pom.xml b/tools/assemblies/pom.xml index 7f65c02807..edefa07cd7 100644 --- a/tools/assemblies/pom.xml +++ b/tools/assemblies/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.tools indy-tools - 2.1.0-SNAPSHOT + 2.1.0 indy-assemblies diff --git a/tools/pom.xml b/tools/pom.xml index a8cc26f881..9df154bbec 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy.tools diff --git a/uis/layover/pom.xml b/uis/layover/pom.xml index 9abc3c07f1..878c4afb47 100644 --- a/uis/layover/pom.xml +++ b/uis/layover/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.ui indy-uis - 2.1.0-SNAPSHOT + 2.1.0 indy-ui-layover diff --git a/uis/pom.xml b/uis/pom.xml index de30dd8cb7..1e7f74aff8 100644 --- a/uis/pom.xml +++ b/uis/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.1.0-SNAPSHOT + 2.1.0 org.commonjava.indy.ui From 5677ee58a81e1ef4c1635bfe9cb9a7b7fe6c5445 Mon Sep 17 00:00:00 2001 From: liyu Date: Thu, 9 Apr 2020 01:54:47 +0800 Subject: [PATCH 08/50] [maven-release-plugin] prepare for next development iteration --- addons/changelog/client-java/pom.xml | 2 +- addons/changelog/common/pom.xml | 2 +- addons/changelog/ftests/pom.xml | 2 +- addons/changelog/jaxrs/pom.xml | 2 +- addons/changelog/pom.xml | 2 +- addons/content-browse/client-java/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/event-audit/common/pom.xml | 2 +- addons/event-audit/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/path-mapped/common/pom.xml | 2 +- addons/path-mapped/jaxrs/pom.xml | 2 +- addons/path-mapped/model-java/pom.xml | 2 +- addons/path-mapped/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/revisions/common/pom.xml | 2 +- addons/revisions/jaxrs/pom.xml | 2 +- addons/revisions/pom.xml | 2 +- addons/sli/pom.xml | 2 +- api/pom.xml | 2 +- bindings/jaxrs/pom.xml | 2 +- bindings/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/common/pom.xml | 2 +- db/flat/pom.xml | 2 +- db/infinispan/pom.xml | 2 +- db/memory/pom.xml | 2 +- db/metrics/pom.xml | 2 +- db/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 | 246 +++++++++---------- rest/api/pom.xml | 2 +- rest/pom.xml | 2 +- subsys/cassandra/pom.xml | 2 +- subsys/cpool/pom.xml | 2 +- subsys/flatfile/pom.xml | 2 +- subsys/git/pom.xml | 2 +- subsys/groovy/pom.xml | 2 +- subsys/honeycomb/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/prometheus/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 +- 127 files changed, 249 insertions(+), 249 deletions(-) diff --git a/addons/changelog/client-java/pom.xml b/addons/changelog/client-java/pom.xml index 741ce90f47..5e31062a71 100644 --- a/addons/changelog/client-java/pom.xml +++ b/addons/changelog/client-java/pom.xml @@ -20,7 +20,7 @@ indy-changelog org.commonjava.indy - 2.1.0 + 2.2.0-SNAPSHOT 4.0.0 diff --git a/addons/changelog/common/pom.xml b/addons/changelog/common/pom.xml index f4d9311a5f..fd7d586aec 100644 --- a/addons/changelog/common/pom.xml +++ b/addons/changelog/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.1.0 + 2.2.0-SNAPSHOT indy-changelog-common Indy :: Add-Ons :: ChangeLog :: Common diff --git a/addons/changelog/ftests/pom.xml b/addons/changelog/ftests/pom.xml index 7a73b22798..30b9389fd8 100644 --- a/addons/changelog/ftests/pom.xml +++ b/addons/changelog/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.1.0 + 2.2.0-SNAPSHOT indy-ftests-changelog diff --git a/addons/changelog/jaxrs/pom.xml b/addons/changelog/jaxrs/pom.xml index de30486fa3..d32ae8f720 100644 --- a/addons/changelog/jaxrs/pom.xml +++ b/addons/changelog/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.1.0 + 2.2.0-SNAPSHOT indy-changelog-jaxrs diff --git a/addons/changelog/pom.xml b/addons/changelog/pom.xml index 1a1bc3f05d..933c0332a3 100644 --- a/addons/changelog/pom.xml +++ b/addons/changelog/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.1.0 + 2.2.0-SNAPSHOT indy-changelog Indy :: Add-Ons :: ChangeLog :: Parent diff --git a/addons/content-browse/client-java/pom.xml b/addons/content-browse/client-java/pom.xml index 83ce834275..c9e5d8aaca 100644 --- a/addons/content-browse/client-java/pom.xml +++ b/addons/content-browse/client-java/pom.xml @@ -20,7 +20,7 @@ indy-content-browse org.commonjava.indy - 2.1.0 + 2.2.0-SNAPSHOT 4.0.0 diff --git a/addons/content-browse/common/pom.xml b/addons/content-browse/common/pom.xml index c77ecd78d0..cd4e5869da 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 - 2.1.0 + 2.2.0-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 631ddd8145..aedef4b759 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 - 2.1.0 + 2.2.0-SNAPSHOT indy-ftests-content-browse diff --git a/addons/content-browse/jaxrs/pom.xml b/addons/content-browse/jaxrs/pom.xml index 43a40162af..6c764568a6 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 - 2.1.0 + 2.2.0-SNAPSHOT indy-content-browse-jaxrs diff --git a/addons/content-browse/model-java/pom.xml b/addons/content-browse/model-java/pom.xml index 6e6ee47e07..35dc05bc8e 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 - 2.1.0 + 2.2.0-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 44fd7137ab..4b1cadee0a 100644 --- a/addons/content-browse/pom.xml +++ b/addons/content-browse/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.1.0 + 2.2.0-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 75842d701b..a05f72ea60 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 - 2.1.0 + 2.2.0-SNAPSHOT 4.0.0 diff --git a/addons/content-index/pom.xml b/addons/content-index/pom.xml index 754bdee4d3..0705c5967c 100644 --- a/addons/content-index/pom.xml +++ b/addons/content-index/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.1.0 + 2.2.0-SNAPSHOT indy-content-index diff --git a/addons/diagnostics/client-java/pom.xml b/addons/diagnostics/client-java/pom.xml index 33ec20093c..635d5baf93 100644 --- a/addons/diagnostics/client-java/pom.xml +++ b/addons/diagnostics/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.1.0 + 2.2.0-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 3e7681d1c0..afea30ef47 100644 --- a/addons/diagnostics/common/pom.xml +++ b/addons/diagnostics/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.1.0 + 2.2.0-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 c6e9c0e3f9..06bca5b91f 100644 --- a/addons/diagnostics/ftests/pom.xml +++ b/addons/diagnostics/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.1.0 + 2.2.0-SNAPSHOT indy-ftests-diagnostics diff --git a/addons/diagnostics/jaxrs/pom.xml b/addons/diagnostics/jaxrs/pom.xml index 354ffe34de..7cdf3d69c3 100644 --- a/addons/diagnostics/jaxrs/pom.xml +++ b/addons/diagnostics/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.1.0 + 2.2.0-SNAPSHOT indy-diagnostics-jaxrs diff --git a/addons/diagnostics/pom.xml b/addons/diagnostics/pom.xml index a954a16538..72d6e2e481 100644 --- a/addons/diagnostics/pom.xml +++ b/addons/diagnostics/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.1.0 + 2.2.0-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 40923ea75b..1a8c82c616 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 - 2.1.0 + 2.2.0-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 f9924ce113..6ee428fae0 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 - 2.1.0 + 2.2.0-SNAPSHOT indy-ftests-dot-maven diff --git a/addons/dot-maven/jaxrs/pom.xml b/addons/dot-maven/jaxrs/pom.xml index 775e3d827f..295867c4e6 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 - 2.1.0 + 2.2.0-SNAPSHOT indy-dot-maven-jaxrs diff --git a/addons/dot-maven/pom.xml b/addons/dot-maven/pom.xml index 1430746041..9bd7bf7998 100644 --- a/addons/dot-maven/pom.xml +++ b/addons/dot-maven/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.1.0 + 2.2.0-SNAPSHOT indy-dot-maven diff --git a/addons/event-audit/common/pom.xml b/addons/event-audit/common/pom.xml index 8a39fcc3d9..ea8c32052c 100644 --- a/addons/event-audit/common/pom.xml +++ b/addons/event-audit/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-event-audit - 2.1.0 + 2.2.0-SNAPSHOT indy-event-audit-common diff --git a/addons/event-audit/pom.xml b/addons/event-audit/pom.xml index 375216e506..aede9c09f0 100644 --- a/addons/event-audit/pom.xml +++ b/addons/event-audit/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.1.0 + 2.2.0-SNAPSHOT indy-event-audit diff --git a/addons/folo/client-java/pom.xml b/addons/folo/client-java/pom.xml index 8a1c7781d3..544761ebe9 100644 --- a/addons/folo/client-java/pom.xml +++ b/addons/folo/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.1.0 + 2.2.0-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 bcd9a2416d..759f108651 100644 --- a/addons/folo/common/pom.xml +++ b/addons/folo/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.1.0 + 2.2.0-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 4cd423c4f2..14e2a38349 100644 --- a/addons/folo/ftests/pom.xml +++ b/addons/folo/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.1.0 + 2.2.0-SNAPSHOT indy-ftests-folo diff --git a/addons/folo/jaxrs/pom.xml b/addons/folo/jaxrs/pom.xml index 4a1422d1cd..f7ba2c8e50 100644 --- a/addons/folo/jaxrs/pom.xml +++ b/addons/folo/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.1.0 + 2.2.0-SNAPSHOT indy-folo-jaxrs diff --git a/addons/folo/model-java/pom.xml b/addons/folo/model-java/pom.xml index e3faefe986..0f4da9e730 100644 --- a/addons/folo/model-java/pom.xml +++ b/addons/folo/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.1.0 + 2.2.0-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 4c76bb4b86..bda46598ec 100644 --- a/addons/folo/pom.xml +++ b/addons/folo/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.1.0 + 2.2.0-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 924997c77c..4170434c37 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 - 2.1.0 + 2.2.0-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 6f277097cb..26e8300888 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 - 2.1.0 + 2.2.0-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 bbdd6fbb8a..f8cc016657 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 - 2.1.0 + 2.2.0-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 f58339da0d..613aa544f1 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 - 2.1.0 + 2.2.0-SNAPSHOT indy-hosted-by-archive-jaxrs diff --git a/addons/hosted-by-archive/pom.xml b/addons/hosted-by-archive/pom.xml index 564768ff04..d9123c6540 100644 --- a/addons/hosted-by-archive/pom.xml +++ b/addons/hosted-by-archive/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.1.0 + 2.2.0-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 32711593c0..07cd6d8de0 100644 --- a/addons/httprox/common/pom.xml +++ b/addons/httprox/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.1.0 + 2.2.0-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 c27f42abfc..b3a38288d7 100644 --- a/addons/httprox/ftests/pom.xml +++ b/addons/httprox/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.1.0 + 2.2.0-SNAPSHOT indy-ftests-httprox diff --git a/addons/httprox/jaxrs/pom.xml b/addons/httprox/jaxrs/pom.xml index 7567dc7892..ba4f55c5de 100644 --- a/addons/httprox/jaxrs/pom.xml +++ b/addons/httprox/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.1.0 + 2.2.0-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 1d68ecd3aa..4b8c25fd48 100644 --- a/addons/httprox/pom.xml +++ b/addons/httprox/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.1.0 + 2.2.0-SNAPSHOT indy-httprox diff --git a/addons/implied-repos/client-java/pom.xml b/addons/implied-repos/client-java/pom.xml index f749a50e8f..5902d236dd 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 - 2.1.0 + 2.2.0-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 c8c787c039..d8f9b237de 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 - 2.1.0 + 2.2.0-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 3de86326c1..7bbcb14f37 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 - 2.1.0 + 2.2.0-SNAPSHOT indy-ftests-implied-repos diff --git a/addons/implied-repos/model-java/pom.xml b/addons/implied-repos/model-java/pom.xml index 2dade197cd..dbd33b8596 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 - 2.1.0 + 2.2.0-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 a1f24d18e9..bf10022d54 100644 --- a/addons/implied-repos/pom.xml +++ b/addons/implied-repos/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.1.0 + 2.2.0-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 10dcf6517f..6f50129de3 100644 --- a/addons/koji/client-java/pom.xml +++ b/addons/koji/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.1.0 + 2.2.0-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 8b85a1bb64..ce02b580fb 100644 --- a/addons/koji/common/pom.xml +++ b/addons/koji/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.1.0 + 2.2.0-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 fe1c37d07d..421d9b3a51 100644 --- a/addons/koji/jaxrs/pom.xml +++ b/addons/koji/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.1.0 + 2.2.0-SNAPSHOT indy-koji-jaxrs diff --git a/addons/koji/model-java/pom.xml b/addons/koji/model-java/pom.xml index a3289d40b6..4be1487395 100644 --- a/addons/koji/model-java/pom.xml +++ b/addons/koji/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.1.0 + 2.2.0-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 1a264e3457..14df676a29 100644 --- a/addons/koji/pom.xml +++ b/addons/koji/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.1.0 + 2.2.0-SNAPSHOT indy-koji Indy :: Add-Ons :: Koji Integration :: Parent diff --git a/addons/path-mapped/common/pom.xml b/addons/path-mapped/common/pom.xml index e4bd7f69eb..29a41bfdd4 100644 --- a/addons/path-mapped/common/pom.xml +++ b/addons/path-mapped/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.1.0 + 2.2.0-SNAPSHOT indy-path-mapped-common diff --git a/addons/path-mapped/jaxrs/pom.xml b/addons/path-mapped/jaxrs/pom.xml index a4de3dd09d..0bab59fdef 100644 --- a/addons/path-mapped/jaxrs/pom.xml +++ b/addons/path-mapped/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.1.0 + 2.2.0-SNAPSHOT indy-path-mapped-jaxrs diff --git a/addons/path-mapped/model-java/pom.xml b/addons/path-mapped/model-java/pom.xml index 7b904a15e4..2768ea899b 100644 --- a/addons/path-mapped/model-java/pom.xml +++ b/addons/path-mapped/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.1.0 + 2.2.0-SNAPSHOT indy-path-mapped-model-java diff --git a/addons/path-mapped/pom.xml b/addons/path-mapped/pom.xml index 90b5e641f7..fa97eb1464 100644 --- a/addons/path-mapped/pom.xml +++ b/addons/path-mapped/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.1.0 + 2.2.0-SNAPSHOT indy-path-mapped Indy :: Add-Ons :: Path Mapped :: Parent diff --git a/addons/pkg-maven/common/pom.xml b/addons/pkg-maven/common/pom.xml index 6ef1ea03ad..04e76bf009 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 - 2.1.0 + 2.2.0-SNAPSHOT 4.0.0 diff --git a/addons/pkg-maven/ftests/pom.xml b/addons/pkg-maven/ftests/pom.xml index f37de83653..0c433afff1 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 - 2.1.0 + 2.2.0-SNAPSHOT 4.0.0 diff --git a/addons/pkg-maven/jaxrs/pom.xml b/addons/pkg-maven/jaxrs/pom.xml index c0a8c2cf97..6cc92133b3 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 - 2.1.0 + 2.2.0-SNAPSHOT 4.0.0 diff --git a/addons/pkg-maven/pom.xml b/addons/pkg-maven/pom.xml index 8cd083f873..1d0f0e8114 100644 --- a/addons/pkg-maven/pom.xml +++ b/addons/pkg-maven/pom.xml @@ -20,7 +20,7 @@ indy-addons org.commonjava.indy - 2.1.0 + 2.2.0-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/common/pom.xml b/addons/pkg-npm/common/pom.xml index f925704ee1..b224c10158 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 - 2.1.0 + 2.2.0-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/ftests/pom.xml b/addons/pkg-npm/ftests/pom.xml index 208cb186d5..3033f0e322 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 - 2.1.0 + 2.2.0-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/jaxrs/pom.xml b/addons/pkg-npm/jaxrs/pom.xml index a85051482e..0071adfa13 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 - 2.1.0 + 2.2.0-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/model-java/pom.xml b/addons/pkg-npm/model-java/pom.xml index a6e0bd088e..7888d30eb6 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 - 2.1.0 + 2.2.0-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/pom.xml b/addons/pkg-npm/pom.xml index 865120eb25..8783435bae 100644 --- a/addons/pkg-npm/pom.xml +++ b/addons/pkg-npm/pom.xml @@ -20,7 +20,7 @@ indy-addons org.commonjava.indy - 2.1.0 + 2.2.0-SNAPSHOT 4.0.0 diff --git a/addons/pom.xml b/addons/pom.xml index b963e94b90..e22bc19d72 100644 --- a/addons/pom.xml +++ b/addons/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-parent - 2.1.0 + 2.2.0-SNAPSHOT indy-addons diff --git a/addons/promote/client-java/pom.xml b/addons/promote/client-java/pom.xml index b2df280dc1..a0148abf04 100644 --- a/addons/promote/client-java/pom.xml +++ b/addons/promote/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.1.0 + 2.2.0-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 86de643a2f..74ed82f5e9 100644 --- a/addons/promote/common/pom.xml +++ b/addons/promote/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.1.0 + 2.2.0-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 0234d043eb..6c923b4c93 100644 --- a/addons/promote/ftests/pom.xml +++ b/addons/promote/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.1.0 + 2.2.0-SNAPSHOT indy-ftests-promote diff --git a/addons/promote/jaxrs/pom.xml b/addons/promote/jaxrs/pom.xml index 9b50caa6b9..aefaa60401 100644 --- a/addons/promote/jaxrs/pom.xml +++ b/addons/promote/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.1.0 + 2.2.0-SNAPSHOT indy-promote-jaxrs diff --git a/addons/promote/model-java/pom.xml b/addons/promote/model-java/pom.xml index 9c204fc1ca..d7368e8295 100644 --- a/addons/promote/model-java/pom.xml +++ b/addons/promote/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.1.0 + 2.2.0-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 abe09c508b..9a65090aeb 100644 --- a/addons/promote/pom.xml +++ b/addons/promote/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.1.0 + 2.2.0-SNAPSHOT indy-promote Indy :: Add-Ons :: Artifact Promotion :: Parent diff --git a/addons/revisions/common/pom.xml b/addons/revisions/common/pom.xml index 000da2bd24..6b0c6e354c 100644 --- a/addons/revisions/common/pom.xml +++ b/addons/revisions/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-revisions - 2.1.0 + 2.2.0-SNAPSHOT indy-revisions-common Indy :: Add-Ons :: Revisions :: Common diff --git a/addons/revisions/jaxrs/pom.xml b/addons/revisions/jaxrs/pom.xml index afdd673e1a..ef481b397f 100644 --- a/addons/revisions/jaxrs/pom.xml +++ b/addons/revisions/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-revisions - 2.1.0 + 2.2.0-SNAPSHOT indy-revisions-jaxrs diff --git a/addons/revisions/pom.xml b/addons/revisions/pom.xml index 8c2a72dfff..81dbb2ba04 100644 --- a/addons/revisions/pom.xml +++ b/addons/revisions/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.1.0 + 2.2.0-SNAPSHOT indy-revisions Indy :: Add-Ons :: Revisions :: Parent diff --git a/addons/sli/pom.xml b/addons/sli/pom.xml index 2288f019cd..9847264cad 100644 --- a/addons/sli/pom.xml +++ b/addons/sli/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.1.0 + 2.2.0-SNAPSHOT indy-sli Indy :: Add-Ons :: Service Level Indicators Reporting :: JAX-RS diff --git a/api/pom.xml b/api/pom.xml index 9af794ba78..3b06b1f733 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.1.0 + 2.2.0-SNAPSHOT indy-api diff --git a/bindings/jaxrs/pom.xml b/bindings/jaxrs/pom.xml index 04f3def788..4d1d6befe1 100644 --- a/bindings/jaxrs/pom.xml +++ b/bindings/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-bindings - 2.1.0 + 2.2.0-SNAPSHOT indy-bindings-jaxrs diff --git a/bindings/pom.xml b/bindings/pom.xml index c032b376e0..4316068f35 100644 --- a/bindings/pom.xml +++ b/bindings/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-parent - 2.1.0 + 2.2.0-SNAPSHOT indy-bindings diff --git a/boot/jaxrs/pom.xml b/boot/jaxrs/pom.xml index c1d8ade220..bb46639916 100644 --- a/boot/jaxrs/pom.xml +++ b/boot/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.boot indy-booters - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy.boot diff --git a/boot/pom.xml b/boot/pom.xml index 2da8ef5e00..39837ff748 100644 --- a/boot/pom.xml +++ b/boot/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy.boot diff --git a/clients/core-java/pom.xml b/clients/core-java/pom.xml index 684e09d787..7578b796dc 100644 --- a/clients/core-java/pom.xml +++ b/clients/core-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-clients-parent - 2.1.0 + 2.2.0-SNAPSHOT indy-client-core-java diff --git a/clients/pom.xml b/clients/pom.xml index af6990d9a6..d38cb62e6e 100644 --- a/clients/pom.xml +++ b/clients/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.1.0 + 2.2.0-SNAPSHOT indy-clients-parent diff --git a/core/pom.xml b/core/pom.xml index 79f0ec08be..b692aee687 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.1.0 + 2.2.0-SNAPSHOT indy-core diff --git a/db/common/pom.xml b/db/common/pom.xml index 78a33b84cf..52b5b5a7cf 100644 --- a/db/common/pom.xml +++ b/db/common/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-db - 2.1.0 + 2.2.0-SNAPSHOT indy-db-common diff --git a/db/flat/pom.xml b/db/flat/pom.xml index aba03a8fee..53e287e501 100644 --- a/db/flat/pom.xml +++ b/db/flat/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.1.0 + 2.2.0-SNAPSHOT indy-db-flat diff --git a/db/infinispan/pom.xml b/db/infinispan/pom.xml index 3dd66d1fa5..709f0a7c97 100644 --- a/db/infinispan/pom.xml +++ b/db/infinispan/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-db - 2.1.0 + 2.2.0-SNAPSHOT indy-db-infinispan diff --git a/db/memory/pom.xml b/db/memory/pom.xml index cef0ad364d..c7614d46eb 100644 --- a/db/memory/pom.xml +++ b/db/memory/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.1.0 + 2.2.0-SNAPSHOT indy-db-memory diff --git a/db/metrics/pom.xml b/db/metrics/pom.xml index ff2495dc6d..210040d623 100644 --- a/db/metrics/pom.xml +++ b/db/metrics/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.1.0 + 2.2.0-SNAPSHOT indy-db-metrics diff --git a/db/pom.xml b/db/pom.xml index f1d5b85e67..ce2d57149b 100644 --- a/db/pom.xml +++ b/db/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.1.0 + 2.2.0-SNAPSHOT indy-db diff --git a/deployments/launcher/pom.xml b/deployments/launcher/pom.xml index a3e6b9a58a..8821ebceee 100644 --- a/deployments/launcher/pom.xml +++ b/deployments/launcher/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-deployments - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy.launch diff --git a/deployments/pom.xml b/deployments/pom.xml index 949ff2de4d..3edba0aedb 100644 --- a/deployments/pom.xml +++ b/deployments/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.1.0 + 2.2.0-SNAPSHOT indy-deployments diff --git a/embedder/pom.xml b/embedder/pom.xml index 46971fdbb5..bbb19c26f2 100644 --- a/embedder/pom.xml +++ b/embedder/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy.embed diff --git a/filers/default/pom.xml b/filers/default/pom.xml index 68d371fb8c..291175220c 100644 --- a/filers/default/pom.xml +++ b/filers/default/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-file-managers - 2.1.0 + 2.2.0-SNAPSHOT indy-filer-default diff --git a/filers/pom.xml b/filers/pom.xml index 93650978de..f5e029bcb8 100644 --- a/filers/pom.xml +++ b/filers/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.1.0 + 2.2.0-SNAPSHOT indy-file-managers diff --git a/ftests/common/pom.xml b/ftests/common/pom.xml index f4ac31d69a..fc3e4e3516 100644 --- a/ftests/common/pom.xml +++ b/ftests/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-ftests-parent - 2.1.0 + 2.2.0-SNAPSHOT indy-ftests-common diff --git a/ftests/core/pom.xml b/ftests/core/pom.xml index aa0944fc19..a0af947247 100644 --- a/ftests/core/pom.xml +++ b/ftests/core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-ftests-parent - 2.1.0 + 2.2.0-SNAPSHOT indy-ftests-core diff --git a/ftests/metrics/pom.xml b/ftests/metrics/pom.xml index 510fd0ed97..544d6deba5 100644 --- a/ftests/metrics/pom.xml +++ b/ftests/metrics/pom.xml @@ -20,7 +20,7 @@ indy-ftests-parent org.commonjava.indy - 2.1.0 + 2.2.0-SNAPSHOT 4.0.0 diff --git a/ftests/pom.xml b/ftests/pom.xml index 98fae85587..cabc0df0bc 100644 --- a/ftests/pom.xml +++ b/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.1.0 + 2.2.0-SNAPSHOT indy-ftests-parent diff --git a/models/core-java/pom.xml b/models/core-java/pom.xml index 22434a018b..9ff151fa91 100644 --- a/models/core-java/pom.xml +++ b/models/core-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-models-parent - 2.1.0 + 2.2.0-SNAPSHOT indy-model-core-java diff --git a/models/pom.xml b/models/pom.xml index 84fc50496e..b7ca74523e 100644 --- a/models/pom.xml +++ b/models/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.1.0 + 2.2.0-SNAPSHOT indy-models-parent diff --git a/pom.xml b/pom.xml index 96fa4b904f..fd552332bd 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.commonjava.indy indy-parent - 2.1.0 + 2.2.0-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-2.1.0 + indy-parent-2.0.0 @@ -182,7 +182,7 @@ org.commonjava.indy.ui indy-ui-layover - 2.1.0 + 2.2.0-SNAPSHOT runtime @@ -190,22 +190,22 @@ org.commonjava.indy indy-model-core-java - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-api - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-core - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-core - 2.1.0 + 2.2.0-SNAPSHOT tar.gz confset provided @@ -213,32 +213,32 @@ org.commonjava.indy indy-db-flat - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-db-metrics - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-db-common - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-db-infinispan - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-bindings-jaxrs - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy.launch indy-launcher - 2.1.0 + 2.2.0-SNAPSHOT tar.gz skinny provided @@ -246,7 +246,7 @@ org.commonjava.indy.launch indy-launcher - 2.1.0 + 2.2.0-SNAPSHOT tar.gz complete provided @@ -254,7 +254,7 @@ org.commonjava.indy.launch indy-launcher - 2.1.0 + 2.2.0-SNAPSHOT tar.gz data provided @@ -262,7 +262,7 @@ org.commonjava.indy.launch indy-launcher - 2.1.0 + 2.2.0-SNAPSHOT tar.gz etc provided @@ -271,17 +271,17 @@ org.commonjava.indy indy-revisions-jaxrs - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-revisions-common - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-revisions-common - 2.1.0 + 2.2.0-SNAPSHOT tar.gz confset provided @@ -289,7 +289,7 @@ org.commonjava.indy indy-revisions-common - 2.1.0 + 2.2.0-SNAPSHOT tar.gz uiset provided @@ -297,12 +297,12 @@ org.commonjava.indy indy-dot-maven-common - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-dot-maven-common - 2.1.0 + 2.2.0-SNAPSHOT tar.gz dataset provided @@ -310,22 +310,22 @@ org.commonjava.indy indy-dot-maven-jaxrs - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-ftests-dot-maven - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-httprox-common - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-httprox-common - 2.1.0 + 2.2.0-SNAPSHOT tar.gz confset provided @@ -333,17 +333,17 @@ org.commonjava.indy indy-ftests-httprox - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-content-index - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-content-index - 2.1.0 + 2.2.0-SNAPSHOT tar.gz confset provided @@ -351,51 +351,51 @@ org.commonjava.indy indy-db-memory - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-test-db - 2.1.0 + 2.2.0-SNAPSHOT test org.commonjava.indy indy-test-fixtures-core - 2.1.0 + 2.2.0-SNAPSHOT test org.commonjava.indy indy-test-providers-core - 2.1.0 + 2.2.0-SNAPSHOT test org.commonjava.indy indy-test-utils - 2.1.0 + 2.2.0-SNAPSHOT test org.commonjava.indy indy-filer-default - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-subsys-jaxrs - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-subsys-honeycomb - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-subsys-honeycomb - 2.1.0 + 2.2.0-SNAPSHOT tar.gz confset provided @@ -403,17 +403,17 @@ org.commonjava.indy indy-subsys-flatfile - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-subsys-cassandra - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-subsys-cassandra - 2.1.0 + 2.2.0-SNAPSHOT tar.gz confset provided @@ -421,79 +421,79 @@ org.commonjava.indy indy-subsys-infinispan - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-subsys-http - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-subsys-git - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-subsys-groovy - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-subsys-prefetch - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-subsys-cpool - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-client-core-java - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-ftests-common - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-ftests-core - 2.1.0 + 2.2.0-SNAPSHOT test org.commonjava.indy indy-folo-jaxrs - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-ftests-folo - 2.1.0 + 2.2.0-SNAPSHOT test org.commonjava.indy indy-folo-client-java - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-folo-model-java - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-folo-common - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-folo-common - 2.1.0 + 2.2.0-SNAPSHOT tar.gz dataset provided @@ -501,7 +501,7 @@ org.commonjava.indy indy-folo-common - 2.1.0 + 2.2.0-SNAPSHOT tar.gz confset provided @@ -509,33 +509,33 @@ org.commonjava.indy indy-promote-jaxrs - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-ftests-promote - 2.1.0 + 2.2.0-SNAPSHOT test org.commonjava.indy indy-promote-client-java - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-promote-model-java - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-promote-common - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-promote-common - 2.1.0 + 2.2.0-SNAPSHOT tar.gz confset provided @@ -543,7 +543,7 @@ org.commonjava.indy indy-promote-common - 2.1.0 + 2.2.0-SNAPSHOT tar.gz dataset provided @@ -551,19 +551,19 @@ org.commonjava.indy indy-promote-common - 2.1.0 + 2.2.0-SNAPSHOT dataset provided org.commonjava.indy indy-implied-repos-common - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-implied-repos-common - 2.1.0 + 2.2.0-SNAPSHOT tar.gz confset provided @@ -571,37 +571,37 @@ org.commonjava.indy indy-implied-repos-model-java - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-implied-repos-client-java - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-ftests-implied-repos - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy.embed indy-embedder - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy.boot indy-booter-jaxrs - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-subsys-keycloak - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-subsys-keycloak - 2.1.0 + 2.2.0-SNAPSHOT tar.gz confset provided @@ -609,7 +609,7 @@ org.commonjava.indy indy-subsys-infinispan - 2.1.0 + 2.2.0-SNAPSHOT tar.gz confset provided @@ -617,7 +617,7 @@ org.commonjava.indy indy-subsys-prefetch - 2.1.0 + 2.2.0-SNAPSHOT tar.gz confset provided @@ -626,7 +626,7 @@ org.commonjava.indy indy-koji-common - 2.1.0 + 2.2.0-SNAPSHOT tar.gz confset provided @@ -634,103 +634,103 @@ org.commonjava.indy indy-koji-common - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-koji-model-java - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-koji-client-java - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-koji-jaxrs - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-path-mapped-common - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-path-mapped-model-java - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-path-mapped-jaxrs - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-pkg-maven-common - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-pkg-maven-jaxrs - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-pkg-npm-jaxrs - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-ftests-pkg-maven - 2.1.0 + 2.2.0-SNAPSHOT test org.commonjava.indy indy-ftests-pkg-npm - 2.1.0 + 2.2.0-SNAPSHOT test org.commonjava.indy indy-pkg-npm-common - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-pkg-npm-model-java - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-diagnostics-jaxrs - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-diagnostics-client-java - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-diagnostics-common - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-ftests-diagnostics - 2.1.0 + 2.2.0-SNAPSHOT test org.commonjava.indy indy-diagnostics-common - 2.1.0 + 2.2.0-SNAPSHOT confset tar.gz provided @@ -738,28 +738,28 @@ org.commonjava.indy indy-hosted-by-archive-common - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-hosted-by-archive-client-java - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-ftests-hosted-by-archive - 2.1.0 + 2.2.0-SNAPSHOT test org.commonjava.indy indy-hosted-by-archive-jaxrs - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-hosted-by-archive-common - 2.1.0 + 2.2.0-SNAPSHOT confset tar.gz @@ -767,22 +767,22 @@ org.commonjava.indy indy-subsys-metrics-core - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-subsys-metrics-reporter - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-subsys-metrics-prometheus - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-subsys-metrics-reporter - 2.1.0 + 2.2.0-SNAPSHOT confset tar.gz provided @@ -791,28 +791,28 @@ org.commonjava.indy indy-ftests-metrics - 2.1.0 + 2.2.0-SNAPSHOT test org.commonjava.indy indy-sli - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy.rest indy-rest-api yaml - 2.1.0 + 2.2.0-SNAPSHOT provided org.commonjava.indy.rest indy-rest-api json - 2.1.0 + 2.2.0-SNAPSHOT provided @@ -846,33 +846,33 @@ org.commonjava.indy indy-content-browse-common - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-content-browse-jaxrs - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-ftests-content-browse - 2.1.0 + 2.2.0-SNAPSHOT test org.commonjava.indy indy-content-browse-model-java - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-content-browse-client-java - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-content-browse-common - 2.1.0 + 2.2.0-SNAPSHOT confset tar.gz provided @@ -880,35 +880,35 @@ org.commonjava.indy indy-content-browse-ui - 2.1.0 + 2.2.0-SNAPSHOT reactui tar.gz org.commonjava.indy indy-changelog-common - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-changelog-client-java - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-ftests-changelog - 2.1.0 + 2.2.0-SNAPSHOT test org.commonjava.indy indy-changelog-jaxrs - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-changelog-common - 2.1.0 + 2.2.0-SNAPSHOT confset tar.gz @@ -926,12 +926,12 @@ org.commonjava.indy indy-event-audit-common - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy indy-event-audit-common - 2.1.0 + 2.2.0-SNAPSHOT confset tar.gz provided diff --git a/rest/api/pom.xml b/rest/api/pom.xml index 45d3801226..d30e54b84f 100644 --- a/rest/api/pom.xml +++ b/rest/api/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.rest indy-rest-parent - 2.1.0 + 2.2.0-SNAPSHOT indy-rest-api diff --git a/rest/pom.xml b/rest/pom.xml index 92f5c88bf9..0f70947591 100644 --- a/rest/pom.xml +++ b/rest/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy.rest diff --git a/subsys/cassandra/pom.xml b/subsys/cassandra/pom.xml index b5b4afdeb2..100a49c371 100644 --- a/subsys/cassandra/pom.xml +++ b/subsys/cassandra/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-subsystems - 2.1.0 + 2.2.0-SNAPSHOT indy-subsys-cassandra diff --git a/subsys/cpool/pom.xml b/subsys/cpool/pom.xml index 301720ab65..87cbe701ee 100644 --- a/subsys/cpool/pom.xml +++ b/subsys/cpool/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.1.0 + 2.2.0-SNAPSHOT indy-subsys-cpool diff --git a/subsys/flatfile/pom.xml b/subsys/flatfile/pom.xml index e5438732aa..c772783688 100644 --- a/subsys/flatfile/pom.xml +++ b/subsys/flatfile/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.1.0 + 2.2.0-SNAPSHOT indy-subsys-flatfile diff --git a/subsys/git/pom.xml b/subsys/git/pom.xml index 2819f36b73..2b1d0e238d 100644 --- a/subsys/git/pom.xml +++ b/subsys/git/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.1.0 + 2.2.0-SNAPSHOT indy-subsys-git diff --git a/subsys/groovy/pom.xml b/subsys/groovy/pom.xml index a6281ea96d..465fdd30ff 100644 --- a/subsys/groovy/pom.xml +++ b/subsys/groovy/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.1.0 + 2.2.0-SNAPSHOT indy-subsys-groovy diff --git a/subsys/honeycomb/pom.xml b/subsys/honeycomb/pom.xml index cb9fad8142..5d2dc455e5 100644 --- a/subsys/honeycomb/pom.xml +++ b/subsys/honeycomb/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.1.0 + 2.2.0-SNAPSHOT 4.0.0 diff --git a/subsys/http/pom.xml b/subsys/http/pom.xml index 9b30ea300d..2fe9c8d1c0 100644 --- a/subsys/http/pom.xml +++ b/subsys/http/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.1.0 + 2.2.0-SNAPSHOT indy-subsys-http diff --git a/subsys/infinispan/pom.xml b/subsys/infinispan/pom.xml index 74d405f98b..26c09f0af4 100644 --- a/subsys/infinispan/pom.xml +++ b/subsys/infinispan/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.1.0 + 2.2.0-SNAPSHOT indy-subsys-infinispan diff --git a/subsys/jaxrs/pom.xml b/subsys/jaxrs/pom.xml index 4e1c8fd38c..c34e26ed3b 100644 --- a/subsys/jaxrs/pom.xml +++ b/subsys/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.1.0 + 2.2.0-SNAPSHOT indy-subsys-jaxrs diff --git a/subsys/kafka/pom.xml b/subsys/kafka/pom.xml index fb846b9205..da270fa774 100644 --- a/subsys/kafka/pom.xml +++ b/subsys/kafka/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.1.0 + 2.2.0-SNAPSHOT 4.0.0 diff --git a/subsys/keycloak/pom.xml b/subsys/keycloak/pom.xml index af78b78635..50a08a01a1 100644 --- a/subsys/keycloak/pom.xml +++ b/subsys/keycloak/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.1.0 + 2.2.0-SNAPSHOT indy-subsys-keycloak Indy :: Subsystems :: Keycloak diff --git a/subsys/metrics/core/pom.xml b/subsys/metrics/core/pom.xml index c3068bda1a..9b4a85c4d7 100644 --- a/subsys/metrics/core/pom.xml +++ b/subsys/metrics/core/pom.xml @@ -20,7 +20,7 @@ indy-subsys-metrics org.commonjava.indy - 2.1.0 + 2.2.0-SNAPSHOT 4.0.0 diff --git a/subsys/metrics/pom.xml b/subsys/metrics/pom.xml index 29c0d3732b..ae9103f13b 100644 --- a/subsys/metrics/pom.xml +++ b/subsys/metrics/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.1.0 + 2.2.0-SNAPSHOT 4.0.0 diff --git a/subsys/metrics/prometheus/pom.xml b/subsys/metrics/prometheus/pom.xml index dd75e16940..a6bfd4c6f5 100644 --- a/subsys/metrics/prometheus/pom.xml +++ b/subsys/metrics/prometheus/pom.xml @@ -20,7 +20,7 @@ indy-subsys-metrics org.commonjava.indy - 2.1.0 + 2.2.0-SNAPSHOT 4.0.0 diff --git a/subsys/metrics/reporter/pom.xml b/subsys/metrics/reporter/pom.xml index 554109eef7..cab4a375db 100644 --- a/subsys/metrics/reporter/pom.xml +++ b/subsys/metrics/reporter/pom.xml @@ -20,7 +20,7 @@ indy-subsys-metrics org.commonjava.indy - 2.1.0 + 2.2.0-SNAPSHOT 4.0.0 diff --git a/subsys/pom.xml b/subsys/pom.xml index 0e4eb58708..aa6d173c76 100644 --- a/subsys/pom.xml +++ b/subsys/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.1.0 + 2.2.0-SNAPSHOT indy-subsystems diff --git a/subsys/prefetch/pom.xml b/subsys/prefetch/pom.xml index e74ff2b40c..2e8266b41e 100644 --- a/subsys/prefetch/pom.xml +++ b/subsys/prefetch/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.1.0 + 2.2.0-SNAPSHOT 4.0.0 diff --git a/test/db/pom.xml b/test/db/pom.xml index 383a071d14..b6ea8fb01d 100644 --- a/test/db/pom.xml +++ b/test/db/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.1.0 + 2.2.0-SNAPSHOT indy-test-db diff --git a/test/fixtures-core/pom.xml b/test/fixtures-core/pom.xml index 594f3bdb30..523e70515e 100644 --- a/test/fixtures-core/pom.xml +++ b/test/fixtures-core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.1.0 + 2.2.0-SNAPSHOT indy-test-fixtures-core diff --git a/test/pom.xml b/test/pom.xml index 22a3f88af2..2237bab5f2 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.1.0 + 2.2.0-SNAPSHOT indy-test diff --git a/test/providers-core/pom.xml b/test/providers-core/pom.xml index 16fba9436f..0918d0d8b7 100644 --- a/test/providers-core/pom.xml +++ b/test/providers-core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.1.0 + 2.2.0-SNAPSHOT indy-test-providers-core diff --git a/test/utils/pom.xml b/test/utils/pom.xml index 7cb82ebba0..43bf185c63 100644 --- a/test/utils/pom.xml +++ b/test/utils/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.1.0 + 2.2.0-SNAPSHOT indy-test-utils diff --git a/tools/assemblies/pom.xml b/tools/assemblies/pom.xml index edefa07cd7..7464a0012d 100644 --- a/tools/assemblies/pom.xml +++ b/tools/assemblies/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.tools indy-tools - 2.1.0 + 2.2.0-SNAPSHOT indy-assemblies diff --git a/tools/pom.xml b/tools/pom.xml index 9df154bbec..9f496fa4ce 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy.tools diff --git a/uis/layover/pom.xml b/uis/layover/pom.xml index 878c4afb47..05255c08e6 100644 --- a/uis/layover/pom.xml +++ b/uis/layover/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.ui indy-uis - 2.1.0 + 2.2.0-SNAPSHOT indy-ui-layover diff --git a/uis/pom.xml b/uis/pom.xml index 1e7f74aff8..d4f0918298 100644 --- a/uis/pom.xml +++ b/uis/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.1.0 + 2.2.0-SNAPSHOT org.commonjava.indy.ui From 31101cc11b6d9d2f8a16b9d8505a9456631b8e48 Mon Sep 17 00:00:00 2001 From: Rui Han Date: Fri, 10 Apr 2020 12:32:57 +0800 Subject: [PATCH 09/50] Bump to 2.1.1-SNAPSHOT (#1580) --- addons/changelog/client-java/pom.xml | 2 +- addons/changelog/common/pom.xml | 2 +- addons/changelog/ftests/pom.xml | 2 +- addons/changelog/jaxrs/pom.xml | 2 +- addons/changelog/pom.xml | 2 +- addons/content-browse/client-java/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/event-audit/common/pom.xml | 2 +- addons/event-audit/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/path-mapped/common/pom.xml | 2 +- addons/path-mapped/jaxrs/pom.xml | 2 +- addons/path-mapped/model-java/pom.xml | 2 +- addons/path-mapped/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/revisions/common/pom.xml | 2 +- addons/revisions/jaxrs/pom.xml | 2 +- addons/revisions/pom.xml | 2 +- addons/sli/pom.xml | 2 +- api/pom.xml | 2 +- bindings/jaxrs/pom.xml | 2 +- bindings/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/common/pom.xml | 2 +- db/flat/pom.xml | 2 +- db/infinispan/pom.xml | 2 +- db/memory/pom.xml | 2 +- db/metrics/pom.xml | 2 +- db/pom.xml | 2 +- deployments/cache-migrator/pom.xml | 2 +- deployments/docker/pom.xml | 2 +- deployments/launcher/pom.xml | 2 +- deployments/pom.xml | 2 +- deployments/record-extractor/pom.xml | 2 +- deployments/standalone/launcher/pom.xml | 2 +- deployments/standalone/pom.xml | 2 +- embedder-tests/pom.xml | 2 +- embedder-tests/sonar-report/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 | 244 +++++++++---------- rest/api/pom.xml | 2 +- rest/pom.xml | 2 +- subsys/cassandra/pom.xml | 2 +- subsys/cpool/pom.xml | 2 +- subsys/flatfile/pom.xml | 2 +- subsys/git/pom.xml | 2 +- subsys/groovy/pom.xml | 2 +- subsys/honeycomb/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/prometheus/pom.xml | 2 +- subsys/metrics/reporter/pom.xml | 2 +- subsys/pom.xml | 2 +- subsys/prefetch/pom.xml | 2 +- test/db/pom.xml | 2 +- test/docker/gogs-test-appliance/pom.xml | 2 +- test/docker/keycloak-test-appliance/pom.xml | 2 +- test/docker/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 +- 137 files changed, 258 insertions(+), 258 deletions(-) diff --git a/addons/changelog/client-java/pom.xml b/addons/changelog/client-java/pom.xml index 5e31062a71..abdbf39fca 100644 --- a/addons/changelog/client-java/pom.xml +++ b/addons/changelog/client-java/pom.xml @@ -20,7 +20,7 @@ indy-changelog org.commonjava.indy - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT 4.0.0 diff --git a/addons/changelog/common/pom.xml b/addons/changelog/common/pom.xml index fd7d586aec..8429f21b86 100644 --- a/addons/changelog/common/pom.xml +++ b/addons/changelog/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-changelog-common Indy :: Add-Ons :: ChangeLog :: Common diff --git a/addons/changelog/ftests/pom.xml b/addons/changelog/ftests/pom.xml index 30b9389fd8..ac796840d3 100644 --- a/addons/changelog/ftests/pom.xml +++ b/addons/changelog/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-ftests-changelog diff --git a/addons/changelog/jaxrs/pom.xml b/addons/changelog/jaxrs/pom.xml index d32ae8f720..2db5815cfe 100644 --- a/addons/changelog/jaxrs/pom.xml +++ b/addons/changelog/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-changelog-jaxrs diff --git a/addons/changelog/pom.xml b/addons/changelog/pom.xml index 933c0332a3..66594022c4 100644 --- a/addons/changelog/pom.xml +++ b/addons/changelog/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-changelog Indy :: Add-Ons :: ChangeLog :: Parent diff --git a/addons/content-browse/client-java/pom.xml b/addons/content-browse/client-java/pom.xml index c9e5d8aaca..ef5309b2f4 100644 --- a/addons/content-browse/client-java/pom.xml +++ b/addons/content-browse/client-java/pom.xml @@ -20,7 +20,7 @@ indy-content-browse org.commonjava.indy - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT 4.0.0 diff --git a/addons/content-browse/common/pom.xml b/addons/content-browse/common/pom.xml index cd4e5869da..961bd473ac 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 - 2.2.0-SNAPSHOT + 2.1.1-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 aedef4b759..2d1ae852cf 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 - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-ftests-content-browse diff --git a/addons/content-browse/jaxrs/pom.xml b/addons/content-browse/jaxrs/pom.xml index 6c764568a6..b2030def46 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 - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-content-browse-jaxrs diff --git a/addons/content-browse/model-java/pom.xml b/addons/content-browse/model-java/pom.xml index 35dc05bc8e..4a8a1697f9 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 - 2.2.0-SNAPSHOT + 2.1.1-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 4b1cadee0a..881fb6562a 100644 --- a/addons/content-browse/pom.xml +++ b/addons/content-browse/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.2.0-SNAPSHOT + 2.1.1-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 a05f72ea60..3abe82ba6e 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 - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT 4.0.0 diff --git a/addons/content-index/pom.xml b/addons/content-index/pom.xml index 0705c5967c..8f6d93f844 100644 --- a/addons/content-index/pom.xml +++ b/addons/content-index/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-content-index diff --git a/addons/diagnostics/client-java/pom.xml b/addons/diagnostics/client-java/pom.xml index 635d5baf93..8ff6862017 100644 --- a/addons/diagnostics/client-java/pom.xml +++ b/addons/diagnostics/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.2.0-SNAPSHOT + 2.1.1-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 afea30ef47..6b7cc7809c 100644 --- a/addons/diagnostics/common/pom.xml +++ b/addons/diagnostics/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.2.0-SNAPSHOT + 2.1.1-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 06bca5b91f..1b1ce43b44 100644 --- a/addons/diagnostics/ftests/pom.xml +++ b/addons/diagnostics/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-ftests-diagnostics diff --git a/addons/diagnostics/jaxrs/pom.xml b/addons/diagnostics/jaxrs/pom.xml index 7cdf3d69c3..1491bf5b7b 100644 --- a/addons/diagnostics/jaxrs/pom.xml +++ b/addons/diagnostics/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-diagnostics-jaxrs diff --git a/addons/diagnostics/pom.xml b/addons/diagnostics/pom.xml index 72d6e2e481..f8e11e5c31 100644 --- a/addons/diagnostics/pom.xml +++ b/addons/diagnostics/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.2.0-SNAPSHOT + 2.1.1-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 1a8c82c616..cd12f1f3bf 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 - 2.2.0-SNAPSHOT + 2.1.1-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 6ee428fae0..ebd2ebb05f 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 - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-ftests-dot-maven diff --git a/addons/dot-maven/jaxrs/pom.xml b/addons/dot-maven/jaxrs/pom.xml index 295867c4e6..691f6cd8a5 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 - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-dot-maven-jaxrs diff --git a/addons/dot-maven/pom.xml b/addons/dot-maven/pom.xml index 9bd7bf7998..81852d4383 100644 --- a/addons/dot-maven/pom.xml +++ b/addons/dot-maven/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-dot-maven diff --git a/addons/event-audit/common/pom.xml b/addons/event-audit/common/pom.xml index ea8c32052c..1fa7aac026 100644 --- a/addons/event-audit/common/pom.xml +++ b/addons/event-audit/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-event-audit - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-event-audit-common diff --git a/addons/event-audit/pom.xml b/addons/event-audit/pom.xml index aede9c09f0..cacc617a0d 100644 --- a/addons/event-audit/pom.xml +++ b/addons/event-audit/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-event-audit diff --git a/addons/folo/client-java/pom.xml b/addons/folo/client-java/pom.xml index 544761ebe9..c50e57b98a 100644 --- a/addons/folo/client-java/pom.xml +++ b/addons/folo/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.2.0-SNAPSHOT + 2.1.1-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 759f108651..38bdb6efd3 100644 --- a/addons/folo/common/pom.xml +++ b/addons/folo/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.2.0-SNAPSHOT + 2.1.1-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 14e2a38349..d3d7ca27c7 100644 --- a/addons/folo/ftests/pom.xml +++ b/addons/folo/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-ftests-folo diff --git a/addons/folo/jaxrs/pom.xml b/addons/folo/jaxrs/pom.xml index f7ba2c8e50..43fddb2d11 100644 --- a/addons/folo/jaxrs/pom.xml +++ b/addons/folo/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-folo-jaxrs diff --git a/addons/folo/model-java/pom.xml b/addons/folo/model-java/pom.xml index 0f4da9e730..e88bea6420 100644 --- a/addons/folo/model-java/pom.xml +++ b/addons/folo/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.2.0-SNAPSHOT + 2.1.1-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 bda46598ec..7801f14cc4 100644 --- a/addons/folo/pom.xml +++ b/addons/folo/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.2.0-SNAPSHOT + 2.1.1-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 4170434c37..317db5a9c0 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 - 2.2.0-SNAPSHOT + 2.1.1-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 26e8300888..da3a8fa049 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 - 2.2.0-SNAPSHOT + 2.1.1-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 f8cc016657..7fca0361b6 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 - 2.2.0-SNAPSHOT + 2.1.1-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 613aa544f1..0d647ac431 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 - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-hosted-by-archive-jaxrs diff --git a/addons/hosted-by-archive/pom.xml b/addons/hosted-by-archive/pom.xml index d9123c6540..0ac1e6bca6 100644 --- a/addons/hosted-by-archive/pom.xml +++ b/addons/hosted-by-archive/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.2.0-SNAPSHOT + 2.1.1-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 07cd6d8de0..43f23447d2 100644 --- a/addons/httprox/common/pom.xml +++ b/addons/httprox/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.2.0-SNAPSHOT + 2.1.1-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 b3a38288d7..b729c95624 100644 --- a/addons/httprox/ftests/pom.xml +++ b/addons/httprox/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-ftests-httprox diff --git a/addons/httprox/jaxrs/pom.xml b/addons/httprox/jaxrs/pom.xml index ba4f55c5de..39e841a424 100644 --- a/addons/httprox/jaxrs/pom.xml +++ b/addons/httprox/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.2.0-SNAPSHOT + 2.1.1-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 4b8c25fd48..1e51456f53 100644 --- a/addons/httprox/pom.xml +++ b/addons/httprox/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-httprox diff --git a/addons/implied-repos/client-java/pom.xml b/addons/implied-repos/client-java/pom.xml index 5902d236dd..e4b07207d7 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 - 2.2.0-SNAPSHOT + 2.1.1-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 d8f9b237de..1baf07a7a5 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 - 2.2.0-SNAPSHOT + 2.1.1-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 7bbcb14f37..dea44f9510 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 - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-ftests-implied-repos diff --git a/addons/implied-repos/model-java/pom.xml b/addons/implied-repos/model-java/pom.xml index dbd33b8596..6ef2f3d302 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 - 2.2.0-SNAPSHOT + 2.1.1-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 bf10022d54..c19fb32435 100644 --- a/addons/implied-repos/pom.xml +++ b/addons/implied-repos/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.2.0-SNAPSHOT + 2.1.1-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 6f50129de3..f6d319fc92 100644 --- a/addons/koji/client-java/pom.xml +++ b/addons/koji/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.2.0-SNAPSHOT + 2.1.1-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 ce02b580fb..99beae5793 100644 --- a/addons/koji/common/pom.xml +++ b/addons/koji/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.2.0-SNAPSHOT + 2.1.1-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 421d9b3a51..fb40b8bc40 100644 --- a/addons/koji/jaxrs/pom.xml +++ b/addons/koji/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-koji-jaxrs diff --git a/addons/koji/model-java/pom.xml b/addons/koji/model-java/pom.xml index 4be1487395..79d50247cc 100644 --- a/addons/koji/model-java/pom.xml +++ b/addons/koji/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.2.0-SNAPSHOT + 2.1.1-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 14df676a29..b5a16f7cda 100644 --- a/addons/koji/pom.xml +++ b/addons/koji/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-koji Indy :: Add-Ons :: Koji Integration :: Parent diff --git a/addons/path-mapped/common/pom.xml b/addons/path-mapped/common/pom.xml index 29a41bfdd4..3079680b38 100644 --- a/addons/path-mapped/common/pom.xml +++ b/addons/path-mapped/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-path-mapped-common diff --git a/addons/path-mapped/jaxrs/pom.xml b/addons/path-mapped/jaxrs/pom.xml index 0bab59fdef..644e87114a 100644 --- a/addons/path-mapped/jaxrs/pom.xml +++ b/addons/path-mapped/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-path-mapped-jaxrs diff --git a/addons/path-mapped/model-java/pom.xml b/addons/path-mapped/model-java/pom.xml index 2768ea899b..b5b3197fe2 100644 --- a/addons/path-mapped/model-java/pom.xml +++ b/addons/path-mapped/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-path-mapped-model-java diff --git a/addons/path-mapped/pom.xml b/addons/path-mapped/pom.xml index fa97eb1464..b1124121ba 100644 --- a/addons/path-mapped/pom.xml +++ b/addons/path-mapped/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-path-mapped Indy :: Add-Ons :: Path Mapped :: Parent diff --git a/addons/pkg-maven/common/pom.xml b/addons/pkg-maven/common/pom.xml index 04e76bf009..2cb185423c 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 - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT 4.0.0 diff --git a/addons/pkg-maven/ftests/pom.xml b/addons/pkg-maven/ftests/pom.xml index 0c433afff1..291b3c262f 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 - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT 4.0.0 diff --git a/addons/pkg-maven/jaxrs/pom.xml b/addons/pkg-maven/jaxrs/pom.xml index 6cc92133b3..a2024010cc 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 - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT 4.0.0 diff --git a/addons/pkg-maven/pom.xml b/addons/pkg-maven/pom.xml index 1d0f0e8114..ca25e4b8be 100644 --- a/addons/pkg-maven/pom.xml +++ b/addons/pkg-maven/pom.xml @@ -20,7 +20,7 @@ indy-addons org.commonjava.indy - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/common/pom.xml b/addons/pkg-npm/common/pom.xml index b224c10158..6c66e9eb53 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 - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/ftests/pom.xml b/addons/pkg-npm/ftests/pom.xml index 3033f0e322..dcbeb195fa 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 - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/jaxrs/pom.xml b/addons/pkg-npm/jaxrs/pom.xml index 0071adfa13..9fcf481d9f 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 - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/model-java/pom.xml b/addons/pkg-npm/model-java/pom.xml index 7888d30eb6..71f4280f08 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 - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/pom.xml b/addons/pkg-npm/pom.xml index 8783435bae..456fe2e5e6 100644 --- a/addons/pkg-npm/pom.xml +++ b/addons/pkg-npm/pom.xml @@ -20,7 +20,7 @@ indy-addons org.commonjava.indy - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT 4.0.0 diff --git a/addons/pom.xml b/addons/pom.xml index e22bc19d72..bc27feac60 100644 --- a/addons/pom.xml +++ b/addons/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-parent - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-addons diff --git a/addons/promote/client-java/pom.xml b/addons/promote/client-java/pom.xml index a0148abf04..5cae8776fd 100644 --- a/addons/promote/client-java/pom.xml +++ b/addons/promote/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.2.0-SNAPSHOT + 2.1.1-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 74ed82f5e9..d31ab86e87 100644 --- a/addons/promote/common/pom.xml +++ b/addons/promote/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.2.0-SNAPSHOT + 2.1.1-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 6c923b4c93..19ab3532bd 100644 --- a/addons/promote/ftests/pom.xml +++ b/addons/promote/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-ftests-promote diff --git a/addons/promote/jaxrs/pom.xml b/addons/promote/jaxrs/pom.xml index aefaa60401..59f86e2463 100644 --- a/addons/promote/jaxrs/pom.xml +++ b/addons/promote/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-promote-jaxrs diff --git a/addons/promote/model-java/pom.xml b/addons/promote/model-java/pom.xml index d7368e8295..0bfc3bde85 100644 --- a/addons/promote/model-java/pom.xml +++ b/addons/promote/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.2.0-SNAPSHOT + 2.1.1-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 9a65090aeb..e845d2279a 100644 --- a/addons/promote/pom.xml +++ b/addons/promote/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-promote Indy :: Add-Ons :: Artifact Promotion :: Parent diff --git a/addons/revisions/common/pom.xml b/addons/revisions/common/pom.xml index 6b0c6e354c..ae128d80ec 100644 --- a/addons/revisions/common/pom.xml +++ b/addons/revisions/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-revisions - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-revisions-common Indy :: Add-Ons :: Revisions :: Common diff --git a/addons/revisions/jaxrs/pom.xml b/addons/revisions/jaxrs/pom.xml index ef481b397f..006986144c 100644 --- a/addons/revisions/jaxrs/pom.xml +++ b/addons/revisions/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-revisions - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-revisions-jaxrs diff --git a/addons/revisions/pom.xml b/addons/revisions/pom.xml index 81dbb2ba04..980544d5e0 100644 --- a/addons/revisions/pom.xml +++ b/addons/revisions/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-revisions Indy :: Add-Ons :: Revisions :: Parent diff --git a/addons/sli/pom.xml b/addons/sli/pom.xml index 9847264cad..f5ae5345cd 100644 --- a/addons/sli/pom.xml +++ b/addons/sli/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-sli Indy :: Add-Ons :: Service Level Indicators Reporting :: JAX-RS diff --git a/api/pom.xml b/api/pom.xml index 3b06b1f733..67a88a9825 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-api diff --git a/bindings/jaxrs/pom.xml b/bindings/jaxrs/pom.xml index 4d1d6befe1..92a47588f9 100644 --- a/bindings/jaxrs/pom.xml +++ b/bindings/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-bindings - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-bindings-jaxrs diff --git a/bindings/pom.xml b/bindings/pom.xml index 4316068f35..ee2cf8ca4b 100644 --- a/bindings/pom.xml +++ b/bindings/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-parent - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-bindings diff --git a/boot/jaxrs/pom.xml b/boot/jaxrs/pom.xml index bb46639916..f81d807971 100644 --- a/boot/jaxrs/pom.xml +++ b/boot/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.boot indy-booters - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy.boot diff --git a/boot/pom.xml b/boot/pom.xml index 39837ff748..2110d4ae27 100644 --- a/boot/pom.xml +++ b/boot/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy.boot diff --git a/clients/core-java/pom.xml b/clients/core-java/pom.xml index 7578b796dc..948de85298 100644 --- a/clients/core-java/pom.xml +++ b/clients/core-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-clients-parent - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-client-core-java diff --git a/clients/pom.xml b/clients/pom.xml index d38cb62e6e..0b5cffaef2 100644 --- a/clients/pom.xml +++ b/clients/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-clients-parent diff --git a/core/pom.xml b/core/pom.xml index b692aee687..907d51e3ab 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-core diff --git a/db/common/pom.xml b/db/common/pom.xml index 52b5b5a7cf..7ef0ba06c1 100644 --- a/db/common/pom.xml +++ b/db/common/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-db - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-db-common diff --git a/db/flat/pom.xml b/db/flat/pom.xml index 53e287e501..0a5de40f92 100644 --- a/db/flat/pom.xml +++ b/db/flat/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-db-flat diff --git a/db/infinispan/pom.xml b/db/infinispan/pom.xml index 709f0a7c97..189c2a9f96 100644 --- a/db/infinispan/pom.xml +++ b/db/infinispan/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-db - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-db-infinispan diff --git a/db/memory/pom.xml b/db/memory/pom.xml index c7614d46eb..c611d9802c 100644 --- a/db/memory/pom.xml +++ b/db/memory/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-db-memory diff --git a/db/metrics/pom.xml b/db/metrics/pom.xml index 210040d623..df650aefb9 100644 --- a/db/metrics/pom.xml +++ b/db/metrics/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-db-metrics diff --git a/db/pom.xml b/db/pom.xml index ce2d57149b..7346f5aaa3 100644 --- a/db/pom.xml +++ b/db/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-db diff --git a/deployments/cache-migrator/pom.xml b/deployments/cache-migrator/pom.xml index b9e5ea462c..54b66abbfd 100644 --- a/deployments/cache-migrator/pom.xml +++ b/deployments/cache-migrator/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-deployments - 2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy.launch diff --git a/deployments/docker/pom.xml b/deployments/docker/pom.xml index d03ceb141e..5146f04781 100644 --- a/deployments/docker/pom.xml +++ b/deployments/docker/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-deployments - 2.1.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy.docker diff --git a/deployments/launcher/pom.xml b/deployments/launcher/pom.xml index 8821ebceee..794dbba0ec 100644 --- a/deployments/launcher/pom.xml +++ b/deployments/launcher/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-deployments - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy.launch diff --git a/deployments/pom.xml b/deployments/pom.xml index 3edba0aedb..541b6fa774 100644 --- a/deployments/pom.xml +++ b/deployments/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-deployments diff --git a/deployments/record-extractor/pom.xml b/deployments/record-extractor/pom.xml index 9deb37c09c..e6a4d69026 100644 --- a/deployments/record-extractor/pom.xml +++ b/deployments/record-extractor/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-deployments - 2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy.launch diff --git a/deployments/standalone/launcher/pom.xml b/deployments/standalone/launcher/pom.xml index f52bdf3c0e..fa0104828a 100644 --- a/deployments/standalone/launcher/pom.xml +++ b/deployments/standalone/launcher/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-standalone - 2.1.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-standalone-launcher diff --git a/deployments/standalone/pom.xml b/deployments/standalone/pom.xml index 34b26bd26b..d981f86cd1 100644 --- a/deployments/standalone/pom.xml +++ b/deployments/standalone/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-deployments - 2.1.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-standalone diff --git a/embedder-tests/pom.xml b/embedder-tests/pom.xml index 7d0f6f1fc9..9af83fc8c1 100644 --- a/embedder-tests/pom.xml +++ b/embedder-tests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.1.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy.embed.test diff --git a/embedder-tests/sonar-report/pom.xml b/embedder-tests/sonar-report/pom.xml index 7863efbcdb..24efc7bae9 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 - 2.1.0-SNAPSHOT + 2.1.1-SNAPSHOT 4.0.0 diff --git a/embedder/pom.xml b/embedder/pom.xml index bbb19c26f2..179c4a36c3 100644 --- a/embedder/pom.xml +++ b/embedder/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy.embed diff --git a/filers/default/pom.xml b/filers/default/pom.xml index 291175220c..f66d876aed 100644 --- a/filers/default/pom.xml +++ b/filers/default/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-file-managers - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-filer-default diff --git a/filers/pom.xml b/filers/pom.xml index f5e029bcb8..4e2b5c7f05 100644 --- a/filers/pom.xml +++ b/filers/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-file-managers diff --git a/ftests/common/pom.xml b/ftests/common/pom.xml index fc3e4e3516..7f2deaae5c 100644 --- a/ftests/common/pom.xml +++ b/ftests/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-ftests-parent - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-ftests-common diff --git a/ftests/core/pom.xml b/ftests/core/pom.xml index a0af947247..8a47a511ed 100644 --- a/ftests/core/pom.xml +++ b/ftests/core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-ftests-parent - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-ftests-core diff --git a/ftests/metrics/pom.xml b/ftests/metrics/pom.xml index 544d6deba5..b50ab1c03c 100644 --- a/ftests/metrics/pom.xml +++ b/ftests/metrics/pom.xml @@ -20,7 +20,7 @@ indy-ftests-parent org.commonjava.indy - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT 4.0.0 diff --git a/ftests/pom.xml b/ftests/pom.xml index cabc0df0bc..c93e0e7419 100644 --- a/ftests/pom.xml +++ b/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-ftests-parent diff --git a/models/core-java/pom.xml b/models/core-java/pom.xml index 9ff151fa91..08617b2e15 100644 --- a/models/core-java/pom.xml +++ b/models/core-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-models-parent - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-model-core-java diff --git a/models/pom.xml b/models/pom.xml index b7ca74523e..3083025034 100644 --- a/models/pom.xml +++ b/models/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-models-parent diff --git a/pom.xml b/pom.xml index fd552332bd..c318d33709 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.commonjava.indy indy-parent - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT pom @@ -182,7 +182,7 @@ org.commonjava.indy.ui indy-ui-layover - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT runtime @@ -190,22 +190,22 @@ org.commonjava.indy indy-model-core-java - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-api - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-core - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-core - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT tar.gz confset provided @@ -213,32 +213,32 @@ org.commonjava.indy indy-db-flat - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-db-metrics - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-db-common - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-db-infinispan - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-bindings-jaxrs - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy.launch indy-launcher - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT tar.gz skinny provided @@ -246,7 +246,7 @@ org.commonjava.indy.launch indy-launcher - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT tar.gz complete provided @@ -254,7 +254,7 @@ org.commonjava.indy.launch indy-launcher - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT tar.gz data provided @@ -262,7 +262,7 @@ org.commonjava.indy.launch indy-launcher - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT tar.gz etc provided @@ -271,17 +271,17 @@ org.commonjava.indy indy-revisions-jaxrs - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-revisions-common - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-revisions-common - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT tar.gz confset provided @@ -289,7 +289,7 @@ org.commonjava.indy indy-revisions-common - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT tar.gz uiset provided @@ -297,12 +297,12 @@ org.commonjava.indy indy-dot-maven-common - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-dot-maven-common - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT tar.gz dataset provided @@ -310,22 +310,22 @@ org.commonjava.indy indy-dot-maven-jaxrs - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-ftests-dot-maven - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-httprox-common - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-httprox-common - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT tar.gz confset provided @@ -333,17 +333,17 @@ org.commonjava.indy indy-ftests-httprox - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-content-index - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-content-index - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT tar.gz confset provided @@ -351,51 +351,51 @@ org.commonjava.indy indy-db-memory - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-test-db - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT test org.commonjava.indy indy-test-fixtures-core - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT test org.commonjava.indy indy-test-providers-core - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT test org.commonjava.indy indy-test-utils - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT test org.commonjava.indy indy-filer-default - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-subsys-jaxrs - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-subsys-honeycomb - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-subsys-honeycomb - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT tar.gz confset provided @@ -403,17 +403,17 @@ org.commonjava.indy indy-subsys-flatfile - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-subsys-cassandra - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-subsys-cassandra - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT tar.gz confset provided @@ -421,79 +421,79 @@ org.commonjava.indy indy-subsys-infinispan - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-subsys-http - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-subsys-git - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-subsys-groovy - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-subsys-prefetch - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-subsys-cpool - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-client-core-java - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-ftests-common - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-ftests-core - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT test org.commonjava.indy indy-folo-jaxrs - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-ftests-folo - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT test org.commonjava.indy indy-folo-client-java - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-folo-model-java - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-folo-common - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-folo-common - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT tar.gz dataset provided @@ -501,7 +501,7 @@ org.commonjava.indy indy-folo-common - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT tar.gz confset provided @@ -509,33 +509,33 @@ org.commonjava.indy indy-promote-jaxrs - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-ftests-promote - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT test org.commonjava.indy indy-promote-client-java - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-promote-model-java - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-promote-common - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-promote-common - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT tar.gz confset provided @@ -543,7 +543,7 @@ org.commonjava.indy indy-promote-common - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT tar.gz dataset provided @@ -551,19 +551,19 @@ org.commonjava.indy indy-promote-common - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT dataset provided org.commonjava.indy indy-implied-repos-common - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-implied-repos-common - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT tar.gz confset provided @@ -571,37 +571,37 @@ org.commonjava.indy indy-implied-repos-model-java - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-implied-repos-client-java - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-ftests-implied-repos - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy.embed indy-embedder - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy.boot indy-booter-jaxrs - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-subsys-keycloak - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-subsys-keycloak - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT tar.gz confset provided @@ -609,7 +609,7 @@ org.commonjava.indy indy-subsys-infinispan - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT tar.gz confset provided @@ -617,7 +617,7 @@ org.commonjava.indy indy-subsys-prefetch - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT tar.gz confset provided @@ -626,7 +626,7 @@ org.commonjava.indy indy-koji-common - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT tar.gz confset provided @@ -634,103 +634,103 @@ org.commonjava.indy indy-koji-common - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-koji-model-java - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-koji-client-java - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-koji-jaxrs - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-path-mapped-common - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-path-mapped-model-java - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-path-mapped-jaxrs - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-pkg-maven-common - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-pkg-maven-jaxrs - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-pkg-npm-jaxrs - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-ftests-pkg-maven - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT test org.commonjava.indy indy-ftests-pkg-npm - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT test org.commonjava.indy indy-pkg-npm-common - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-pkg-npm-model-java - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-diagnostics-jaxrs - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-diagnostics-client-java - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-diagnostics-common - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-ftests-diagnostics - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT test org.commonjava.indy indy-diagnostics-common - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT confset tar.gz provided @@ -738,28 +738,28 @@ org.commonjava.indy indy-hosted-by-archive-common - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-hosted-by-archive-client-java - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-ftests-hosted-by-archive - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT test org.commonjava.indy indy-hosted-by-archive-jaxrs - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-hosted-by-archive-common - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT confset tar.gz @@ -767,22 +767,22 @@ org.commonjava.indy indy-subsys-metrics-core - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-subsys-metrics-reporter - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-subsys-metrics-prometheus - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-subsys-metrics-reporter - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT confset tar.gz provided @@ -791,28 +791,28 @@ org.commonjava.indy indy-ftests-metrics - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT test org.commonjava.indy indy-sli - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy.rest indy-rest-api yaml - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT provided org.commonjava.indy.rest indy-rest-api json - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT provided @@ -846,33 +846,33 @@ org.commonjava.indy indy-content-browse-common - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-content-browse-jaxrs - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-ftests-content-browse - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT test org.commonjava.indy indy-content-browse-model-java - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-content-browse-client-java - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-content-browse-common - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT confset tar.gz provided @@ -880,35 +880,35 @@ org.commonjava.indy indy-content-browse-ui - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT reactui tar.gz org.commonjava.indy indy-changelog-common - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-changelog-client-java - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-ftests-changelog - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT test org.commonjava.indy indy-changelog-jaxrs - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-changelog-common - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT confset tar.gz @@ -926,12 +926,12 @@ org.commonjava.indy indy-event-audit-common - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy indy-event-audit-common - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT confset tar.gz provided diff --git a/rest/api/pom.xml b/rest/api/pom.xml index d30e54b84f..567bf50446 100644 --- a/rest/api/pom.xml +++ b/rest/api/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.rest indy-rest-parent - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-rest-api diff --git a/rest/pom.xml b/rest/pom.xml index 0f70947591..aa117c441c 100644 --- a/rest/pom.xml +++ b/rest/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy.rest diff --git a/subsys/cassandra/pom.xml b/subsys/cassandra/pom.xml index 100a49c371..835b7561e0 100644 --- a/subsys/cassandra/pom.xml +++ b/subsys/cassandra/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-subsystems - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-subsys-cassandra diff --git a/subsys/cpool/pom.xml b/subsys/cpool/pom.xml index 87cbe701ee..1ab00c453a 100644 --- a/subsys/cpool/pom.xml +++ b/subsys/cpool/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-subsys-cpool diff --git a/subsys/flatfile/pom.xml b/subsys/flatfile/pom.xml index c772783688..af67e0216f 100644 --- a/subsys/flatfile/pom.xml +++ b/subsys/flatfile/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-subsys-flatfile diff --git a/subsys/git/pom.xml b/subsys/git/pom.xml index 2b1d0e238d..8aada894c3 100644 --- a/subsys/git/pom.xml +++ b/subsys/git/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-subsys-git diff --git a/subsys/groovy/pom.xml b/subsys/groovy/pom.xml index 465fdd30ff..e28e410203 100644 --- a/subsys/groovy/pom.xml +++ b/subsys/groovy/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-subsys-groovy diff --git a/subsys/honeycomb/pom.xml b/subsys/honeycomb/pom.xml index 5d2dc455e5..89aa7fc64d 100644 --- a/subsys/honeycomb/pom.xml +++ b/subsys/honeycomb/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT 4.0.0 diff --git a/subsys/http/pom.xml b/subsys/http/pom.xml index 2fe9c8d1c0..45ef2c3e14 100644 --- a/subsys/http/pom.xml +++ b/subsys/http/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-subsys-http diff --git a/subsys/infinispan/pom.xml b/subsys/infinispan/pom.xml index 26c09f0af4..96d090df60 100644 --- a/subsys/infinispan/pom.xml +++ b/subsys/infinispan/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-subsys-infinispan diff --git a/subsys/jaxrs/pom.xml b/subsys/jaxrs/pom.xml index c34e26ed3b..d5d6c88ba7 100644 --- a/subsys/jaxrs/pom.xml +++ b/subsys/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-subsys-jaxrs diff --git a/subsys/kafka/pom.xml b/subsys/kafka/pom.xml index da270fa774..a45e923e21 100644 --- a/subsys/kafka/pom.xml +++ b/subsys/kafka/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT 4.0.0 diff --git a/subsys/keycloak/pom.xml b/subsys/keycloak/pom.xml index 50a08a01a1..1234733b16 100644 --- a/subsys/keycloak/pom.xml +++ b/subsys/keycloak/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-subsys-keycloak Indy :: Subsystems :: Keycloak diff --git a/subsys/metrics/core/pom.xml b/subsys/metrics/core/pom.xml index 9b4a85c4d7..ef6655a6b1 100644 --- a/subsys/metrics/core/pom.xml +++ b/subsys/metrics/core/pom.xml @@ -20,7 +20,7 @@ indy-subsys-metrics org.commonjava.indy - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT 4.0.0 diff --git a/subsys/metrics/pom.xml b/subsys/metrics/pom.xml index ae9103f13b..5869b52f52 100644 --- a/subsys/metrics/pom.xml +++ b/subsys/metrics/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT 4.0.0 diff --git a/subsys/metrics/prometheus/pom.xml b/subsys/metrics/prometheus/pom.xml index a6bfd4c6f5..3100a410e0 100644 --- a/subsys/metrics/prometheus/pom.xml +++ b/subsys/metrics/prometheus/pom.xml @@ -20,7 +20,7 @@ indy-subsys-metrics org.commonjava.indy - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT 4.0.0 diff --git a/subsys/metrics/reporter/pom.xml b/subsys/metrics/reporter/pom.xml index cab4a375db..bb455806d2 100644 --- a/subsys/metrics/reporter/pom.xml +++ b/subsys/metrics/reporter/pom.xml @@ -20,7 +20,7 @@ indy-subsys-metrics org.commonjava.indy - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT 4.0.0 diff --git a/subsys/pom.xml b/subsys/pom.xml index aa6d173c76..c911b4b464 100644 --- a/subsys/pom.xml +++ b/subsys/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-subsystems diff --git a/subsys/prefetch/pom.xml b/subsys/prefetch/pom.xml index 2e8266b41e..082ef8da91 100644 --- a/subsys/prefetch/pom.xml +++ b/subsys/prefetch/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT 4.0.0 diff --git a/test/db/pom.xml b/test/db/pom.xml index b6ea8fb01d..a4acee0000 100644 --- a/test/db/pom.xml +++ b/test/db/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-test-db diff --git a/test/docker/gogs-test-appliance/pom.xml b/test/docker/gogs-test-appliance/pom.xml index 500170df99..8d36b432d8 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 - 2.1.0-SNAPSHOT + 2.1.1-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 e71d5f75df..737093eb44 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 - 2.1.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-docker-keycloak-test-appliance diff --git a/test/docker/pom.xml b/test/docker/pom.xml index 2f6e0815ae..53a9662e43 100644 --- a/test/docker/pom.xml +++ b/test/docker/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.1.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy.docker diff --git a/test/fixtures-core/pom.xml b/test/fixtures-core/pom.xml index 523e70515e..57c431267a 100644 --- a/test/fixtures-core/pom.xml +++ b/test/fixtures-core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-test-fixtures-core diff --git a/test/pom.xml b/test/pom.xml index 2237bab5f2..64d370fc78 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-test diff --git a/test/providers-core/pom.xml b/test/providers-core/pom.xml index 0918d0d8b7..3a44162759 100644 --- a/test/providers-core/pom.xml +++ b/test/providers-core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-test-providers-core diff --git a/test/utils/pom.xml b/test/utils/pom.xml index 43bf185c63..35ac2713c6 100644 --- a/test/utils/pom.xml +++ b/test/utils/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-test-utils diff --git a/tools/assemblies/pom.xml b/tools/assemblies/pom.xml index 7464a0012d..b8eae261bc 100644 --- a/tools/assemblies/pom.xml +++ b/tools/assemblies/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.tools indy-tools - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-assemblies diff --git a/tools/pom.xml b/tools/pom.xml index 9f496fa4ce..e109929755 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy.tools diff --git a/uis/layover/pom.xml b/uis/layover/pom.xml index 05255c08e6..f7a0fdc337 100644 --- a/uis/layover/pom.xml +++ b/uis/layover/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.ui indy-uis - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT indy-ui-layover diff --git a/uis/pom.xml b/uis/pom.xml index d4f0918298..033e325275 100644 --- a/uis/pom.xml +++ b/uis/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.2.0-SNAPSHOT + 2.1.1-SNAPSHOT org.commonjava.indy.ui From 21e9331a6e66383b3408b3fa7e8fbeb180746f17 Mon Sep 17 00:00:00 2001 From: John Casey Date: Wed, 15 Apr 2020 15:45:23 -0500 Subject: [PATCH 10/50] Disable bearer token debug (#1583) This debugger class actually has some code that throws two different kinds of RuntimeException, which is very dangerous considering its function is to help debug the authentication process (not change it). --- .../indy/httprox/keycloak/KeycloakProxyAuthenticator.java | 2 +- .../bind/jaxrs/keycloak/BasicAuthenticationOAuthTranslator.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/httprox/common/src/main/java/org/commonjava/indy/httprox/keycloak/KeycloakProxyAuthenticator.java b/addons/httprox/common/src/main/java/org/commonjava/indy/httprox/keycloak/KeycloakProxyAuthenticator.java index 57e5016265..43cc5de9e4 100644 --- a/addons/httprox/common/src/main/java/org/commonjava/indy/httprox/keycloak/KeycloakProxyAuthenticator.java +++ b/addons/httprox/common/src/main/java/org/commonjava/indy/httprox/keycloak/KeycloakProxyAuthenticator.java @@ -184,7 +184,7 @@ protected AuthResult authenticateToken( HttpWrapper exchange, String tokenString AccessToken token; try { - KeycloakBearerTokenDebug.debugToken( tokenString ); +// KeycloakBearerTokenDebug.debugToken( tokenString ); logger.debug( "Verifying token: '{}'", tokenString ); token = RSATokenVerifier.verifyToken( tokenString, getHardcodedRealmKey( deployment ), deployment.getRealmInfoUrl() ); diff --git a/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/keycloak/BasicAuthenticationOAuthTranslator.java b/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/keycloak/BasicAuthenticationOAuthTranslator.java index 5f68e8d29c..97b44584ac 100644 --- a/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/keycloak/BasicAuthenticationOAuthTranslator.java +++ b/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/keycloak/BasicAuthenticationOAuthTranslator.java @@ -169,7 +169,7 @@ else if ( value.toLowerCase() "BASIC authentication translated into OAuth 2.0 bearer token. Handing off to Keycloak." ); resultValues.add( value ); - KeycloakBearerTokenDebug.debugToken( encodedToken ); +// KeycloakBearerTokenDebug.debugToken( encodedToken ); exchange.getResponseHeaders().add( new HttpString( INDY_BEARER_TOKEN ), encodedToken ); } } From d6fd765daa5067918db951371673dc1bd91de89c Mon Sep 17 00:00:00 2001 From: Rui Han Date: Fri, 17 Apr 2020 12:39:25 +0800 Subject: [PATCH 11/50] Fix npe in getStrategyPath (#1587) * Fix npe in getStrategyPath * Set cassandra so timeout to 120s --- .../PathMappedGroupRepositoryFilter.java | 28 +++++++++++-------- .../subsys/cassandra/CassandraClient.java | 4 +-- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/addons/path-mapped/common/src/main/java/org/commonjava/indy/pathmapped/inject/PathMappedGroupRepositoryFilter.java b/addons/path-mapped/common/src/main/java/org/commonjava/indy/pathmapped/inject/PathMappedGroupRepositoryFilter.java index beeebd6c27..5ae3235ad0 100644 --- a/addons/path-mapped/common/src/main/java/org/commonjava/indy/pathmapped/inject/PathMappedGroupRepositoryFilter.java +++ b/addons/path-mapped/common/src/main/java/org/commonjava/indy/pathmapped/inject/PathMappedGroupRepositoryFilter.java @@ -35,6 +35,7 @@ import java.util.Set; import java.util.stream.Collectors; +import static org.apache.commons.lang3.StringUtils.isBlank; import static org.commonjava.indy.pkg.maven.model.MavenPackageTypeDescriptor.MAVEN_PKG_KEY; import static org.commonjava.indy.pkg.npm.model.NPMPackageTypeDescriptor.NPM_PKG_KEY; @@ -116,10 +117,16 @@ private List getCandidates( List concreteStores ) private String getStrategyPath( final StoreKey key, final String rawPath ) { + if ( isBlank( rawPath ) ) + { + return null; + } + + Path parent = null; if ( key.getPackageType().equals( MAVEN_PKG_KEY ) ) { // Use parent path because 1. maven metadata generator need to list it, 2. it is supper set of file path - return Paths.get( rawPath ).getParent().toString(); + parent = Paths.get( rawPath ).getParent(); } else if ( key.getPackageType().equals( NPM_PKG_KEY ) ) { @@ -128,17 +135,16 @@ else if ( key.getPackageType().equals( NPM_PKG_KEY ) ) * jquery/-/jquery-1.5.1.tgz -> jquery/-/, jquery-1.5.1.tgz * jquery -> jquery/, package.json */ - Path parent = Paths.get( rawPath ).getParent(); - if ( parent == null ) - { - return rawPath; - } - else - { - return parent.toString(); - } + parent = Paths.get( rawPath ).getParent(); + } + if ( parent == null ) + { + return rawPath; + } + else + { + return parent.toString(); } - return null; } } diff --git a/subsys/cassandra/src/main/java/org/commonjava/indy/subsys/cassandra/CassandraClient.java b/subsys/cassandra/src/main/java/org/commonjava/indy/subsys/cassandra/CassandraClient.java index b160570bda..f1db419754 100644 --- a/subsys/cassandra/src/main/java/org/commonjava/indy/subsys/cassandra/CassandraClient.java +++ b/subsys/cassandra/src/main/java/org/commonjava/indy/subsys/cassandra/CassandraClient.java @@ -71,8 +71,8 @@ private void init() host = config.getCassandraHost(); port = config.getCassandraPort(); SocketOptions socketOptions = new SocketOptions(); - socketOptions.setConnectTimeoutMillis( 30000 ); - socketOptions.setReadTimeoutMillis( 30000 ); + socketOptions.setConnectTimeoutMillis( 120000 ); + socketOptions.setReadTimeoutMillis( 120000 ); Cluster.Builder builder = Cluster.builder() .withoutJMXReporting() .addContactPoint( host ) From 0bb3e9f86ca1117fa6e83d2426e7efcf1ba99226 Mon Sep 17 00:00:00 2001 From: Gang Li Date: Fri, 17 Apr 2020 15:24:05 +0800 Subject: [PATCH 12/50] Fix bug of unknown api version We found some weird issue from prod, that the apiVersion header got from client is "unknown", which caused NUmberFormatException in code. So this code is to solve the problem. --- .../org/commonjava/indy/stats/IndyDeprecatedApis.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/models/core-java/src/main/java/org/commonjava/indy/stats/IndyDeprecatedApis.java b/models/core-java/src/main/java/org/commonjava/indy/stats/IndyDeprecatedApis.java index 1a7b124217..0c9188ee41 100644 --- a/models/core-java/src/main/java/org/commonjava/indy/stats/IndyDeprecatedApis.java +++ b/models/core-java/src/main/java/org/commonjava/indy/stats/IndyDeprecatedApis.java @@ -88,7 +88,16 @@ public DeprecatedApiEntry getDeprecated( String reqApiVersion ) { return null; } - Float reqVer = Float.parseFloat( reqApiVersion ); + Float reqVer; + try + { + reqVer = Float.parseFloat( reqApiVersion ); + } + catch ( NumberFormatException e ) + { + logger.warn( "Unknown api version: {}", reqApiVersion ); + return null; + } // the scopes may overlap, we go through range entries first and other entries next for ( DeprecatedApiEntry et : deprecatedApis ) From bd6a2f40e5fbaf550e734706c7dcf94a114d7442 Mon Sep 17 00:00:00 2001 From: Gang Li Date: Fri, 17 Apr 2020 23:34:20 +0800 Subject: [PATCH 13/50] Refactor the getDeprecated to use Optional instead of returning null --- .../commonjava/indy/stats/IndyDeprecatedApis.java | 15 +++++++++------ .../indy/bind/jaxrs/ApiVersioningFilter.java | 10 ++++++---- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/models/core-java/src/main/java/org/commonjava/indy/stats/IndyDeprecatedApis.java b/models/core-java/src/main/java/org/commonjava/indy/stats/IndyDeprecatedApis.java index 0c9188ee41..649ec24925 100644 --- a/models/core-java/src/main/java/org/commonjava/indy/stats/IndyDeprecatedApis.java +++ b/models/core-java/src/main/java/org/commonjava/indy/stats/IndyDeprecatedApis.java @@ -23,9 +23,12 @@ import javax.inject.Named; import java.util.ArrayList; import java.util.List; +import java.util.Optional; import java.util.Properties; import java.util.Set; +import static java.util.Optional.empty; +import static java.util.Optional.of; import static org.apache.commons.lang.StringUtils.isBlank; @Alternative @@ -82,11 +85,11 @@ public IndyDeprecatedApis( Properties props ) logger.debug( "Parsed deprecatedApis:{}, minApiVersion:{}", deprecatedApis, minApiVersion ); } - public DeprecatedApiEntry getDeprecated( String reqApiVersion ) + public Optional getDeprecated( String reqApiVersion ) { if ( isBlank( reqApiVersion )) { - return null; + return empty(); } Float reqVer; try @@ -96,7 +99,7 @@ public DeprecatedApiEntry getDeprecated( String reqApiVersion ) catch ( NumberFormatException e ) { logger.warn( "Unknown api version: {}", reqApiVersion ); - return null; + return empty(); } // the scopes may overlap, we go through range entries first and other entries next @@ -104,7 +107,7 @@ public DeprecatedApiEntry getDeprecated( String reqApiVersion ) { if ( et.range != null && et.range.containsFloat( reqVer ) ) { - return et; + return of( et ); } } @@ -112,11 +115,11 @@ public DeprecatedApiEntry getDeprecated( String reqApiVersion ) { if ( et.endVersion != null && reqVer <= et.endVersion ) { - return et; + return of( et ); } } - return null; + return empty(); } public String getMinApiVersion() diff --git a/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/ApiVersioningFilter.java b/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/ApiVersioningFilter.java index 4596bb1ac5..3fd9c543a8 100644 --- a/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/ApiVersioningFilter.java +++ b/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/ApiVersioningFilter.java @@ -36,6 +36,7 @@ import java.util.Collections; import java.util.Enumeration; import java.util.List; +import java.util.Optional; import static io.undertow.util.StatusCodes.GONE; import static org.apache.commons.lang.StringUtils.isBlank; @@ -107,20 +108,21 @@ public void doFilter( final ServletRequest request, final ServletResponse respon httpServletResponse.addHeader( HEADER_INDY_CUR_API_VERSION, indyVersioning.getApiVersion() ); httpServletResponse.addHeader( HEADER_INDY_MIN_API_VERSION, indyDeprecatedApis.getMinApiVersion() ); - IndyDeprecatedApis.DeprecatedApiEntry deprecatedApiEntry = indyDeprecatedApis.getDeprecated( reqApiVersion ); + Optional + deprecatedApiEntry = indyDeprecatedApis.getDeprecated( reqApiVersion ); String deprecatedApiVersion = null; - if ( deprecatedApiEntry != null ) + if ( deprecatedApiEntry.isPresent() ) { - if (deprecatedApiEntry.isOff() ) + if ( deprecatedApiEntry.get().isOff() ) { httpServletResponse.setStatus( GONE ); // Return 410 return; } else { - deprecatedApiVersion = deprecatedApiEntry.getValue(); + deprecatedApiVersion = deprecatedApiEntry.get().getValue(); } } From c4efcafe5367d4a027cff5af13d3e90cb2734491 Mon Sep 17 00:00:00 2001 From: Rui Han Date: Wed, 6 May 2020 07:55:06 +0800 Subject: [PATCH 14/50] [Cherry-pick] Support retries when Cassandra read timeout (#1591) (#1605) * Support retries when Cassandra read timeout * Add warn message --- .../subsys/cassandra/CassandraClient.java | 5 +- .../cassandra/ConfigurableRetryPolicy.java | 89 +++++++++++++++++++ .../cassandra/config/CassandraConfig.java | 39 ++++++++ 3 files changed, 131 insertions(+), 2 deletions(-) create mode 100644 subsys/cassandra/src/main/java/org/commonjava/indy/subsys/cassandra/ConfigurableRetryPolicy.java diff --git a/subsys/cassandra/src/main/java/org/commonjava/indy/subsys/cassandra/CassandraClient.java b/subsys/cassandra/src/main/java/org/commonjava/indy/subsys/cassandra/CassandraClient.java index f1db419754..13d3eac6ac 100644 --- a/subsys/cassandra/src/main/java/org/commonjava/indy/subsys/cassandra/CassandraClient.java +++ b/subsys/cassandra/src/main/java/org/commonjava/indy/subsys/cassandra/CassandraClient.java @@ -71,10 +71,11 @@ private void init() host = config.getCassandraHost(); port = config.getCassandraPort(); SocketOptions socketOptions = new SocketOptions(); - socketOptions.setConnectTimeoutMillis( 120000 ); - socketOptions.setReadTimeoutMillis( 120000 ); + socketOptions.setConnectTimeoutMillis( config.getConnectTimeoutMillis() ); + socketOptions.setReadTimeoutMillis( config.getReadTimeoutMillis() ); Cluster.Builder builder = Cluster.builder() .withoutJMXReporting() + .withRetryPolicy( new ConfigurableRetryPolicy( config.getReadRetries() ) ) .addContactPoint( host ) .withPort( port ) .withSocketOptions( socketOptions ); diff --git a/subsys/cassandra/src/main/java/org/commonjava/indy/subsys/cassandra/ConfigurableRetryPolicy.java b/subsys/cassandra/src/main/java/org/commonjava/indy/subsys/cassandra/ConfigurableRetryPolicy.java new file mode 100644 index 0000000000..8b92a9f6bd --- /dev/null +++ b/subsys/cassandra/src/main/java/org/commonjava/indy/subsys/cassandra/ConfigurableRetryPolicy.java @@ -0,0 +1,89 @@ +/** + * Copyright (C) 2011-2020 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.cassandra; + +import com.datastax.driver.core.Cluster; +import com.datastax.driver.core.ConsistencyLevel; +import com.datastax.driver.core.Statement; +import com.datastax.driver.core.WriteType; +import com.datastax.driver.core.exceptions.DriverException; +import com.datastax.driver.core.policies.DefaultRetryPolicy; +import com.datastax.driver.core.policies.RetryPolicy; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class ConfigurableRetryPolicy + implements RetryPolicy +{ + private final Logger logger = LoggerFactory.getLogger( getClass() ); + + final private RetryPolicy delegate = DefaultRetryPolicy.INSTANCE; + + final int retries; // number of retries + + public ConfigurableRetryPolicy( int retries ) + { + this.retries = retries; + } + + /** + * Defines whether to retry and at which consistency level on a read timeout. {@link DefaultRetryPolicy} + * @param nbRetry the number of retry already performed for this operation. + */ + @Override + public RetryDecision onReadTimeout( Statement statement, ConsistencyLevel cl, int requiredResponses, + int receivedResponses, boolean dataRetrieved, int nbRetry ) + { + logger.warn( "ReadTimeout, statement: {}, nbRetry: {}, retries: {}", statement, nbRetry, retries ); + if ( nbRetry >= retries ) + { + return RetryDecision.rethrow(); + } + return RetryDecision.tryNextHost( cl ); + } + + @Override + public RetryDecision onWriteTimeout( Statement statement, ConsistencyLevel cl, WriteType writeType, + int requiredAcks, int receivedAcks, int nbRetry ) + { + return delegate.onWriteTimeout( statement, cl, writeType, requiredAcks, receivedAcks, nbRetry ); + } + + @Override + public RetryDecision onUnavailable( Statement statement, ConsistencyLevel cl, int requiredReplica, int aliveReplica, + int nbRetry ) + { + return delegate.onUnavailable( statement, cl, requiredReplica, aliveReplica, nbRetry ); + } + + @Override + public RetryDecision onRequestError( Statement statement, ConsistencyLevel cl, DriverException e, int nbRetry ) + { + return delegate.onRequestError( statement, cl, e, nbRetry ); + } + + @Override + public void init( Cluster cluster ) + { + delegate.init( cluster ); + } + + @Override + public void close() + { + delegate.close(); + } +} diff --git a/subsys/cassandra/src/main/java/org/commonjava/indy/subsys/cassandra/config/CassandraConfig.java b/subsys/cassandra/src/main/java/org/commonjava/indy/subsys/cassandra/config/CassandraConfig.java index a5b9772631..9191637410 100644 --- a/subsys/cassandra/src/main/java/org/commonjava/indy/subsys/cassandra/config/CassandraConfig.java +++ b/subsys/cassandra/src/main/java/org/commonjava/indy/subsys/cassandra/config/CassandraConfig.java @@ -37,6 +37,12 @@ public class CassandraConfig private String cassandraPass; + private int connectTimeoutMillis = 60000; + + private int readTimeoutMillis = 60000; + + private int readRetries = 3; + public CassandraConfig() { } @@ -100,6 +106,39 @@ public String getCassandraPass() return cassandraPass; } + public int getConnectTimeoutMillis() + { + return connectTimeoutMillis; + } + + @ConfigName( "cassandra.connect.timeout.millis" ) + public void setConnectTimeoutMillis( int connectTimeoutMillis ) + { + this.connectTimeoutMillis = connectTimeoutMillis; + } + + public int getReadTimeoutMillis() + { + return readTimeoutMillis; + } + + @ConfigName( "cassandra.read.timeout.millis" ) + public void setReadTimeoutMillis( int readTimeoutMillis ) + { + this.readTimeoutMillis = readTimeoutMillis; + } + + public int getReadRetries() + { + return readRetries; + } + + @ConfigName( "cassandra.read.retries" ) + public void setReadRetries( int readRetries ) + { + this.readRetries = readRetries; + } + @Override public String getDefaultConfigFileName() { From c5adb4615c978e25002859038c81c35cc0081447 Mon Sep 17 00:00:00 2001 From: Rui Han Date: Wed, 6 May 2020 07:56:37 +0800 Subject: [PATCH 15/50] [Cherry-pick] Apply batching when filter repo candidates via getFileSystemContaining (#1609) * Apply batching when filter repo candidates via getFileSystemContaining * Handle getFileSystemContaining return null --- .../PathMappedGroupRepositoryFilter.java | 25 ++++++++++++++++++- .../indy/conf/DefaultIndyConfiguration.java | 14 +++++++++++ .../indy/conf/IndyConfiguration.java | 8 ++++++ 3 files changed, 46 insertions(+), 1 deletion(-) diff --git a/addons/path-mapped/common/src/main/java/org/commonjava/indy/pathmapped/inject/PathMappedGroupRepositoryFilter.java b/addons/path-mapped/common/src/main/java/org/commonjava/indy/pathmapped/inject/PathMappedGroupRepositoryFilter.java index 5ae3235ad0..9075c2379d 100644 --- a/addons/path-mapped/common/src/main/java/org/commonjava/indy/pathmapped/inject/PathMappedGroupRepositoryFilter.java +++ b/addons/path-mapped/common/src/main/java/org/commonjava/indy/pathmapped/inject/PathMappedGroupRepositoryFilter.java @@ -15,6 +15,8 @@ */ package org.commonjava.indy.pathmapped.inject; +import com.google.common.collect.Lists; +import org.commonjava.indy.conf.IndyConfiguration; import org.commonjava.indy.core.content.group.AbstractGroupRepositoryFilter; import org.commonjava.indy.model.core.ArtifactStore; import org.commonjava.indy.model.core.Group; @@ -31,6 +33,7 @@ import javax.inject.Inject; import java.nio.file.Path; import java.nio.file.Paths; +import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.stream.Collectors; @@ -48,6 +51,9 @@ public class PathMappedGroupRepositoryFilter @Inject private CacheProvider cacheProvider; + @Inject + private IndyConfiguration indyConfig; + private PathMappedFileManager pathMappedFileManager; @PostConstruct @@ -96,7 +102,24 @@ public List filter( String path, Group group, List return concreteStores; } - Set ret = pathMappedFileManager.getFileSystemContainingDirectory( candidates, strategyPath ); + // batch it to avoid huge 'IN' query + Set ret = new HashSet<>(); + int batchSize = indyConfig.getFileSystemContainingBatchSize(); + List> subSets = Lists.partition( candidates, batchSize ); + subSets.forEach( subSet -> { + logger.debug( "Get file system containing, strategyPath: {}, subSet: {}", strategyPath, subSet ); + Set st = pathMappedFileManager.getFileSystemContainingDirectory( subSet, strategyPath ); + if ( st == null ) + { + // query failed but those candidates may contain the target path so we add all subSet candidates + logger.warn( "Get fileSystems query failed, add subSet candidates" ); + ret.addAll( subSet ); + } + else + { + ret.addAll( st ); + } + } ); return concreteStores.stream() .filter( store -> store.getType() == StoreType.remote || ret.contains( diff --git a/api/src/main/java/org/commonjava/indy/conf/DefaultIndyConfiguration.java b/api/src/main/java/org/commonjava/indy/conf/DefaultIndyConfiguration.java index aa1f2d07ae..bde17de693 100644 --- a/api/src/main/java/org/commonjava/indy/conf/DefaultIndyConfiguration.java +++ b/api/src/main/java/org/commonjava/indy/conf/DefaultIndyConfiguration.java @@ -88,6 +88,8 @@ public class DefaultIndyConfiguration private String affectedGroupsExcludeFilter; + private int fileSystemContainingBatchSize = 100; // default + private String cacheKeyspace = "indycache"; // default private Boolean standalone; @@ -323,6 +325,18 @@ public void setAffectedGroupsExcludeFilter( String affectedGroupsExcludeFilter ) this.affectedGroupsExcludeFilter = affectedGroupsExcludeFilter; } + @Override + public int getFileSystemContainingBatchSize() + { + return fileSystemContainingBatchSize; + } + + @ConfigName( "filesystem.containing.batch.size" ) + public void setFileSystemContainingBatchSize( int fileSystemContainingBatchSize ) + { + this.fileSystemContainingBatchSize = fileSystemContainingBatchSize; + } + @Override public Boolean isStandalone() { diff --git a/api/src/main/java/org/commonjava/indy/conf/IndyConfiguration.java b/api/src/main/java/org/commonjava/indy/conf/IndyConfiguration.java index 09f98f9b38..61ae6e8033 100644 --- a/api/src/main/java/org/commonjava/indy/conf/IndyConfiguration.java +++ b/api/src/main/java/org/commonjava/indy/conf/IndyConfiguration.java @@ -96,4 +96,12 @@ public interface IndyConfiguration Boolean isStandalone(); boolean isRepositoryFilterEnabled(); + + /** + * FileSystemContaining is an operation by which we get what path in which repository. We use batching to + * limit the query candidates size to avoid huge 'IN' query. + * @return + * @since 2.1.0 + */ + int getFileSystemContainingBatchSize(); } From e11b7f045e1cf882a165f4d9352fc0edd8e5db83 Mon Sep 17 00:00:00 2001 From: Rui Han Date: Wed, 6 May 2020 07:57:37 +0800 Subject: [PATCH 16/50] [Cherry-pick] Update to pathmap 1.4 snapshot (#1608) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c318d33709..550e57e531 100644 --- a/pom.xml +++ b/pom.xml @@ -80,7 +80,7 @@ 1.1.0 3.7.1.0 3.7.2 - 1.3 + 1.4-SNAPSHOT 1.1.0 From d458270b2f5e2eaca71f1dd8578edbb5f30f9239 Mon Sep 17 00:00:00 2001 From: Rui Han Date: Mon, 11 May 2020 09:53:29 +0800 Subject: [PATCH 17/50] Use getClass().getClassLoader() to load version properties file (#1604) (#1618) * Use getClass().getClassLoader() to load version properties file * Use IndyVersioningProvider.class.getClassLoader() * Warn if resource not found --- .../indy/inject/IndyVersioningProvider.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/models/core-java/src/main/java/org/commonjava/indy/inject/IndyVersioningProvider.java b/models/core-java/src/main/java/org/commonjava/indy/inject/IndyVersioningProvider.java index 398223e1d2..b848edd950 100644 --- a/models/core-java/src/main/java/org/commonjava/indy/inject/IndyVersioningProvider.java +++ b/models/core-java/src/main/java/org/commonjava/indy/inject/IndyVersioningProvider.java @@ -48,16 +48,20 @@ public class IndyVersioningProvider public IndyVersioningProvider() { + ClassLoader cl = IndyVersioningProvider.class.getClassLoader(); + // Load indy-version final Properties props = new Properties(); - try (InputStream is = Thread.currentThread() - .getContextClassLoader() - .getResourceAsStream( INDY_VERSIONING_PROPERTIES )) + try (InputStream is = cl.getResourceAsStream( INDY_VERSIONING_PROPERTIES )) { if ( is != null ) { props.load( is ); } + else + { + logger.warn( "Resource not found, file: {}, loader: {}", INDY_VERSIONING_PROPERTIES, cl ); + } } catch ( final IOException e ) { @@ -76,14 +80,16 @@ public IndyVersioningProvider() logger.info( "Get deprecatedApiFile: {}", deprecatedApiFile ); final Properties deprApis = new Properties(); - try (InputStream is = Thread.currentThread() - .getContextClassLoader() - .getResourceAsStream( deprecatedApiFile )) + try (InputStream is = cl.getResourceAsStream( deprecatedApiFile )) { if ( is != null ) { deprApis.load( is ); } + else + { + logger.warn( "Resource not found, file: {}, loader: {}", INDY_DEPRECATED_APIS_PROPERTIES, cl ); + } } catch ( final IOException e ) { From 73a247caa32d820945bf6b67d0ba606e81844240 Mon Sep 17 00:00:00 2001 From: shokakucarrier Date: Tue, 2 Jun 2020 08:13:06 +0000 Subject: [PATCH 18/50] [maven-release-plugin] prepare release indy-parent-2.3.0 --- addons/changelog/client-java/pom.xml | 2 +- addons/changelog/common/pom.xml | 2 +- addons/changelog/ftests/pom.xml | 2 +- addons/changelog/jaxrs/pom.xml | 2 +- addons/changelog/pom.xml | 2 +- addons/content-browse/client-java/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/event-audit/common/pom.xml | 2 +- addons/event-audit/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/path-mapped/common/pom.xml | 2 +- addons/path-mapped/jaxrs/pom.xml | 2 +- addons/path-mapped/model-java/pom.xml | 2 +- addons/path-mapped/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/repo-proxy/common/pom.xml | 2 +- addons/repo-proxy/ftests/pom.xml | 2 +- addons/repo-proxy/jaxrs/pom.xml | 2 +- addons/repo-proxy/pom.xml | 2 +- addons/revisions/common/pom.xml | 2 +- addons/revisions/jaxrs/pom.xml | 2 +- addons/revisions/pom.xml | 2 +- addons/sli/pom.xml | 2 +- api/pom.xml | 2 +- bindings/jaxrs/pom.xml | 2 +- bindings/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/common/pom.xml | 2 +- db/flat/pom.xml | 2 +- db/infinispan/pom.xml | 2 +- db/memory/pom.xml | 2 +- db/metrics/pom.xml | 2 +- db/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 | 254 +++++++++---------- rest/api/pom.xml | 2 +- rest/pom.xml | 2 +- subsys/cassandra/pom.xml | 2 +- subsys/cpool/pom.xml | 2 +- subsys/flatfile/pom.xml | 2 +- subsys/git/pom.xml | 2 +- subsys/groovy/pom.xml | 2 +- subsys/honeycomb/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/prometheus/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 +- 131 files changed, 257 insertions(+), 257 deletions(-) diff --git a/addons/changelog/client-java/pom.xml b/addons/changelog/client-java/pom.xml index 4106f0a9ad..09e059c6d6 100644 --- a/addons/changelog/client-java/pom.xml +++ b/addons/changelog/client-java/pom.xml @@ -20,7 +20,7 @@ indy-changelog org.commonjava.indy - 2.2.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/addons/changelog/common/pom.xml b/addons/changelog/common/pom.xml index dc62ceb2a8..9fd2efef29 100644 --- a/addons/changelog/common/pom.xml +++ b/addons/changelog/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.2.1-SNAPSHOT + 2.3.0 indy-changelog-common Indy :: Add-Ons :: ChangeLog :: Common diff --git a/addons/changelog/ftests/pom.xml b/addons/changelog/ftests/pom.xml index f20a9476bf..7dbabc5056 100644 --- a/addons/changelog/ftests/pom.xml +++ b/addons/changelog/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.2.1-SNAPSHOT + 2.3.0 indy-ftests-changelog diff --git a/addons/changelog/jaxrs/pom.xml b/addons/changelog/jaxrs/pom.xml index ce7ba4e046..f29eea040e 100644 --- a/addons/changelog/jaxrs/pom.xml +++ b/addons/changelog/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.2.1-SNAPSHOT + 2.3.0 indy-changelog-jaxrs diff --git a/addons/changelog/pom.xml b/addons/changelog/pom.xml index f63b1cb7c7..a94b540dd6 100644 --- a/addons/changelog/pom.xml +++ b/addons/changelog/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.2.1-SNAPSHOT + 2.3.0 indy-changelog Indy :: Add-Ons :: ChangeLog :: Parent diff --git a/addons/content-browse/client-java/pom.xml b/addons/content-browse/client-java/pom.xml index c75c9cbc61..3275dc2a3c 100644 --- a/addons/content-browse/client-java/pom.xml +++ b/addons/content-browse/client-java/pom.xml @@ -20,7 +20,7 @@ indy-content-browse org.commonjava.indy - 2.2.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/addons/content-browse/common/pom.xml b/addons/content-browse/common/pom.xml index 48cf0eba66..6099f654aa 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 - 2.2.1-SNAPSHOT + 2.3.0 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 714d4b8ab5..499be7649d 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 - 2.2.1-SNAPSHOT + 2.3.0 indy-ftests-content-browse diff --git a/addons/content-browse/jaxrs/pom.xml b/addons/content-browse/jaxrs/pom.xml index b9207855f8..f986f86ca5 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 - 2.2.1-SNAPSHOT + 2.3.0 indy-content-browse-jaxrs diff --git a/addons/content-browse/model-java/pom.xml b/addons/content-browse/model-java/pom.xml index c3988d9549..554ac325ea 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 - 2.2.1-SNAPSHOT + 2.3.0 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 2c971dde7d..ff2abd54e3 100644 --- a/addons/content-browse/pom.xml +++ b/addons/content-browse/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.2.1-SNAPSHOT + 2.3.0 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 33ffcf7632..048c14497e 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 - 2.2.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/addons/content-index/pom.xml b/addons/content-index/pom.xml index 4ce75edcc7..1e51281a07 100644 --- a/addons/content-index/pom.xml +++ b/addons/content-index/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.2.1-SNAPSHOT + 2.3.0 indy-content-index diff --git a/addons/diagnostics/client-java/pom.xml b/addons/diagnostics/client-java/pom.xml index f80176bba0..eb0275b636 100644 --- a/addons/diagnostics/client-java/pom.xml +++ b/addons/diagnostics/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.2.1-SNAPSHOT + 2.3.0 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 6e30401e9a..30293043e2 100644 --- a/addons/diagnostics/common/pom.xml +++ b/addons/diagnostics/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.2.1-SNAPSHOT + 2.3.0 indy-diagnostics-common Indy :: Add-Ons :: Diagnostic Tools :: Common diff --git a/addons/diagnostics/ftests/pom.xml b/addons/diagnostics/ftests/pom.xml index b2881ac943..22de3011f0 100644 --- a/addons/diagnostics/ftests/pom.xml +++ b/addons/diagnostics/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.2.1-SNAPSHOT + 2.3.0 indy-ftests-diagnostics diff --git a/addons/diagnostics/jaxrs/pom.xml b/addons/diagnostics/jaxrs/pom.xml index 19404ed66d..70aba53c86 100644 --- a/addons/diagnostics/jaxrs/pom.xml +++ b/addons/diagnostics/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.2.1-SNAPSHOT + 2.3.0 indy-diagnostics-jaxrs diff --git a/addons/diagnostics/pom.xml b/addons/diagnostics/pom.xml index 083fcd525e..27155869c8 100644 --- a/addons/diagnostics/pom.xml +++ b/addons/diagnostics/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.2.1-SNAPSHOT + 2.3.0 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 7377968466..def6c2d35a 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 - 2.2.1-SNAPSHOT + 2.3.0 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 f698895cdb..9be0a57fc1 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 - 2.2.1-SNAPSHOT + 2.3.0 indy-ftests-dot-maven diff --git a/addons/dot-maven/jaxrs/pom.xml b/addons/dot-maven/jaxrs/pom.xml index a5a13b3103..02fc695fc5 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 - 2.2.1-SNAPSHOT + 2.3.0 indy-dot-maven-jaxrs diff --git a/addons/dot-maven/pom.xml b/addons/dot-maven/pom.xml index 11669e8798..e1626a57ef 100644 --- a/addons/dot-maven/pom.xml +++ b/addons/dot-maven/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.2.1-SNAPSHOT + 2.3.0 indy-dot-maven diff --git a/addons/event-audit/common/pom.xml b/addons/event-audit/common/pom.xml index 7e114e54b2..8a457976b6 100644 --- a/addons/event-audit/common/pom.xml +++ b/addons/event-audit/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-event-audit - 2.2.1-SNAPSHOT + 2.3.0 indy-event-audit-common diff --git a/addons/event-audit/pom.xml b/addons/event-audit/pom.xml index a220b49a02..7d4ff58aa9 100644 --- a/addons/event-audit/pom.xml +++ b/addons/event-audit/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.2.1-SNAPSHOT + 2.3.0 indy-event-audit diff --git a/addons/folo/client-java/pom.xml b/addons/folo/client-java/pom.xml index 30aaa0d6c1..b4151c3557 100644 --- a/addons/folo/client-java/pom.xml +++ b/addons/folo/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.2.1-SNAPSHOT + 2.3.0 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 990a0426ff..85cf71ac69 100644 --- a/addons/folo/common/pom.xml +++ b/addons/folo/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.2.1-SNAPSHOT + 2.3.0 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 56c5565b1e..7389ca9c9e 100644 --- a/addons/folo/ftests/pom.xml +++ b/addons/folo/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.2.1-SNAPSHOT + 2.3.0 indy-ftests-folo diff --git a/addons/folo/jaxrs/pom.xml b/addons/folo/jaxrs/pom.xml index 4d650a080a..c06223439d 100644 --- a/addons/folo/jaxrs/pom.xml +++ b/addons/folo/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.2.1-SNAPSHOT + 2.3.0 indy-folo-jaxrs diff --git a/addons/folo/model-java/pom.xml b/addons/folo/model-java/pom.xml index c193252f6a..fc17e66a06 100644 --- a/addons/folo/model-java/pom.xml +++ b/addons/folo/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.2.1-SNAPSHOT + 2.3.0 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 8ed7c045df..715502f064 100644 --- a/addons/folo/pom.xml +++ b/addons/folo/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.2.1-SNAPSHOT + 2.3.0 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 ba064ae7b7..ef1c3923d0 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 - 2.2.1-SNAPSHOT + 2.3.0 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 058c69a386..6546c735ee 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 - 2.2.1-SNAPSHOT + 2.3.0 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 206dda7ac6..b753e8d2e2 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 - 2.2.1-SNAPSHOT + 2.3.0 indy-ftests-hosted-by-archive diff --git a/addons/hosted-by-archive/jaxrs/pom.xml b/addons/hosted-by-archive/jaxrs/pom.xml index ca1e8f53b9..1ce22eebbc 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 - 2.2.1-SNAPSHOT + 2.3.0 indy-hosted-by-archive-jaxrs diff --git a/addons/hosted-by-archive/pom.xml b/addons/hosted-by-archive/pom.xml index a37d91b7fc..f44da728de 100644 --- a/addons/hosted-by-archive/pom.xml +++ b/addons/hosted-by-archive/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.2.1-SNAPSHOT + 2.3.0 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 b7ff6fe1b1..e380b0d4c4 100644 --- a/addons/httprox/common/pom.xml +++ b/addons/httprox/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.2.1-SNAPSHOT + 2.3.0 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 08d52012de..deb3d4065e 100644 --- a/addons/httprox/ftests/pom.xml +++ b/addons/httprox/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.2.1-SNAPSHOT + 2.3.0 indy-ftests-httprox diff --git a/addons/httprox/jaxrs/pom.xml b/addons/httprox/jaxrs/pom.xml index d33993ec85..65fcc30594 100644 --- a/addons/httprox/jaxrs/pom.xml +++ b/addons/httprox/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.2.1-SNAPSHOT + 2.3.0 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 b6b453d796..f6101dc202 100644 --- a/addons/httprox/pom.xml +++ b/addons/httprox/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.2.1-SNAPSHOT + 2.3.0 indy-httprox diff --git a/addons/implied-repos/client-java/pom.xml b/addons/implied-repos/client-java/pom.xml index fa570c2fa7..aaa1fdb2d7 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 - 2.2.1-SNAPSHOT + 2.3.0 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 2ad16ec781..02f8ef6591 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 - 2.2.1-SNAPSHOT + 2.3.0 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 d192462cef..4b685069e1 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 - 2.2.1-SNAPSHOT + 2.3.0 indy-ftests-implied-repos diff --git a/addons/implied-repos/model-java/pom.xml b/addons/implied-repos/model-java/pom.xml index 9e79b325f7..5afc2d4e8a 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 - 2.2.1-SNAPSHOT + 2.3.0 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 0d2dc70df3..02155aeb24 100644 --- a/addons/implied-repos/pom.xml +++ b/addons/implied-repos/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.2.1-SNAPSHOT + 2.3.0 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 d4ac5a431f..3d21a4700a 100644 --- a/addons/koji/client-java/pom.xml +++ b/addons/koji/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.2.1-SNAPSHOT + 2.3.0 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 c53d7a0aec..923d4c66d1 100644 --- a/addons/koji/common/pom.xml +++ b/addons/koji/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.2.1-SNAPSHOT + 2.3.0 indy-koji-common Indy :: Add-Ons :: Koji Integration :: Common diff --git a/addons/koji/jaxrs/pom.xml b/addons/koji/jaxrs/pom.xml index f845163a70..7d0a000263 100644 --- a/addons/koji/jaxrs/pom.xml +++ b/addons/koji/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.2.1-SNAPSHOT + 2.3.0 indy-koji-jaxrs diff --git a/addons/koji/model-java/pom.xml b/addons/koji/model-java/pom.xml index d214b74f9f..11f70b4a68 100644 --- a/addons/koji/model-java/pom.xml +++ b/addons/koji/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.2.1-SNAPSHOT + 2.3.0 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 400a9b75a4..a2c41ea128 100644 --- a/addons/koji/pom.xml +++ b/addons/koji/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.2.1-SNAPSHOT + 2.3.0 indy-koji Indy :: Add-Ons :: Koji Integration :: Parent diff --git a/addons/path-mapped/common/pom.xml b/addons/path-mapped/common/pom.xml index 4074654215..acc88bf236 100644 --- a/addons/path-mapped/common/pom.xml +++ b/addons/path-mapped/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.2.1-SNAPSHOT + 2.3.0 indy-path-mapped-common diff --git a/addons/path-mapped/jaxrs/pom.xml b/addons/path-mapped/jaxrs/pom.xml index b5badd3ee8..887335f872 100644 --- a/addons/path-mapped/jaxrs/pom.xml +++ b/addons/path-mapped/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.2.1-SNAPSHOT + 2.3.0 indy-path-mapped-jaxrs diff --git a/addons/path-mapped/model-java/pom.xml b/addons/path-mapped/model-java/pom.xml index 88e4dff1c4..603f241172 100644 --- a/addons/path-mapped/model-java/pom.xml +++ b/addons/path-mapped/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.2.1-SNAPSHOT + 2.3.0 indy-path-mapped-model-java diff --git a/addons/path-mapped/pom.xml b/addons/path-mapped/pom.xml index b45f48494c..a7b6a0e9cc 100644 --- a/addons/path-mapped/pom.xml +++ b/addons/path-mapped/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.2.1-SNAPSHOT + 2.3.0 indy-path-mapped Indy :: Add-Ons :: Path Mapped :: Parent diff --git a/addons/pkg-maven/common/pom.xml b/addons/pkg-maven/common/pom.xml index 2c3dcdf8c1..f9f52dbed7 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 - 2.2.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/addons/pkg-maven/ftests/pom.xml b/addons/pkg-maven/ftests/pom.xml index 1183fd25cf..410401acac 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 - 2.2.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/addons/pkg-maven/jaxrs/pom.xml b/addons/pkg-maven/jaxrs/pom.xml index f652c83377..83dbc94b0f 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 - 2.2.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/addons/pkg-maven/pom.xml b/addons/pkg-maven/pom.xml index a26ea12c02..a6e11ee82e 100644 --- a/addons/pkg-maven/pom.xml +++ b/addons/pkg-maven/pom.xml @@ -20,7 +20,7 @@ indy-addons org.commonjava.indy - 2.2.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/addons/pkg-npm/common/pom.xml b/addons/pkg-npm/common/pom.xml index 920f2363b5..362dc0fc67 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 - 2.2.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/addons/pkg-npm/ftests/pom.xml b/addons/pkg-npm/ftests/pom.xml index ca5211b0f4..3c30d7af9f 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 - 2.2.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/addons/pkg-npm/jaxrs/pom.xml b/addons/pkg-npm/jaxrs/pom.xml index efd6975f9b..1f974ee013 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 - 2.2.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/addons/pkg-npm/model-java/pom.xml b/addons/pkg-npm/model-java/pom.xml index c3aee8b8f6..7df3c3c0ef 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 - 2.2.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/addons/pkg-npm/pom.xml b/addons/pkg-npm/pom.xml index 13f0ac8656..d0b8b55727 100644 --- a/addons/pkg-npm/pom.xml +++ b/addons/pkg-npm/pom.xml @@ -20,7 +20,7 @@ indy-addons org.commonjava.indy - 2.2.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/addons/pom.xml b/addons/pom.xml index 1b32f193ce..d583462ce5 100644 --- a/addons/pom.xml +++ b/addons/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-parent - 2.2.1-SNAPSHOT + 2.3.0 indy-addons diff --git a/addons/promote/client-java/pom.xml b/addons/promote/client-java/pom.xml index 55c06851b1..442282cb65 100644 --- a/addons/promote/client-java/pom.xml +++ b/addons/promote/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.2.1-SNAPSHOT + 2.3.0 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 5f3909acf5..89cb65bf3d 100644 --- a/addons/promote/common/pom.xml +++ b/addons/promote/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.2.1-SNAPSHOT + 2.3.0 indy-promote-common Indy :: Add-Ons :: Artifact Promotion :: Common diff --git a/addons/promote/ftests/pom.xml b/addons/promote/ftests/pom.xml index aab538e1f5..95749f15f8 100644 --- a/addons/promote/ftests/pom.xml +++ b/addons/promote/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.2.1-SNAPSHOT + 2.3.0 indy-ftests-promote diff --git a/addons/promote/jaxrs/pom.xml b/addons/promote/jaxrs/pom.xml index 0c3e85f827..d934be4708 100644 --- a/addons/promote/jaxrs/pom.xml +++ b/addons/promote/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.2.1-SNAPSHOT + 2.3.0 indy-promote-jaxrs diff --git a/addons/promote/model-java/pom.xml b/addons/promote/model-java/pom.xml index 5cff5458d2..c305809e75 100644 --- a/addons/promote/model-java/pom.xml +++ b/addons/promote/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.2.1-SNAPSHOT + 2.3.0 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 b6db1e4824..e8f19fa746 100644 --- a/addons/promote/pom.xml +++ b/addons/promote/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.2.1-SNAPSHOT + 2.3.0 indy-promote Indy :: Add-Ons :: Artifact Promotion :: Parent diff --git a/addons/repo-proxy/common/pom.xml b/addons/repo-proxy/common/pom.xml index d3d6f9a37c..3fc1ca2bd5 100644 --- a/addons/repo-proxy/common/pom.xml +++ b/addons/repo-proxy/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-repo-proxy - 2.2.1-SNAPSHOT + 2.3.0 indy-repo-proxy-common Indy :: Add-Ons :: Repository-Proxy :: Common diff --git a/addons/repo-proxy/ftests/pom.xml b/addons/repo-proxy/ftests/pom.xml index 758eb90370..217bc68ac9 100644 --- a/addons/repo-proxy/ftests/pom.xml +++ b/addons/repo-proxy/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-repo-proxy - 2.2.1-SNAPSHOT + 2.3.0 indy-ftests-repo-proxy diff --git a/addons/repo-proxy/jaxrs/pom.xml b/addons/repo-proxy/jaxrs/pom.xml index 0ff2630699..cd57139326 100644 --- a/addons/repo-proxy/jaxrs/pom.xml +++ b/addons/repo-proxy/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-repo-proxy - 2.2.1-SNAPSHOT + 2.3.0 indy-repo-proxy-jaxrs diff --git a/addons/repo-proxy/pom.xml b/addons/repo-proxy/pom.xml index 1997c8c8eb..581e3f254e 100644 --- a/addons/repo-proxy/pom.xml +++ b/addons/repo-proxy/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.2.1-SNAPSHOT + 2.3.0 indy-repo-proxy Indy :: Add-Ons :: Repository-Proxy :: Parent diff --git a/addons/revisions/common/pom.xml b/addons/revisions/common/pom.xml index 4f39d02a8a..a8ddc3ebfd 100644 --- a/addons/revisions/common/pom.xml +++ b/addons/revisions/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-revisions - 2.2.1-SNAPSHOT + 2.3.0 indy-revisions-common Indy :: Add-Ons :: Revisions :: Common diff --git a/addons/revisions/jaxrs/pom.xml b/addons/revisions/jaxrs/pom.xml index b6cf98f654..abe50652c1 100644 --- a/addons/revisions/jaxrs/pom.xml +++ b/addons/revisions/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-revisions - 2.2.1-SNAPSHOT + 2.3.0 indy-revisions-jaxrs diff --git a/addons/revisions/pom.xml b/addons/revisions/pom.xml index 3f4a7580f2..31ef179b51 100644 --- a/addons/revisions/pom.xml +++ b/addons/revisions/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.2.1-SNAPSHOT + 2.3.0 indy-revisions Indy :: Add-Ons :: Revisions :: Parent diff --git a/addons/sli/pom.xml b/addons/sli/pom.xml index f881c4367b..942341733e 100644 --- a/addons/sli/pom.xml +++ b/addons/sli/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.2.1-SNAPSHOT + 2.3.0 indy-sli Indy :: Add-Ons :: Service Level Indicators Reporting :: JAX-RS diff --git a/api/pom.xml b/api/pom.xml index 7ba4c26e64..e257dc753c 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.2.1-SNAPSHOT + 2.3.0 indy-api diff --git a/bindings/jaxrs/pom.xml b/bindings/jaxrs/pom.xml index 128ce073bc..cd85bc994e 100644 --- a/bindings/jaxrs/pom.xml +++ b/bindings/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-bindings - 2.2.1-SNAPSHOT + 2.3.0 indy-bindings-jaxrs diff --git a/bindings/pom.xml b/bindings/pom.xml index 61c59c5158..45c7c3cd33 100644 --- a/bindings/pom.xml +++ b/bindings/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-parent - 2.2.1-SNAPSHOT + 2.3.0 indy-bindings diff --git a/boot/jaxrs/pom.xml b/boot/jaxrs/pom.xml index bddb851bb1..bc88ecfa7c 100644 --- a/boot/jaxrs/pom.xml +++ b/boot/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.boot indy-booters - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy.boot diff --git a/boot/pom.xml b/boot/pom.xml index 61576dea61..02413e47de 100644 --- a/boot/pom.xml +++ b/boot/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy.boot diff --git a/clients/core-java/pom.xml b/clients/core-java/pom.xml index 9f2ec9a02d..eed9089e21 100644 --- a/clients/core-java/pom.xml +++ b/clients/core-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-clients-parent - 2.2.1-SNAPSHOT + 2.3.0 indy-client-core-java diff --git a/clients/pom.xml b/clients/pom.xml index cd49aae35b..dfd582f6e1 100644 --- a/clients/pom.xml +++ b/clients/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.2.1-SNAPSHOT + 2.3.0 indy-clients-parent diff --git a/core/pom.xml b/core/pom.xml index 588cd6e8f6..5765559abc 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.2.1-SNAPSHOT + 2.3.0 indy-core diff --git a/db/common/pom.xml b/db/common/pom.xml index 43ba12c9f6..c2f223f054 100644 --- a/db/common/pom.xml +++ b/db/common/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-db - 2.2.1-SNAPSHOT + 2.3.0 indy-db-common diff --git a/db/flat/pom.xml b/db/flat/pom.xml index c72979c248..6559e60bca 100644 --- a/db/flat/pom.xml +++ b/db/flat/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.2.1-SNAPSHOT + 2.3.0 indy-db-flat diff --git a/db/infinispan/pom.xml b/db/infinispan/pom.xml index 39f19735ad..bf2fd3e16d 100644 --- a/db/infinispan/pom.xml +++ b/db/infinispan/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-db - 2.2.1-SNAPSHOT + 2.3.0 indy-db-infinispan diff --git a/db/memory/pom.xml b/db/memory/pom.xml index e7fcde6f3e..c746862dee 100644 --- a/db/memory/pom.xml +++ b/db/memory/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.2.1-SNAPSHOT + 2.3.0 indy-db-memory diff --git a/db/metrics/pom.xml b/db/metrics/pom.xml index 7c07bca400..3b48971250 100644 --- a/db/metrics/pom.xml +++ b/db/metrics/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.2.1-SNAPSHOT + 2.3.0 indy-db-metrics diff --git a/db/pom.xml b/db/pom.xml index 817e26a2ba..98fbb8d219 100644 --- a/db/pom.xml +++ b/db/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.2.1-SNAPSHOT + 2.3.0 indy-db diff --git a/deployments/launcher/pom.xml b/deployments/launcher/pom.xml index 5c5d8b83e6..1376e27362 100644 --- a/deployments/launcher/pom.xml +++ b/deployments/launcher/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-deployments - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy.launch diff --git a/deployments/pom.xml b/deployments/pom.xml index 0791b21c58..afc13247ad 100644 --- a/deployments/pom.xml +++ b/deployments/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.2.1-SNAPSHOT + 2.3.0 indy-deployments diff --git a/embedder/pom.xml b/embedder/pom.xml index 9ed7a8c572..a4c52d9981 100644 --- a/embedder/pom.xml +++ b/embedder/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy.embed diff --git a/filers/default/pom.xml b/filers/default/pom.xml index 7e6c002ce1..9de0979761 100644 --- a/filers/default/pom.xml +++ b/filers/default/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-file-managers - 2.2.1-SNAPSHOT + 2.3.0 indy-filer-default diff --git a/filers/pom.xml b/filers/pom.xml index f9bf12b7df..1138a48864 100644 --- a/filers/pom.xml +++ b/filers/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.2.1-SNAPSHOT + 2.3.0 indy-file-managers diff --git a/ftests/common/pom.xml b/ftests/common/pom.xml index f593c61ae4..f48a64b0b7 100644 --- a/ftests/common/pom.xml +++ b/ftests/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-ftests-parent - 2.2.1-SNAPSHOT + 2.3.0 indy-ftests-common diff --git a/ftests/core/pom.xml b/ftests/core/pom.xml index 11b3572d0a..4cf506ae80 100644 --- a/ftests/core/pom.xml +++ b/ftests/core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-ftests-parent - 2.2.1-SNAPSHOT + 2.3.0 indy-ftests-core diff --git a/ftests/metrics/pom.xml b/ftests/metrics/pom.xml index 295e7dd864..c3afd2799d 100644 --- a/ftests/metrics/pom.xml +++ b/ftests/metrics/pom.xml @@ -20,7 +20,7 @@ indy-ftests-parent org.commonjava.indy - 2.2.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/ftests/pom.xml b/ftests/pom.xml index 3ea1922e77..a22666292c 100644 --- a/ftests/pom.xml +++ b/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.2.1-SNAPSHOT + 2.3.0 indy-ftests-parent diff --git a/models/core-java/pom.xml b/models/core-java/pom.xml index 613b823481..824f03bba1 100644 --- a/models/core-java/pom.xml +++ b/models/core-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-models-parent - 2.2.1-SNAPSHOT + 2.3.0 indy-model-core-java diff --git a/models/pom.xml b/models/pom.xml index 6d770e0cbd..f697237fc3 100644 --- a/models/pom.xml +++ b/models/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.2.1-SNAPSHOT + 2.3.0 indy-models-parent diff --git a/pom.xml b/pom.xml index 0c764547a4..8e3c3b0a91 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.commonjava.indy indy-parent - 2.2.1-SNAPSHOT + 2.3.0 pom @@ -37,7 +37,7 @@ scm:git:https://github.com/CommonJava/indy scm:git:https://github.com/CommonJava/indy http://github.com/Commonjava/indy - HEAD + indy-parent-2.3.0 @@ -187,7 +187,7 @@ org.commonjava.indy.ui indy-ui-layover - 2.2.1-SNAPSHOT + 2.3.0 runtime @@ -195,22 +195,22 @@ org.commonjava.indy indy-model-core-java - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-api - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-core - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-core - 2.2.1-SNAPSHOT + 2.3.0 tar.gz confset provided @@ -218,32 +218,32 @@ org.commonjava.indy indy-db-flat - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-db-metrics - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-db-common - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-db-infinispan - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-bindings-jaxrs - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy.launch indy-launcher - 2.2.1-SNAPSHOT + 2.3.0 tar.gz skinny provided @@ -251,7 +251,7 @@ org.commonjava.indy.launch indy-launcher - 2.2.1-SNAPSHOT + 2.3.0 tar.gz complete provided @@ -259,7 +259,7 @@ org.commonjava.indy.launch indy-launcher - 2.2.1-SNAPSHOT + 2.3.0 tar.gz data provided @@ -267,7 +267,7 @@ org.commonjava.indy.launch indy-launcher - 2.2.1-SNAPSHOT + 2.3.0 tar.gz etc provided @@ -276,17 +276,17 @@ org.commonjava.indy indy-revisions-jaxrs - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-revisions-common - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-revisions-common - 2.2.1-SNAPSHOT + 2.3.0 tar.gz confset provided @@ -294,7 +294,7 @@ org.commonjava.indy indy-revisions-common - 2.2.1-SNAPSHOT + 2.3.0 tar.gz uiset provided @@ -302,12 +302,12 @@ org.commonjava.indy indy-dot-maven-common - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-dot-maven-common - 2.2.1-SNAPSHOT + 2.3.0 tar.gz dataset provided @@ -315,22 +315,22 @@ org.commonjava.indy indy-dot-maven-jaxrs - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-ftests-dot-maven - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-httprox-common - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-httprox-common - 2.2.1-SNAPSHOT + 2.3.0 tar.gz confset provided @@ -338,17 +338,17 @@ org.commonjava.indy indy-ftests-httprox - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-content-index - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-content-index - 2.2.1-SNAPSHOT + 2.3.0 tar.gz confset provided @@ -356,51 +356,51 @@ org.commonjava.indy indy-db-memory - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-test-db - 2.2.1-SNAPSHOT + 2.3.0 test org.commonjava.indy indy-test-fixtures-core - 2.2.1-SNAPSHOT + 2.3.0 test org.commonjava.indy indy-test-providers-core - 2.2.1-SNAPSHOT + 2.3.0 test org.commonjava.indy indy-test-utils - 2.2.1-SNAPSHOT + 2.3.0 test org.commonjava.indy indy-filer-default - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-subsys-jaxrs - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-subsys-honeycomb - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-subsys-honeycomb - 2.2.1-SNAPSHOT + 2.3.0 tar.gz confset provided @@ -408,17 +408,17 @@ org.commonjava.indy indy-subsys-flatfile - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-subsys-cassandra - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-subsys-cassandra - 2.2.1-SNAPSHOT + 2.3.0 tar.gz confset provided @@ -426,79 +426,79 @@ org.commonjava.indy indy-subsys-infinispan - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-subsys-http - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-subsys-git - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-subsys-groovy - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-subsys-prefetch - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-subsys-cpool - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-client-core-java - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-ftests-common - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-ftests-core - 2.2.1-SNAPSHOT + 2.3.0 test org.commonjava.indy indy-folo-jaxrs - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-ftests-folo - 2.2.1-SNAPSHOT + 2.3.0 test org.commonjava.indy indy-folo-client-java - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-folo-model-java - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-folo-common - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-folo-common - 2.2.1-SNAPSHOT + 2.3.0 tar.gz dataset provided @@ -506,7 +506,7 @@ org.commonjava.indy indy-folo-common - 2.2.1-SNAPSHOT + 2.3.0 tar.gz confset provided @@ -514,33 +514,33 @@ org.commonjava.indy indy-promote-jaxrs - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-ftests-promote - 2.2.1-SNAPSHOT + 2.3.0 test org.commonjava.indy indy-promote-client-java - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-promote-model-java - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-promote-common - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-promote-common - 2.2.1-SNAPSHOT + 2.3.0 tar.gz confset provided @@ -548,7 +548,7 @@ org.commonjava.indy indy-promote-common - 2.2.1-SNAPSHOT + 2.3.0 tar.gz dataset provided @@ -556,19 +556,19 @@ org.commonjava.indy indy-promote-common - 2.2.1-SNAPSHOT + 2.3.0 dataset provided org.commonjava.indy indy-implied-repos-common - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-implied-repos-common - 2.2.1-SNAPSHOT + 2.3.0 tar.gz confset provided @@ -576,37 +576,37 @@ org.commonjava.indy indy-implied-repos-model-java - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-implied-repos-client-java - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-ftests-implied-repos - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy.embed indy-embedder - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy.boot indy-booter-jaxrs - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-subsys-keycloak - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-subsys-keycloak - 2.2.1-SNAPSHOT + 2.3.0 tar.gz confset provided @@ -614,7 +614,7 @@ org.commonjava.indy indy-subsys-infinispan - 2.2.1-SNAPSHOT + 2.3.0 tar.gz confset provided @@ -622,7 +622,7 @@ org.commonjava.indy indy-subsys-prefetch - 2.2.1-SNAPSHOT + 2.3.0 tar.gz confset provided @@ -631,7 +631,7 @@ org.commonjava.indy indy-koji-common - 2.2.1-SNAPSHOT + 2.3.0 tar.gz confset provided @@ -639,103 +639,103 @@ org.commonjava.indy indy-koji-common - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-koji-model-java - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-koji-client-java - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-koji-jaxrs - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-path-mapped-common - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-path-mapped-model-java - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-path-mapped-jaxrs - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-pkg-maven-common - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-pkg-maven-jaxrs - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-pkg-npm-jaxrs - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-ftests-pkg-maven - 2.2.1-SNAPSHOT + 2.3.0 test org.commonjava.indy indy-ftests-pkg-npm - 2.2.1-SNAPSHOT + 2.3.0 test org.commonjava.indy indy-pkg-npm-common - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-pkg-npm-model-java - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-diagnostics-jaxrs - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-diagnostics-client-java - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-diagnostics-common - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-ftests-diagnostics - 2.2.1-SNAPSHOT + 2.3.0 test org.commonjava.indy indy-diagnostics-common - 2.2.1-SNAPSHOT + 2.3.0 confset tar.gz provided @@ -743,28 +743,28 @@ org.commonjava.indy indy-hosted-by-archive-common - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-hosted-by-archive-client-java - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-ftests-hosted-by-archive - 2.2.1-SNAPSHOT + 2.3.0 test org.commonjava.indy indy-hosted-by-archive-jaxrs - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-hosted-by-archive-common - 2.2.1-SNAPSHOT + 2.3.0 confset tar.gz @@ -772,22 +772,22 @@ org.commonjava.indy indy-subsys-metrics-core - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-subsys-metrics-reporter - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-subsys-metrics-prometheus - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-subsys-metrics-reporter - 2.2.1-SNAPSHOT + 2.3.0 confset tar.gz provided @@ -796,28 +796,28 @@ org.commonjava.indy indy-ftests-metrics - 2.2.1-SNAPSHOT + 2.3.0 test org.commonjava.indy indy-sli - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy.rest indy-rest-api yaml - 2.2.1-SNAPSHOT + 2.3.0 provided org.commonjava.indy.rest indy-rest-api json - 2.2.1-SNAPSHOT + 2.3.0 provided @@ -851,33 +851,33 @@ org.commonjava.indy indy-content-browse-common - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-content-browse-jaxrs - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-ftests-content-browse - 2.2.1-SNAPSHOT + 2.3.0 test org.commonjava.indy indy-content-browse-model-java - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-content-browse-client-java - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-content-browse-common - 2.2.1-SNAPSHOT + 2.3.0 confset tar.gz provided @@ -885,35 +885,35 @@ org.commonjava.indy indy-content-browse-ui - 2.2.1-SNAPSHOT + 2.3.0 reactui tar.gz org.commonjava.indy indy-changelog-common - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-changelog-client-java - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-ftests-changelog - 2.2.1-SNAPSHOT + 2.3.0 test org.commonjava.indy indy-changelog-jaxrs - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-changelog-common - 2.2.1-SNAPSHOT + 2.3.0 confset tar.gz @@ -931,12 +931,12 @@ org.commonjava.indy indy-event-audit-common - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-event-audit-common - 2.2.1-SNAPSHOT + 2.3.0 confset tar.gz provided @@ -951,23 +951,23 @@ org.commonjava.indy indy-repo-proxy-common - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-repo-proxy-jaxrs - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-ftests-repo-proxy - 2.2.1-SNAPSHOT + 2.3.0 test org.commonjava.indy indy-repo-proxy-common - 2.2.1-SNAPSHOT + 2.3.0 confset tar.gz diff --git a/rest/api/pom.xml b/rest/api/pom.xml index 222f3e7850..fe60ed482c 100644 --- a/rest/api/pom.xml +++ b/rest/api/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.rest indy-rest-parent - 2.2.1-SNAPSHOT + 2.3.0 indy-rest-api diff --git a/rest/pom.xml b/rest/pom.xml index 4dd7937847..cec45f016d 100644 --- a/rest/pom.xml +++ b/rest/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy.rest diff --git a/subsys/cassandra/pom.xml b/subsys/cassandra/pom.xml index 4609d30e1c..d516f22c88 100644 --- a/subsys/cassandra/pom.xml +++ b/subsys/cassandra/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-subsystems - 2.2.1-SNAPSHOT + 2.3.0 indy-subsys-cassandra diff --git a/subsys/cpool/pom.xml b/subsys/cpool/pom.xml index 576ace5024..568d0dde85 100644 --- a/subsys/cpool/pom.xml +++ b/subsys/cpool/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.2.1-SNAPSHOT + 2.3.0 indy-subsys-cpool diff --git a/subsys/flatfile/pom.xml b/subsys/flatfile/pom.xml index f64b5eb5cd..6df172be83 100644 --- a/subsys/flatfile/pom.xml +++ b/subsys/flatfile/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.2.1-SNAPSHOT + 2.3.0 indy-subsys-flatfile diff --git a/subsys/git/pom.xml b/subsys/git/pom.xml index 1ecf4d68c1..af288ea205 100644 --- a/subsys/git/pom.xml +++ b/subsys/git/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.2.1-SNAPSHOT + 2.3.0 indy-subsys-git diff --git a/subsys/groovy/pom.xml b/subsys/groovy/pom.xml index aba22610e8..c8c6fd40cd 100644 --- a/subsys/groovy/pom.xml +++ b/subsys/groovy/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.2.1-SNAPSHOT + 2.3.0 indy-subsys-groovy diff --git a/subsys/honeycomb/pom.xml b/subsys/honeycomb/pom.xml index e12a1a8983..3aa86532c7 100644 --- a/subsys/honeycomb/pom.xml +++ b/subsys/honeycomb/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.2.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/subsys/http/pom.xml b/subsys/http/pom.xml index f7aca6035e..4abd44570a 100644 --- a/subsys/http/pom.xml +++ b/subsys/http/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.2.1-SNAPSHOT + 2.3.0 indy-subsys-http diff --git a/subsys/infinispan/pom.xml b/subsys/infinispan/pom.xml index d85403482d..29fd78c9fc 100644 --- a/subsys/infinispan/pom.xml +++ b/subsys/infinispan/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.2.1-SNAPSHOT + 2.3.0 indy-subsys-infinispan diff --git a/subsys/jaxrs/pom.xml b/subsys/jaxrs/pom.xml index 45f6d33833..486b88b10e 100644 --- a/subsys/jaxrs/pom.xml +++ b/subsys/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.2.1-SNAPSHOT + 2.3.0 indy-subsys-jaxrs diff --git a/subsys/kafka/pom.xml b/subsys/kafka/pom.xml index bb155925ce..a718b0b115 100644 --- a/subsys/kafka/pom.xml +++ b/subsys/kafka/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.2.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/subsys/keycloak/pom.xml b/subsys/keycloak/pom.xml index 6d37022dc3..f63fafc9d9 100644 --- a/subsys/keycloak/pom.xml +++ b/subsys/keycloak/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.2.1-SNAPSHOT + 2.3.0 indy-subsys-keycloak Indy :: Subsystems :: Keycloak diff --git a/subsys/metrics/core/pom.xml b/subsys/metrics/core/pom.xml index bfc58d5553..4c551ef53f 100644 --- a/subsys/metrics/core/pom.xml +++ b/subsys/metrics/core/pom.xml @@ -20,7 +20,7 @@ indy-subsys-metrics org.commonjava.indy - 2.2.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/subsys/metrics/pom.xml b/subsys/metrics/pom.xml index 19412ac78b..d91a87e939 100644 --- a/subsys/metrics/pom.xml +++ b/subsys/metrics/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.2.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/subsys/metrics/prometheus/pom.xml b/subsys/metrics/prometheus/pom.xml index a74cc072eb..6da400c1d7 100644 --- a/subsys/metrics/prometheus/pom.xml +++ b/subsys/metrics/prometheus/pom.xml @@ -20,7 +20,7 @@ indy-subsys-metrics org.commonjava.indy - 2.2.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/subsys/metrics/reporter/pom.xml b/subsys/metrics/reporter/pom.xml index 817dd862a0..b80a434e7d 100644 --- a/subsys/metrics/reporter/pom.xml +++ b/subsys/metrics/reporter/pom.xml @@ -20,7 +20,7 @@ indy-subsys-metrics org.commonjava.indy - 2.2.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/subsys/pom.xml b/subsys/pom.xml index 30900a8b39..a631ec9126 100644 --- a/subsys/pom.xml +++ b/subsys/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.2.1-SNAPSHOT + 2.3.0 indy-subsystems diff --git a/subsys/prefetch/pom.xml b/subsys/prefetch/pom.xml index f89a92f4ac..0da1b4edb8 100644 --- a/subsys/prefetch/pom.xml +++ b/subsys/prefetch/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.2.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/test/db/pom.xml b/test/db/pom.xml index 1c41938b27..2b19cadd7e 100644 --- a/test/db/pom.xml +++ b/test/db/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.2.1-SNAPSHOT + 2.3.0 indy-test-db diff --git a/test/fixtures-core/pom.xml b/test/fixtures-core/pom.xml index 4f524fecf7..092bc9c081 100644 --- a/test/fixtures-core/pom.xml +++ b/test/fixtures-core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.2.1-SNAPSHOT + 2.3.0 indy-test-fixtures-core diff --git a/test/pom.xml b/test/pom.xml index 58414c5a87..44c25d37e9 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.2.1-SNAPSHOT + 2.3.0 indy-test diff --git a/test/providers-core/pom.xml b/test/providers-core/pom.xml index 95a0454904..41cfe037c6 100644 --- a/test/providers-core/pom.xml +++ b/test/providers-core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.2.1-SNAPSHOT + 2.3.0 indy-test-providers-core diff --git a/test/utils/pom.xml b/test/utils/pom.xml index 41b478f236..d3cc042c61 100644 --- a/test/utils/pom.xml +++ b/test/utils/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.2.1-SNAPSHOT + 2.3.0 indy-test-utils diff --git a/tools/assemblies/pom.xml b/tools/assemblies/pom.xml index 8854f320e4..87f551981f 100644 --- a/tools/assemblies/pom.xml +++ b/tools/assemblies/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.tools indy-tools - 2.2.1-SNAPSHOT + 2.3.0 indy-assemblies diff --git a/tools/pom.xml b/tools/pom.xml index 0c278e3765..77668a67d4 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy.tools diff --git a/uis/layover/pom.xml b/uis/layover/pom.xml index 0639033450..83bd37b954 100644 --- a/uis/layover/pom.xml +++ b/uis/layover/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.ui indy-uis - 2.2.1-SNAPSHOT + 2.3.0 indy-ui-layover diff --git a/uis/pom.xml b/uis/pom.xml index b3988ce494..c0aa544ea1 100644 --- a/uis/pom.xml +++ b/uis/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.2.1-SNAPSHOT + 2.3.0 org.commonjava.indy.ui From 410a7a72f63cf938b66497ef3f223212e2c167c0 Mon Sep 17 00:00:00 2001 From: shokakucarrier Date: Tue, 2 Jun 2020 08:13:14 +0000 Subject: [PATCH 19/50] [maven-release-plugin] prepare for next development iteration --- addons/changelog/client-java/pom.xml | 2 +- addons/changelog/common/pom.xml | 2 +- addons/changelog/ftests/pom.xml | 2 +- addons/changelog/jaxrs/pom.xml | 2 +- addons/changelog/pom.xml | 2 +- addons/content-browse/client-java/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/event-audit/common/pom.xml | 2 +- addons/event-audit/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/path-mapped/common/pom.xml | 2 +- addons/path-mapped/jaxrs/pom.xml | 2 +- addons/path-mapped/model-java/pom.xml | 2 +- addons/path-mapped/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/repo-proxy/common/pom.xml | 2 +- addons/repo-proxy/ftests/pom.xml | 2 +- addons/repo-proxy/jaxrs/pom.xml | 2 +- addons/repo-proxy/pom.xml | 2 +- addons/revisions/common/pom.xml | 2 +- addons/revisions/jaxrs/pom.xml | 2 +- addons/revisions/pom.xml | 2 +- addons/sli/pom.xml | 2 +- api/pom.xml | 2 +- bindings/jaxrs/pom.xml | 2 +- bindings/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/common/pom.xml | 2 +- db/flat/pom.xml | 2 +- db/infinispan/pom.xml | 2 +- db/memory/pom.xml | 2 +- db/metrics/pom.xml | 2 +- db/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 | 254 +++++++++---------- rest/api/pom.xml | 2 +- rest/pom.xml | 2 +- subsys/cassandra/pom.xml | 2 +- subsys/cpool/pom.xml | 2 +- subsys/flatfile/pom.xml | 2 +- subsys/git/pom.xml | 2 +- subsys/groovy/pom.xml | 2 +- subsys/honeycomb/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/prometheus/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 +- 131 files changed, 257 insertions(+), 257 deletions(-) diff --git a/addons/changelog/client-java/pom.xml b/addons/changelog/client-java/pom.xml index 09e059c6d6..de4dcddc8f 100644 --- a/addons/changelog/client-java/pom.xml +++ b/addons/changelog/client-java/pom.xml @@ -20,7 +20,7 @@ indy-changelog org.commonjava.indy - 2.3.0 + 2.3.1-SNAPSHOT 4.0.0 diff --git a/addons/changelog/common/pom.xml b/addons/changelog/common/pom.xml index 9fd2efef29..4ce05ce260 100644 --- a/addons/changelog/common/pom.xml +++ b/addons/changelog/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.3.0 + 2.3.1-SNAPSHOT indy-changelog-common Indy :: Add-Ons :: ChangeLog :: Common diff --git a/addons/changelog/ftests/pom.xml b/addons/changelog/ftests/pom.xml index 7dbabc5056..8ba598ffe1 100644 --- a/addons/changelog/ftests/pom.xml +++ b/addons/changelog/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.3.0 + 2.3.1-SNAPSHOT indy-ftests-changelog diff --git a/addons/changelog/jaxrs/pom.xml b/addons/changelog/jaxrs/pom.xml index f29eea040e..2539db27e0 100644 --- a/addons/changelog/jaxrs/pom.xml +++ b/addons/changelog/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.3.0 + 2.3.1-SNAPSHOT indy-changelog-jaxrs diff --git a/addons/changelog/pom.xml b/addons/changelog/pom.xml index a94b540dd6..2ccd6f4218 100644 --- a/addons/changelog/pom.xml +++ b/addons/changelog/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.0 + 2.3.1-SNAPSHOT indy-changelog Indy :: Add-Ons :: ChangeLog :: Parent diff --git a/addons/content-browse/client-java/pom.xml b/addons/content-browse/client-java/pom.xml index 3275dc2a3c..b7de6b3324 100644 --- a/addons/content-browse/client-java/pom.xml +++ b/addons/content-browse/client-java/pom.xml @@ -20,7 +20,7 @@ indy-content-browse org.commonjava.indy - 2.3.0 + 2.3.1-SNAPSHOT 4.0.0 diff --git a/addons/content-browse/common/pom.xml b/addons/content-browse/common/pom.xml index 6099f654aa..e2d2c70965 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 - 2.3.0 + 2.3.1-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 499be7649d..548c640515 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 - 2.3.0 + 2.3.1-SNAPSHOT indy-ftests-content-browse diff --git a/addons/content-browse/jaxrs/pom.xml b/addons/content-browse/jaxrs/pom.xml index f986f86ca5..9669da119f 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 - 2.3.0 + 2.3.1-SNAPSHOT indy-content-browse-jaxrs diff --git a/addons/content-browse/model-java/pom.xml b/addons/content-browse/model-java/pom.xml index 554ac325ea..90c82b69b5 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 - 2.3.0 + 2.3.1-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 ff2abd54e3..3a23b6ee98 100644 --- a/addons/content-browse/pom.xml +++ b/addons/content-browse/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.0 + 2.3.1-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 048c14497e..4ef90168d8 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 - 2.3.0 + 2.3.1-SNAPSHOT 4.0.0 diff --git a/addons/content-index/pom.xml b/addons/content-index/pom.xml index 1e51281a07..00a808a086 100644 --- a/addons/content-index/pom.xml +++ b/addons/content-index/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.0 + 2.3.1-SNAPSHOT indy-content-index diff --git a/addons/diagnostics/client-java/pom.xml b/addons/diagnostics/client-java/pom.xml index eb0275b636..df820dd3b9 100644 --- a/addons/diagnostics/client-java/pom.xml +++ b/addons/diagnostics/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.3.0 + 2.3.1-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 30293043e2..5a0d73adb6 100644 --- a/addons/diagnostics/common/pom.xml +++ b/addons/diagnostics/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.3.0 + 2.3.1-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 22de3011f0..567444347c 100644 --- a/addons/diagnostics/ftests/pom.xml +++ b/addons/diagnostics/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.3.0 + 2.3.1-SNAPSHOT indy-ftests-diagnostics diff --git a/addons/diagnostics/jaxrs/pom.xml b/addons/diagnostics/jaxrs/pom.xml index 70aba53c86..e2eb7cb76a 100644 --- a/addons/diagnostics/jaxrs/pom.xml +++ b/addons/diagnostics/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.3.0 + 2.3.1-SNAPSHOT indy-diagnostics-jaxrs diff --git a/addons/diagnostics/pom.xml b/addons/diagnostics/pom.xml index 27155869c8..35fd1bac50 100644 --- a/addons/diagnostics/pom.xml +++ b/addons/diagnostics/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.0 + 2.3.1-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 def6c2d35a..5b3e7e279c 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 - 2.3.0 + 2.3.1-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 9be0a57fc1..b6d9ef8a39 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 - 2.3.0 + 2.3.1-SNAPSHOT indy-ftests-dot-maven diff --git a/addons/dot-maven/jaxrs/pom.xml b/addons/dot-maven/jaxrs/pom.xml index 02fc695fc5..5b88d335a8 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 - 2.3.0 + 2.3.1-SNAPSHOT indy-dot-maven-jaxrs diff --git a/addons/dot-maven/pom.xml b/addons/dot-maven/pom.xml index e1626a57ef..e296f1bb61 100644 --- a/addons/dot-maven/pom.xml +++ b/addons/dot-maven/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.0 + 2.3.1-SNAPSHOT indy-dot-maven diff --git a/addons/event-audit/common/pom.xml b/addons/event-audit/common/pom.xml index 8a457976b6..f5d836dbb1 100644 --- a/addons/event-audit/common/pom.xml +++ b/addons/event-audit/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-event-audit - 2.3.0 + 2.3.1-SNAPSHOT indy-event-audit-common diff --git a/addons/event-audit/pom.xml b/addons/event-audit/pom.xml index 7d4ff58aa9..90770a4e31 100644 --- a/addons/event-audit/pom.xml +++ b/addons/event-audit/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.0 + 2.3.1-SNAPSHOT indy-event-audit diff --git a/addons/folo/client-java/pom.xml b/addons/folo/client-java/pom.xml index b4151c3557..e42252fac4 100644 --- a/addons/folo/client-java/pom.xml +++ b/addons/folo/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.3.0 + 2.3.1-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 85cf71ac69..d240f53f81 100644 --- a/addons/folo/common/pom.xml +++ b/addons/folo/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.3.0 + 2.3.1-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 7389ca9c9e..12d81aabea 100644 --- a/addons/folo/ftests/pom.xml +++ b/addons/folo/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.3.0 + 2.3.1-SNAPSHOT indy-ftests-folo diff --git a/addons/folo/jaxrs/pom.xml b/addons/folo/jaxrs/pom.xml index c06223439d..c212486856 100644 --- a/addons/folo/jaxrs/pom.xml +++ b/addons/folo/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.3.0 + 2.3.1-SNAPSHOT indy-folo-jaxrs diff --git a/addons/folo/model-java/pom.xml b/addons/folo/model-java/pom.xml index fc17e66a06..1fef90c316 100644 --- a/addons/folo/model-java/pom.xml +++ b/addons/folo/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.3.0 + 2.3.1-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 715502f064..be1296cb41 100644 --- a/addons/folo/pom.xml +++ b/addons/folo/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.0 + 2.3.1-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 ef1c3923d0..7d8db5d2c9 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 - 2.3.0 + 2.3.1-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 6546c735ee..77cf1ab180 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 - 2.3.0 + 2.3.1-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 b753e8d2e2..90d69b3413 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 - 2.3.0 + 2.3.1-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 1ce22eebbc..702c31d048 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 - 2.3.0 + 2.3.1-SNAPSHOT indy-hosted-by-archive-jaxrs diff --git a/addons/hosted-by-archive/pom.xml b/addons/hosted-by-archive/pom.xml index f44da728de..a6aacae656 100644 --- a/addons/hosted-by-archive/pom.xml +++ b/addons/hosted-by-archive/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.0 + 2.3.1-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 e380b0d4c4..7646c3b1c3 100644 --- a/addons/httprox/common/pom.xml +++ b/addons/httprox/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.3.0 + 2.3.1-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 deb3d4065e..2a8ec6b823 100644 --- a/addons/httprox/ftests/pom.xml +++ b/addons/httprox/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.3.0 + 2.3.1-SNAPSHOT indy-ftests-httprox diff --git a/addons/httprox/jaxrs/pom.xml b/addons/httprox/jaxrs/pom.xml index 65fcc30594..0f595181d1 100644 --- a/addons/httprox/jaxrs/pom.xml +++ b/addons/httprox/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.3.0 + 2.3.1-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 f6101dc202..76fd6dd9e4 100644 --- a/addons/httprox/pom.xml +++ b/addons/httprox/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.0 + 2.3.1-SNAPSHOT indy-httprox diff --git a/addons/implied-repos/client-java/pom.xml b/addons/implied-repos/client-java/pom.xml index aaa1fdb2d7..f779d8454b 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 - 2.3.0 + 2.3.1-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 02f8ef6591..b50bdd41fd 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 - 2.3.0 + 2.3.1-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 4b685069e1..9eb3b6e472 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 - 2.3.0 + 2.3.1-SNAPSHOT indy-ftests-implied-repos diff --git a/addons/implied-repos/model-java/pom.xml b/addons/implied-repos/model-java/pom.xml index 5afc2d4e8a..8914076fd0 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 - 2.3.0 + 2.3.1-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 02155aeb24..9122cd173e 100644 --- a/addons/implied-repos/pom.xml +++ b/addons/implied-repos/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.0 + 2.3.1-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 3d21a4700a..c211df3729 100644 --- a/addons/koji/client-java/pom.xml +++ b/addons/koji/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.3.0 + 2.3.1-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 923d4c66d1..7ebe8f05ad 100644 --- a/addons/koji/common/pom.xml +++ b/addons/koji/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.3.0 + 2.3.1-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 7d0a000263..609fcc4597 100644 --- a/addons/koji/jaxrs/pom.xml +++ b/addons/koji/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.3.0 + 2.3.1-SNAPSHOT indy-koji-jaxrs diff --git a/addons/koji/model-java/pom.xml b/addons/koji/model-java/pom.xml index 11f70b4a68..3ffeee42c9 100644 --- a/addons/koji/model-java/pom.xml +++ b/addons/koji/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.3.0 + 2.3.1-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 a2c41ea128..c9f208f28f 100644 --- a/addons/koji/pom.xml +++ b/addons/koji/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.0 + 2.3.1-SNAPSHOT indy-koji Indy :: Add-Ons :: Koji Integration :: Parent diff --git a/addons/path-mapped/common/pom.xml b/addons/path-mapped/common/pom.xml index acc88bf236..ea66e28b6e 100644 --- a/addons/path-mapped/common/pom.xml +++ b/addons/path-mapped/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.3.0 + 2.3.1-SNAPSHOT indy-path-mapped-common diff --git a/addons/path-mapped/jaxrs/pom.xml b/addons/path-mapped/jaxrs/pom.xml index 887335f872..2f147f7157 100644 --- a/addons/path-mapped/jaxrs/pom.xml +++ b/addons/path-mapped/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.3.0 + 2.3.1-SNAPSHOT indy-path-mapped-jaxrs diff --git a/addons/path-mapped/model-java/pom.xml b/addons/path-mapped/model-java/pom.xml index 603f241172..ca6d1a6e32 100644 --- a/addons/path-mapped/model-java/pom.xml +++ b/addons/path-mapped/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.3.0 + 2.3.1-SNAPSHOT indy-path-mapped-model-java diff --git a/addons/path-mapped/pom.xml b/addons/path-mapped/pom.xml index a7b6a0e9cc..9aa2d57ccd 100644 --- a/addons/path-mapped/pom.xml +++ b/addons/path-mapped/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.0 + 2.3.1-SNAPSHOT indy-path-mapped Indy :: Add-Ons :: Path Mapped :: Parent diff --git a/addons/pkg-maven/common/pom.xml b/addons/pkg-maven/common/pom.xml index f9f52dbed7..0f9f2fcfbb 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 - 2.3.0 + 2.3.1-SNAPSHOT 4.0.0 diff --git a/addons/pkg-maven/ftests/pom.xml b/addons/pkg-maven/ftests/pom.xml index 410401acac..555fc341e5 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 - 2.3.0 + 2.3.1-SNAPSHOT 4.0.0 diff --git a/addons/pkg-maven/jaxrs/pom.xml b/addons/pkg-maven/jaxrs/pom.xml index 83dbc94b0f..fb95ddb2ea 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 - 2.3.0 + 2.3.1-SNAPSHOT 4.0.0 diff --git a/addons/pkg-maven/pom.xml b/addons/pkg-maven/pom.xml index a6e11ee82e..c8da871908 100644 --- a/addons/pkg-maven/pom.xml +++ b/addons/pkg-maven/pom.xml @@ -20,7 +20,7 @@ indy-addons org.commonjava.indy - 2.3.0 + 2.3.1-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/common/pom.xml b/addons/pkg-npm/common/pom.xml index 362dc0fc67..d73550364f 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 - 2.3.0 + 2.3.1-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/ftests/pom.xml b/addons/pkg-npm/ftests/pom.xml index 3c30d7af9f..aaefabc144 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 - 2.3.0 + 2.3.1-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/jaxrs/pom.xml b/addons/pkg-npm/jaxrs/pom.xml index 1f974ee013..ab5d85a94c 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 - 2.3.0 + 2.3.1-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/model-java/pom.xml b/addons/pkg-npm/model-java/pom.xml index 7df3c3c0ef..e792c57e6f 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 - 2.3.0 + 2.3.1-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/pom.xml b/addons/pkg-npm/pom.xml index d0b8b55727..96acdd61dd 100644 --- a/addons/pkg-npm/pom.xml +++ b/addons/pkg-npm/pom.xml @@ -20,7 +20,7 @@ indy-addons org.commonjava.indy - 2.3.0 + 2.3.1-SNAPSHOT 4.0.0 diff --git a/addons/pom.xml b/addons/pom.xml index d583462ce5..4e65ca8d94 100644 --- a/addons/pom.xml +++ b/addons/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-parent - 2.3.0 + 2.3.1-SNAPSHOT indy-addons diff --git a/addons/promote/client-java/pom.xml b/addons/promote/client-java/pom.xml index 442282cb65..5bc00e55e5 100644 --- a/addons/promote/client-java/pom.xml +++ b/addons/promote/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.3.0 + 2.3.1-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 89cb65bf3d..3a2a63c42b 100644 --- a/addons/promote/common/pom.xml +++ b/addons/promote/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.3.0 + 2.3.1-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 95749f15f8..73e868b2c0 100644 --- a/addons/promote/ftests/pom.xml +++ b/addons/promote/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.3.0 + 2.3.1-SNAPSHOT indy-ftests-promote diff --git a/addons/promote/jaxrs/pom.xml b/addons/promote/jaxrs/pom.xml index d934be4708..a94f79f8e7 100644 --- a/addons/promote/jaxrs/pom.xml +++ b/addons/promote/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.3.0 + 2.3.1-SNAPSHOT indy-promote-jaxrs diff --git a/addons/promote/model-java/pom.xml b/addons/promote/model-java/pom.xml index c305809e75..4b82e9ae91 100644 --- a/addons/promote/model-java/pom.xml +++ b/addons/promote/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.3.0 + 2.3.1-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 e8f19fa746..b72722127b 100644 --- a/addons/promote/pom.xml +++ b/addons/promote/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.0 + 2.3.1-SNAPSHOT indy-promote Indy :: Add-Ons :: Artifact Promotion :: Parent diff --git a/addons/repo-proxy/common/pom.xml b/addons/repo-proxy/common/pom.xml index 3fc1ca2bd5..04cc76f311 100644 --- a/addons/repo-proxy/common/pom.xml +++ b/addons/repo-proxy/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-repo-proxy - 2.3.0 + 2.3.1-SNAPSHOT indy-repo-proxy-common Indy :: Add-Ons :: Repository-Proxy :: Common diff --git a/addons/repo-proxy/ftests/pom.xml b/addons/repo-proxy/ftests/pom.xml index 217bc68ac9..1880a1fdc3 100644 --- a/addons/repo-proxy/ftests/pom.xml +++ b/addons/repo-proxy/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-repo-proxy - 2.3.0 + 2.3.1-SNAPSHOT indy-ftests-repo-proxy diff --git a/addons/repo-proxy/jaxrs/pom.xml b/addons/repo-proxy/jaxrs/pom.xml index cd57139326..1046b1e795 100644 --- a/addons/repo-proxy/jaxrs/pom.xml +++ b/addons/repo-proxy/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-repo-proxy - 2.3.0 + 2.3.1-SNAPSHOT indy-repo-proxy-jaxrs diff --git a/addons/repo-proxy/pom.xml b/addons/repo-proxy/pom.xml index 581e3f254e..e537a14ab7 100644 --- a/addons/repo-proxy/pom.xml +++ b/addons/repo-proxy/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.0 + 2.3.1-SNAPSHOT indy-repo-proxy Indy :: Add-Ons :: Repository-Proxy :: Parent diff --git a/addons/revisions/common/pom.xml b/addons/revisions/common/pom.xml index a8ddc3ebfd..96ce90f263 100644 --- a/addons/revisions/common/pom.xml +++ b/addons/revisions/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-revisions - 2.3.0 + 2.3.1-SNAPSHOT indy-revisions-common Indy :: Add-Ons :: Revisions :: Common diff --git a/addons/revisions/jaxrs/pom.xml b/addons/revisions/jaxrs/pom.xml index abe50652c1..379e28efc7 100644 --- a/addons/revisions/jaxrs/pom.xml +++ b/addons/revisions/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-revisions - 2.3.0 + 2.3.1-SNAPSHOT indy-revisions-jaxrs diff --git a/addons/revisions/pom.xml b/addons/revisions/pom.xml index 31ef179b51..d016402cef 100644 --- a/addons/revisions/pom.xml +++ b/addons/revisions/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.0 + 2.3.1-SNAPSHOT indy-revisions Indy :: Add-Ons :: Revisions :: Parent diff --git a/addons/sli/pom.xml b/addons/sli/pom.xml index 942341733e..449ae2c258 100644 --- a/addons/sli/pom.xml +++ b/addons/sli/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.0 + 2.3.1-SNAPSHOT indy-sli Indy :: Add-Ons :: Service Level Indicators Reporting :: JAX-RS diff --git a/api/pom.xml b/api/pom.xml index e257dc753c..58048edacf 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.0 + 2.3.1-SNAPSHOT indy-api diff --git a/bindings/jaxrs/pom.xml b/bindings/jaxrs/pom.xml index cd85bc994e..46679ad14b 100644 --- a/bindings/jaxrs/pom.xml +++ b/bindings/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-bindings - 2.3.0 + 2.3.1-SNAPSHOT indy-bindings-jaxrs diff --git a/bindings/pom.xml b/bindings/pom.xml index 45c7c3cd33..7e3a87f446 100644 --- a/bindings/pom.xml +++ b/bindings/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-parent - 2.3.0 + 2.3.1-SNAPSHOT indy-bindings diff --git a/boot/jaxrs/pom.xml b/boot/jaxrs/pom.xml index bc88ecfa7c..a5af953903 100644 --- a/boot/jaxrs/pom.xml +++ b/boot/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.boot indy-booters - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy.boot diff --git a/boot/pom.xml b/boot/pom.xml index 02413e47de..90531e11dd 100644 --- a/boot/pom.xml +++ b/boot/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy.boot diff --git a/clients/core-java/pom.xml b/clients/core-java/pom.xml index eed9089e21..ea39c07326 100644 --- a/clients/core-java/pom.xml +++ b/clients/core-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-clients-parent - 2.3.0 + 2.3.1-SNAPSHOT indy-client-core-java diff --git a/clients/pom.xml b/clients/pom.xml index dfd582f6e1..f6324186ab 100644 --- a/clients/pom.xml +++ b/clients/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.0 + 2.3.1-SNAPSHOT indy-clients-parent diff --git a/core/pom.xml b/core/pom.xml index 5765559abc..67cf6913d9 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.0 + 2.3.1-SNAPSHOT indy-core diff --git a/db/common/pom.xml b/db/common/pom.xml index c2f223f054..c78e04fed9 100644 --- a/db/common/pom.xml +++ b/db/common/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-db - 2.3.0 + 2.3.1-SNAPSHOT indy-db-common diff --git a/db/flat/pom.xml b/db/flat/pom.xml index 6559e60bca..e8010d8ad2 100644 --- a/db/flat/pom.xml +++ b/db/flat/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.3.0 + 2.3.1-SNAPSHOT indy-db-flat diff --git a/db/infinispan/pom.xml b/db/infinispan/pom.xml index bf2fd3e16d..19cf6022fa 100644 --- a/db/infinispan/pom.xml +++ b/db/infinispan/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-db - 2.3.0 + 2.3.1-SNAPSHOT indy-db-infinispan diff --git a/db/memory/pom.xml b/db/memory/pom.xml index c746862dee..4999f14df9 100644 --- a/db/memory/pom.xml +++ b/db/memory/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.3.0 + 2.3.1-SNAPSHOT indy-db-memory diff --git a/db/metrics/pom.xml b/db/metrics/pom.xml index 3b48971250..48abcbf8d4 100644 --- a/db/metrics/pom.xml +++ b/db/metrics/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.3.0 + 2.3.1-SNAPSHOT indy-db-metrics diff --git a/db/pom.xml b/db/pom.xml index 98fbb8d219..81e5b9e841 100644 --- a/db/pom.xml +++ b/db/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.0 + 2.3.1-SNAPSHOT indy-db diff --git a/deployments/launcher/pom.xml b/deployments/launcher/pom.xml index 1376e27362..acf0fe643a 100644 --- a/deployments/launcher/pom.xml +++ b/deployments/launcher/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-deployments - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy.launch diff --git a/deployments/pom.xml b/deployments/pom.xml index afc13247ad..41d0e1d7fb 100644 --- a/deployments/pom.xml +++ b/deployments/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.0 + 2.3.1-SNAPSHOT indy-deployments diff --git a/embedder/pom.xml b/embedder/pom.xml index a4c52d9981..32a320e34b 100644 --- a/embedder/pom.xml +++ b/embedder/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy.embed diff --git a/filers/default/pom.xml b/filers/default/pom.xml index 9de0979761..91e90f0022 100644 --- a/filers/default/pom.xml +++ b/filers/default/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-file-managers - 2.3.0 + 2.3.1-SNAPSHOT indy-filer-default diff --git a/filers/pom.xml b/filers/pom.xml index 1138a48864..4b320f8392 100644 --- a/filers/pom.xml +++ b/filers/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.0 + 2.3.1-SNAPSHOT indy-file-managers diff --git a/ftests/common/pom.xml b/ftests/common/pom.xml index f48a64b0b7..907b7ad17b 100644 --- a/ftests/common/pom.xml +++ b/ftests/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-ftests-parent - 2.3.0 + 2.3.1-SNAPSHOT indy-ftests-common diff --git a/ftests/core/pom.xml b/ftests/core/pom.xml index 4cf506ae80..8986980eb5 100644 --- a/ftests/core/pom.xml +++ b/ftests/core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-ftests-parent - 2.3.0 + 2.3.1-SNAPSHOT indy-ftests-core diff --git a/ftests/metrics/pom.xml b/ftests/metrics/pom.xml index c3afd2799d..ee09db0ceb 100644 --- a/ftests/metrics/pom.xml +++ b/ftests/metrics/pom.xml @@ -20,7 +20,7 @@ indy-ftests-parent org.commonjava.indy - 2.3.0 + 2.3.1-SNAPSHOT 4.0.0 diff --git a/ftests/pom.xml b/ftests/pom.xml index a22666292c..22c72fb756 100644 --- a/ftests/pom.xml +++ b/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.0 + 2.3.1-SNAPSHOT indy-ftests-parent diff --git a/models/core-java/pom.xml b/models/core-java/pom.xml index 824f03bba1..8200f5d14d 100644 --- a/models/core-java/pom.xml +++ b/models/core-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-models-parent - 2.3.0 + 2.3.1-SNAPSHOT indy-model-core-java diff --git a/models/pom.xml b/models/pom.xml index f697237fc3..72433f7ed5 100644 --- a/models/pom.xml +++ b/models/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.0 + 2.3.1-SNAPSHOT indy-models-parent diff --git a/pom.xml b/pom.xml index 8e3c3b0a91..33e31c424e 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.commonjava.indy indy-parent - 2.3.0 + 2.3.1-SNAPSHOT pom @@ -37,7 +37,7 @@ scm:git:https://github.com/CommonJava/indy scm:git:https://github.com/CommonJava/indy http://github.com/Commonjava/indy - indy-parent-2.3.0 + HEAD @@ -187,7 +187,7 @@ org.commonjava.indy.ui indy-ui-layover - 2.3.0 + 2.3.1-SNAPSHOT runtime @@ -195,22 +195,22 @@ org.commonjava.indy indy-model-core-java - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-api - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-core - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-core - 2.3.0 + 2.3.1-SNAPSHOT tar.gz confset provided @@ -218,32 +218,32 @@ org.commonjava.indy indy-db-flat - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-db-metrics - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-db-common - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-db-infinispan - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-bindings-jaxrs - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy.launch indy-launcher - 2.3.0 + 2.3.1-SNAPSHOT tar.gz skinny provided @@ -251,7 +251,7 @@ org.commonjava.indy.launch indy-launcher - 2.3.0 + 2.3.1-SNAPSHOT tar.gz complete provided @@ -259,7 +259,7 @@ org.commonjava.indy.launch indy-launcher - 2.3.0 + 2.3.1-SNAPSHOT tar.gz data provided @@ -267,7 +267,7 @@ org.commonjava.indy.launch indy-launcher - 2.3.0 + 2.3.1-SNAPSHOT tar.gz etc provided @@ -276,17 +276,17 @@ org.commonjava.indy indy-revisions-jaxrs - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-revisions-common - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-revisions-common - 2.3.0 + 2.3.1-SNAPSHOT tar.gz confset provided @@ -294,7 +294,7 @@ org.commonjava.indy indy-revisions-common - 2.3.0 + 2.3.1-SNAPSHOT tar.gz uiset provided @@ -302,12 +302,12 @@ org.commonjava.indy indy-dot-maven-common - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-dot-maven-common - 2.3.0 + 2.3.1-SNAPSHOT tar.gz dataset provided @@ -315,22 +315,22 @@ org.commonjava.indy indy-dot-maven-jaxrs - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-ftests-dot-maven - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-httprox-common - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-httprox-common - 2.3.0 + 2.3.1-SNAPSHOT tar.gz confset provided @@ -338,17 +338,17 @@ org.commonjava.indy indy-ftests-httprox - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-content-index - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-content-index - 2.3.0 + 2.3.1-SNAPSHOT tar.gz confset provided @@ -356,51 +356,51 @@ org.commonjava.indy indy-db-memory - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-test-db - 2.3.0 + 2.3.1-SNAPSHOT test org.commonjava.indy indy-test-fixtures-core - 2.3.0 + 2.3.1-SNAPSHOT test org.commonjava.indy indy-test-providers-core - 2.3.0 + 2.3.1-SNAPSHOT test org.commonjava.indy indy-test-utils - 2.3.0 + 2.3.1-SNAPSHOT test org.commonjava.indy indy-filer-default - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-subsys-jaxrs - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-subsys-honeycomb - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-subsys-honeycomb - 2.3.0 + 2.3.1-SNAPSHOT tar.gz confset provided @@ -408,17 +408,17 @@ org.commonjava.indy indy-subsys-flatfile - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-subsys-cassandra - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-subsys-cassandra - 2.3.0 + 2.3.1-SNAPSHOT tar.gz confset provided @@ -426,79 +426,79 @@ org.commonjava.indy indy-subsys-infinispan - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-subsys-http - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-subsys-git - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-subsys-groovy - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-subsys-prefetch - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-subsys-cpool - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-client-core-java - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-ftests-common - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-ftests-core - 2.3.0 + 2.3.1-SNAPSHOT test org.commonjava.indy indy-folo-jaxrs - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-ftests-folo - 2.3.0 + 2.3.1-SNAPSHOT test org.commonjava.indy indy-folo-client-java - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-folo-model-java - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-folo-common - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-folo-common - 2.3.0 + 2.3.1-SNAPSHOT tar.gz dataset provided @@ -506,7 +506,7 @@ org.commonjava.indy indy-folo-common - 2.3.0 + 2.3.1-SNAPSHOT tar.gz confset provided @@ -514,33 +514,33 @@ org.commonjava.indy indy-promote-jaxrs - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-ftests-promote - 2.3.0 + 2.3.1-SNAPSHOT test org.commonjava.indy indy-promote-client-java - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-promote-model-java - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-promote-common - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-promote-common - 2.3.0 + 2.3.1-SNAPSHOT tar.gz confset provided @@ -548,7 +548,7 @@ org.commonjava.indy indy-promote-common - 2.3.0 + 2.3.1-SNAPSHOT tar.gz dataset provided @@ -556,19 +556,19 @@ org.commonjava.indy indy-promote-common - 2.3.0 + 2.3.1-SNAPSHOT dataset provided org.commonjava.indy indy-implied-repos-common - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-implied-repos-common - 2.3.0 + 2.3.1-SNAPSHOT tar.gz confset provided @@ -576,37 +576,37 @@ org.commonjava.indy indy-implied-repos-model-java - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-implied-repos-client-java - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-ftests-implied-repos - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy.embed indy-embedder - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy.boot indy-booter-jaxrs - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-subsys-keycloak - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-subsys-keycloak - 2.3.0 + 2.3.1-SNAPSHOT tar.gz confset provided @@ -614,7 +614,7 @@ org.commonjava.indy indy-subsys-infinispan - 2.3.0 + 2.3.1-SNAPSHOT tar.gz confset provided @@ -622,7 +622,7 @@ org.commonjava.indy indy-subsys-prefetch - 2.3.0 + 2.3.1-SNAPSHOT tar.gz confset provided @@ -631,7 +631,7 @@ org.commonjava.indy indy-koji-common - 2.3.0 + 2.3.1-SNAPSHOT tar.gz confset provided @@ -639,103 +639,103 @@ org.commonjava.indy indy-koji-common - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-koji-model-java - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-koji-client-java - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-koji-jaxrs - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-path-mapped-common - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-path-mapped-model-java - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-path-mapped-jaxrs - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-pkg-maven-common - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-pkg-maven-jaxrs - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-pkg-npm-jaxrs - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-ftests-pkg-maven - 2.3.0 + 2.3.1-SNAPSHOT test org.commonjava.indy indy-ftests-pkg-npm - 2.3.0 + 2.3.1-SNAPSHOT test org.commonjava.indy indy-pkg-npm-common - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-pkg-npm-model-java - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-diagnostics-jaxrs - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-diagnostics-client-java - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-diagnostics-common - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-ftests-diagnostics - 2.3.0 + 2.3.1-SNAPSHOT test org.commonjava.indy indy-diagnostics-common - 2.3.0 + 2.3.1-SNAPSHOT confset tar.gz provided @@ -743,28 +743,28 @@ org.commonjava.indy indy-hosted-by-archive-common - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-hosted-by-archive-client-java - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-ftests-hosted-by-archive - 2.3.0 + 2.3.1-SNAPSHOT test org.commonjava.indy indy-hosted-by-archive-jaxrs - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-hosted-by-archive-common - 2.3.0 + 2.3.1-SNAPSHOT confset tar.gz @@ -772,22 +772,22 @@ org.commonjava.indy indy-subsys-metrics-core - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-subsys-metrics-reporter - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-subsys-metrics-prometheus - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-subsys-metrics-reporter - 2.3.0 + 2.3.1-SNAPSHOT confset tar.gz provided @@ -796,28 +796,28 @@ org.commonjava.indy indy-ftests-metrics - 2.3.0 + 2.3.1-SNAPSHOT test org.commonjava.indy indy-sli - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy.rest indy-rest-api yaml - 2.3.0 + 2.3.1-SNAPSHOT provided org.commonjava.indy.rest indy-rest-api json - 2.3.0 + 2.3.1-SNAPSHOT provided @@ -851,33 +851,33 @@ org.commonjava.indy indy-content-browse-common - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-content-browse-jaxrs - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-ftests-content-browse - 2.3.0 + 2.3.1-SNAPSHOT test org.commonjava.indy indy-content-browse-model-java - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-content-browse-client-java - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-content-browse-common - 2.3.0 + 2.3.1-SNAPSHOT confset tar.gz provided @@ -885,35 +885,35 @@ org.commonjava.indy indy-content-browse-ui - 2.3.0 + 2.3.1-SNAPSHOT reactui tar.gz org.commonjava.indy indy-changelog-common - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-changelog-client-java - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-ftests-changelog - 2.3.0 + 2.3.1-SNAPSHOT test org.commonjava.indy indy-changelog-jaxrs - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-changelog-common - 2.3.0 + 2.3.1-SNAPSHOT confset tar.gz @@ -931,12 +931,12 @@ org.commonjava.indy indy-event-audit-common - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-event-audit-common - 2.3.0 + 2.3.1-SNAPSHOT confset tar.gz provided @@ -951,23 +951,23 @@ org.commonjava.indy indy-repo-proxy-common - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-repo-proxy-jaxrs - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-ftests-repo-proxy - 2.3.0 + 2.3.1-SNAPSHOT test org.commonjava.indy indy-repo-proxy-common - 2.3.0 + 2.3.1-SNAPSHOT confset tar.gz diff --git a/rest/api/pom.xml b/rest/api/pom.xml index fe60ed482c..4b66e85070 100644 --- a/rest/api/pom.xml +++ b/rest/api/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.rest indy-rest-parent - 2.3.0 + 2.3.1-SNAPSHOT indy-rest-api diff --git a/rest/pom.xml b/rest/pom.xml index cec45f016d..988dcceeca 100644 --- a/rest/pom.xml +++ b/rest/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy.rest diff --git a/subsys/cassandra/pom.xml b/subsys/cassandra/pom.xml index d516f22c88..2a3dc93d37 100644 --- a/subsys/cassandra/pom.xml +++ b/subsys/cassandra/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-subsystems - 2.3.0 + 2.3.1-SNAPSHOT indy-subsys-cassandra diff --git a/subsys/cpool/pom.xml b/subsys/cpool/pom.xml index 568d0dde85..bcd01527cc 100644 --- a/subsys/cpool/pom.xml +++ b/subsys/cpool/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.3.0 + 2.3.1-SNAPSHOT indy-subsys-cpool diff --git a/subsys/flatfile/pom.xml b/subsys/flatfile/pom.xml index 6df172be83..51d0faeecb 100644 --- a/subsys/flatfile/pom.xml +++ b/subsys/flatfile/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.3.0 + 2.3.1-SNAPSHOT indy-subsys-flatfile diff --git a/subsys/git/pom.xml b/subsys/git/pom.xml index af288ea205..f8bac07685 100644 --- a/subsys/git/pom.xml +++ b/subsys/git/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.3.0 + 2.3.1-SNAPSHOT indy-subsys-git diff --git a/subsys/groovy/pom.xml b/subsys/groovy/pom.xml index c8c6fd40cd..62d3b3ed68 100644 --- a/subsys/groovy/pom.xml +++ b/subsys/groovy/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.3.0 + 2.3.1-SNAPSHOT indy-subsys-groovy diff --git a/subsys/honeycomb/pom.xml b/subsys/honeycomb/pom.xml index 3aa86532c7..a932d7e27f 100644 --- a/subsys/honeycomb/pom.xml +++ b/subsys/honeycomb/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.3.0 + 2.3.1-SNAPSHOT 4.0.0 diff --git a/subsys/http/pom.xml b/subsys/http/pom.xml index 4abd44570a..25945f743f 100644 --- a/subsys/http/pom.xml +++ b/subsys/http/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.3.0 + 2.3.1-SNAPSHOT indy-subsys-http diff --git a/subsys/infinispan/pom.xml b/subsys/infinispan/pom.xml index 29fd78c9fc..d213f42fb4 100644 --- a/subsys/infinispan/pom.xml +++ b/subsys/infinispan/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.3.0 + 2.3.1-SNAPSHOT indy-subsys-infinispan diff --git a/subsys/jaxrs/pom.xml b/subsys/jaxrs/pom.xml index 486b88b10e..e1e08bc461 100644 --- a/subsys/jaxrs/pom.xml +++ b/subsys/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.3.0 + 2.3.1-SNAPSHOT indy-subsys-jaxrs diff --git a/subsys/kafka/pom.xml b/subsys/kafka/pom.xml index a718b0b115..5a23afa4d1 100644 --- a/subsys/kafka/pom.xml +++ b/subsys/kafka/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.3.0 + 2.3.1-SNAPSHOT 4.0.0 diff --git a/subsys/keycloak/pom.xml b/subsys/keycloak/pom.xml index f63fafc9d9..cdeb51792e 100644 --- a/subsys/keycloak/pom.xml +++ b/subsys/keycloak/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.3.0 + 2.3.1-SNAPSHOT indy-subsys-keycloak Indy :: Subsystems :: Keycloak diff --git a/subsys/metrics/core/pom.xml b/subsys/metrics/core/pom.xml index 4c551ef53f..ddbb94ac78 100644 --- a/subsys/metrics/core/pom.xml +++ b/subsys/metrics/core/pom.xml @@ -20,7 +20,7 @@ indy-subsys-metrics org.commonjava.indy - 2.3.0 + 2.3.1-SNAPSHOT 4.0.0 diff --git a/subsys/metrics/pom.xml b/subsys/metrics/pom.xml index d91a87e939..89b46754d2 100644 --- a/subsys/metrics/pom.xml +++ b/subsys/metrics/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.3.0 + 2.3.1-SNAPSHOT 4.0.0 diff --git a/subsys/metrics/prometheus/pom.xml b/subsys/metrics/prometheus/pom.xml index 6da400c1d7..c56966e0dd 100644 --- a/subsys/metrics/prometheus/pom.xml +++ b/subsys/metrics/prometheus/pom.xml @@ -20,7 +20,7 @@ indy-subsys-metrics org.commonjava.indy - 2.3.0 + 2.3.1-SNAPSHOT 4.0.0 diff --git a/subsys/metrics/reporter/pom.xml b/subsys/metrics/reporter/pom.xml index b80a434e7d..584e17f87e 100644 --- a/subsys/metrics/reporter/pom.xml +++ b/subsys/metrics/reporter/pom.xml @@ -20,7 +20,7 @@ indy-subsys-metrics org.commonjava.indy - 2.3.0 + 2.3.1-SNAPSHOT 4.0.0 diff --git a/subsys/pom.xml b/subsys/pom.xml index a631ec9126..52360c6b32 100644 --- a/subsys/pom.xml +++ b/subsys/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.0 + 2.3.1-SNAPSHOT indy-subsystems diff --git a/subsys/prefetch/pom.xml b/subsys/prefetch/pom.xml index 0da1b4edb8..5f51d1d0b3 100644 --- a/subsys/prefetch/pom.xml +++ b/subsys/prefetch/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.3.0 + 2.3.1-SNAPSHOT 4.0.0 diff --git a/test/db/pom.xml b/test/db/pom.xml index 2b19cadd7e..1facdfea1e 100644 --- a/test/db/pom.xml +++ b/test/db/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.3.0 + 2.3.1-SNAPSHOT indy-test-db diff --git a/test/fixtures-core/pom.xml b/test/fixtures-core/pom.xml index 092bc9c081..107ead7aea 100644 --- a/test/fixtures-core/pom.xml +++ b/test/fixtures-core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.3.0 + 2.3.1-SNAPSHOT indy-test-fixtures-core diff --git a/test/pom.xml b/test/pom.xml index 44c25d37e9..82249bae2e 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.0 + 2.3.1-SNAPSHOT indy-test diff --git a/test/providers-core/pom.xml b/test/providers-core/pom.xml index 41cfe037c6..86792ffb77 100644 --- a/test/providers-core/pom.xml +++ b/test/providers-core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.3.0 + 2.3.1-SNAPSHOT indy-test-providers-core diff --git a/test/utils/pom.xml b/test/utils/pom.xml index d3cc042c61..6e9c0d73b9 100644 --- a/test/utils/pom.xml +++ b/test/utils/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.3.0 + 2.3.1-SNAPSHOT indy-test-utils diff --git a/tools/assemblies/pom.xml b/tools/assemblies/pom.xml index 87f551981f..960fda790c 100644 --- a/tools/assemblies/pom.xml +++ b/tools/assemblies/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.tools indy-tools - 2.3.0 + 2.3.1-SNAPSHOT indy-assemblies diff --git a/tools/pom.xml b/tools/pom.xml index 77668a67d4..b5054289d2 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy.tools diff --git a/uis/layover/pom.xml b/uis/layover/pom.xml index 83bd37b954..7abf843373 100644 --- a/uis/layover/pom.xml +++ b/uis/layover/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.ui indy-uis - 2.3.0 + 2.3.1-SNAPSHOT indy-ui-layover diff --git a/uis/pom.xml b/uis/pom.xml index c0aa544ea1..f916f5a0b9 100644 --- a/uis/pom.xml +++ b/uis/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy.ui From 3adc35521052c24d1fff1a439ec97bb2119c1af8 Mon Sep 17 00:00:00 2001 From: shokakucarrier Date: Tue, 2 Jun 2020 09:19:08 +0000 Subject: [PATCH 20/50] [maven-release-plugin] prepare release indy-parent-2.3.0 --- addons/changelog/client-java/pom.xml | 2 +- addons/changelog/common/pom.xml | 2 +- addons/changelog/ftests/pom.xml | 2 +- addons/changelog/jaxrs/pom.xml | 2 +- addons/changelog/pom.xml | 2 +- addons/content-browse/client-java/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/event-audit/common/pom.xml | 2 +- addons/event-audit/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/path-mapped/common/pom.xml | 2 +- addons/path-mapped/jaxrs/pom.xml | 2 +- addons/path-mapped/model-java/pom.xml | 2 +- addons/path-mapped/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/repo-proxy/common/pom.xml | 2 +- addons/repo-proxy/ftests/pom.xml | 2 +- addons/repo-proxy/jaxrs/pom.xml | 2 +- addons/repo-proxy/pom.xml | 2 +- addons/revisions/common/pom.xml | 2 +- addons/revisions/jaxrs/pom.xml | 2 +- addons/revisions/pom.xml | 2 +- addons/sli/pom.xml | 2 +- api/pom.xml | 2 +- bindings/jaxrs/pom.xml | 2 +- bindings/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/common/pom.xml | 2 +- db/flat/pom.xml | 2 +- db/infinispan/pom.xml | 2 +- db/memory/pom.xml | 2 +- db/metrics/pom.xml | 2 +- db/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 | 254 +++++++++---------- rest/api/pom.xml | 2 +- rest/pom.xml | 2 +- subsys/cassandra/pom.xml | 2 +- subsys/cpool/pom.xml | 2 +- subsys/flatfile/pom.xml | 2 +- subsys/git/pom.xml | 2 +- subsys/groovy/pom.xml | 2 +- subsys/honeycomb/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/prometheus/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 +- 131 files changed, 257 insertions(+), 257 deletions(-) diff --git a/addons/changelog/client-java/pom.xml b/addons/changelog/client-java/pom.xml index de4dcddc8f..09e059c6d6 100644 --- a/addons/changelog/client-java/pom.xml +++ b/addons/changelog/client-java/pom.xml @@ -20,7 +20,7 @@ indy-changelog org.commonjava.indy - 2.3.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/addons/changelog/common/pom.xml b/addons/changelog/common/pom.xml index 4ce05ce260..9fd2efef29 100644 --- a/addons/changelog/common/pom.xml +++ b/addons/changelog/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.3.1-SNAPSHOT + 2.3.0 indy-changelog-common Indy :: Add-Ons :: ChangeLog :: Common diff --git a/addons/changelog/ftests/pom.xml b/addons/changelog/ftests/pom.xml index 8ba598ffe1..7dbabc5056 100644 --- a/addons/changelog/ftests/pom.xml +++ b/addons/changelog/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.3.1-SNAPSHOT + 2.3.0 indy-ftests-changelog diff --git a/addons/changelog/jaxrs/pom.xml b/addons/changelog/jaxrs/pom.xml index 2539db27e0..f29eea040e 100644 --- a/addons/changelog/jaxrs/pom.xml +++ b/addons/changelog/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.3.1-SNAPSHOT + 2.3.0 indy-changelog-jaxrs diff --git a/addons/changelog/pom.xml b/addons/changelog/pom.xml index 2ccd6f4218..a94b540dd6 100644 --- a/addons/changelog/pom.xml +++ b/addons/changelog/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.1-SNAPSHOT + 2.3.0 indy-changelog Indy :: Add-Ons :: ChangeLog :: Parent diff --git a/addons/content-browse/client-java/pom.xml b/addons/content-browse/client-java/pom.xml index b7de6b3324..3275dc2a3c 100644 --- a/addons/content-browse/client-java/pom.xml +++ b/addons/content-browse/client-java/pom.xml @@ -20,7 +20,7 @@ indy-content-browse org.commonjava.indy - 2.3.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/addons/content-browse/common/pom.xml b/addons/content-browse/common/pom.xml index e2d2c70965..6099f654aa 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 - 2.3.1-SNAPSHOT + 2.3.0 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 548c640515..499be7649d 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 - 2.3.1-SNAPSHOT + 2.3.0 indy-ftests-content-browse diff --git a/addons/content-browse/jaxrs/pom.xml b/addons/content-browse/jaxrs/pom.xml index 9669da119f..f986f86ca5 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 - 2.3.1-SNAPSHOT + 2.3.0 indy-content-browse-jaxrs diff --git a/addons/content-browse/model-java/pom.xml b/addons/content-browse/model-java/pom.xml index 90c82b69b5..554ac325ea 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 - 2.3.1-SNAPSHOT + 2.3.0 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 3a23b6ee98..ff2abd54e3 100644 --- a/addons/content-browse/pom.xml +++ b/addons/content-browse/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.1-SNAPSHOT + 2.3.0 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 4ef90168d8..048c14497e 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 - 2.3.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/addons/content-index/pom.xml b/addons/content-index/pom.xml index 00a808a086..1e51281a07 100644 --- a/addons/content-index/pom.xml +++ b/addons/content-index/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.1-SNAPSHOT + 2.3.0 indy-content-index diff --git a/addons/diagnostics/client-java/pom.xml b/addons/diagnostics/client-java/pom.xml index df820dd3b9..eb0275b636 100644 --- a/addons/diagnostics/client-java/pom.xml +++ b/addons/diagnostics/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.3.1-SNAPSHOT + 2.3.0 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 5a0d73adb6..30293043e2 100644 --- a/addons/diagnostics/common/pom.xml +++ b/addons/diagnostics/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.3.1-SNAPSHOT + 2.3.0 indy-diagnostics-common Indy :: Add-Ons :: Diagnostic Tools :: Common diff --git a/addons/diagnostics/ftests/pom.xml b/addons/diagnostics/ftests/pom.xml index 567444347c..22de3011f0 100644 --- a/addons/diagnostics/ftests/pom.xml +++ b/addons/diagnostics/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.3.1-SNAPSHOT + 2.3.0 indy-ftests-diagnostics diff --git a/addons/diagnostics/jaxrs/pom.xml b/addons/diagnostics/jaxrs/pom.xml index e2eb7cb76a..70aba53c86 100644 --- a/addons/diagnostics/jaxrs/pom.xml +++ b/addons/diagnostics/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.3.1-SNAPSHOT + 2.3.0 indy-diagnostics-jaxrs diff --git a/addons/diagnostics/pom.xml b/addons/diagnostics/pom.xml index 35fd1bac50..27155869c8 100644 --- a/addons/diagnostics/pom.xml +++ b/addons/diagnostics/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.1-SNAPSHOT + 2.3.0 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 5b3e7e279c..def6c2d35a 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 - 2.3.1-SNAPSHOT + 2.3.0 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 b6d9ef8a39..9be0a57fc1 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 - 2.3.1-SNAPSHOT + 2.3.0 indy-ftests-dot-maven diff --git a/addons/dot-maven/jaxrs/pom.xml b/addons/dot-maven/jaxrs/pom.xml index 5b88d335a8..02fc695fc5 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 - 2.3.1-SNAPSHOT + 2.3.0 indy-dot-maven-jaxrs diff --git a/addons/dot-maven/pom.xml b/addons/dot-maven/pom.xml index e296f1bb61..e1626a57ef 100644 --- a/addons/dot-maven/pom.xml +++ b/addons/dot-maven/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.1-SNAPSHOT + 2.3.0 indy-dot-maven diff --git a/addons/event-audit/common/pom.xml b/addons/event-audit/common/pom.xml index f5d836dbb1..8a457976b6 100644 --- a/addons/event-audit/common/pom.xml +++ b/addons/event-audit/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-event-audit - 2.3.1-SNAPSHOT + 2.3.0 indy-event-audit-common diff --git a/addons/event-audit/pom.xml b/addons/event-audit/pom.xml index 90770a4e31..7d4ff58aa9 100644 --- a/addons/event-audit/pom.xml +++ b/addons/event-audit/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.1-SNAPSHOT + 2.3.0 indy-event-audit diff --git a/addons/folo/client-java/pom.xml b/addons/folo/client-java/pom.xml index e42252fac4..b4151c3557 100644 --- a/addons/folo/client-java/pom.xml +++ b/addons/folo/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.3.1-SNAPSHOT + 2.3.0 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 d240f53f81..85cf71ac69 100644 --- a/addons/folo/common/pom.xml +++ b/addons/folo/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.3.1-SNAPSHOT + 2.3.0 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 12d81aabea..7389ca9c9e 100644 --- a/addons/folo/ftests/pom.xml +++ b/addons/folo/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.3.1-SNAPSHOT + 2.3.0 indy-ftests-folo diff --git a/addons/folo/jaxrs/pom.xml b/addons/folo/jaxrs/pom.xml index c212486856..c06223439d 100644 --- a/addons/folo/jaxrs/pom.xml +++ b/addons/folo/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.3.1-SNAPSHOT + 2.3.0 indy-folo-jaxrs diff --git a/addons/folo/model-java/pom.xml b/addons/folo/model-java/pom.xml index 1fef90c316..fc17e66a06 100644 --- a/addons/folo/model-java/pom.xml +++ b/addons/folo/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.3.1-SNAPSHOT + 2.3.0 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 be1296cb41..715502f064 100644 --- a/addons/folo/pom.xml +++ b/addons/folo/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.1-SNAPSHOT + 2.3.0 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 7d8db5d2c9..ef1c3923d0 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 - 2.3.1-SNAPSHOT + 2.3.0 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 77cf1ab180..6546c735ee 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 - 2.3.1-SNAPSHOT + 2.3.0 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 90d69b3413..b753e8d2e2 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 - 2.3.1-SNAPSHOT + 2.3.0 indy-ftests-hosted-by-archive diff --git a/addons/hosted-by-archive/jaxrs/pom.xml b/addons/hosted-by-archive/jaxrs/pom.xml index 702c31d048..1ce22eebbc 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 - 2.3.1-SNAPSHOT + 2.3.0 indy-hosted-by-archive-jaxrs diff --git a/addons/hosted-by-archive/pom.xml b/addons/hosted-by-archive/pom.xml index a6aacae656..f44da728de 100644 --- a/addons/hosted-by-archive/pom.xml +++ b/addons/hosted-by-archive/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.1-SNAPSHOT + 2.3.0 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 7646c3b1c3..e380b0d4c4 100644 --- a/addons/httprox/common/pom.xml +++ b/addons/httprox/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.3.1-SNAPSHOT + 2.3.0 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 2a8ec6b823..deb3d4065e 100644 --- a/addons/httprox/ftests/pom.xml +++ b/addons/httprox/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.3.1-SNAPSHOT + 2.3.0 indy-ftests-httprox diff --git a/addons/httprox/jaxrs/pom.xml b/addons/httprox/jaxrs/pom.xml index 0f595181d1..65fcc30594 100644 --- a/addons/httprox/jaxrs/pom.xml +++ b/addons/httprox/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.3.1-SNAPSHOT + 2.3.0 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 76fd6dd9e4..f6101dc202 100644 --- a/addons/httprox/pom.xml +++ b/addons/httprox/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.1-SNAPSHOT + 2.3.0 indy-httprox diff --git a/addons/implied-repos/client-java/pom.xml b/addons/implied-repos/client-java/pom.xml index f779d8454b..aaa1fdb2d7 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 - 2.3.1-SNAPSHOT + 2.3.0 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 b50bdd41fd..02f8ef6591 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 - 2.3.1-SNAPSHOT + 2.3.0 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 9eb3b6e472..4b685069e1 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 - 2.3.1-SNAPSHOT + 2.3.0 indy-ftests-implied-repos diff --git a/addons/implied-repos/model-java/pom.xml b/addons/implied-repos/model-java/pom.xml index 8914076fd0..5afc2d4e8a 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 - 2.3.1-SNAPSHOT + 2.3.0 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 9122cd173e..02155aeb24 100644 --- a/addons/implied-repos/pom.xml +++ b/addons/implied-repos/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.1-SNAPSHOT + 2.3.0 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 c211df3729..3d21a4700a 100644 --- a/addons/koji/client-java/pom.xml +++ b/addons/koji/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.3.1-SNAPSHOT + 2.3.0 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 7ebe8f05ad..923d4c66d1 100644 --- a/addons/koji/common/pom.xml +++ b/addons/koji/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.3.1-SNAPSHOT + 2.3.0 indy-koji-common Indy :: Add-Ons :: Koji Integration :: Common diff --git a/addons/koji/jaxrs/pom.xml b/addons/koji/jaxrs/pom.xml index 609fcc4597..7d0a000263 100644 --- a/addons/koji/jaxrs/pom.xml +++ b/addons/koji/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.3.1-SNAPSHOT + 2.3.0 indy-koji-jaxrs diff --git a/addons/koji/model-java/pom.xml b/addons/koji/model-java/pom.xml index 3ffeee42c9..11f70b4a68 100644 --- a/addons/koji/model-java/pom.xml +++ b/addons/koji/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.3.1-SNAPSHOT + 2.3.0 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 c9f208f28f..a2c41ea128 100644 --- a/addons/koji/pom.xml +++ b/addons/koji/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.1-SNAPSHOT + 2.3.0 indy-koji Indy :: Add-Ons :: Koji Integration :: Parent diff --git a/addons/path-mapped/common/pom.xml b/addons/path-mapped/common/pom.xml index ea66e28b6e..acc88bf236 100644 --- a/addons/path-mapped/common/pom.xml +++ b/addons/path-mapped/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.3.1-SNAPSHOT + 2.3.0 indy-path-mapped-common diff --git a/addons/path-mapped/jaxrs/pom.xml b/addons/path-mapped/jaxrs/pom.xml index 2f147f7157..887335f872 100644 --- a/addons/path-mapped/jaxrs/pom.xml +++ b/addons/path-mapped/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.3.1-SNAPSHOT + 2.3.0 indy-path-mapped-jaxrs diff --git a/addons/path-mapped/model-java/pom.xml b/addons/path-mapped/model-java/pom.xml index ca6d1a6e32..603f241172 100644 --- a/addons/path-mapped/model-java/pom.xml +++ b/addons/path-mapped/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.3.1-SNAPSHOT + 2.3.0 indy-path-mapped-model-java diff --git a/addons/path-mapped/pom.xml b/addons/path-mapped/pom.xml index 9aa2d57ccd..a7b6a0e9cc 100644 --- a/addons/path-mapped/pom.xml +++ b/addons/path-mapped/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.1-SNAPSHOT + 2.3.0 indy-path-mapped Indy :: Add-Ons :: Path Mapped :: Parent diff --git a/addons/pkg-maven/common/pom.xml b/addons/pkg-maven/common/pom.xml index 0f9f2fcfbb..f9f52dbed7 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 - 2.3.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/addons/pkg-maven/ftests/pom.xml b/addons/pkg-maven/ftests/pom.xml index 555fc341e5..410401acac 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 - 2.3.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/addons/pkg-maven/jaxrs/pom.xml b/addons/pkg-maven/jaxrs/pom.xml index fb95ddb2ea..83dbc94b0f 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 - 2.3.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/addons/pkg-maven/pom.xml b/addons/pkg-maven/pom.xml index c8da871908..a6e11ee82e 100644 --- a/addons/pkg-maven/pom.xml +++ b/addons/pkg-maven/pom.xml @@ -20,7 +20,7 @@ indy-addons org.commonjava.indy - 2.3.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/addons/pkg-npm/common/pom.xml b/addons/pkg-npm/common/pom.xml index d73550364f..362dc0fc67 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 - 2.3.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/addons/pkg-npm/ftests/pom.xml b/addons/pkg-npm/ftests/pom.xml index aaefabc144..3c30d7af9f 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 - 2.3.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/addons/pkg-npm/jaxrs/pom.xml b/addons/pkg-npm/jaxrs/pom.xml index ab5d85a94c..1f974ee013 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 - 2.3.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/addons/pkg-npm/model-java/pom.xml b/addons/pkg-npm/model-java/pom.xml index e792c57e6f..7df3c3c0ef 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 - 2.3.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/addons/pkg-npm/pom.xml b/addons/pkg-npm/pom.xml index 96acdd61dd..d0b8b55727 100644 --- a/addons/pkg-npm/pom.xml +++ b/addons/pkg-npm/pom.xml @@ -20,7 +20,7 @@ indy-addons org.commonjava.indy - 2.3.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/addons/pom.xml b/addons/pom.xml index 4e65ca8d94..d583462ce5 100644 --- a/addons/pom.xml +++ b/addons/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-parent - 2.3.1-SNAPSHOT + 2.3.0 indy-addons diff --git a/addons/promote/client-java/pom.xml b/addons/promote/client-java/pom.xml index 5bc00e55e5..442282cb65 100644 --- a/addons/promote/client-java/pom.xml +++ b/addons/promote/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.3.1-SNAPSHOT + 2.3.0 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 3a2a63c42b..89cb65bf3d 100644 --- a/addons/promote/common/pom.xml +++ b/addons/promote/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.3.1-SNAPSHOT + 2.3.0 indy-promote-common Indy :: Add-Ons :: Artifact Promotion :: Common diff --git a/addons/promote/ftests/pom.xml b/addons/promote/ftests/pom.xml index 73e868b2c0..95749f15f8 100644 --- a/addons/promote/ftests/pom.xml +++ b/addons/promote/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.3.1-SNAPSHOT + 2.3.0 indy-ftests-promote diff --git a/addons/promote/jaxrs/pom.xml b/addons/promote/jaxrs/pom.xml index a94f79f8e7..d934be4708 100644 --- a/addons/promote/jaxrs/pom.xml +++ b/addons/promote/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.3.1-SNAPSHOT + 2.3.0 indy-promote-jaxrs diff --git a/addons/promote/model-java/pom.xml b/addons/promote/model-java/pom.xml index 4b82e9ae91..c305809e75 100644 --- a/addons/promote/model-java/pom.xml +++ b/addons/promote/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.3.1-SNAPSHOT + 2.3.0 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 b72722127b..e8f19fa746 100644 --- a/addons/promote/pom.xml +++ b/addons/promote/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.1-SNAPSHOT + 2.3.0 indy-promote Indy :: Add-Ons :: Artifact Promotion :: Parent diff --git a/addons/repo-proxy/common/pom.xml b/addons/repo-proxy/common/pom.xml index 04cc76f311..3fc1ca2bd5 100644 --- a/addons/repo-proxy/common/pom.xml +++ b/addons/repo-proxy/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-repo-proxy - 2.3.1-SNAPSHOT + 2.3.0 indy-repo-proxy-common Indy :: Add-Ons :: Repository-Proxy :: Common diff --git a/addons/repo-proxy/ftests/pom.xml b/addons/repo-proxy/ftests/pom.xml index 1880a1fdc3..217bc68ac9 100644 --- a/addons/repo-proxy/ftests/pom.xml +++ b/addons/repo-proxy/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-repo-proxy - 2.3.1-SNAPSHOT + 2.3.0 indy-ftests-repo-proxy diff --git a/addons/repo-proxy/jaxrs/pom.xml b/addons/repo-proxy/jaxrs/pom.xml index 1046b1e795..cd57139326 100644 --- a/addons/repo-proxy/jaxrs/pom.xml +++ b/addons/repo-proxy/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-repo-proxy - 2.3.1-SNAPSHOT + 2.3.0 indy-repo-proxy-jaxrs diff --git a/addons/repo-proxy/pom.xml b/addons/repo-proxy/pom.xml index e537a14ab7..581e3f254e 100644 --- a/addons/repo-proxy/pom.xml +++ b/addons/repo-proxy/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.1-SNAPSHOT + 2.3.0 indy-repo-proxy Indy :: Add-Ons :: Repository-Proxy :: Parent diff --git a/addons/revisions/common/pom.xml b/addons/revisions/common/pom.xml index 96ce90f263..a8ddc3ebfd 100644 --- a/addons/revisions/common/pom.xml +++ b/addons/revisions/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-revisions - 2.3.1-SNAPSHOT + 2.3.0 indy-revisions-common Indy :: Add-Ons :: Revisions :: Common diff --git a/addons/revisions/jaxrs/pom.xml b/addons/revisions/jaxrs/pom.xml index 379e28efc7..abe50652c1 100644 --- a/addons/revisions/jaxrs/pom.xml +++ b/addons/revisions/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-revisions - 2.3.1-SNAPSHOT + 2.3.0 indy-revisions-jaxrs diff --git a/addons/revisions/pom.xml b/addons/revisions/pom.xml index d016402cef..31ef179b51 100644 --- a/addons/revisions/pom.xml +++ b/addons/revisions/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.1-SNAPSHOT + 2.3.0 indy-revisions Indy :: Add-Ons :: Revisions :: Parent diff --git a/addons/sli/pom.xml b/addons/sli/pom.xml index 449ae2c258..942341733e 100644 --- a/addons/sli/pom.xml +++ b/addons/sli/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.1-SNAPSHOT + 2.3.0 indy-sli Indy :: Add-Ons :: Service Level Indicators Reporting :: JAX-RS diff --git a/api/pom.xml b/api/pom.xml index 58048edacf..e257dc753c 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.1-SNAPSHOT + 2.3.0 indy-api diff --git a/bindings/jaxrs/pom.xml b/bindings/jaxrs/pom.xml index 46679ad14b..cd85bc994e 100644 --- a/bindings/jaxrs/pom.xml +++ b/bindings/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-bindings - 2.3.1-SNAPSHOT + 2.3.0 indy-bindings-jaxrs diff --git a/bindings/pom.xml b/bindings/pom.xml index 7e3a87f446..45c7c3cd33 100644 --- a/bindings/pom.xml +++ b/bindings/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-parent - 2.3.1-SNAPSHOT + 2.3.0 indy-bindings diff --git a/boot/jaxrs/pom.xml b/boot/jaxrs/pom.xml index a5af953903..bc88ecfa7c 100644 --- a/boot/jaxrs/pom.xml +++ b/boot/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.boot indy-booters - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy.boot diff --git a/boot/pom.xml b/boot/pom.xml index 90531e11dd..02413e47de 100644 --- a/boot/pom.xml +++ b/boot/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy.boot diff --git a/clients/core-java/pom.xml b/clients/core-java/pom.xml index ea39c07326..eed9089e21 100644 --- a/clients/core-java/pom.xml +++ b/clients/core-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-clients-parent - 2.3.1-SNAPSHOT + 2.3.0 indy-client-core-java diff --git a/clients/pom.xml b/clients/pom.xml index f6324186ab..dfd582f6e1 100644 --- a/clients/pom.xml +++ b/clients/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.1-SNAPSHOT + 2.3.0 indy-clients-parent diff --git a/core/pom.xml b/core/pom.xml index 67cf6913d9..5765559abc 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.1-SNAPSHOT + 2.3.0 indy-core diff --git a/db/common/pom.xml b/db/common/pom.xml index c78e04fed9..c2f223f054 100644 --- a/db/common/pom.xml +++ b/db/common/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-db - 2.3.1-SNAPSHOT + 2.3.0 indy-db-common diff --git a/db/flat/pom.xml b/db/flat/pom.xml index e8010d8ad2..6559e60bca 100644 --- a/db/flat/pom.xml +++ b/db/flat/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.3.1-SNAPSHOT + 2.3.0 indy-db-flat diff --git a/db/infinispan/pom.xml b/db/infinispan/pom.xml index 19cf6022fa..bf2fd3e16d 100644 --- a/db/infinispan/pom.xml +++ b/db/infinispan/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-db - 2.3.1-SNAPSHOT + 2.3.0 indy-db-infinispan diff --git a/db/memory/pom.xml b/db/memory/pom.xml index 4999f14df9..c746862dee 100644 --- a/db/memory/pom.xml +++ b/db/memory/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.3.1-SNAPSHOT + 2.3.0 indy-db-memory diff --git a/db/metrics/pom.xml b/db/metrics/pom.xml index 48abcbf8d4..3b48971250 100644 --- a/db/metrics/pom.xml +++ b/db/metrics/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.3.1-SNAPSHOT + 2.3.0 indy-db-metrics diff --git a/db/pom.xml b/db/pom.xml index 81e5b9e841..98fbb8d219 100644 --- a/db/pom.xml +++ b/db/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.1-SNAPSHOT + 2.3.0 indy-db diff --git a/deployments/launcher/pom.xml b/deployments/launcher/pom.xml index acf0fe643a..1376e27362 100644 --- a/deployments/launcher/pom.xml +++ b/deployments/launcher/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-deployments - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy.launch diff --git a/deployments/pom.xml b/deployments/pom.xml index 41d0e1d7fb..afc13247ad 100644 --- a/deployments/pom.xml +++ b/deployments/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.1-SNAPSHOT + 2.3.0 indy-deployments diff --git a/embedder/pom.xml b/embedder/pom.xml index 32a320e34b..a4c52d9981 100644 --- a/embedder/pom.xml +++ b/embedder/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy.embed diff --git a/filers/default/pom.xml b/filers/default/pom.xml index 91e90f0022..9de0979761 100644 --- a/filers/default/pom.xml +++ b/filers/default/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-file-managers - 2.3.1-SNAPSHOT + 2.3.0 indy-filer-default diff --git a/filers/pom.xml b/filers/pom.xml index 4b320f8392..1138a48864 100644 --- a/filers/pom.xml +++ b/filers/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.1-SNAPSHOT + 2.3.0 indy-file-managers diff --git a/ftests/common/pom.xml b/ftests/common/pom.xml index 907b7ad17b..f48a64b0b7 100644 --- a/ftests/common/pom.xml +++ b/ftests/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-ftests-parent - 2.3.1-SNAPSHOT + 2.3.0 indy-ftests-common diff --git a/ftests/core/pom.xml b/ftests/core/pom.xml index 8986980eb5..4cf506ae80 100644 --- a/ftests/core/pom.xml +++ b/ftests/core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-ftests-parent - 2.3.1-SNAPSHOT + 2.3.0 indy-ftests-core diff --git a/ftests/metrics/pom.xml b/ftests/metrics/pom.xml index ee09db0ceb..c3afd2799d 100644 --- a/ftests/metrics/pom.xml +++ b/ftests/metrics/pom.xml @@ -20,7 +20,7 @@ indy-ftests-parent org.commonjava.indy - 2.3.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/ftests/pom.xml b/ftests/pom.xml index 22c72fb756..a22666292c 100644 --- a/ftests/pom.xml +++ b/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.1-SNAPSHOT + 2.3.0 indy-ftests-parent diff --git a/models/core-java/pom.xml b/models/core-java/pom.xml index 8200f5d14d..824f03bba1 100644 --- a/models/core-java/pom.xml +++ b/models/core-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-models-parent - 2.3.1-SNAPSHOT + 2.3.0 indy-model-core-java diff --git a/models/pom.xml b/models/pom.xml index 72433f7ed5..f697237fc3 100644 --- a/models/pom.xml +++ b/models/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.1-SNAPSHOT + 2.3.0 indy-models-parent diff --git a/pom.xml b/pom.xml index 33e31c424e..8e3c3b0a91 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.commonjava.indy indy-parent - 2.3.1-SNAPSHOT + 2.3.0 pom @@ -37,7 +37,7 @@ scm:git:https://github.com/CommonJava/indy scm:git:https://github.com/CommonJava/indy http://github.com/Commonjava/indy - HEAD + indy-parent-2.3.0 @@ -187,7 +187,7 @@ org.commonjava.indy.ui indy-ui-layover - 2.3.1-SNAPSHOT + 2.3.0 runtime @@ -195,22 +195,22 @@ org.commonjava.indy indy-model-core-java - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-api - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-core - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-core - 2.3.1-SNAPSHOT + 2.3.0 tar.gz confset provided @@ -218,32 +218,32 @@ org.commonjava.indy indy-db-flat - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-db-metrics - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-db-common - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-db-infinispan - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-bindings-jaxrs - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy.launch indy-launcher - 2.3.1-SNAPSHOT + 2.3.0 tar.gz skinny provided @@ -251,7 +251,7 @@ org.commonjava.indy.launch indy-launcher - 2.3.1-SNAPSHOT + 2.3.0 tar.gz complete provided @@ -259,7 +259,7 @@ org.commonjava.indy.launch indy-launcher - 2.3.1-SNAPSHOT + 2.3.0 tar.gz data provided @@ -267,7 +267,7 @@ org.commonjava.indy.launch indy-launcher - 2.3.1-SNAPSHOT + 2.3.0 tar.gz etc provided @@ -276,17 +276,17 @@ org.commonjava.indy indy-revisions-jaxrs - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-revisions-common - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-revisions-common - 2.3.1-SNAPSHOT + 2.3.0 tar.gz confset provided @@ -294,7 +294,7 @@ org.commonjava.indy indy-revisions-common - 2.3.1-SNAPSHOT + 2.3.0 tar.gz uiset provided @@ -302,12 +302,12 @@ org.commonjava.indy indy-dot-maven-common - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-dot-maven-common - 2.3.1-SNAPSHOT + 2.3.0 tar.gz dataset provided @@ -315,22 +315,22 @@ org.commonjava.indy indy-dot-maven-jaxrs - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-ftests-dot-maven - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-httprox-common - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-httprox-common - 2.3.1-SNAPSHOT + 2.3.0 tar.gz confset provided @@ -338,17 +338,17 @@ org.commonjava.indy indy-ftests-httprox - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-content-index - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-content-index - 2.3.1-SNAPSHOT + 2.3.0 tar.gz confset provided @@ -356,51 +356,51 @@ org.commonjava.indy indy-db-memory - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-test-db - 2.3.1-SNAPSHOT + 2.3.0 test org.commonjava.indy indy-test-fixtures-core - 2.3.1-SNAPSHOT + 2.3.0 test org.commonjava.indy indy-test-providers-core - 2.3.1-SNAPSHOT + 2.3.0 test org.commonjava.indy indy-test-utils - 2.3.1-SNAPSHOT + 2.3.0 test org.commonjava.indy indy-filer-default - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-subsys-jaxrs - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-subsys-honeycomb - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-subsys-honeycomb - 2.3.1-SNAPSHOT + 2.3.0 tar.gz confset provided @@ -408,17 +408,17 @@ org.commonjava.indy indy-subsys-flatfile - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-subsys-cassandra - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-subsys-cassandra - 2.3.1-SNAPSHOT + 2.3.0 tar.gz confset provided @@ -426,79 +426,79 @@ org.commonjava.indy indy-subsys-infinispan - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-subsys-http - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-subsys-git - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-subsys-groovy - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-subsys-prefetch - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-subsys-cpool - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-client-core-java - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-ftests-common - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-ftests-core - 2.3.1-SNAPSHOT + 2.3.0 test org.commonjava.indy indy-folo-jaxrs - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-ftests-folo - 2.3.1-SNAPSHOT + 2.3.0 test org.commonjava.indy indy-folo-client-java - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-folo-model-java - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-folo-common - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-folo-common - 2.3.1-SNAPSHOT + 2.3.0 tar.gz dataset provided @@ -506,7 +506,7 @@ org.commonjava.indy indy-folo-common - 2.3.1-SNAPSHOT + 2.3.0 tar.gz confset provided @@ -514,33 +514,33 @@ org.commonjava.indy indy-promote-jaxrs - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-ftests-promote - 2.3.1-SNAPSHOT + 2.3.0 test org.commonjava.indy indy-promote-client-java - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-promote-model-java - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-promote-common - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-promote-common - 2.3.1-SNAPSHOT + 2.3.0 tar.gz confset provided @@ -548,7 +548,7 @@ org.commonjava.indy indy-promote-common - 2.3.1-SNAPSHOT + 2.3.0 tar.gz dataset provided @@ -556,19 +556,19 @@ org.commonjava.indy indy-promote-common - 2.3.1-SNAPSHOT + 2.3.0 dataset provided org.commonjava.indy indy-implied-repos-common - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-implied-repos-common - 2.3.1-SNAPSHOT + 2.3.0 tar.gz confset provided @@ -576,37 +576,37 @@ org.commonjava.indy indy-implied-repos-model-java - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-implied-repos-client-java - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-ftests-implied-repos - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy.embed indy-embedder - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy.boot indy-booter-jaxrs - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-subsys-keycloak - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-subsys-keycloak - 2.3.1-SNAPSHOT + 2.3.0 tar.gz confset provided @@ -614,7 +614,7 @@ org.commonjava.indy indy-subsys-infinispan - 2.3.1-SNAPSHOT + 2.3.0 tar.gz confset provided @@ -622,7 +622,7 @@ org.commonjava.indy indy-subsys-prefetch - 2.3.1-SNAPSHOT + 2.3.0 tar.gz confset provided @@ -631,7 +631,7 @@ org.commonjava.indy indy-koji-common - 2.3.1-SNAPSHOT + 2.3.0 tar.gz confset provided @@ -639,103 +639,103 @@ org.commonjava.indy indy-koji-common - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-koji-model-java - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-koji-client-java - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-koji-jaxrs - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-path-mapped-common - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-path-mapped-model-java - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-path-mapped-jaxrs - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-pkg-maven-common - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-pkg-maven-jaxrs - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-pkg-npm-jaxrs - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-ftests-pkg-maven - 2.3.1-SNAPSHOT + 2.3.0 test org.commonjava.indy indy-ftests-pkg-npm - 2.3.1-SNAPSHOT + 2.3.0 test org.commonjava.indy indy-pkg-npm-common - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-pkg-npm-model-java - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-diagnostics-jaxrs - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-diagnostics-client-java - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-diagnostics-common - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-ftests-diagnostics - 2.3.1-SNAPSHOT + 2.3.0 test org.commonjava.indy indy-diagnostics-common - 2.3.1-SNAPSHOT + 2.3.0 confset tar.gz provided @@ -743,28 +743,28 @@ org.commonjava.indy indy-hosted-by-archive-common - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-hosted-by-archive-client-java - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-ftests-hosted-by-archive - 2.3.1-SNAPSHOT + 2.3.0 test org.commonjava.indy indy-hosted-by-archive-jaxrs - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-hosted-by-archive-common - 2.3.1-SNAPSHOT + 2.3.0 confset tar.gz @@ -772,22 +772,22 @@ org.commonjava.indy indy-subsys-metrics-core - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-subsys-metrics-reporter - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-subsys-metrics-prometheus - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-subsys-metrics-reporter - 2.3.1-SNAPSHOT + 2.3.0 confset tar.gz provided @@ -796,28 +796,28 @@ org.commonjava.indy indy-ftests-metrics - 2.3.1-SNAPSHOT + 2.3.0 test org.commonjava.indy indy-sli - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy.rest indy-rest-api yaml - 2.3.1-SNAPSHOT + 2.3.0 provided org.commonjava.indy.rest indy-rest-api json - 2.3.1-SNAPSHOT + 2.3.0 provided @@ -851,33 +851,33 @@ org.commonjava.indy indy-content-browse-common - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-content-browse-jaxrs - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-ftests-content-browse - 2.3.1-SNAPSHOT + 2.3.0 test org.commonjava.indy indy-content-browse-model-java - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-content-browse-client-java - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-content-browse-common - 2.3.1-SNAPSHOT + 2.3.0 confset tar.gz provided @@ -885,35 +885,35 @@ org.commonjava.indy indy-content-browse-ui - 2.3.1-SNAPSHOT + 2.3.0 reactui tar.gz org.commonjava.indy indy-changelog-common - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-changelog-client-java - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-ftests-changelog - 2.3.1-SNAPSHOT + 2.3.0 test org.commonjava.indy indy-changelog-jaxrs - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-changelog-common - 2.3.1-SNAPSHOT + 2.3.0 confset tar.gz @@ -931,12 +931,12 @@ org.commonjava.indy indy-event-audit-common - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-event-audit-common - 2.3.1-SNAPSHOT + 2.3.0 confset tar.gz provided @@ -951,23 +951,23 @@ org.commonjava.indy indy-repo-proxy-common - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-repo-proxy-jaxrs - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-ftests-repo-proxy - 2.3.1-SNAPSHOT + 2.3.0 test org.commonjava.indy indy-repo-proxy-common - 2.3.1-SNAPSHOT + 2.3.0 confset tar.gz diff --git a/rest/api/pom.xml b/rest/api/pom.xml index 4b66e85070..fe60ed482c 100644 --- a/rest/api/pom.xml +++ b/rest/api/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.rest indy-rest-parent - 2.3.1-SNAPSHOT + 2.3.0 indy-rest-api diff --git a/rest/pom.xml b/rest/pom.xml index 988dcceeca..cec45f016d 100644 --- a/rest/pom.xml +++ b/rest/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy.rest diff --git a/subsys/cassandra/pom.xml b/subsys/cassandra/pom.xml index 2a3dc93d37..d516f22c88 100644 --- a/subsys/cassandra/pom.xml +++ b/subsys/cassandra/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-subsystems - 2.3.1-SNAPSHOT + 2.3.0 indy-subsys-cassandra diff --git a/subsys/cpool/pom.xml b/subsys/cpool/pom.xml index bcd01527cc..568d0dde85 100644 --- a/subsys/cpool/pom.xml +++ b/subsys/cpool/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.3.1-SNAPSHOT + 2.3.0 indy-subsys-cpool diff --git a/subsys/flatfile/pom.xml b/subsys/flatfile/pom.xml index 51d0faeecb..6df172be83 100644 --- a/subsys/flatfile/pom.xml +++ b/subsys/flatfile/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.3.1-SNAPSHOT + 2.3.0 indy-subsys-flatfile diff --git a/subsys/git/pom.xml b/subsys/git/pom.xml index f8bac07685..af288ea205 100644 --- a/subsys/git/pom.xml +++ b/subsys/git/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.3.1-SNAPSHOT + 2.3.0 indy-subsys-git diff --git a/subsys/groovy/pom.xml b/subsys/groovy/pom.xml index 62d3b3ed68..c8c6fd40cd 100644 --- a/subsys/groovy/pom.xml +++ b/subsys/groovy/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.3.1-SNAPSHOT + 2.3.0 indy-subsys-groovy diff --git a/subsys/honeycomb/pom.xml b/subsys/honeycomb/pom.xml index a932d7e27f..3aa86532c7 100644 --- a/subsys/honeycomb/pom.xml +++ b/subsys/honeycomb/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.3.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/subsys/http/pom.xml b/subsys/http/pom.xml index 25945f743f..4abd44570a 100644 --- a/subsys/http/pom.xml +++ b/subsys/http/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.3.1-SNAPSHOT + 2.3.0 indy-subsys-http diff --git a/subsys/infinispan/pom.xml b/subsys/infinispan/pom.xml index d213f42fb4..29fd78c9fc 100644 --- a/subsys/infinispan/pom.xml +++ b/subsys/infinispan/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.3.1-SNAPSHOT + 2.3.0 indy-subsys-infinispan diff --git a/subsys/jaxrs/pom.xml b/subsys/jaxrs/pom.xml index e1e08bc461..486b88b10e 100644 --- a/subsys/jaxrs/pom.xml +++ b/subsys/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.3.1-SNAPSHOT + 2.3.0 indy-subsys-jaxrs diff --git a/subsys/kafka/pom.xml b/subsys/kafka/pom.xml index 5a23afa4d1..a718b0b115 100644 --- a/subsys/kafka/pom.xml +++ b/subsys/kafka/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.3.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/subsys/keycloak/pom.xml b/subsys/keycloak/pom.xml index cdeb51792e..f63fafc9d9 100644 --- a/subsys/keycloak/pom.xml +++ b/subsys/keycloak/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.3.1-SNAPSHOT + 2.3.0 indy-subsys-keycloak Indy :: Subsystems :: Keycloak diff --git a/subsys/metrics/core/pom.xml b/subsys/metrics/core/pom.xml index ddbb94ac78..4c551ef53f 100644 --- a/subsys/metrics/core/pom.xml +++ b/subsys/metrics/core/pom.xml @@ -20,7 +20,7 @@ indy-subsys-metrics org.commonjava.indy - 2.3.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/subsys/metrics/pom.xml b/subsys/metrics/pom.xml index 89b46754d2..d91a87e939 100644 --- a/subsys/metrics/pom.xml +++ b/subsys/metrics/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.3.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/subsys/metrics/prometheus/pom.xml b/subsys/metrics/prometheus/pom.xml index c56966e0dd..6da400c1d7 100644 --- a/subsys/metrics/prometheus/pom.xml +++ b/subsys/metrics/prometheus/pom.xml @@ -20,7 +20,7 @@ indy-subsys-metrics org.commonjava.indy - 2.3.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/subsys/metrics/reporter/pom.xml b/subsys/metrics/reporter/pom.xml index 584e17f87e..b80a434e7d 100644 --- a/subsys/metrics/reporter/pom.xml +++ b/subsys/metrics/reporter/pom.xml @@ -20,7 +20,7 @@ indy-subsys-metrics org.commonjava.indy - 2.3.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/subsys/pom.xml b/subsys/pom.xml index 52360c6b32..a631ec9126 100644 --- a/subsys/pom.xml +++ b/subsys/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.1-SNAPSHOT + 2.3.0 indy-subsystems diff --git a/subsys/prefetch/pom.xml b/subsys/prefetch/pom.xml index 5f51d1d0b3..0da1b4edb8 100644 --- a/subsys/prefetch/pom.xml +++ b/subsys/prefetch/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.3.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/test/db/pom.xml b/test/db/pom.xml index 1facdfea1e..2b19cadd7e 100644 --- a/test/db/pom.xml +++ b/test/db/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.3.1-SNAPSHOT + 2.3.0 indy-test-db diff --git a/test/fixtures-core/pom.xml b/test/fixtures-core/pom.xml index 107ead7aea..092bc9c081 100644 --- a/test/fixtures-core/pom.xml +++ b/test/fixtures-core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.3.1-SNAPSHOT + 2.3.0 indy-test-fixtures-core diff --git a/test/pom.xml b/test/pom.xml index 82249bae2e..44c25d37e9 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.1-SNAPSHOT + 2.3.0 indy-test diff --git a/test/providers-core/pom.xml b/test/providers-core/pom.xml index 86792ffb77..41cfe037c6 100644 --- a/test/providers-core/pom.xml +++ b/test/providers-core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.3.1-SNAPSHOT + 2.3.0 indy-test-providers-core diff --git a/test/utils/pom.xml b/test/utils/pom.xml index 6e9c0d73b9..d3cc042c61 100644 --- a/test/utils/pom.xml +++ b/test/utils/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.3.1-SNAPSHOT + 2.3.0 indy-test-utils diff --git a/tools/assemblies/pom.xml b/tools/assemblies/pom.xml index 960fda790c..87f551981f 100644 --- a/tools/assemblies/pom.xml +++ b/tools/assemblies/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.tools indy-tools - 2.3.1-SNAPSHOT + 2.3.0 indy-assemblies diff --git a/tools/pom.xml b/tools/pom.xml index b5054289d2..77668a67d4 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy.tools diff --git a/uis/layover/pom.xml b/uis/layover/pom.xml index 7abf843373..83bd37b954 100644 --- a/uis/layover/pom.xml +++ b/uis/layover/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.ui indy-uis - 2.3.1-SNAPSHOT + 2.3.0 indy-ui-layover diff --git a/uis/pom.xml b/uis/pom.xml index f916f5a0b9..c0aa544ea1 100644 --- a/uis/pom.xml +++ b/uis/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy.ui From e14777c00010493b1202679a3b37274a07629437 Mon Sep 17 00:00:00 2001 From: liyu Date: Tue, 2 Jun 2020 17:40:31 +0800 Subject: [PATCH 21/50] Revert "[maven-release-plugin] prepare release indy-parent-2.3.0" This reverts commit 3adc35521052c24d1fff1a439ec97bb2119c1af8. --- addons/changelog/client-java/pom.xml | 2 +- addons/changelog/common/pom.xml | 2 +- addons/changelog/ftests/pom.xml | 2 +- addons/changelog/jaxrs/pom.xml | 2 +- addons/changelog/pom.xml | 2 +- addons/content-browse/client-java/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/event-audit/common/pom.xml | 2 +- addons/event-audit/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/path-mapped/common/pom.xml | 2 +- addons/path-mapped/jaxrs/pom.xml | 2 +- addons/path-mapped/model-java/pom.xml | 2 +- addons/path-mapped/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/repo-proxy/common/pom.xml | 2 +- addons/repo-proxy/ftests/pom.xml | 2 +- addons/repo-proxy/jaxrs/pom.xml | 2 +- addons/repo-proxy/pom.xml | 2 +- addons/revisions/common/pom.xml | 2 +- addons/revisions/jaxrs/pom.xml | 2 +- addons/revisions/pom.xml | 2 +- addons/sli/pom.xml | 2 +- api/pom.xml | 2 +- bindings/jaxrs/pom.xml | 2 +- bindings/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/common/pom.xml | 2 +- db/flat/pom.xml | 2 +- db/infinispan/pom.xml | 2 +- db/memory/pom.xml | 2 +- db/metrics/pom.xml | 2 +- db/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 | 254 +++++++++---------- rest/api/pom.xml | 2 +- rest/pom.xml | 2 +- subsys/cassandra/pom.xml | 2 +- subsys/cpool/pom.xml | 2 +- subsys/flatfile/pom.xml | 2 +- subsys/git/pom.xml | 2 +- subsys/groovy/pom.xml | 2 +- subsys/honeycomb/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/prometheus/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 +- 131 files changed, 257 insertions(+), 257 deletions(-) diff --git a/addons/changelog/client-java/pom.xml b/addons/changelog/client-java/pom.xml index 09e059c6d6..de4dcddc8f 100644 --- a/addons/changelog/client-java/pom.xml +++ b/addons/changelog/client-java/pom.xml @@ -20,7 +20,7 @@ indy-changelog org.commonjava.indy - 2.3.0 + 2.3.1-SNAPSHOT 4.0.0 diff --git a/addons/changelog/common/pom.xml b/addons/changelog/common/pom.xml index 9fd2efef29..4ce05ce260 100644 --- a/addons/changelog/common/pom.xml +++ b/addons/changelog/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.3.0 + 2.3.1-SNAPSHOT indy-changelog-common Indy :: Add-Ons :: ChangeLog :: Common diff --git a/addons/changelog/ftests/pom.xml b/addons/changelog/ftests/pom.xml index 7dbabc5056..8ba598ffe1 100644 --- a/addons/changelog/ftests/pom.xml +++ b/addons/changelog/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.3.0 + 2.3.1-SNAPSHOT indy-ftests-changelog diff --git a/addons/changelog/jaxrs/pom.xml b/addons/changelog/jaxrs/pom.xml index f29eea040e..2539db27e0 100644 --- a/addons/changelog/jaxrs/pom.xml +++ b/addons/changelog/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.3.0 + 2.3.1-SNAPSHOT indy-changelog-jaxrs diff --git a/addons/changelog/pom.xml b/addons/changelog/pom.xml index a94b540dd6..2ccd6f4218 100644 --- a/addons/changelog/pom.xml +++ b/addons/changelog/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.0 + 2.3.1-SNAPSHOT indy-changelog Indy :: Add-Ons :: ChangeLog :: Parent diff --git a/addons/content-browse/client-java/pom.xml b/addons/content-browse/client-java/pom.xml index 3275dc2a3c..b7de6b3324 100644 --- a/addons/content-browse/client-java/pom.xml +++ b/addons/content-browse/client-java/pom.xml @@ -20,7 +20,7 @@ indy-content-browse org.commonjava.indy - 2.3.0 + 2.3.1-SNAPSHOT 4.0.0 diff --git a/addons/content-browse/common/pom.xml b/addons/content-browse/common/pom.xml index 6099f654aa..e2d2c70965 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 - 2.3.0 + 2.3.1-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 499be7649d..548c640515 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 - 2.3.0 + 2.3.1-SNAPSHOT indy-ftests-content-browse diff --git a/addons/content-browse/jaxrs/pom.xml b/addons/content-browse/jaxrs/pom.xml index f986f86ca5..9669da119f 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 - 2.3.0 + 2.3.1-SNAPSHOT indy-content-browse-jaxrs diff --git a/addons/content-browse/model-java/pom.xml b/addons/content-browse/model-java/pom.xml index 554ac325ea..90c82b69b5 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 - 2.3.0 + 2.3.1-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 ff2abd54e3..3a23b6ee98 100644 --- a/addons/content-browse/pom.xml +++ b/addons/content-browse/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.0 + 2.3.1-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 048c14497e..4ef90168d8 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 - 2.3.0 + 2.3.1-SNAPSHOT 4.0.0 diff --git a/addons/content-index/pom.xml b/addons/content-index/pom.xml index 1e51281a07..00a808a086 100644 --- a/addons/content-index/pom.xml +++ b/addons/content-index/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.0 + 2.3.1-SNAPSHOT indy-content-index diff --git a/addons/diagnostics/client-java/pom.xml b/addons/diagnostics/client-java/pom.xml index eb0275b636..df820dd3b9 100644 --- a/addons/diagnostics/client-java/pom.xml +++ b/addons/diagnostics/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.3.0 + 2.3.1-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 30293043e2..5a0d73adb6 100644 --- a/addons/diagnostics/common/pom.xml +++ b/addons/diagnostics/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.3.0 + 2.3.1-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 22de3011f0..567444347c 100644 --- a/addons/diagnostics/ftests/pom.xml +++ b/addons/diagnostics/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.3.0 + 2.3.1-SNAPSHOT indy-ftests-diagnostics diff --git a/addons/diagnostics/jaxrs/pom.xml b/addons/diagnostics/jaxrs/pom.xml index 70aba53c86..e2eb7cb76a 100644 --- a/addons/diagnostics/jaxrs/pom.xml +++ b/addons/diagnostics/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.3.0 + 2.3.1-SNAPSHOT indy-diagnostics-jaxrs diff --git a/addons/diagnostics/pom.xml b/addons/diagnostics/pom.xml index 27155869c8..35fd1bac50 100644 --- a/addons/diagnostics/pom.xml +++ b/addons/diagnostics/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.0 + 2.3.1-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 def6c2d35a..5b3e7e279c 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 - 2.3.0 + 2.3.1-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 9be0a57fc1..b6d9ef8a39 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 - 2.3.0 + 2.3.1-SNAPSHOT indy-ftests-dot-maven diff --git a/addons/dot-maven/jaxrs/pom.xml b/addons/dot-maven/jaxrs/pom.xml index 02fc695fc5..5b88d335a8 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 - 2.3.0 + 2.3.1-SNAPSHOT indy-dot-maven-jaxrs diff --git a/addons/dot-maven/pom.xml b/addons/dot-maven/pom.xml index e1626a57ef..e296f1bb61 100644 --- a/addons/dot-maven/pom.xml +++ b/addons/dot-maven/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.0 + 2.3.1-SNAPSHOT indy-dot-maven diff --git a/addons/event-audit/common/pom.xml b/addons/event-audit/common/pom.xml index 8a457976b6..f5d836dbb1 100644 --- a/addons/event-audit/common/pom.xml +++ b/addons/event-audit/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-event-audit - 2.3.0 + 2.3.1-SNAPSHOT indy-event-audit-common diff --git a/addons/event-audit/pom.xml b/addons/event-audit/pom.xml index 7d4ff58aa9..90770a4e31 100644 --- a/addons/event-audit/pom.xml +++ b/addons/event-audit/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.0 + 2.3.1-SNAPSHOT indy-event-audit diff --git a/addons/folo/client-java/pom.xml b/addons/folo/client-java/pom.xml index b4151c3557..e42252fac4 100644 --- a/addons/folo/client-java/pom.xml +++ b/addons/folo/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.3.0 + 2.3.1-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 85cf71ac69..d240f53f81 100644 --- a/addons/folo/common/pom.xml +++ b/addons/folo/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.3.0 + 2.3.1-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 7389ca9c9e..12d81aabea 100644 --- a/addons/folo/ftests/pom.xml +++ b/addons/folo/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.3.0 + 2.3.1-SNAPSHOT indy-ftests-folo diff --git a/addons/folo/jaxrs/pom.xml b/addons/folo/jaxrs/pom.xml index c06223439d..c212486856 100644 --- a/addons/folo/jaxrs/pom.xml +++ b/addons/folo/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.3.0 + 2.3.1-SNAPSHOT indy-folo-jaxrs diff --git a/addons/folo/model-java/pom.xml b/addons/folo/model-java/pom.xml index fc17e66a06..1fef90c316 100644 --- a/addons/folo/model-java/pom.xml +++ b/addons/folo/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.3.0 + 2.3.1-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 715502f064..be1296cb41 100644 --- a/addons/folo/pom.xml +++ b/addons/folo/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.0 + 2.3.1-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 ef1c3923d0..7d8db5d2c9 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 - 2.3.0 + 2.3.1-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 6546c735ee..77cf1ab180 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 - 2.3.0 + 2.3.1-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 b753e8d2e2..90d69b3413 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 - 2.3.0 + 2.3.1-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 1ce22eebbc..702c31d048 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 - 2.3.0 + 2.3.1-SNAPSHOT indy-hosted-by-archive-jaxrs diff --git a/addons/hosted-by-archive/pom.xml b/addons/hosted-by-archive/pom.xml index f44da728de..a6aacae656 100644 --- a/addons/hosted-by-archive/pom.xml +++ b/addons/hosted-by-archive/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.0 + 2.3.1-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 e380b0d4c4..7646c3b1c3 100644 --- a/addons/httprox/common/pom.xml +++ b/addons/httprox/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.3.0 + 2.3.1-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 deb3d4065e..2a8ec6b823 100644 --- a/addons/httprox/ftests/pom.xml +++ b/addons/httprox/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.3.0 + 2.3.1-SNAPSHOT indy-ftests-httprox diff --git a/addons/httprox/jaxrs/pom.xml b/addons/httprox/jaxrs/pom.xml index 65fcc30594..0f595181d1 100644 --- a/addons/httprox/jaxrs/pom.xml +++ b/addons/httprox/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.3.0 + 2.3.1-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 f6101dc202..76fd6dd9e4 100644 --- a/addons/httprox/pom.xml +++ b/addons/httprox/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.0 + 2.3.1-SNAPSHOT indy-httprox diff --git a/addons/implied-repos/client-java/pom.xml b/addons/implied-repos/client-java/pom.xml index aaa1fdb2d7..f779d8454b 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 - 2.3.0 + 2.3.1-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 02f8ef6591..b50bdd41fd 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 - 2.3.0 + 2.3.1-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 4b685069e1..9eb3b6e472 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 - 2.3.0 + 2.3.1-SNAPSHOT indy-ftests-implied-repos diff --git a/addons/implied-repos/model-java/pom.xml b/addons/implied-repos/model-java/pom.xml index 5afc2d4e8a..8914076fd0 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 - 2.3.0 + 2.3.1-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 02155aeb24..9122cd173e 100644 --- a/addons/implied-repos/pom.xml +++ b/addons/implied-repos/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.0 + 2.3.1-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 3d21a4700a..c211df3729 100644 --- a/addons/koji/client-java/pom.xml +++ b/addons/koji/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.3.0 + 2.3.1-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 923d4c66d1..7ebe8f05ad 100644 --- a/addons/koji/common/pom.xml +++ b/addons/koji/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.3.0 + 2.3.1-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 7d0a000263..609fcc4597 100644 --- a/addons/koji/jaxrs/pom.xml +++ b/addons/koji/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.3.0 + 2.3.1-SNAPSHOT indy-koji-jaxrs diff --git a/addons/koji/model-java/pom.xml b/addons/koji/model-java/pom.xml index 11f70b4a68..3ffeee42c9 100644 --- a/addons/koji/model-java/pom.xml +++ b/addons/koji/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.3.0 + 2.3.1-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 a2c41ea128..c9f208f28f 100644 --- a/addons/koji/pom.xml +++ b/addons/koji/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.0 + 2.3.1-SNAPSHOT indy-koji Indy :: Add-Ons :: Koji Integration :: Parent diff --git a/addons/path-mapped/common/pom.xml b/addons/path-mapped/common/pom.xml index acc88bf236..ea66e28b6e 100644 --- a/addons/path-mapped/common/pom.xml +++ b/addons/path-mapped/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.3.0 + 2.3.1-SNAPSHOT indy-path-mapped-common diff --git a/addons/path-mapped/jaxrs/pom.xml b/addons/path-mapped/jaxrs/pom.xml index 887335f872..2f147f7157 100644 --- a/addons/path-mapped/jaxrs/pom.xml +++ b/addons/path-mapped/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.3.0 + 2.3.1-SNAPSHOT indy-path-mapped-jaxrs diff --git a/addons/path-mapped/model-java/pom.xml b/addons/path-mapped/model-java/pom.xml index 603f241172..ca6d1a6e32 100644 --- a/addons/path-mapped/model-java/pom.xml +++ b/addons/path-mapped/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.3.0 + 2.3.1-SNAPSHOT indy-path-mapped-model-java diff --git a/addons/path-mapped/pom.xml b/addons/path-mapped/pom.xml index a7b6a0e9cc..9aa2d57ccd 100644 --- a/addons/path-mapped/pom.xml +++ b/addons/path-mapped/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.0 + 2.3.1-SNAPSHOT indy-path-mapped Indy :: Add-Ons :: Path Mapped :: Parent diff --git a/addons/pkg-maven/common/pom.xml b/addons/pkg-maven/common/pom.xml index f9f52dbed7..0f9f2fcfbb 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 - 2.3.0 + 2.3.1-SNAPSHOT 4.0.0 diff --git a/addons/pkg-maven/ftests/pom.xml b/addons/pkg-maven/ftests/pom.xml index 410401acac..555fc341e5 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 - 2.3.0 + 2.3.1-SNAPSHOT 4.0.0 diff --git a/addons/pkg-maven/jaxrs/pom.xml b/addons/pkg-maven/jaxrs/pom.xml index 83dbc94b0f..fb95ddb2ea 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 - 2.3.0 + 2.3.1-SNAPSHOT 4.0.0 diff --git a/addons/pkg-maven/pom.xml b/addons/pkg-maven/pom.xml index a6e11ee82e..c8da871908 100644 --- a/addons/pkg-maven/pom.xml +++ b/addons/pkg-maven/pom.xml @@ -20,7 +20,7 @@ indy-addons org.commonjava.indy - 2.3.0 + 2.3.1-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/common/pom.xml b/addons/pkg-npm/common/pom.xml index 362dc0fc67..d73550364f 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 - 2.3.0 + 2.3.1-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/ftests/pom.xml b/addons/pkg-npm/ftests/pom.xml index 3c30d7af9f..aaefabc144 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 - 2.3.0 + 2.3.1-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/jaxrs/pom.xml b/addons/pkg-npm/jaxrs/pom.xml index 1f974ee013..ab5d85a94c 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 - 2.3.0 + 2.3.1-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/model-java/pom.xml b/addons/pkg-npm/model-java/pom.xml index 7df3c3c0ef..e792c57e6f 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 - 2.3.0 + 2.3.1-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/pom.xml b/addons/pkg-npm/pom.xml index d0b8b55727..96acdd61dd 100644 --- a/addons/pkg-npm/pom.xml +++ b/addons/pkg-npm/pom.xml @@ -20,7 +20,7 @@ indy-addons org.commonjava.indy - 2.3.0 + 2.3.1-SNAPSHOT 4.0.0 diff --git a/addons/pom.xml b/addons/pom.xml index d583462ce5..4e65ca8d94 100644 --- a/addons/pom.xml +++ b/addons/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-parent - 2.3.0 + 2.3.1-SNAPSHOT indy-addons diff --git a/addons/promote/client-java/pom.xml b/addons/promote/client-java/pom.xml index 442282cb65..5bc00e55e5 100644 --- a/addons/promote/client-java/pom.xml +++ b/addons/promote/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.3.0 + 2.3.1-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 89cb65bf3d..3a2a63c42b 100644 --- a/addons/promote/common/pom.xml +++ b/addons/promote/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.3.0 + 2.3.1-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 95749f15f8..73e868b2c0 100644 --- a/addons/promote/ftests/pom.xml +++ b/addons/promote/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.3.0 + 2.3.1-SNAPSHOT indy-ftests-promote diff --git a/addons/promote/jaxrs/pom.xml b/addons/promote/jaxrs/pom.xml index d934be4708..a94f79f8e7 100644 --- a/addons/promote/jaxrs/pom.xml +++ b/addons/promote/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.3.0 + 2.3.1-SNAPSHOT indy-promote-jaxrs diff --git a/addons/promote/model-java/pom.xml b/addons/promote/model-java/pom.xml index c305809e75..4b82e9ae91 100644 --- a/addons/promote/model-java/pom.xml +++ b/addons/promote/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.3.0 + 2.3.1-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 e8f19fa746..b72722127b 100644 --- a/addons/promote/pom.xml +++ b/addons/promote/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.0 + 2.3.1-SNAPSHOT indy-promote Indy :: Add-Ons :: Artifact Promotion :: Parent diff --git a/addons/repo-proxy/common/pom.xml b/addons/repo-proxy/common/pom.xml index 3fc1ca2bd5..04cc76f311 100644 --- a/addons/repo-proxy/common/pom.xml +++ b/addons/repo-proxy/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-repo-proxy - 2.3.0 + 2.3.1-SNAPSHOT indy-repo-proxy-common Indy :: Add-Ons :: Repository-Proxy :: Common diff --git a/addons/repo-proxy/ftests/pom.xml b/addons/repo-proxy/ftests/pom.xml index 217bc68ac9..1880a1fdc3 100644 --- a/addons/repo-proxy/ftests/pom.xml +++ b/addons/repo-proxy/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-repo-proxy - 2.3.0 + 2.3.1-SNAPSHOT indy-ftests-repo-proxy diff --git a/addons/repo-proxy/jaxrs/pom.xml b/addons/repo-proxy/jaxrs/pom.xml index cd57139326..1046b1e795 100644 --- a/addons/repo-proxy/jaxrs/pom.xml +++ b/addons/repo-proxy/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-repo-proxy - 2.3.0 + 2.3.1-SNAPSHOT indy-repo-proxy-jaxrs diff --git a/addons/repo-proxy/pom.xml b/addons/repo-proxy/pom.xml index 581e3f254e..e537a14ab7 100644 --- a/addons/repo-proxy/pom.xml +++ b/addons/repo-proxy/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.0 + 2.3.1-SNAPSHOT indy-repo-proxy Indy :: Add-Ons :: Repository-Proxy :: Parent diff --git a/addons/revisions/common/pom.xml b/addons/revisions/common/pom.xml index a8ddc3ebfd..96ce90f263 100644 --- a/addons/revisions/common/pom.xml +++ b/addons/revisions/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-revisions - 2.3.0 + 2.3.1-SNAPSHOT indy-revisions-common Indy :: Add-Ons :: Revisions :: Common diff --git a/addons/revisions/jaxrs/pom.xml b/addons/revisions/jaxrs/pom.xml index abe50652c1..379e28efc7 100644 --- a/addons/revisions/jaxrs/pom.xml +++ b/addons/revisions/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-revisions - 2.3.0 + 2.3.1-SNAPSHOT indy-revisions-jaxrs diff --git a/addons/revisions/pom.xml b/addons/revisions/pom.xml index 31ef179b51..d016402cef 100644 --- a/addons/revisions/pom.xml +++ b/addons/revisions/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.0 + 2.3.1-SNAPSHOT indy-revisions Indy :: Add-Ons :: Revisions :: Parent diff --git a/addons/sli/pom.xml b/addons/sli/pom.xml index 942341733e..449ae2c258 100644 --- a/addons/sli/pom.xml +++ b/addons/sli/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.0 + 2.3.1-SNAPSHOT indy-sli Indy :: Add-Ons :: Service Level Indicators Reporting :: JAX-RS diff --git a/api/pom.xml b/api/pom.xml index e257dc753c..58048edacf 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.0 + 2.3.1-SNAPSHOT indy-api diff --git a/bindings/jaxrs/pom.xml b/bindings/jaxrs/pom.xml index cd85bc994e..46679ad14b 100644 --- a/bindings/jaxrs/pom.xml +++ b/bindings/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-bindings - 2.3.0 + 2.3.1-SNAPSHOT indy-bindings-jaxrs diff --git a/bindings/pom.xml b/bindings/pom.xml index 45c7c3cd33..7e3a87f446 100644 --- a/bindings/pom.xml +++ b/bindings/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-parent - 2.3.0 + 2.3.1-SNAPSHOT indy-bindings diff --git a/boot/jaxrs/pom.xml b/boot/jaxrs/pom.xml index bc88ecfa7c..a5af953903 100644 --- a/boot/jaxrs/pom.xml +++ b/boot/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.boot indy-booters - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy.boot diff --git a/boot/pom.xml b/boot/pom.xml index 02413e47de..90531e11dd 100644 --- a/boot/pom.xml +++ b/boot/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy.boot diff --git a/clients/core-java/pom.xml b/clients/core-java/pom.xml index eed9089e21..ea39c07326 100644 --- a/clients/core-java/pom.xml +++ b/clients/core-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-clients-parent - 2.3.0 + 2.3.1-SNAPSHOT indy-client-core-java diff --git a/clients/pom.xml b/clients/pom.xml index dfd582f6e1..f6324186ab 100644 --- a/clients/pom.xml +++ b/clients/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.0 + 2.3.1-SNAPSHOT indy-clients-parent diff --git a/core/pom.xml b/core/pom.xml index 5765559abc..67cf6913d9 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.0 + 2.3.1-SNAPSHOT indy-core diff --git a/db/common/pom.xml b/db/common/pom.xml index c2f223f054..c78e04fed9 100644 --- a/db/common/pom.xml +++ b/db/common/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-db - 2.3.0 + 2.3.1-SNAPSHOT indy-db-common diff --git a/db/flat/pom.xml b/db/flat/pom.xml index 6559e60bca..e8010d8ad2 100644 --- a/db/flat/pom.xml +++ b/db/flat/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.3.0 + 2.3.1-SNAPSHOT indy-db-flat diff --git a/db/infinispan/pom.xml b/db/infinispan/pom.xml index bf2fd3e16d..19cf6022fa 100644 --- a/db/infinispan/pom.xml +++ b/db/infinispan/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-db - 2.3.0 + 2.3.1-SNAPSHOT indy-db-infinispan diff --git a/db/memory/pom.xml b/db/memory/pom.xml index c746862dee..4999f14df9 100644 --- a/db/memory/pom.xml +++ b/db/memory/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.3.0 + 2.3.1-SNAPSHOT indy-db-memory diff --git a/db/metrics/pom.xml b/db/metrics/pom.xml index 3b48971250..48abcbf8d4 100644 --- a/db/metrics/pom.xml +++ b/db/metrics/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.3.0 + 2.3.1-SNAPSHOT indy-db-metrics diff --git a/db/pom.xml b/db/pom.xml index 98fbb8d219..81e5b9e841 100644 --- a/db/pom.xml +++ b/db/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.0 + 2.3.1-SNAPSHOT indy-db diff --git a/deployments/launcher/pom.xml b/deployments/launcher/pom.xml index 1376e27362..acf0fe643a 100644 --- a/deployments/launcher/pom.xml +++ b/deployments/launcher/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-deployments - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy.launch diff --git a/deployments/pom.xml b/deployments/pom.xml index afc13247ad..41d0e1d7fb 100644 --- a/deployments/pom.xml +++ b/deployments/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.0 + 2.3.1-SNAPSHOT indy-deployments diff --git a/embedder/pom.xml b/embedder/pom.xml index a4c52d9981..32a320e34b 100644 --- a/embedder/pom.xml +++ b/embedder/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy.embed diff --git a/filers/default/pom.xml b/filers/default/pom.xml index 9de0979761..91e90f0022 100644 --- a/filers/default/pom.xml +++ b/filers/default/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-file-managers - 2.3.0 + 2.3.1-SNAPSHOT indy-filer-default diff --git a/filers/pom.xml b/filers/pom.xml index 1138a48864..4b320f8392 100644 --- a/filers/pom.xml +++ b/filers/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.0 + 2.3.1-SNAPSHOT indy-file-managers diff --git a/ftests/common/pom.xml b/ftests/common/pom.xml index f48a64b0b7..907b7ad17b 100644 --- a/ftests/common/pom.xml +++ b/ftests/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-ftests-parent - 2.3.0 + 2.3.1-SNAPSHOT indy-ftests-common diff --git a/ftests/core/pom.xml b/ftests/core/pom.xml index 4cf506ae80..8986980eb5 100644 --- a/ftests/core/pom.xml +++ b/ftests/core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-ftests-parent - 2.3.0 + 2.3.1-SNAPSHOT indy-ftests-core diff --git a/ftests/metrics/pom.xml b/ftests/metrics/pom.xml index c3afd2799d..ee09db0ceb 100644 --- a/ftests/metrics/pom.xml +++ b/ftests/metrics/pom.xml @@ -20,7 +20,7 @@ indy-ftests-parent org.commonjava.indy - 2.3.0 + 2.3.1-SNAPSHOT 4.0.0 diff --git a/ftests/pom.xml b/ftests/pom.xml index a22666292c..22c72fb756 100644 --- a/ftests/pom.xml +++ b/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.0 + 2.3.1-SNAPSHOT indy-ftests-parent diff --git a/models/core-java/pom.xml b/models/core-java/pom.xml index 824f03bba1..8200f5d14d 100644 --- a/models/core-java/pom.xml +++ b/models/core-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-models-parent - 2.3.0 + 2.3.1-SNAPSHOT indy-model-core-java diff --git a/models/pom.xml b/models/pom.xml index f697237fc3..72433f7ed5 100644 --- a/models/pom.xml +++ b/models/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.0 + 2.3.1-SNAPSHOT indy-models-parent diff --git a/pom.xml b/pom.xml index 8e3c3b0a91..33e31c424e 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.commonjava.indy indy-parent - 2.3.0 + 2.3.1-SNAPSHOT pom @@ -37,7 +37,7 @@ scm:git:https://github.com/CommonJava/indy scm:git:https://github.com/CommonJava/indy http://github.com/Commonjava/indy - indy-parent-2.3.0 + HEAD @@ -187,7 +187,7 @@ org.commonjava.indy.ui indy-ui-layover - 2.3.0 + 2.3.1-SNAPSHOT runtime @@ -195,22 +195,22 @@ org.commonjava.indy indy-model-core-java - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-api - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-core - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-core - 2.3.0 + 2.3.1-SNAPSHOT tar.gz confset provided @@ -218,32 +218,32 @@ org.commonjava.indy indy-db-flat - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-db-metrics - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-db-common - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-db-infinispan - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-bindings-jaxrs - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy.launch indy-launcher - 2.3.0 + 2.3.1-SNAPSHOT tar.gz skinny provided @@ -251,7 +251,7 @@ org.commonjava.indy.launch indy-launcher - 2.3.0 + 2.3.1-SNAPSHOT tar.gz complete provided @@ -259,7 +259,7 @@ org.commonjava.indy.launch indy-launcher - 2.3.0 + 2.3.1-SNAPSHOT tar.gz data provided @@ -267,7 +267,7 @@ org.commonjava.indy.launch indy-launcher - 2.3.0 + 2.3.1-SNAPSHOT tar.gz etc provided @@ -276,17 +276,17 @@ org.commonjava.indy indy-revisions-jaxrs - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-revisions-common - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-revisions-common - 2.3.0 + 2.3.1-SNAPSHOT tar.gz confset provided @@ -294,7 +294,7 @@ org.commonjava.indy indy-revisions-common - 2.3.0 + 2.3.1-SNAPSHOT tar.gz uiset provided @@ -302,12 +302,12 @@ org.commonjava.indy indy-dot-maven-common - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-dot-maven-common - 2.3.0 + 2.3.1-SNAPSHOT tar.gz dataset provided @@ -315,22 +315,22 @@ org.commonjava.indy indy-dot-maven-jaxrs - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-ftests-dot-maven - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-httprox-common - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-httprox-common - 2.3.0 + 2.3.1-SNAPSHOT tar.gz confset provided @@ -338,17 +338,17 @@ org.commonjava.indy indy-ftests-httprox - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-content-index - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-content-index - 2.3.0 + 2.3.1-SNAPSHOT tar.gz confset provided @@ -356,51 +356,51 @@ org.commonjava.indy indy-db-memory - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-test-db - 2.3.0 + 2.3.1-SNAPSHOT test org.commonjava.indy indy-test-fixtures-core - 2.3.0 + 2.3.1-SNAPSHOT test org.commonjava.indy indy-test-providers-core - 2.3.0 + 2.3.1-SNAPSHOT test org.commonjava.indy indy-test-utils - 2.3.0 + 2.3.1-SNAPSHOT test org.commonjava.indy indy-filer-default - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-subsys-jaxrs - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-subsys-honeycomb - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-subsys-honeycomb - 2.3.0 + 2.3.1-SNAPSHOT tar.gz confset provided @@ -408,17 +408,17 @@ org.commonjava.indy indy-subsys-flatfile - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-subsys-cassandra - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-subsys-cassandra - 2.3.0 + 2.3.1-SNAPSHOT tar.gz confset provided @@ -426,79 +426,79 @@ org.commonjava.indy indy-subsys-infinispan - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-subsys-http - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-subsys-git - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-subsys-groovy - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-subsys-prefetch - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-subsys-cpool - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-client-core-java - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-ftests-common - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-ftests-core - 2.3.0 + 2.3.1-SNAPSHOT test org.commonjava.indy indy-folo-jaxrs - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-ftests-folo - 2.3.0 + 2.3.1-SNAPSHOT test org.commonjava.indy indy-folo-client-java - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-folo-model-java - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-folo-common - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-folo-common - 2.3.0 + 2.3.1-SNAPSHOT tar.gz dataset provided @@ -506,7 +506,7 @@ org.commonjava.indy indy-folo-common - 2.3.0 + 2.3.1-SNAPSHOT tar.gz confset provided @@ -514,33 +514,33 @@ org.commonjava.indy indy-promote-jaxrs - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-ftests-promote - 2.3.0 + 2.3.1-SNAPSHOT test org.commonjava.indy indy-promote-client-java - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-promote-model-java - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-promote-common - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-promote-common - 2.3.0 + 2.3.1-SNAPSHOT tar.gz confset provided @@ -548,7 +548,7 @@ org.commonjava.indy indy-promote-common - 2.3.0 + 2.3.1-SNAPSHOT tar.gz dataset provided @@ -556,19 +556,19 @@ org.commonjava.indy indy-promote-common - 2.3.0 + 2.3.1-SNAPSHOT dataset provided org.commonjava.indy indy-implied-repos-common - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-implied-repos-common - 2.3.0 + 2.3.1-SNAPSHOT tar.gz confset provided @@ -576,37 +576,37 @@ org.commonjava.indy indy-implied-repos-model-java - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-implied-repos-client-java - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-ftests-implied-repos - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy.embed indy-embedder - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy.boot indy-booter-jaxrs - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-subsys-keycloak - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-subsys-keycloak - 2.3.0 + 2.3.1-SNAPSHOT tar.gz confset provided @@ -614,7 +614,7 @@ org.commonjava.indy indy-subsys-infinispan - 2.3.0 + 2.3.1-SNAPSHOT tar.gz confset provided @@ -622,7 +622,7 @@ org.commonjava.indy indy-subsys-prefetch - 2.3.0 + 2.3.1-SNAPSHOT tar.gz confset provided @@ -631,7 +631,7 @@ org.commonjava.indy indy-koji-common - 2.3.0 + 2.3.1-SNAPSHOT tar.gz confset provided @@ -639,103 +639,103 @@ org.commonjava.indy indy-koji-common - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-koji-model-java - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-koji-client-java - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-koji-jaxrs - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-path-mapped-common - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-path-mapped-model-java - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-path-mapped-jaxrs - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-pkg-maven-common - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-pkg-maven-jaxrs - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-pkg-npm-jaxrs - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-ftests-pkg-maven - 2.3.0 + 2.3.1-SNAPSHOT test org.commonjava.indy indy-ftests-pkg-npm - 2.3.0 + 2.3.1-SNAPSHOT test org.commonjava.indy indy-pkg-npm-common - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-pkg-npm-model-java - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-diagnostics-jaxrs - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-diagnostics-client-java - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-diagnostics-common - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-ftests-diagnostics - 2.3.0 + 2.3.1-SNAPSHOT test org.commonjava.indy indy-diagnostics-common - 2.3.0 + 2.3.1-SNAPSHOT confset tar.gz provided @@ -743,28 +743,28 @@ org.commonjava.indy indy-hosted-by-archive-common - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-hosted-by-archive-client-java - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-ftests-hosted-by-archive - 2.3.0 + 2.3.1-SNAPSHOT test org.commonjava.indy indy-hosted-by-archive-jaxrs - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-hosted-by-archive-common - 2.3.0 + 2.3.1-SNAPSHOT confset tar.gz @@ -772,22 +772,22 @@ org.commonjava.indy indy-subsys-metrics-core - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-subsys-metrics-reporter - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-subsys-metrics-prometheus - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-subsys-metrics-reporter - 2.3.0 + 2.3.1-SNAPSHOT confset tar.gz provided @@ -796,28 +796,28 @@ org.commonjava.indy indy-ftests-metrics - 2.3.0 + 2.3.1-SNAPSHOT test org.commonjava.indy indy-sli - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy.rest indy-rest-api yaml - 2.3.0 + 2.3.1-SNAPSHOT provided org.commonjava.indy.rest indy-rest-api json - 2.3.0 + 2.3.1-SNAPSHOT provided @@ -851,33 +851,33 @@ org.commonjava.indy indy-content-browse-common - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-content-browse-jaxrs - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-ftests-content-browse - 2.3.0 + 2.3.1-SNAPSHOT test org.commonjava.indy indy-content-browse-model-java - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-content-browse-client-java - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-content-browse-common - 2.3.0 + 2.3.1-SNAPSHOT confset tar.gz provided @@ -885,35 +885,35 @@ org.commonjava.indy indy-content-browse-ui - 2.3.0 + 2.3.1-SNAPSHOT reactui tar.gz org.commonjava.indy indy-changelog-common - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-changelog-client-java - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-ftests-changelog - 2.3.0 + 2.3.1-SNAPSHOT test org.commonjava.indy indy-changelog-jaxrs - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-changelog-common - 2.3.0 + 2.3.1-SNAPSHOT confset tar.gz @@ -931,12 +931,12 @@ org.commonjava.indy indy-event-audit-common - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-event-audit-common - 2.3.0 + 2.3.1-SNAPSHOT confset tar.gz provided @@ -951,23 +951,23 @@ org.commonjava.indy indy-repo-proxy-common - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-repo-proxy-jaxrs - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy indy-ftests-repo-proxy - 2.3.0 + 2.3.1-SNAPSHOT test org.commonjava.indy indy-repo-proxy-common - 2.3.0 + 2.3.1-SNAPSHOT confset tar.gz diff --git a/rest/api/pom.xml b/rest/api/pom.xml index fe60ed482c..4b66e85070 100644 --- a/rest/api/pom.xml +++ b/rest/api/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.rest indy-rest-parent - 2.3.0 + 2.3.1-SNAPSHOT indy-rest-api diff --git a/rest/pom.xml b/rest/pom.xml index cec45f016d..988dcceeca 100644 --- a/rest/pom.xml +++ b/rest/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy.rest diff --git a/subsys/cassandra/pom.xml b/subsys/cassandra/pom.xml index d516f22c88..2a3dc93d37 100644 --- a/subsys/cassandra/pom.xml +++ b/subsys/cassandra/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-subsystems - 2.3.0 + 2.3.1-SNAPSHOT indy-subsys-cassandra diff --git a/subsys/cpool/pom.xml b/subsys/cpool/pom.xml index 568d0dde85..bcd01527cc 100644 --- a/subsys/cpool/pom.xml +++ b/subsys/cpool/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.3.0 + 2.3.1-SNAPSHOT indy-subsys-cpool diff --git a/subsys/flatfile/pom.xml b/subsys/flatfile/pom.xml index 6df172be83..51d0faeecb 100644 --- a/subsys/flatfile/pom.xml +++ b/subsys/flatfile/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.3.0 + 2.3.1-SNAPSHOT indy-subsys-flatfile diff --git a/subsys/git/pom.xml b/subsys/git/pom.xml index af288ea205..f8bac07685 100644 --- a/subsys/git/pom.xml +++ b/subsys/git/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.3.0 + 2.3.1-SNAPSHOT indy-subsys-git diff --git a/subsys/groovy/pom.xml b/subsys/groovy/pom.xml index c8c6fd40cd..62d3b3ed68 100644 --- a/subsys/groovy/pom.xml +++ b/subsys/groovy/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.3.0 + 2.3.1-SNAPSHOT indy-subsys-groovy diff --git a/subsys/honeycomb/pom.xml b/subsys/honeycomb/pom.xml index 3aa86532c7..a932d7e27f 100644 --- a/subsys/honeycomb/pom.xml +++ b/subsys/honeycomb/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.3.0 + 2.3.1-SNAPSHOT 4.0.0 diff --git a/subsys/http/pom.xml b/subsys/http/pom.xml index 4abd44570a..25945f743f 100644 --- a/subsys/http/pom.xml +++ b/subsys/http/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.3.0 + 2.3.1-SNAPSHOT indy-subsys-http diff --git a/subsys/infinispan/pom.xml b/subsys/infinispan/pom.xml index 29fd78c9fc..d213f42fb4 100644 --- a/subsys/infinispan/pom.xml +++ b/subsys/infinispan/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.3.0 + 2.3.1-SNAPSHOT indy-subsys-infinispan diff --git a/subsys/jaxrs/pom.xml b/subsys/jaxrs/pom.xml index 486b88b10e..e1e08bc461 100644 --- a/subsys/jaxrs/pom.xml +++ b/subsys/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.3.0 + 2.3.1-SNAPSHOT indy-subsys-jaxrs diff --git a/subsys/kafka/pom.xml b/subsys/kafka/pom.xml index a718b0b115..5a23afa4d1 100644 --- a/subsys/kafka/pom.xml +++ b/subsys/kafka/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.3.0 + 2.3.1-SNAPSHOT 4.0.0 diff --git a/subsys/keycloak/pom.xml b/subsys/keycloak/pom.xml index f63fafc9d9..cdeb51792e 100644 --- a/subsys/keycloak/pom.xml +++ b/subsys/keycloak/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.3.0 + 2.3.1-SNAPSHOT indy-subsys-keycloak Indy :: Subsystems :: Keycloak diff --git a/subsys/metrics/core/pom.xml b/subsys/metrics/core/pom.xml index 4c551ef53f..ddbb94ac78 100644 --- a/subsys/metrics/core/pom.xml +++ b/subsys/metrics/core/pom.xml @@ -20,7 +20,7 @@ indy-subsys-metrics org.commonjava.indy - 2.3.0 + 2.3.1-SNAPSHOT 4.0.0 diff --git a/subsys/metrics/pom.xml b/subsys/metrics/pom.xml index d91a87e939..89b46754d2 100644 --- a/subsys/metrics/pom.xml +++ b/subsys/metrics/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.3.0 + 2.3.1-SNAPSHOT 4.0.0 diff --git a/subsys/metrics/prometheus/pom.xml b/subsys/metrics/prometheus/pom.xml index 6da400c1d7..c56966e0dd 100644 --- a/subsys/metrics/prometheus/pom.xml +++ b/subsys/metrics/prometheus/pom.xml @@ -20,7 +20,7 @@ indy-subsys-metrics org.commonjava.indy - 2.3.0 + 2.3.1-SNAPSHOT 4.0.0 diff --git a/subsys/metrics/reporter/pom.xml b/subsys/metrics/reporter/pom.xml index b80a434e7d..584e17f87e 100644 --- a/subsys/metrics/reporter/pom.xml +++ b/subsys/metrics/reporter/pom.xml @@ -20,7 +20,7 @@ indy-subsys-metrics org.commonjava.indy - 2.3.0 + 2.3.1-SNAPSHOT 4.0.0 diff --git a/subsys/pom.xml b/subsys/pom.xml index a631ec9126..52360c6b32 100644 --- a/subsys/pom.xml +++ b/subsys/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.0 + 2.3.1-SNAPSHOT indy-subsystems diff --git a/subsys/prefetch/pom.xml b/subsys/prefetch/pom.xml index 0da1b4edb8..5f51d1d0b3 100644 --- a/subsys/prefetch/pom.xml +++ b/subsys/prefetch/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.3.0 + 2.3.1-SNAPSHOT 4.0.0 diff --git a/test/db/pom.xml b/test/db/pom.xml index 2b19cadd7e..1facdfea1e 100644 --- a/test/db/pom.xml +++ b/test/db/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.3.0 + 2.3.1-SNAPSHOT indy-test-db diff --git a/test/fixtures-core/pom.xml b/test/fixtures-core/pom.xml index 092bc9c081..107ead7aea 100644 --- a/test/fixtures-core/pom.xml +++ b/test/fixtures-core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.3.0 + 2.3.1-SNAPSHOT indy-test-fixtures-core diff --git a/test/pom.xml b/test/pom.xml index 44c25d37e9..82249bae2e 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.0 + 2.3.1-SNAPSHOT indy-test diff --git a/test/providers-core/pom.xml b/test/providers-core/pom.xml index 41cfe037c6..86792ffb77 100644 --- a/test/providers-core/pom.xml +++ b/test/providers-core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.3.0 + 2.3.1-SNAPSHOT indy-test-providers-core diff --git a/test/utils/pom.xml b/test/utils/pom.xml index d3cc042c61..6e9c0d73b9 100644 --- a/test/utils/pom.xml +++ b/test/utils/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.3.0 + 2.3.1-SNAPSHOT indy-test-utils diff --git a/tools/assemblies/pom.xml b/tools/assemblies/pom.xml index 87f551981f..960fda790c 100644 --- a/tools/assemblies/pom.xml +++ b/tools/assemblies/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.tools indy-tools - 2.3.0 + 2.3.1-SNAPSHOT indy-assemblies diff --git a/tools/pom.xml b/tools/pom.xml index 77668a67d4..b5054289d2 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy.tools diff --git a/uis/layover/pom.xml b/uis/layover/pom.xml index 83bd37b954..7abf843373 100644 --- a/uis/layover/pom.xml +++ b/uis/layover/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.ui indy-uis - 2.3.0 + 2.3.1-SNAPSHOT indy-ui-layover diff --git a/uis/pom.xml b/uis/pom.xml index c0aa544ea1..f916f5a0b9 100644 --- a/uis/pom.xml +++ b/uis/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.0 + 2.3.1-SNAPSHOT org.commonjava.indy.ui From 17efe53dcd02dc608674fd9b325e18c3c1d6ca7d Mon Sep 17 00:00:00 2001 From: liyu Date: Tue, 2 Jun 2020 17:40:39 +0800 Subject: [PATCH 22/50] Revert "[maven-release-plugin] prepare for next development iteration" This reverts commit 410a7a72f63cf938b66497ef3f223212e2c167c0. --- addons/changelog/client-java/pom.xml | 2 +- addons/changelog/common/pom.xml | 2 +- addons/changelog/ftests/pom.xml | 2 +- addons/changelog/jaxrs/pom.xml | 2 +- addons/changelog/pom.xml | 2 +- addons/content-browse/client-java/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/event-audit/common/pom.xml | 2 +- addons/event-audit/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/path-mapped/common/pom.xml | 2 +- addons/path-mapped/jaxrs/pom.xml | 2 +- addons/path-mapped/model-java/pom.xml | 2 +- addons/path-mapped/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/repo-proxy/common/pom.xml | 2 +- addons/repo-proxy/ftests/pom.xml | 2 +- addons/repo-proxy/jaxrs/pom.xml | 2 +- addons/repo-proxy/pom.xml | 2 +- addons/revisions/common/pom.xml | 2 +- addons/revisions/jaxrs/pom.xml | 2 +- addons/revisions/pom.xml | 2 +- addons/sli/pom.xml | 2 +- api/pom.xml | 2 +- bindings/jaxrs/pom.xml | 2 +- bindings/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/common/pom.xml | 2 +- db/flat/pom.xml | 2 +- db/infinispan/pom.xml | 2 +- db/memory/pom.xml | 2 +- db/metrics/pom.xml | 2 +- db/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 | 254 +++++++++---------- rest/api/pom.xml | 2 +- rest/pom.xml | 2 +- subsys/cassandra/pom.xml | 2 +- subsys/cpool/pom.xml | 2 +- subsys/flatfile/pom.xml | 2 +- subsys/git/pom.xml | 2 +- subsys/groovy/pom.xml | 2 +- subsys/honeycomb/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/prometheus/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 +- 131 files changed, 257 insertions(+), 257 deletions(-) diff --git a/addons/changelog/client-java/pom.xml b/addons/changelog/client-java/pom.xml index de4dcddc8f..09e059c6d6 100644 --- a/addons/changelog/client-java/pom.xml +++ b/addons/changelog/client-java/pom.xml @@ -20,7 +20,7 @@ indy-changelog org.commonjava.indy - 2.3.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/addons/changelog/common/pom.xml b/addons/changelog/common/pom.xml index 4ce05ce260..9fd2efef29 100644 --- a/addons/changelog/common/pom.xml +++ b/addons/changelog/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.3.1-SNAPSHOT + 2.3.0 indy-changelog-common Indy :: Add-Ons :: ChangeLog :: Common diff --git a/addons/changelog/ftests/pom.xml b/addons/changelog/ftests/pom.xml index 8ba598ffe1..7dbabc5056 100644 --- a/addons/changelog/ftests/pom.xml +++ b/addons/changelog/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.3.1-SNAPSHOT + 2.3.0 indy-ftests-changelog diff --git a/addons/changelog/jaxrs/pom.xml b/addons/changelog/jaxrs/pom.xml index 2539db27e0..f29eea040e 100644 --- a/addons/changelog/jaxrs/pom.xml +++ b/addons/changelog/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.3.1-SNAPSHOT + 2.3.0 indy-changelog-jaxrs diff --git a/addons/changelog/pom.xml b/addons/changelog/pom.xml index 2ccd6f4218..a94b540dd6 100644 --- a/addons/changelog/pom.xml +++ b/addons/changelog/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.1-SNAPSHOT + 2.3.0 indy-changelog Indy :: Add-Ons :: ChangeLog :: Parent diff --git a/addons/content-browse/client-java/pom.xml b/addons/content-browse/client-java/pom.xml index b7de6b3324..3275dc2a3c 100644 --- a/addons/content-browse/client-java/pom.xml +++ b/addons/content-browse/client-java/pom.xml @@ -20,7 +20,7 @@ indy-content-browse org.commonjava.indy - 2.3.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/addons/content-browse/common/pom.xml b/addons/content-browse/common/pom.xml index e2d2c70965..6099f654aa 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 - 2.3.1-SNAPSHOT + 2.3.0 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 548c640515..499be7649d 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 - 2.3.1-SNAPSHOT + 2.3.0 indy-ftests-content-browse diff --git a/addons/content-browse/jaxrs/pom.xml b/addons/content-browse/jaxrs/pom.xml index 9669da119f..f986f86ca5 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 - 2.3.1-SNAPSHOT + 2.3.0 indy-content-browse-jaxrs diff --git a/addons/content-browse/model-java/pom.xml b/addons/content-browse/model-java/pom.xml index 90c82b69b5..554ac325ea 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 - 2.3.1-SNAPSHOT + 2.3.0 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 3a23b6ee98..ff2abd54e3 100644 --- a/addons/content-browse/pom.xml +++ b/addons/content-browse/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.1-SNAPSHOT + 2.3.0 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 4ef90168d8..048c14497e 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 - 2.3.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/addons/content-index/pom.xml b/addons/content-index/pom.xml index 00a808a086..1e51281a07 100644 --- a/addons/content-index/pom.xml +++ b/addons/content-index/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.1-SNAPSHOT + 2.3.0 indy-content-index diff --git a/addons/diagnostics/client-java/pom.xml b/addons/diagnostics/client-java/pom.xml index df820dd3b9..eb0275b636 100644 --- a/addons/diagnostics/client-java/pom.xml +++ b/addons/diagnostics/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.3.1-SNAPSHOT + 2.3.0 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 5a0d73adb6..30293043e2 100644 --- a/addons/diagnostics/common/pom.xml +++ b/addons/diagnostics/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.3.1-SNAPSHOT + 2.3.0 indy-diagnostics-common Indy :: Add-Ons :: Diagnostic Tools :: Common diff --git a/addons/diagnostics/ftests/pom.xml b/addons/diagnostics/ftests/pom.xml index 567444347c..22de3011f0 100644 --- a/addons/diagnostics/ftests/pom.xml +++ b/addons/diagnostics/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.3.1-SNAPSHOT + 2.3.0 indy-ftests-diagnostics diff --git a/addons/diagnostics/jaxrs/pom.xml b/addons/diagnostics/jaxrs/pom.xml index e2eb7cb76a..70aba53c86 100644 --- a/addons/diagnostics/jaxrs/pom.xml +++ b/addons/diagnostics/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.3.1-SNAPSHOT + 2.3.0 indy-diagnostics-jaxrs diff --git a/addons/diagnostics/pom.xml b/addons/diagnostics/pom.xml index 35fd1bac50..27155869c8 100644 --- a/addons/diagnostics/pom.xml +++ b/addons/diagnostics/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.1-SNAPSHOT + 2.3.0 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 5b3e7e279c..def6c2d35a 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 - 2.3.1-SNAPSHOT + 2.3.0 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 b6d9ef8a39..9be0a57fc1 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 - 2.3.1-SNAPSHOT + 2.3.0 indy-ftests-dot-maven diff --git a/addons/dot-maven/jaxrs/pom.xml b/addons/dot-maven/jaxrs/pom.xml index 5b88d335a8..02fc695fc5 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 - 2.3.1-SNAPSHOT + 2.3.0 indy-dot-maven-jaxrs diff --git a/addons/dot-maven/pom.xml b/addons/dot-maven/pom.xml index e296f1bb61..e1626a57ef 100644 --- a/addons/dot-maven/pom.xml +++ b/addons/dot-maven/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.1-SNAPSHOT + 2.3.0 indy-dot-maven diff --git a/addons/event-audit/common/pom.xml b/addons/event-audit/common/pom.xml index f5d836dbb1..8a457976b6 100644 --- a/addons/event-audit/common/pom.xml +++ b/addons/event-audit/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-event-audit - 2.3.1-SNAPSHOT + 2.3.0 indy-event-audit-common diff --git a/addons/event-audit/pom.xml b/addons/event-audit/pom.xml index 90770a4e31..7d4ff58aa9 100644 --- a/addons/event-audit/pom.xml +++ b/addons/event-audit/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.1-SNAPSHOT + 2.3.0 indy-event-audit diff --git a/addons/folo/client-java/pom.xml b/addons/folo/client-java/pom.xml index e42252fac4..b4151c3557 100644 --- a/addons/folo/client-java/pom.xml +++ b/addons/folo/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.3.1-SNAPSHOT + 2.3.0 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 d240f53f81..85cf71ac69 100644 --- a/addons/folo/common/pom.xml +++ b/addons/folo/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.3.1-SNAPSHOT + 2.3.0 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 12d81aabea..7389ca9c9e 100644 --- a/addons/folo/ftests/pom.xml +++ b/addons/folo/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.3.1-SNAPSHOT + 2.3.0 indy-ftests-folo diff --git a/addons/folo/jaxrs/pom.xml b/addons/folo/jaxrs/pom.xml index c212486856..c06223439d 100644 --- a/addons/folo/jaxrs/pom.xml +++ b/addons/folo/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.3.1-SNAPSHOT + 2.3.0 indy-folo-jaxrs diff --git a/addons/folo/model-java/pom.xml b/addons/folo/model-java/pom.xml index 1fef90c316..fc17e66a06 100644 --- a/addons/folo/model-java/pom.xml +++ b/addons/folo/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.3.1-SNAPSHOT + 2.3.0 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 be1296cb41..715502f064 100644 --- a/addons/folo/pom.xml +++ b/addons/folo/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.1-SNAPSHOT + 2.3.0 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 7d8db5d2c9..ef1c3923d0 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 - 2.3.1-SNAPSHOT + 2.3.0 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 77cf1ab180..6546c735ee 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 - 2.3.1-SNAPSHOT + 2.3.0 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 90d69b3413..b753e8d2e2 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 - 2.3.1-SNAPSHOT + 2.3.0 indy-ftests-hosted-by-archive diff --git a/addons/hosted-by-archive/jaxrs/pom.xml b/addons/hosted-by-archive/jaxrs/pom.xml index 702c31d048..1ce22eebbc 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 - 2.3.1-SNAPSHOT + 2.3.0 indy-hosted-by-archive-jaxrs diff --git a/addons/hosted-by-archive/pom.xml b/addons/hosted-by-archive/pom.xml index a6aacae656..f44da728de 100644 --- a/addons/hosted-by-archive/pom.xml +++ b/addons/hosted-by-archive/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.1-SNAPSHOT + 2.3.0 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 7646c3b1c3..e380b0d4c4 100644 --- a/addons/httprox/common/pom.xml +++ b/addons/httprox/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.3.1-SNAPSHOT + 2.3.0 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 2a8ec6b823..deb3d4065e 100644 --- a/addons/httprox/ftests/pom.xml +++ b/addons/httprox/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.3.1-SNAPSHOT + 2.3.0 indy-ftests-httprox diff --git a/addons/httprox/jaxrs/pom.xml b/addons/httprox/jaxrs/pom.xml index 0f595181d1..65fcc30594 100644 --- a/addons/httprox/jaxrs/pom.xml +++ b/addons/httprox/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.3.1-SNAPSHOT + 2.3.0 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 76fd6dd9e4..f6101dc202 100644 --- a/addons/httprox/pom.xml +++ b/addons/httprox/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.1-SNAPSHOT + 2.3.0 indy-httprox diff --git a/addons/implied-repos/client-java/pom.xml b/addons/implied-repos/client-java/pom.xml index f779d8454b..aaa1fdb2d7 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 - 2.3.1-SNAPSHOT + 2.3.0 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 b50bdd41fd..02f8ef6591 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 - 2.3.1-SNAPSHOT + 2.3.0 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 9eb3b6e472..4b685069e1 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 - 2.3.1-SNAPSHOT + 2.3.0 indy-ftests-implied-repos diff --git a/addons/implied-repos/model-java/pom.xml b/addons/implied-repos/model-java/pom.xml index 8914076fd0..5afc2d4e8a 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 - 2.3.1-SNAPSHOT + 2.3.0 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 9122cd173e..02155aeb24 100644 --- a/addons/implied-repos/pom.xml +++ b/addons/implied-repos/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.1-SNAPSHOT + 2.3.0 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 c211df3729..3d21a4700a 100644 --- a/addons/koji/client-java/pom.xml +++ b/addons/koji/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.3.1-SNAPSHOT + 2.3.0 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 7ebe8f05ad..923d4c66d1 100644 --- a/addons/koji/common/pom.xml +++ b/addons/koji/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.3.1-SNAPSHOT + 2.3.0 indy-koji-common Indy :: Add-Ons :: Koji Integration :: Common diff --git a/addons/koji/jaxrs/pom.xml b/addons/koji/jaxrs/pom.xml index 609fcc4597..7d0a000263 100644 --- a/addons/koji/jaxrs/pom.xml +++ b/addons/koji/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.3.1-SNAPSHOT + 2.3.0 indy-koji-jaxrs diff --git a/addons/koji/model-java/pom.xml b/addons/koji/model-java/pom.xml index 3ffeee42c9..11f70b4a68 100644 --- a/addons/koji/model-java/pom.xml +++ b/addons/koji/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.3.1-SNAPSHOT + 2.3.0 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 c9f208f28f..a2c41ea128 100644 --- a/addons/koji/pom.xml +++ b/addons/koji/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.1-SNAPSHOT + 2.3.0 indy-koji Indy :: Add-Ons :: Koji Integration :: Parent diff --git a/addons/path-mapped/common/pom.xml b/addons/path-mapped/common/pom.xml index ea66e28b6e..acc88bf236 100644 --- a/addons/path-mapped/common/pom.xml +++ b/addons/path-mapped/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.3.1-SNAPSHOT + 2.3.0 indy-path-mapped-common diff --git a/addons/path-mapped/jaxrs/pom.xml b/addons/path-mapped/jaxrs/pom.xml index 2f147f7157..887335f872 100644 --- a/addons/path-mapped/jaxrs/pom.xml +++ b/addons/path-mapped/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.3.1-SNAPSHOT + 2.3.0 indy-path-mapped-jaxrs diff --git a/addons/path-mapped/model-java/pom.xml b/addons/path-mapped/model-java/pom.xml index ca6d1a6e32..603f241172 100644 --- a/addons/path-mapped/model-java/pom.xml +++ b/addons/path-mapped/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.3.1-SNAPSHOT + 2.3.0 indy-path-mapped-model-java diff --git a/addons/path-mapped/pom.xml b/addons/path-mapped/pom.xml index 9aa2d57ccd..a7b6a0e9cc 100644 --- a/addons/path-mapped/pom.xml +++ b/addons/path-mapped/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.1-SNAPSHOT + 2.3.0 indy-path-mapped Indy :: Add-Ons :: Path Mapped :: Parent diff --git a/addons/pkg-maven/common/pom.xml b/addons/pkg-maven/common/pom.xml index 0f9f2fcfbb..f9f52dbed7 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 - 2.3.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/addons/pkg-maven/ftests/pom.xml b/addons/pkg-maven/ftests/pom.xml index 555fc341e5..410401acac 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 - 2.3.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/addons/pkg-maven/jaxrs/pom.xml b/addons/pkg-maven/jaxrs/pom.xml index fb95ddb2ea..83dbc94b0f 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 - 2.3.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/addons/pkg-maven/pom.xml b/addons/pkg-maven/pom.xml index c8da871908..a6e11ee82e 100644 --- a/addons/pkg-maven/pom.xml +++ b/addons/pkg-maven/pom.xml @@ -20,7 +20,7 @@ indy-addons org.commonjava.indy - 2.3.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/addons/pkg-npm/common/pom.xml b/addons/pkg-npm/common/pom.xml index d73550364f..362dc0fc67 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 - 2.3.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/addons/pkg-npm/ftests/pom.xml b/addons/pkg-npm/ftests/pom.xml index aaefabc144..3c30d7af9f 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 - 2.3.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/addons/pkg-npm/jaxrs/pom.xml b/addons/pkg-npm/jaxrs/pom.xml index ab5d85a94c..1f974ee013 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 - 2.3.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/addons/pkg-npm/model-java/pom.xml b/addons/pkg-npm/model-java/pom.xml index e792c57e6f..7df3c3c0ef 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 - 2.3.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/addons/pkg-npm/pom.xml b/addons/pkg-npm/pom.xml index 96acdd61dd..d0b8b55727 100644 --- a/addons/pkg-npm/pom.xml +++ b/addons/pkg-npm/pom.xml @@ -20,7 +20,7 @@ indy-addons org.commonjava.indy - 2.3.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/addons/pom.xml b/addons/pom.xml index 4e65ca8d94..d583462ce5 100644 --- a/addons/pom.xml +++ b/addons/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-parent - 2.3.1-SNAPSHOT + 2.3.0 indy-addons diff --git a/addons/promote/client-java/pom.xml b/addons/promote/client-java/pom.xml index 5bc00e55e5..442282cb65 100644 --- a/addons/promote/client-java/pom.xml +++ b/addons/promote/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.3.1-SNAPSHOT + 2.3.0 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 3a2a63c42b..89cb65bf3d 100644 --- a/addons/promote/common/pom.xml +++ b/addons/promote/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.3.1-SNAPSHOT + 2.3.0 indy-promote-common Indy :: Add-Ons :: Artifact Promotion :: Common diff --git a/addons/promote/ftests/pom.xml b/addons/promote/ftests/pom.xml index 73e868b2c0..95749f15f8 100644 --- a/addons/promote/ftests/pom.xml +++ b/addons/promote/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.3.1-SNAPSHOT + 2.3.0 indy-ftests-promote diff --git a/addons/promote/jaxrs/pom.xml b/addons/promote/jaxrs/pom.xml index a94f79f8e7..d934be4708 100644 --- a/addons/promote/jaxrs/pom.xml +++ b/addons/promote/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.3.1-SNAPSHOT + 2.3.0 indy-promote-jaxrs diff --git a/addons/promote/model-java/pom.xml b/addons/promote/model-java/pom.xml index 4b82e9ae91..c305809e75 100644 --- a/addons/promote/model-java/pom.xml +++ b/addons/promote/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.3.1-SNAPSHOT + 2.3.0 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 b72722127b..e8f19fa746 100644 --- a/addons/promote/pom.xml +++ b/addons/promote/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.1-SNAPSHOT + 2.3.0 indy-promote Indy :: Add-Ons :: Artifact Promotion :: Parent diff --git a/addons/repo-proxy/common/pom.xml b/addons/repo-proxy/common/pom.xml index 04cc76f311..3fc1ca2bd5 100644 --- a/addons/repo-proxy/common/pom.xml +++ b/addons/repo-proxy/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-repo-proxy - 2.3.1-SNAPSHOT + 2.3.0 indy-repo-proxy-common Indy :: Add-Ons :: Repository-Proxy :: Common diff --git a/addons/repo-proxy/ftests/pom.xml b/addons/repo-proxy/ftests/pom.xml index 1880a1fdc3..217bc68ac9 100644 --- a/addons/repo-proxy/ftests/pom.xml +++ b/addons/repo-proxy/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-repo-proxy - 2.3.1-SNAPSHOT + 2.3.0 indy-ftests-repo-proxy diff --git a/addons/repo-proxy/jaxrs/pom.xml b/addons/repo-proxy/jaxrs/pom.xml index 1046b1e795..cd57139326 100644 --- a/addons/repo-proxy/jaxrs/pom.xml +++ b/addons/repo-proxy/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-repo-proxy - 2.3.1-SNAPSHOT + 2.3.0 indy-repo-proxy-jaxrs diff --git a/addons/repo-proxy/pom.xml b/addons/repo-proxy/pom.xml index e537a14ab7..581e3f254e 100644 --- a/addons/repo-proxy/pom.xml +++ b/addons/repo-proxy/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.1-SNAPSHOT + 2.3.0 indy-repo-proxy Indy :: Add-Ons :: Repository-Proxy :: Parent diff --git a/addons/revisions/common/pom.xml b/addons/revisions/common/pom.xml index 96ce90f263..a8ddc3ebfd 100644 --- a/addons/revisions/common/pom.xml +++ b/addons/revisions/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-revisions - 2.3.1-SNAPSHOT + 2.3.0 indy-revisions-common Indy :: Add-Ons :: Revisions :: Common diff --git a/addons/revisions/jaxrs/pom.xml b/addons/revisions/jaxrs/pom.xml index 379e28efc7..abe50652c1 100644 --- a/addons/revisions/jaxrs/pom.xml +++ b/addons/revisions/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-revisions - 2.3.1-SNAPSHOT + 2.3.0 indy-revisions-jaxrs diff --git a/addons/revisions/pom.xml b/addons/revisions/pom.xml index d016402cef..31ef179b51 100644 --- a/addons/revisions/pom.xml +++ b/addons/revisions/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.1-SNAPSHOT + 2.3.0 indy-revisions Indy :: Add-Ons :: Revisions :: Parent diff --git a/addons/sli/pom.xml b/addons/sli/pom.xml index 449ae2c258..942341733e 100644 --- a/addons/sli/pom.xml +++ b/addons/sli/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.1-SNAPSHOT + 2.3.0 indy-sli Indy :: Add-Ons :: Service Level Indicators Reporting :: JAX-RS diff --git a/api/pom.xml b/api/pom.xml index 58048edacf..e257dc753c 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.1-SNAPSHOT + 2.3.0 indy-api diff --git a/bindings/jaxrs/pom.xml b/bindings/jaxrs/pom.xml index 46679ad14b..cd85bc994e 100644 --- a/bindings/jaxrs/pom.xml +++ b/bindings/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-bindings - 2.3.1-SNAPSHOT + 2.3.0 indy-bindings-jaxrs diff --git a/bindings/pom.xml b/bindings/pom.xml index 7e3a87f446..45c7c3cd33 100644 --- a/bindings/pom.xml +++ b/bindings/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-parent - 2.3.1-SNAPSHOT + 2.3.0 indy-bindings diff --git a/boot/jaxrs/pom.xml b/boot/jaxrs/pom.xml index a5af953903..bc88ecfa7c 100644 --- a/boot/jaxrs/pom.xml +++ b/boot/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.boot indy-booters - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy.boot diff --git a/boot/pom.xml b/boot/pom.xml index 90531e11dd..02413e47de 100644 --- a/boot/pom.xml +++ b/boot/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy.boot diff --git a/clients/core-java/pom.xml b/clients/core-java/pom.xml index ea39c07326..eed9089e21 100644 --- a/clients/core-java/pom.xml +++ b/clients/core-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-clients-parent - 2.3.1-SNAPSHOT + 2.3.0 indy-client-core-java diff --git a/clients/pom.xml b/clients/pom.xml index f6324186ab..dfd582f6e1 100644 --- a/clients/pom.xml +++ b/clients/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.1-SNAPSHOT + 2.3.0 indy-clients-parent diff --git a/core/pom.xml b/core/pom.xml index 67cf6913d9..5765559abc 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.1-SNAPSHOT + 2.3.0 indy-core diff --git a/db/common/pom.xml b/db/common/pom.xml index c78e04fed9..c2f223f054 100644 --- a/db/common/pom.xml +++ b/db/common/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-db - 2.3.1-SNAPSHOT + 2.3.0 indy-db-common diff --git a/db/flat/pom.xml b/db/flat/pom.xml index e8010d8ad2..6559e60bca 100644 --- a/db/flat/pom.xml +++ b/db/flat/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.3.1-SNAPSHOT + 2.3.0 indy-db-flat diff --git a/db/infinispan/pom.xml b/db/infinispan/pom.xml index 19cf6022fa..bf2fd3e16d 100644 --- a/db/infinispan/pom.xml +++ b/db/infinispan/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-db - 2.3.1-SNAPSHOT + 2.3.0 indy-db-infinispan diff --git a/db/memory/pom.xml b/db/memory/pom.xml index 4999f14df9..c746862dee 100644 --- a/db/memory/pom.xml +++ b/db/memory/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.3.1-SNAPSHOT + 2.3.0 indy-db-memory diff --git a/db/metrics/pom.xml b/db/metrics/pom.xml index 48abcbf8d4..3b48971250 100644 --- a/db/metrics/pom.xml +++ b/db/metrics/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.3.1-SNAPSHOT + 2.3.0 indy-db-metrics diff --git a/db/pom.xml b/db/pom.xml index 81e5b9e841..98fbb8d219 100644 --- a/db/pom.xml +++ b/db/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.1-SNAPSHOT + 2.3.0 indy-db diff --git a/deployments/launcher/pom.xml b/deployments/launcher/pom.xml index acf0fe643a..1376e27362 100644 --- a/deployments/launcher/pom.xml +++ b/deployments/launcher/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-deployments - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy.launch diff --git a/deployments/pom.xml b/deployments/pom.xml index 41d0e1d7fb..afc13247ad 100644 --- a/deployments/pom.xml +++ b/deployments/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.1-SNAPSHOT + 2.3.0 indy-deployments diff --git a/embedder/pom.xml b/embedder/pom.xml index 32a320e34b..a4c52d9981 100644 --- a/embedder/pom.xml +++ b/embedder/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy.embed diff --git a/filers/default/pom.xml b/filers/default/pom.xml index 91e90f0022..9de0979761 100644 --- a/filers/default/pom.xml +++ b/filers/default/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-file-managers - 2.3.1-SNAPSHOT + 2.3.0 indy-filer-default diff --git a/filers/pom.xml b/filers/pom.xml index 4b320f8392..1138a48864 100644 --- a/filers/pom.xml +++ b/filers/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.1-SNAPSHOT + 2.3.0 indy-file-managers diff --git a/ftests/common/pom.xml b/ftests/common/pom.xml index 907b7ad17b..f48a64b0b7 100644 --- a/ftests/common/pom.xml +++ b/ftests/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-ftests-parent - 2.3.1-SNAPSHOT + 2.3.0 indy-ftests-common diff --git a/ftests/core/pom.xml b/ftests/core/pom.xml index 8986980eb5..4cf506ae80 100644 --- a/ftests/core/pom.xml +++ b/ftests/core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-ftests-parent - 2.3.1-SNAPSHOT + 2.3.0 indy-ftests-core diff --git a/ftests/metrics/pom.xml b/ftests/metrics/pom.xml index ee09db0ceb..c3afd2799d 100644 --- a/ftests/metrics/pom.xml +++ b/ftests/metrics/pom.xml @@ -20,7 +20,7 @@ indy-ftests-parent org.commonjava.indy - 2.3.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/ftests/pom.xml b/ftests/pom.xml index 22c72fb756..a22666292c 100644 --- a/ftests/pom.xml +++ b/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.1-SNAPSHOT + 2.3.0 indy-ftests-parent diff --git a/models/core-java/pom.xml b/models/core-java/pom.xml index 8200f5d14d..824f03bba1 100644 --- a/models/core-java/pom.xml +++ b/models/core-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-models-parent - 2.3.1-SNAPSHOT + 2.3.0 indy-model-core-java diff --git a/models/pom.xml b/models/pom.xml index 72433f7ed5..f697237fc3 100644 --- a/models/pom.xml +++ b/models/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.1-SNAPSHOT + 2.3.0 indy-models-parent diff --git a/pom.xml b/pom.xml index 33e31c424e..8e3c3b0a91 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.commonjava.indy indy-parent - 2.3.1-SNAPSHOT + 2.3.0 pom @@ -37,7 +37,7 @@ scm:git:https://github.com/CommonJava/indy scm:git:https://github.com/CommonJava/indy http://github.com/Commonjava/indy - HEAD + indy-parent-2.3.0 @@ -187,7 +187,7 @@ org.commonjava.indy.ui indy-ui-layover - 2.3.1-SNAPSHOT + 2.3.0 runtime @@ -195,22 +195,22 @@ org.commonjava.indy indy-model-core-java - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-api - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-core - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-core - 2.3.1-SNAPSHOT + 2.3.0 tar.gz confset provided @@ -218,32 +218,32 @@ org.commonjava.indy indy-db-flat - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-db-metrics - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-db-common - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-db-infinispan - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-bindings-jaxrs - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy.launch indy-launcher - 2.3.1-SNAPSHOT + 2.3.0 tar.gz skinny provided @@ -251,7 +251,7 @@ org.commonjava.indy.launch indy-launcher - 2.3.1-SNAPSHOT + 2.3.0 tar.gz complete provided @@ -259,7 +259,7 @@ org.commonjava.indy.launch indy-launcher - 2.3.1-SNAPSHOT + 2.3.0 tar.gz data provided @@ -267,7 +267,7 @@ org.commonjava.indy.launch indy-launcher - 2.3.1-SNAPSHOT + 2.3.0 tar.gz etc provided @@ -276,17 +276,17 @@ org.commonjava.indy indy-revisions-jaxrs - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-revisions-common - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-revisions-common - 2.3.1-SNAPSHOT + 2.3.0 tar.gz confset provided @@ -294,7 +294,7 @@ org.commonjava.indy indy-revisions-common - 2.3.1-SNAPSHOT + 2.3.0 tar.gz uiset provided @@ -302,12 +302,12 @@ org.commonjava.indy indy-dot-maven-common - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-dot-maven-common - 2.3.1-SNAPSHOT + 2.3.0 tar.gz dataset provided @@ -315,22 +315,22 @@ org.commonjava.indy indy-dot-maven-jaxrs - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-ftests-dot-maven - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-httprox-common - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-httprox-common - 2.3.1-SNAPSHOT + 2.3.0 tar.gz confset provided @@ -338,17 +338,17 @@ org.commonjava.indy indy-ftests-httprox - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-content-index - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-content-index - 2.3.1-SNAPSHOT + 2.3.0 tar.gz confset provided @@ -356,51 +356,51 @@ org.commonjava.indy indy-db-memory - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-test-db - 2.3.1-SNAPSHOT + 2.3.0 test org.commonjava.indy indy-test-fixtures-core - 2.3.1-SNAPSHOT + 2.3.0 test org.commonjava.indy indy-test-providers-core - 2.3.1-SNAPSHOT + 2.3.0 test org.commonjava.indy indy-test-utils - 2.3.1-SNAPSHOT + 2.3.0 test org.commonjava.indy indy-filer-default - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-subsys-jaxrs - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-subsys-honeycomb - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-subsys-honeycomb - 2.3.1-SNAPSHOT + 2.3.0 tar.gz confset provided @@ -408,17 +408,17 @@ org.commonjava.indy indy-subsys-flatfile - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-subsys-cassandra - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-subsys-cassandra - 2.3.1-SNAPSHOT + 2.3.0 tar.gz confset provided @@ -426,79 +426,79 @@ org.commonjava.indy indy-subsys-infinispan - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-subsys-http - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-subsys-git - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-subsys-groovy - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-subsys-prefetch - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-subsys-cpool - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-client-core-java - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-ftests-common - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-ftests-core - 2.3.1-SNAPSHOT + 2.3.0 test org.commonjava.indy indy-folo-jaxrs - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-ftests-folo - 2.3.1-SNAPSHOT + 2.3.0 test org.commonjava.indy indy-folo-client-java - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-folo-model-java - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-folo-common - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-folo-common - 2.3.1-SNAPSHOT + 2.3.0 tar.gz dataset provided @@ -506,7 +506,7 @@ org.commonjava.indy indy-folo-common - 2.3.1-SNAPSHOT + 2.3.0 tar.gz confset provided @@ -514,33 +514,33 @@ org.commonjava.indy indy-promote-jaxrs - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-ftests-promote - 2.3.1-SNAPSHOT + 2.3.0 test org.commonjava.indy indy-promote-client-java - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-promote-model-java - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-promote-common - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-promote-common - 2.3.1-SNAPSHOT + 2.3.0 tar.gz confset provided @@ -548,7 +548,7 @@ org.commonjava.indy indy-promote-common - 2.3.1-SNAPSHOT + 2.3.0 tar.gz dataset provided @@ -556,19 +556,19 @@ org.commonjava.indy indy-promote-common - 2.3.1-SNAPSHOT + 2.3.0 dataset provided org.commonjava.indy indy-implied-repos-common - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-implied-repos-common - 2.3.1-SNAPSHOT + 2.3.0 tar.gz confset provided @@ -576,37 +576,37 @@ org.commonjava.indy indy-implied-repos-model-java - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-implied-repos-client-java - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-ftests-implied-repos - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy.embed indy-embedder - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy.boot indy-booter-jaxrs - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-subsys-keycloak - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-subsys-keycloak - 2.3.1-SNAPSHOT + 2.3.0 tar.gz confset provided @@ -614,7 +614,7 @@ org.commonjava.indy indy-subsys-infinispan - 2.3.1-SNAPSHOT + 2.3.0 tar.gz confset provided @@ -622,7 +622,7 @@ org.commonjava.indy indy-subsys-prefetch - 2.3.1-SNAPSHOT + 2.3.0 tar.gz confset provided @@ -631,7 +631,7 @@ org.commonjava.indy indy-koji-common - 2.3.1-SNAPSHOT + 2.3.0 tar.gz confset provided @@ -639,103 +639,103 @@ org.commonjava.indy indy-koji-common - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-koji-model-java - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-koji-client-java - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-koji-jaxrs - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-path-mapped-common - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-path-mapped-model-java - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-path-mapped-jaxrs - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-pkg-maven-common - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-pkg-maven-jaxrs - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-pkg-npm-jaxrs - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-ftests-pkg-maven - 2.3.1-SNAPSHOT + 2.3.0 test org.commonjava.indy indy-ftests-pkg-npm - 2.3.1-SNAPSHOT + 2.3.0 test org.commonjava.indy indy-pkg-npm-common - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-pkg-npm-model-java - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-diagnostics-jaxrs - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-diagnostics-client-java - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-diagnostics-common - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-ftests-diagnostics - 2.3.1-SNAPSHOT + 2.3.0 test org.commonjava.indy indy-diagnostics-common - 2.3.1-SNAPSHOT + 2.3.0 confset tar.gz provided @@ -743,28 +743,28 @@ org.commonjava.indy indy-hosted-by-archive-common - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-hosted-by-archive-client-java - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-ftests-hosted-by-archive - 2.3.1-SNAPSHOT + 2.3.0 test org.commonjava.indy indy-hosted-by-archive-jaxrs - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-hosted-by-archive-common - 2.3.1-SNAPSHOT + 2.3.0 confset tar.gz @@ -772,22 +772,22 @@ org.commonjava.indy indy-subsys-metrics-core - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-subsys-metrics-reporter - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-subsys-metrics-prometheus - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-subsys-metrics-reporter - 2.3.1-SNAPSHOT + 2.3.0 confset tar.gz provided @@ -796,28 +796,28 @@ org.commonjava.indy indy-ftests-metrics - 2.3.1-SNAPSHOT + 2.3.0 test org.commonjava.indy indy-sli - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy.rest indy-rest-api yaml - 2.3.1-SNAPSHOT + 2.3.0 provided org.commonjava.indy.rest indy-rest-api json - 2.3.1-SNAPSHOT + 2.3.0 provided @@ -851,33 +851,33 @@ org.commonjava.indy indy-content-browse-common - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-content-browse-jaxrs - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-ftests-content-browse - 2.3.1-SNAPSHOT + 2.3.0 test org.commonjava.indy indy-content-browse-model-java - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-content-browse-client-java - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-content-browse-common - 2.3.1-SNAPSHOT + 2.3.0 confset tar.gz provided @@ -885,35 +885,35 @@ org.commonjava.indy indy-content-browse-ui - 2.3.1-SNAPSHOT + 2.3.0 reactui tar.gz org.commonjava.indy indy-changelog-common - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-changelog-client-java - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-ftests-changelog - 2.3.1-SNAPSHOT + 2.3.0 test org.commonjava.indy indy-changelog-jaxrs - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-changelog-common - 2.3.1-SNAPSHOT + 2.3.0 confset tar.gz @@ -931,12 +931,12 @@ org.commonjava.indy indy-event-audit-common - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-event-audit-common - 2.3.1-SNAPSHOT + 2.3.0 confset tar.gz provided @@ -951,23 +951,23 @@ org.commonjava.indy indy-repo-proxy-common - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-repo-proxy-jaxrs - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy indy-ftests-repo-proxy - 2.3.1-SNAPSHOT + 2.3.0 test org.commonjava.indy indy-repo-proxy-common - 2.3.1-SNAPSHOT + 2.3.0 confset tar.gz diff --git a/rest/api/pom.xml b/rest/api/pom.xml index 4b66e85070..fe60ed482c 100644 --- a/rest/api/pom.xml +++ b/rest/api/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.rest indy-rest-parent - 2.3.1-SNAPSHOT + 2.3.0 indy-rest-api diff --git a/rest/pom.xml b/rest/pom.xml index 988dcceeca..cec45f016d 100644 --- a/rest/pom.xml +++ b/rest/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy.rest diff --git a/subsys/cassandra/pom.xml b/subsys/cassandra/pom.xml index 2a3dc93d37..d516f22c88 100644 --- a/subsys/cassandra/pom.xml +++ b/subsys/cassandra/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-subsystems - 2.3.1-SNAPSHOT + 2.3.0 indy-subsys-cassandra diff --git a/subsys/cpool/pom.xml b/subsys/cpool/pom.xml index bcd01527cc..568d0dde85 100644 --- a/subsys/cpool/pom.xml +++ b/subsys/cpool/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.3.1-SNAPSHOT + 2.3.0 indy-subsys-cpool diff --git a/subsys/flatfile/pom.xml b/subsys/flatfile/pom.xml index 51d0faeecb..6df172be83 100644 --- a/subsys/flatfile/pom.xml +++ b/subsys/flatfile/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.3.1-SNAPSHOT + 2.3.0 indy-subsys-flatfile diff --git a/subsys/git/pom.xml b/subsys/git/pom.xml index f8bac07685..af288ea205 100644 --- a/subsys/git/pom.xml +++ b/subsys/git/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.3.1-SNAPSHOT + 2.3.0 indy-subsys-git diff --git a/subsys/groovy/pom.xml b/subsys/groovy/pom.xml index 62d3b3ed68..c8c6fd40cd 100644 --- a/subsys/groovy/pom.xml +++ b/subsys/groovy/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.3.1-SNAPSHOT + 2.3.0 indy-subsys-groovy diff --git a/subsys/honeycomb/pom.xml b/subsys/honeycomb/pom.xml index a932d7e27f..3aa86532c7 100644 --- a/subsys/honeycomb/pom.xml +++ b/subsys/honeycomb/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.3.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/subsys/http/pom.xml b/subsys/http/pom.xml index 25945f743f..4abd44570a 100644 --- a/subsys/http/pom.xml +++ b/subsys/http/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.3.1-SNAPSHOT + 2.3.0 indy-subsys-http diff --git a/subsys/infinispan/pom.xml b/subsys/infinispan/pom.xml index d213f42fb4..29fd78c9fc 100644 --- a/subsys/infinispan/pom.xml +++ b/subsys/infinispan/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.3.1-SNAPSHOT + 2.3.0 indy-subsys-infinispan diff --git a/subsys/jaxrs/pom.xml b/subsys/jaxrs/pom.xml index e1e08bc461..486b88b10e 100644 --- a/subsys/jaxrs/pom.xml +++ b/subsys/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.3.1-SNAPSHOT + 2.3.0 indy-subsys-jaxrs diff --git a/subsys/kafka/pom.xml b/subsys/kafka/pom.xml index 5a23afa4d1..a718b0b115 100644 --- a/subsys/kafka/pom.xml +++ b/subsys/kafka/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.3.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/subsys/keycloak/pom.xml b/subsys/keycloak/pom.xml index cdeb51792e..f63fafc9d9 100644 --- a/subsys/keycloak/pom.xml +++ b/subsys/keycloak/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.3.1-SNAPSHOT + 2.3.0 indy-subsys-keycloak Indy :: Subsystems :: Keycloak diff --git a/subsys/metrics/core/pom.xml b/subsys/metrics/core/pom.xml index ddbb94ac78..4c551ef53f 100644 --- a/subsys/metrics/core/pom.xml +++ b/subsys/metrics/core/pom.xml @@ -20,7 +20,7 @@ indy-subsys-metrics org.commonjava.indy - 2.3.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/subsys/metrics/pom.xml b/subsys/metrics/pom.xml index 89b46754d2..d91a87e939 100644 --- a/subsys/metrics/pom.xml +++ b/subsys/metrics/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.3.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/subsys/metrics/prometheus/pom.xml b/subsys/metrics/prometheus/pom.xml index c56966e0dd..6da400c1d7 100644 --- a/subsys/metrics/prometheus/pom.xml +++ b/subsys/metrics/prometheus/pom.xml @@ -20,7 +20,7 @@ indy-subsys-metrics org.commonjava.indy - 2.3.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/subsys/metrics/reporter/pom.xml b/subsys/metrics/reporter/pom.xml index 584e17f87e..b80a434e7d 100644 --- a/subsys/metrics/reporter/pom.xml +++ b/subsys/metrics/reporter/pom.xml @@ -20,7 +20,7 @@ indy-subsys-metrics org.commonjava.indy - 2.3.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/subsys/pom.xml b/subsys/pom.xml index 52360c6b32..a631ec9126 100644 --- a/subsys/pom.xml +++ b/subsys/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.1-SNAPSHOT + 2.3.0 indy-subsystems diff --git a/subsys/prefetch/pom.xml b/subsys/prefetch/pom.xml index 5f51d1d0b3..0da1b4edb8 100644 --- a/subsys/prefetch/pom.xml +++ b/subsys/prefetch/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.3.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/test/db/pom.xml b/test/db/pom.xml index 1facdfea1e..2b19cadd7e 100644 --- a/test/db/pom.xml +++ b/test/db/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.3.1-SNAPSHOT + 2.3.0 indy-test-db diff --git a/test/fixtures-core/pom.xml b/test/fixtures-core/pom.xml index 107ead7aea..092bc9c081 100644 --- a/test/fixtures-core/pom.xml +++ b/test/fixtures-core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.3.1-SNAPSHOT + 2.3.0 indy-test-fixtures-core diff --git a/test/pom.xml b/test/pom.xml index 82249bae2e..44c25d37e9 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.1-SNAPSHOT + 2.3.0 indy-test diff --git a/test/providers-core/pom.xml b/test/providers-core/pom.xml index 86792ffb77..41cfe037c6 100644 --- a/test/providers-core/pom.xml +++ b/test/providers-core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.3.1-SNAPSHOT + 2.3.0 indy-test-providers-core diff --git a/test/utils/pom.xml b/test/utils/pom.xml index 6e9c0d73b9..d3cc042c61 100644 --- a/test/utils/pom.xml +++ b/test/utils/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.3.1-SNAPSHOT + 2.3.0 indy-test-utils diff --git a/tools/assemblies/pom.xml b/tools/assemblies/pom.xml index 960fda790c..87f551981f 100644 --- a/tools/assemblies/pom.xml +++ b/tools/assemblies/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.tools indy-tools - 2.3.1-SNAPSHOT + 2.3.0 indy-assemblies diff --git a/tools/pom.xml b/tools/pom.xml index b5054289d2..77668a67d4 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy.tools diff --git a/uis/layover/pom.xml b/uis/layover/pom.xml index 7abf843373..83bd37b954 100644 --- a/uis/layover/pom.xml +++ b/uis/layover/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.ui indy-uis - 2.3.1-SNAPSHOT + 2.3.0 indy-ui-layover diff --git a/uis/pom.xml b/uis/pom.xml index f916f5a0b9..c0aa544ea1 100644 --- a/uis/pom.xml +++ b/uis/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.1-SNAPSHOT + 2.3.0 org.commonjava.indy.ui From ad7280be91d41bc1a80ffc1aa502424b6a10a03b Mon Sep 17 00:00:00 2001 From: liyu Date: Tue, 2 Jun 2020 17:40:43 +0800 Subject: [PATCH 23/50] Revert "[maven-release-plugin] prepare release indy-parent-2.3.0" This reverts commit 73a247caa32d820945bf6b67d0ba606e81844240. --- addons/changelog/client-java/pom.xml | 2 +- addons/changelog/common/pom.xml | 2 +- addons/changelog/ftests/pom.xml | 2 +- addons/changelog/jaxrs/pom.xml | 2 +- addons/changelog/pom.xml | 2 +- addons/content-browse/client-java/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/event-audit/common/pom.xml | 2 +- addons/event-audit/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/path-mapped/common/pom.xml | 2 +- addons/path-mapped/jaxrs/pom.xml | 2 +- addons/path-mapped/model-java/pom.xml | 2 +- addons/path-mapped/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/repo-proxy/common/pom.xml | 2 +- addons/repo-proxy/ftests/pom.xml | 2 +- addons/repo-proxy/jaxrs/pom.xml | 2 +- addons/repo-proxy/pom.xml | 2 +- addons/revisions/common/pom.xml | 2 +- addons/revisions/jaxrs/pom.xml | 2 +- addons/revisions/pom.xml | 2 +- addons/sli/pom.xml | 2 +- api/pom.xml | 2 +- bindings/jaxrs/pom.xml | 2 +- bindings/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/common/pom.xml | 2 +- db/flat/pom.xml | 2 +- db/infinispan/pom.xml | 2 +- db/memory/pom.xml | 2 +- db/metrics/pom.xml | 2 +- db/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 | 254 +++++++++---------- rest/api/pom.xml | 2 +- rest/pom.xml | 2 +- subsys/cassandra/pom.xml | 2 +- subsys/cpool/pom.xml | 2 +- subsys/flatfile/pom.xml | 2 +- subsys/git/pom.xml | 2 +- subsys/groovy/pom.xml | 2 +- subsys/honeycomb/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/prometheus/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 +- 131 files changed, 257 insertions(+), 257 deletions(-) diff --git a/addons/changelog/client-java/pom.xml b/addons/changelog/client-java/pom.xml index 09e059c6d6..4106f0a9ad 100644 --- a/addons/changelog/client-java/pom.xml +++ b/addons/changelog/client-java/pom.xml @@ -20,7 +20,7 @@ indy-changelog org.commonjava.indy - 2.3.0 + 2.2.1-SNAPSHOT 4.0.0 diff --git a/addons/changelog/common/pom.xml b/addons/changelog/common/pom.xml index 9fd2efef29..dc62ceb2a8 100644 --- a/addons/changelog/common/pom.xml +++ b/addons/changelog/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.3.0 + 2.2.1-SNAPSHOT indy-changelog-common Indy :: Add-Ons :: ChangeLog :: Common diff --git a/addons/changelog/ftests/pom.xml b/addons/changelog/ftests/pom.xml index 7dbabc5056..f20a9476bf 100644 --- a/addons/changelog/ftests/pom.xml +++ b/addons/changelog/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.3.0 + 2.2.1-SNAPSHOT indy-ftests-changelog diff --git a/addons/changelog/jaxrs/pom.xml b/addons/changelog/jaxrs/pom.xml index f29eea040e..ce7ba4e046 100644 --- a/addons/changelog/jaxrs/pom.xml +++ b/addons/changelog/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.3.0 + 2.2.1-SNAPSHOT indy-changelog-jaxrs diff --git a/addons/changelog/pom.xml b/addons/changelog/pom.xml index a94b540dd6..f63b1cb7c7 100644 --- a/addons/changelog/pom.xml +++ b/addons/changelog/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.0 + 2.2.1-SNAPSHOT indy-changelog Indy :: Add-Ons :: ChangeLog :: Parent diff --git a/addons/content-browse/client-java/pom.xml b/addons/content-browse/client-java/pom.xml index 3275dc2a3c..c75c9cbc61 100644 --- a/addons/content-browse/client-java/pom.xml +++ b/addons/content-browse/client-java/pom.xml @@ -20,7 +20,7 @@ indy-content-browse org.commonjava.indy - 2.3.0 + 2.2.1-SNAPSHOT 4.0.0 diff --git a/addons/content-browse/common/pom.xml b/addons/content-browse/common/pom.xml index 6099f654aa..48cf0eba66 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 - 2.3.0 + 2.2.1-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 499be7649d..714d4b8ab5 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 - 2.3.0 + 2.2.1-SNAPSHOT indy-ftests-content-browse diff --git a/addons/content-browse/jaxrs/pom.xml b/addons/content-browse/jaxrs/pom.xml index f986f86ca5..b9207855f8 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 - 2.3.0 + 2.2.1-SNAPSHOT indy-content-browse-jaxrs diff --git a/addons/content-browse/model-java/pom.xml b/addons/content-browse/model-java/pom.xml index 554ac325ea..c3988d9549 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 - 2.3.0 + 2.2.1-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 ff2abd54e3..2c971dde7d 100644 --- a/addons/content-browse/pom.xml +++ b/addons/content-browse/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.0 + 2.2.1-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 048c14497e..33ffcf7632 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 - 2.3.0 + 2.2.1-SNAPSHOT 4.0.0 diff --git a/addons/content-index/pom.xml b/addons/content-index/pom.xml index 1e51281a07..4ce75edcc7 100644 --- a/addons/content-index/pom.xml +++ b/addons/content-index/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.0 + 2.2.1-SNAPSHOT indy-content-index diff --git a/addons/diagnostics/client-java/pom.xml b/addons/diagnostics/client-java/pom.xml index eb0275b636..f80176bba0 100644 --- a/addons/diagnostics/client-java/pom.xml +++ b/addons/diagnostics/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.3.0 + 2.2.1-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 30293043e2..6e30401e9a 100644 --- a/addons/diagnostics/common/pom.xml +++ b/addons/diagnostics/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.3.0 + 2.2.1-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 22de3011f0..b2881ac943 100644 --- a/addons/diagnostics/ftests/pom.xml +++ b/addons/diagnostics/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.3.0 + 2.2.1-SNAPSHOT indy-ftests-diagnostics diff --git a/addons/diagnostics/jaxrs/pom.xml b/addons/diagnostics/jaxrs/pom.xml index 70aba53c86..19404ed66d 100644 --- a/addons/diagnostics/jaxrs/pom.xml +++ b/addons/diagnostics/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.3.0 + 2.2.1-SNAPSHOT indy-diagnostics-jaxrs diff --git a/addons/diagnostics/pom.xml b/addons/diagnostics/pom.xml index 27155869c8..083fcd525e 100644 --- a/addons/diagnostics/pom.xml +++ b/addons/diagnostics/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.0 + 2.2.1-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 def6c2d35a..7377968466 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 - 2.3.0 + 2.2.1-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 9be0a57fc1..f698895cdb 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 - 2.3.0 + 2.2.1-SNAPSHOT indy-ftests-dot-maven diff --git a/addons/dot-maven/jaxrs/pom.xml b/addons/dot-maven/jaxrs/pom.xml index 02fc695fc5..a5a13b3103 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 - 2.3.0 + 2.2.1-SNAPSHOT indy-dot-maven-jaxrs diff --git a/addons/dot-maven/pom.xml b/addons/dot-maven/pom.xml index e1626a57ef..11669e8798 100644 --- a/addons/dot-maven/pom.xml +++ b/addons/dot-maven/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.0 + 2.2.1-SNAPSHOT indy-dot-maven diff --git a/addons/event-audit/common/pom.xml b/addons/event-audit/common/pom.xml index 8a457976b6..7e114e54b2 100644 --- a/addons/event-audit/common/pom.xml +++ b/addons/event-audit/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-event-audit - 2.3.0 + 2.2.1-SNAPSHOT indy-event-audit-common diff --git a/addons/event-audit/pom.xml b/addons/event-audit/pom.xml index 7d4ff58aa9..a220b49a02 100644 --- a/addons/event-audit/pom.xml +++ b/addons/event-audit/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.0 + 2.2.1-SNAPSHOT indy-event-audit diff --git a/addons/folo/client-java/pom.xml b/addons/folo/client-java/pom.xml index b4151c3557..30aaa0d6c1 100644 --- a/addons/folo/client-java/pom.xml +++ b/addons/folo/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.3.0 + 2.2.1-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 85cf71ac69..990a0426ff 100644 --- a/addons/folo/common/pom.xml +++ b/addons/folo/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.3.0 + 2.2.1-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 7389ca9c9e..56c5565b1e 100644 --- a/addons/folo/ftests/pom.xml +++ b/addons/folo/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.3.0 + 2.2.1-SNAPSHOT indy-ftests-folo diff --git a/addons/folo/jaxrs/pom.xml b/addons/folo/jaxrs/pom.xml index c06223439d..4d650a080a 100644 --- a/addons/folo/jaxrs/pom.xml +++ b/addons/folo/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.3.0 + 2.2.1-SNAPSHOT indy-folo-jaxrs diff --git a/addons/folo/model-java/pom.xml b/addons/folo/model-java/pom.xml index fc17e66a06..c193252f6a 100644 --- a/addons/folo/model-java/pom.xml +++ b/addons/folo/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.3.0 + 2.2.1-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 715502f064..8ed7c045df 100644 --- a/addons/folo/pom.xml +++ b/addons/folo/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.0 + 2.2.1-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 ef1c3923d0..ba064ae7b7 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 - 2.3.0 + 2.2.1-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 6546c735ee..058c69a386 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 - 2.3.0 + 2.2.1-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 b753e8d2e2..206dda7ac6 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 - 2.3.0 + 2.2.1-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 1ce22eebbc..ca1e8f53b9 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 - 2.3.0 + 2.2.1-SNAPSHOT indy-hosted-by-archive-jaxrs diff --git a/addons/hosted-by-archive/pom.xml b/addons/hosted-by-archive/pom.xml index f44da728de..a37d91b7fc 100644 --- a/addons/hosted-by-archive/pom.xml +++ b/addons/hosted-by-archive/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.0 + 2.2.1-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 e380b0d4c4..b7ff6fe1b1 100644 --- a/addons/httprox/common/pom.xml +++ b/addons/httprox/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.3.0 + 2.2.1-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 deb3d4065e..08d52012de 100644 --- a/addons/httprox/ftests/pom.xml +++ b/addons/httprox/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.3.0 + 2.2.1-SNAPSHOT indy-ftests-httprox diff --git a/addons/httprox/jaxrs/pom.xml b/addons/httprox/jaxrs/pom.xml index 65fcc30594..d33993ec85 100644 --- a/addons/httprox/jaxrs/pom.xml +++ b/addons/httprox/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.3.0 + 2.2.1-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 f6101dc202..b6b453d796 100644 --- a/addons/httprox/pom.xml +++ b/addons/httprox/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.0 + 2.2.1-SNAPSHOT indy-httprox diff --git a/addons/implied-repos/client-java/pom.xml b/addons/implied-repos/client-java/pom.xml index aaa1fdb2d7..fa570c2fa7 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 - 2.3.0 + 2.2.1-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 02f8ef6591..2ad16ec781 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 - 2.3.0 + 2.2.1-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 4b685069e1..d192462cef 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 - 2.3.0 + 2.2.1-SNAPSHOT indy-ftests-implied-repos diff --git a/addons/implied-repos/model-java/pom.xml b/addons/implied-repos/model-java/pom.xml index 5afc2d4e8a..9e79b325f7 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 - 2.3.0 + 2.2.1-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 02155aeb24..0d2dc70df3 100644 --- a/addons/implied-repos/pom.xml +++ b/addons/implied-repos/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.0 + 2.2.1-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 3d21a4700a..d4ac5a431f 100644 --- a/addons/koji/client-java/pom.xml +++ b/addons/koji/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.3.0 + 2.2.1-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 923d4c66d1..c53d7a0aec 100644 --- a/addons/koji/common/pom.xml +++ b/addons/koji/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.3.0 + 2.2.1-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 7d0a000263..f845163a70 100644 --- a/addons/koji/jaxrs/pom.xml +++ b/addons/koji/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.3.0 + 2.2.1-SNAPSHOT indy-koji-jaxrs diff --git a/addons/koji/model-java/pom.xml b/addons/koji/model-java/pom.xml index 11f70b4a68..d214b74f9f 100644 --- a/addons/koji/model-java/pom.xml +++ b/addons/koji/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.3.0 + 2.2.1-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 a2c41ea128..400a9b75a4 100644 --- a/addons/koji/pom.xml +++ b/addons/koji/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.0 + 2.2.1-SNAPSHOT indy-koji Indy :: Add-Ons :: Koji Integration :: Parent diff --git a/addons/path-mapped/common/pom.xml b/addons/path-mapped/common/pom.xml index acc88bf236..4074654215 100644 --- a/addons/path-mapped/common/pom.xml +++ b/addons/path-mapped/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.3.0 + 2.2.1-SNAPSHOT indy-path-mapped-common diff --git a/addons/path-mapped/jaxrs/pom.xml b/addons/path-mapped/jaxrs/pom.xml index 887335f872..b5badd3ee8 100644 --- a/addons/path-mapped/jaxrs/pom.xml +++ b/addons/path-mapped/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.3.0 + 2.2.1-SNAPSHOT indy-path-mapped-jaxrs diff --git a/addons/path-mapped/model-java/pom.xml b/addons/path-mapped/model-java/pom.xml index 603f241172..88e4dff1c4 100644 --- a/addons/path-mapped/model-java/pom.xml +++ b/addons/path-mapped/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.3.0 + 2.2.1-SNAPSHOT indy-path-mapped-model-java diff --git a/addons/path-mapped/pom.xml b/addons/path-mapped/pom.xml index a7b6a0e9cc..b45f48494c 100644 --- a/addons/path-mapped/pom.xml +++ b/addons/path-mapped/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.0 + 2.2.1-SNAPSHOT indy-path-mapped Indy :: Add-Ons :: Path Mapped :: Parent diff --git a/addons/pkg-maven/common/pom.xml b/addons/pkg-maven/common/pom.xml index f9f52dbed7..2c3dcdf8c1 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 - 2.3.0 + 2.2.1-SNAPSHOT 4.0.0 diff --git a/addons/pkg-maven/ftests/pom.xml b/addons/pkg-maven/ftests/pom.xml index 410401acac..1183fd25cf 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 - 2.3.0 + 2.2.1-SNAPSHOT 4.0.0 diff --git a/addons/pkg-maven/jaxrs/pom.xml b/addons/pkg-maven/jaxrs/pom.xml index 83dbc94b0f..f652c83377 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 - 2.3.0 + 2.2.1-SNAPSHOT 4.0.0 diff --git a/addons/pkg-maven/pom.xml b/addons/pkg-maven/pom.xml index a6e11ee82e..a26ea12c02 100644 --- a/addons/pkg-maven/pom.xml +++ b/addons/pkg-maven/pom.xml @@ -20,7 +20,7 @@ indy-addons org.commonjava.indy - 2.3.0 + 2.2.1-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/common/pom.xml b/addons/pkg-npm/common/pom.xml index 362dc0fc67..920f2363b5 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 - 2.3.0 + 2.2.1-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/ftests/pom.xml b/addons/pkg-npm/ftests/pom.xml index 3c30d7af9f..ca5211b0f4 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 - 2.3.0 + 2.2.1-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/jaxrs/pom.xml b/addons/pkg-npm/jaxrs/pom.xml index 1f974ee013..efd6975f9b 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 - 2.3.0 + 2.2.1-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/model-java/pom.xml b/addons/pkg-npm/model-java/pom.xml index 7df3c3c0ef..c3aee8b8f6 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 - 2.3.0 + 2.2.1-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/pom.xml b/addons/pkg-npm/pom.xml index d0b8b55727..13f0ac8656 100644 --- a/addons/pkg-npm/pom.xml +++ b/addons/pkg-npm/pom.xml @@ -20,7 +20,7 @@ indy-addons org.commonjava.indy - 2.3.0 + 2.2.1-SNAPSHOT 4.0.0 diff --git a/addons/pom.xml b/addons/pom.xml index d583462ce5..1b32f193ce 100644 --- a/addons/pom.xml +++ b/addons/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-parent - 2.3.0 + 2.2.1-SNAPSHOT indy-addons diff --git a/addons/promote/client-java/pom.xml b/addons/promote/client-java/pom.xml index 442282cb65..55c06851b1 100644 --- a/addons/promote/client-java/pom.xml +++ b/addons/promote/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.3.0 + 2.2.1-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 89cb65bf3d..5f3909acf5 100644 --- a/addons/promote/common/pom.xml +++ b/addons/promote/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.3.0 + 2.2.1-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 95749f15f8..aab538e1f5 100644 --- a/addons/promote/ftests/pom.xml +++ b/addons/promote/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.3.0 + 2.2.1-SNAPSHOT indy-ftests-promote diff --git a/addons/promote/jaxrs/pom.xml b/addons/promote/jaxrs/pom.xml index d934be4708..0c3e85f827 100644 --- a/addons/promote/jaxrs/pom.xml +++ b/addons/promote/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.3.0 + 2.2.1-SNAPSHOT indy-promote-jaxrs diff --git a/addons/promote/model-java/pom.xml b/addons/promote/model-java/pom.xml index c305809e75..5cff5458d2 100644 --- a/addons/promote/model-java/pom.xml +++ b/addons/promote/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.3.0 + 2.2.1-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 e8f19fa746..b6db1e4824 100644 --- a/addons/promote/pom.xml +++ b/addons/promote/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.0 + 2.2.1-SNAPSHOT indy-promote Indy :: Add-Ons :: Artifact Promotion :: Parent diff --git a/addons/repo-proxy/common/pom.xml b/addons/repo-proxy/common/pom.xml index 3fc1ca2bd5..d3d6f9a37c 100644 --- a/addons/repo-proxy/common/pom.xml +++ b/addons/repo-proxy/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-repo-proxy - 2.3.0 + 2.2.1-SNAPSHOT indy-repo-proxy-common Indy :: Add-Ons :: Repository-Proxy :: Common diff --git a/addons/repo-proxy/ftests/pom.xml b/addons/repo-proxy/ftests/pom.xml index 217bc68ac9..758eb90370 100644 --- a/addons/repo-proxy/ftests/pom.xml +++ b/addons/repo-proxy/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-repo-proxy - 2.3.0 + 2.2.1-SNAPSHOT indy-ftests-repo-proxy diff --git a/addons/repo-proxy/jaxrs/pom.xml b/addons/repo-proxy/jaxrs/pom.xml index cd57139326..0ff2630699 100644 --- a/addons/repo-proxy/jaxrs/pom.xml +++ b/addons/repo-proxy/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-repo-proxy - 2.3.0 + 2.2.1-SNAPSHOT indy-repo-proxy-jaxrs diff --git a/addons/repo-proxy/pom.xml b/addons/repo-proxy/pom.xml index 581e3f254e..1997c8c8eb 100644 --- a/addons/repo-proxy/pom.xml +++ b/addons/repo-proxy/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.0 + 2.2.1-SNAPSHOT indy-repo-proxy Indy :: Add-Ons :: Repository-Proxy :: Parent diff --git a/addons/revisions/common/pom.xml b/addons/revisions/common/pom.xml index a8ddc3ebfd..4f39d02a8a 100644 --- a/addons/revisions/common/pom.xml +++ b/addons/revisions/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-revisions - 2.3.0 + 2.2.1-SNAPSHOT indy-revisions-common Indy :: Add-Ons :: Revisions :: Common diff --git a/addons/revisions/jaxrs/pom.xml b/addons/revisions/jaxrs/pom.xml index abe50652c1..b6cf98f654 100644 --- a/addons/revisions/jaxrs/pom.xml +++ b/addons/revisions/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-revisions - 2.3.0 + 2.2.1-SNAPSHOT indy-revisions-jaxrs diff --git a/addons/revisions/pom.xml b/addons/revisions/pom.xml index 31ef179b51..3f4a7580f2 100644 --- a/addons/revisions/pom.xml +++ b/addons/revisions/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.0 + 2.2.1-SNAPSHOT indy-revisions Indy :: Add-Ons :: Revisions :: Parent diff --git a/addons/sli/pom.xml b/addons/sli/pom.xml index 942341733e..f881c4367b 100644 --- a/addons/sli/pom.xml +++ b/addons/sli/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.3.0 + 2.2.1-SNAPSHOT indy-sli Indy :: Add-Ons :: Service Level Indicators Reporting :: JAX-RS diff --git a/api/pom.xml b/api/pom.xml index e257dc753c..7ba4c26e64 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.0 + 2.2.1-SNAPSHOT indy-api diff --git a/bindings/jaxrs/pom.xml b/bindings/jaxrs/pom.xml index cd85bc994e..128ce073bc 100644 --- a/bindings/jaxrs/pom.xml +++ b/bindings/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-bindings - 2.3.0 + 2.2.1-SNAPSHOT indy-bindings-jaxrs diff --git a/bindings/pom.xml b/bindings/pom.xml index 45c7c3cd33..61c59c5158 100644 --- a/bindings/pom.xml +++ b/bindings/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-parent - 2.3.0 + 2.2.1-SNAPSHOT indy-bindings diff --git a/boot/jaxrs/pom.xml b/boot/jaxrs/pom.xml index bc88ecfa7c..bddb851bb1 100644 --- a/boot/jaxrs/pom.xml +++ b/boot/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.boot indy-booters - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy.boot diff --git a/boot/pom.xml b/boot/pom.xml index 02413e47de..61576dea61 100644 --- a/boot/pom.xml +++ b/boot/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy.boot diff --git a/clients/core-java/pom.xml b/clients/core-java/pom.xml index eed9089e21..9f2ec9a02d 100644 --- a/clients/core-java/pom.xml +++ b/clients/core-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-clients-parent - 2.3.0 + 2.2.1-SNAPSHOT indy-client-core-java diff --git a/clients/pom.xml b/clients/pom.xml index dfd582f6e1..cd49aae35b 100644 --- a/clients/pom.xml +++ b/clients/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.0 + 2.2.1-SNAPSHOT indy-clients-parent diff --git a/core/pom.xml b/core/pom.xml index 5765559abc..588cd6e8f6 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.0 + 2.2.1-SNAPSHOT indy-core diff --git a/db/common/pom.xml b/db/common/pom.xml index c2f223f054..43ba12c9f6 100644 --- a/db/common/pom.xml +++ b/db/common/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-db - 2.3.0 + 2.2.1-SNAPSHOT indy-db-common diff --git a/db/flat/pom.xml b/db/flat/pom.xml index 6559e60bca..c72979c248 100644 --- a/db/flat/pom.xml +++ b/db/flat/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.3.0 + 2.2.1-SNAPSHOT indy-db-flat diff --git a/db/infinispan/pom.xml b/db/infinispan/pom.xml index bf2fd3e16d..39f19735ad 100644 --- a/db/infinispan/pom.xml +++ b/db/infinispan/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-db - 2.3.0 + 2.2.1-SNAPSHOT indy-db-infinispan diff --git a/db/memory/pom.xml b/db/memory/pom.xml index c746862dee..e7fcde6f3e 100644 --- a/db/memory/pom.xml +++ b/db/memory/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.3.0 + 2.2.1-SNAPSHOT indy-db-memory diff --git a/db/metrics/pom.xml b/db/metrics/pom.xml index 3b48971250..7c07bca400 100644 --- a/db/metrics/pom.xml +++ b/db/metrics/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.3.0 + 2.2.1-SNAPSHOT indy-db-metrics diff --git a/db/pom.xml b/db/pom.xml index 98fbb8d219..817e26a2ba 100644 --- a/db/pom.xml +++ b/db/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.0 + 2.2.1-SNAPSHOT indy-db diff --git a/deployments/launcher/pom.xml b/deployments/launcher/pom.xml index 1376e27362..5c5d8b83e6 100644 --- a/deployments/launcher/pom.xml +++ b/deployments/launcher/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-deployments - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy.launch diff --git a/deployments/pom.xml b/deployments/pom.xml index afc13247ad..0791b21c58 100644 --- a/deployments/pom.xml +++ b/deployments/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.0 + 2.2.1-SNAPSHOT indy-deployments diff --git a/embedder/pom.xml b/embedder/pom.xml index a4c52d9981..9ed7a8c572 100644 --- a/embedder/pom.xml +++ b/embedder/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy.embed diff --git a/filers/default/pom.xml b/filers/default/pom.xml index 9de0979761..7e6c002ce1 100644 --- a/filers/default/pom.xml +++ b/filers/default/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-file-managers - 2.3.0 + 2.2.1-SNAPSHOT indy-filer-default diff --git a/filers/pom.xml b/filers/pom.xml index 1138a48864..f9bf12b7df 100644 --- a/filers/pom.xml +++ b/filers/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.0 + 2.2.1-SNAPSHOT indy-file-managers diff --git a/ftests/common/pom.xml b/ftests/common/pom.xml index f48a64b0b7..f593c61ae4 100644 --- a/ftests/common/pom.xml +++ b/ftests/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-ftests-parent - 2.3.0 + 2.2.1-SNAPSHOT indy-ftests-common diff --git a/ftests/core/pom.xml b/ftests/core/pom.xml index 4cf506ae80..11b3572d0a 100644 --- a/ftests/core/pom.xml +++ b/ftests/core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-ftests-parent - 2.3.0 + 2.2.1-SNAPSHOT indy-ftests-core diff --git a/ftests/metrics/pom.xml b/ftests/metrics/pom.xml index c3afd2799d..295e7dd864 100644 --- a/ftests/metrics/pom.xml +++ b/ftests/metrics/pom.xml @@ -20,7 +20,7 @@ indy-ftests-parent org.commonjava.indy - 2.3.0 + 2.2.1-SNAPSHOT 4.0.0 diff --git a/ftests/pom.xml b/ftests/pom.xml index a22666292c..3ea1922e77 100644 --- a/ftests/pom.xml +++ b/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.0 + 2.2.1-SNAPSHOT indy-ftests-parent diff --git a/models/core-java/pom.xml b/models/core-java/pom.xml index 824f03bba1..613b823481 100644 --- a/models/core-java/pom.xml +++ b/models/core-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-models-parent - 2.3.0 + 2.2.1-SNAPSHOT indy-model-core-java diff --git a/models/pom.xml b/models/pom.xml index f697237fc3..6d770e0cbd 100644 --- a/models/pom.xml +++ b/models/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.0 + 2.2.1-SNAPSHOT indy-models-parent diff --git a/pom.xml b/pom.xml index 8e3c3b0a91..0c764547a4 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.commonjava.indy indy-parent - 2.3.0 + 2.2.1-SNAPSHOT pom @@ -37,7 +37,7 @@ scm:git:https://github.com/CommonJava/indy scm:git:https://github.com/CommonJava/indy http://github.com/Commonjava/indy - indy-parent-2.3.0 + HEAD @@ -187,7 +187,7 @@ org.commonjava.indy.ui indy-ui-layover - 2.3.0 + 2.2.1-SNAPSHOT runtime @@ -195,22 +195,22 @@ org.commonjava.indy indy-model-core-java - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-api - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-core - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-core - 2.3.0 + 2.2.1-SNAPSHOT tar.gz confset provided @@ -218,32 +218,32 @@ org.commonjava.indy indy-db-flat - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-db-metrics - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-db-common - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-db-infinispan - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-bindings-jaxrs - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy.launch indy-launcher - 2.3.0 + 2.2.1-SNAPSHOT tar.gz skinny provided @@ -251,7 +251,7 @@ org.commonjava.indy.launch indy-launcher - 2.3.0 + 2.2.1-SNAPSHOT tar.gz complete provided @@ -259,7 +259,7 @@ org.commonjava.indy.launch indy-launcher - 2.3.0 + 2.2.1-SNAPSHOT tar.gz data provided @@ -267,7 +267,7 @@ org.commonjava.indy.launch indy-launcher - 2.3.0 + 2.2.1-SNAPSHOT tar.gz etc provided @@ -276,17 +276,17 @@ org.commonjava.indy indy-revisions-jaxrs - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-revisions-common - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-revisions-common - 2.3.0 + 2.2.1-SNAPSHOT tar.gz confset provided @@ -294,7 +294,7 @@ org.commonjava.indy indy-revisions-common - 2.3.0 + 2.2.1-SNAPSHOT tar.gz uiset provided @@ -302,12 +302,12 @@ org.commonjava.indy indy-dot-maven-common - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-dot-maven-common - 2.3.0 + 2.2.1-SNAPSHOT tar.gz dataset provided @@ -315,22 +315,22 @@ org.commonjava.indy indy-dot-maven-jaxrs - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-ftests-dot-maven - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-httprox-common - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-httprox-common - 2.3.0 + 2.2.1-SNAPSHOT tar.gz confset provided @@ -338,17 +338,17 @@ org.commonjava.indy indy-ftests-httprox - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-content-index - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-content-index - 2.3.0 + 2.2.1-SNAPSHOT tar.gz confset provided @@ -356,51 +356,51 @@ org.commonjava.indy indy-db-memory - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-test-db - 2.3.0 + 2.2.1-SNAPSHOT test org.commonjava.indy indy-test-fixtures-core - 2.3.0 + 2.2.1-SNAPSHOT test org.commonjava.indy indy-test-providers-core - 2.3.0 + 2.2.1-SNAPSHOT test org.commonjava.indy indy-test-utils - 2.3.0 + 2.2.1-SNAPSHOT test org.commonjava.indy indy-filer-default - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-subsys-jaxrs - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-subsys-honeycomb - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-subsys-honeycomb - 2.3.0 + 2.2.1-SNAPSHOT tar.gz confset provided @@ -408,17 +408,17 @@ org.commonjava.indy indy-subsys-flatfile - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-subsys-cassandra - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-subsys-cassandra - 2.3.0 + 2.2.1-SNAPSHOT tar.gz confset provided @@ -426,79 +426,79 @@ org.commonjava.indy indy-subsys-infinispan - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-subsys-http - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-subsys-git - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-subsys-groovy - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-subsys-prefetch - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-subsys-cpool - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-client-core-java - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-ftests-common - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-ftests-core - 2.3.0 + 2.2.1-SNAPSHOT test org.commonjava.indy indy-folo-jaxrs - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-ftests-folo - 2.3.0 + 2.2.1-SNAPSHOT test org.commonjava.indy indy-folo-client-java - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-folo-model-java - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-folo-common - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-folo-common - 2.3.0 + 2.2.1-SNAPSHOT tar.gz dataset provided @@ -506,7 +506,7 @@ org.commonjava.indy indy-folo-common - 2.3.0 + 2.2.1-SNAPSHOT tar.gz confset provided @@ -514,33 +514,33 @@ org.commonjava.indy indy-promote-jaxrs - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-ftests-promote - 2.3.0 + 2.2.1-SNAPSHOT test org.commonjava.indy indy-promote-client-java - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-promote-model-java - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-promote-common - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-promote-common - 2.3.0 + 2.2.1-SNAPSHOT tar.gz confset provided @@ -548,7 +548,7 @@ org.commonjava.indy indy-promote-common - 2.3.0 + 2.2.1-SNAPSHOT tar.gz dataset provided @@ -556,19 +556,19 @@ org.commonjava.indy indy-promote-common - 2.3.0 + 2.2.1-SNAPSHOT dataset provided org.commonjava.indy indy-implied-repos-common - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-implied-repos-common - 2.3.0 + 2.2.1-SNAPSHOT tar.gz confset provided @@ -576,37 +576,37 @@ org.commonjava.indy indy-implied-repos-model-java - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-implied-repos-client-java - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-ftests-implied-repos - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy.embed indy-embedder - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy.boot indy-booter-jaxrs - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-subsys-keycloak - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-subsys-keycloak - 2.3.0 + 2.2.1-SNAPSHOT tar.gz confset provided @@ -614,7 +614,7 @@ org.commonjava.indy indy-subsys-infinispan - 2.3.0 + 2.2.1-SNAPSHOT tar.gz confset provided @@ -622,7 +622,7 @@ org.commonjava.indy indy-subsys-prefetch - 2.3.0 + 2.2.1-SNAPSHOT tar.gz confset provided @@ -631,7 +631,7 @@ org.commonjava.indy indy-koji-common - 2.3.0 + 2.2.1-SNAPSHOT tar.gz confset provided @@ -639,103 +639,103 @@ org.commonjava.indy indy-koji-common - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-koji-model-java - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-koji-client-java - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-koji-jaxrs - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-path-mapped-common - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-path-mapped-model-java - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-path-mapped-jaxrs - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-pkg-maven-common - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-pkg-maven-jaxrs - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-pkg-npm-jaxrs - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-ftests-pkg-maven - 2.3.0 + 2.2.1-SNAPSHOT test org.commonjava.indy indy-ftests-pkg-npm - 2.3.0 + 2.2.1-SNAPSHOT test org.commonjava.indy indy-pkg-npm-common - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-pkg-npm-model-java - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-diagnostics-jaxrs - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-diagnostics-client-java - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-diagnostics-common - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-ftests-diagnostics - 2.3.0 + 2.2.1-SNAPSHOT test org.commonjava.indy indy-diagnostics-common - 2.3.0 + 2.2.1-SNAPSHOT confset tar.gz provided @@ -743,28 +743,28 @@ org.commonjava.indy indy-hosted-by-archive-common - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-hosted-by-archive-client-java - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-ftests-hosted-by-archive - 2.3.0 + 2.2.1-SNAPSHOT test org.commonjava.indy indy-hosted-by-archive-jaxrs - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-hosted-by-archive-common - 2.3.0 + 2.2.1-SNAPSHOT confset tar.gz @@ -772,22 +772,22 @@ org.commonjava.indy indy-subsys-metrics-core - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-subsys-metrics-reporter - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-subsys-metrics-prometheus - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-subsys-metrics-reporter - 2.3.0 + 2.2.1-SNAPSHOT confset tar.gz provided @@ -796,28 +796,28 @@ org.commonjava.indy indy-ftests-metrics - 2.3.0 + 2.2.1-SNAPSHOT test org.commonjava.indy indy-sli - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy.rest indy-rest-api yaml - 2.3.0 + 2.2.1-SNAPSHOT provided org.commonjava.indy.rest indy-rest-api json - 2.3.0 + 2.2.1-SNAPSHOT provided @@ -851,33 +851,33 @@ org.commonjava.indy indy-content-browse-common - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-content-browse-jaxrs - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-ftests-content-browse - 2.3.0 + 2.2.1-SNAPSHOT test org.commonjava.indy indy-content-browse-model-java - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-content-browse-client-java - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-content-browse-common - 2.3.0 + 2.2.1-SNAPSHOT confset tar.gz provided @@ -885,35 +885,35 @@ org.commonjava.indy indy-content-browse-ui - 2.3.0 + 2.2.1-SNAPSHOT reactui tar.gz org.commonjava.indy indy-changelog-common - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-changelog-client-java - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-ftests-changelog - 2.3.0 + 2.2.1-SNAPSHOT test org.commonjava.indy indy-changelog-jaxrs - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-changelog-common - 2.3.0 + 2.2.1-SNAPSHOT confset tar.gz @@ -931,12 +931,12 @@ org.commonjava.indy indy-event-audit-common - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-event-audit-common - 2.3.0 + 2.2.1-SNAPSHOT confset tar.gz provided @@ -951,23 +951,23 @@ org.commonjava.indy indy-repo-proxy-common - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-repo-proxy-jaxrs - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy indy-ftests-repo-proxy - 2.3.0 + 2.2.1-SNAPSHOT test org.commonjava.indy indy-repo-proxy-common - 2.3.0 + 2.2.1-SNAPSHOT confset tar.gz diff --git a/rest/api/pom.xml b/rest/api/pom.xml index fe60ed482c..222f3e7850 100644 --- a/rest/api/pom.xml +++ b/rest/api/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.rest indy-rest-parent - 2.3.0 + 2.2.1-SNAPSHOT indy-rest-api diff --git a/rest/pom.xml b/rest/pom.xml index cec45f016d..4dd7937847 100644 --- a/rest/pom.xml +++ b/rest/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy.rest diff --git a/subsys/cassandra/pom.xml b/subsys/cassandra/pom.xml index d516f22c88..4609d30e1c 100644 --- a/subsys/cassandra/pom.xml +++ b/subsys/cassandra/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-subsystems - 2.3.0 + 2.2.1-SNAPSHOT indy-subsys-cassandra diff --git a/subsys/cpool/pom.xml b/subsys/cpool/pom.xml index 568d0dde85..576ace5024 100644 --- a/subsys/cpool/pom.xml +++ b/subsys/cpool/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.3.0 + 2.2.1-SNAPSHOT indy-subsys-cpool diff --git a/subsys/flatfile/pom.xml b/subsys/flatfile/pom.xml index 6df172be83..f64b5eb5cd 100644 --- a/subsys/flatfile/pom.xml +++ b/subsys/flatfile/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.3.0 + 2.2.1-SNAPSHOT indy-subsys-flatfile diff --git a/subsys/git/pom.xml b/subsys/git/pom.xml index af288ea205..1ecf4d68c1 100644 --- a/subsys/git/pom.xml +++ b/subsys/git/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.3.0 + 2.2.1-SNAPSHOT indy-subsys-git diff --git a/subsys/groovy/pom.xml b/subsys/groovy/pom.xml index c8c6fd40cd..aba22610e8 100644 --- a/subsys/groovy/pom.xml +++ b/subsys/groovy/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.3.0 + 2.2.1-SNAPSHOT indy-subsys-groovy diff --git a/subsys/honeycomb/pom.xml b/subsys/honeycomb/pom.xml index 3aa86532c7..e12a1a8983 100644 --- a/subsys/honeycomb/pom.xml +++ b/subsys/honeycomb/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.3.0 + 2.2.1-SNAPSHOT 4.0.0 diff --git a/subsys/http/pom.xml b/subsys/http/pom.xml index 4abd44570a..f7aca6035e 100644 --- a/subsys/http/pom.xml +++ b/subsys/http/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.3.0 + 2.2.1-SNAPSHOT indy-subsys-http diff --git a/subsys/infinispan/pom.xml b/subsys/infinispan/pom.xml index 29fd78c9fc..d85403482d 100644 --- a/subsys/infinispan/pom.xml +++ b/subsys/infinispan/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.3.0 + 2.2.1-SNAPSHOT indy-subsys-infinispan diff --git a/subsys/jaxrs/pom.xml b/subsys/jaxrs/pom.xml index 486b88b10e..45f6d33833 100644 --- a/subsys/jaxrs/pom.xml +++ b/subsys/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.3.0 + 2.2.1-SNAPSHOT indy-subsys-jaxrs diff --git a/subsys/kafka/pom.xml b/subsys/kafka/pom.xml index a718b0b115..bb155925ce 100644 --- a/subsys/kafka/pom.xml +++ b/subsys/kafka/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.3.0 + 2.2.1-SNAPSHOT 4.0.0 diff --git a/subsys/keycloak/pom.xml b/subsys/keycloak/pom.xml index f63fafc9d9..6d37022dc3 100644 --- a/subsys/keycloak/pom.xml +++ b/subsys/keycloak/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.3.0 + 2.2.1-SNAPSHOT indy-subsys-keycloak Indy :: Subsystems :: Keycloak diff --git a/subsys/metrics/core/pom.xml b/subsys/metrics/core/pom.xml index 4c551ef53f..bfc58d5553 100644 --- a/subsys/metrics/core/pom.xml +++ b/subsys/metrics/core/pom.xml @@ -20,7 +20,7 @@ indy-subsys-metrics org.commonjava.indy - 2.3.0 + 2.2.1-SNAPSHOT 4.0.0 diff --git a/subsys/metrics/pom.xml b/subsys/metrics/pom.xml index d91a87e939..19412ac78b 100644 --- a/subsys/metrics/pom.xml +++ b/subsys/metrics/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.3.0 + 2.2.1-SNAPSHOT 4.0.0 diff --git a/subsys/metrics/prometheus/pom.xml b/subsys/metrics/prometheus/pom.xml index 6da400c1d7..a74cc072eb 100644 --- a/subsys/metrics/prometheus/pom.xml +++ b/subsys/metrics/prometheus/pom.xml @@ -20,7 +20,7 @@ indy-subsys-metrics org.commonjava.indy - 2.3.0 + 2.2.1-SNAPSHOT 4.0.0 diff --git a/subsys/metrics/reporter/pom.xml b/subsys/metrics/reporter/pom.xml index b80a434e7d..817dd862a0 100644 --- a/subsys/metrics/reporter/pom.xml +++ b/subsys/metrics/reporter/pom.xml @@ -20,7 +20,7 @@ indy-subsys-metrics org.commonjava.indy - 2.3.0 + 2.2.1-SNAPSHOT 4.0.0 diff --git a/subsys/pom.xml b/subsys/pom.xml index a631ec9126..30900a8b39 100644 --- a/subsys/pom.xml +++ b/subsys/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.0 + 2.2.1-SNAPSHOT indy-subsystems diff --git a/subsys/prefetch/pom.xml b/subsys/prefetch/pom.xml index 0da1b4edb8..f89a92f4ac 100644 --- a/subsys/prefetch/pom.xml +++ b/subsys/prefetch/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.3.0 + 2.2.1-SNAPSHOT 4.0.0 diff --git a/test/db/pom.xml b/test/db/pom.xml index 2b19cadd7e..1c41938b27 100644 --- a/test/db/pom.xml +++ b/test/db/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.3.0 + 2.2.1-SNAPSHOT indy-test-db diff --git a/test/fixtures-core/pom.xml b/test/fixtures-core/pom.xml index 092bc9c081..4f524fecf7 100644 --- a/test/fixtures-core/pom.xml +++ b/test/fixtures-core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.3.0 + 2.2.1-SNAPSHOT indy-test-fixtures-core diff --git a/test/pom.xml b/test/pom.xml index 44c25d37e9..58414c5a87 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.0 + 2.2.1-SNAPSHOT indy-test diff --git a/test/providers-core/pom.xml b/test/providers-core/pom.xml index 41cfe037c6..95a0454904 100644 --- a/test/providers-core/pom.xml +++ b/test/providers-core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.3.0 + 2.2.1-SNAPSHOT indy-test-providers-core diff --git a/test/utils/pom.xml b/test/utils/pom.xml index d3cc042c61..41b478f236 100644 --- a/test/utils/pom.xml +++ b/test/utils/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.3.0 + 2.2.1-SNAPSHOT indy-test-utils diff --git a/tools/assemblies/pom.xml b/tools/assemblies/pom.xml index 87f551981f..8854f320e4 100644 --- a/tools/assemblies/pom.xml +++ b/tools/assemblies/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.tools indy-tools - 2.3.0 + 2.2.1-SNAPSHOT indy-assemblies diff --git a/tools/pom.xml b/tools/pom.xml index 77668a67d4..0c278e3765 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy.tools diff --git a/uis/layover/pom.xml b/uis/layover/pom.xml index 83bd37b954..0639033450 100644 --- a/uis/layover/pom.xml +++ b/uis/layover/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.ui indy-uis - 2.3.0 + 2.2.1-SNAPSHOT indy-ui-layover diff --git a/uis/pom.xml b/uis/pom.xml index c0aa544ea1..b3988ce494 100644 --- a/uis/pom.xml +++ b/uis/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.0 + 2.2.1-SNAPSHOT org.commonjava.indy.ui From 1c92a6528166820c9af264028e9d123850618728 Mon Sep 17 00:00:00 2001 From: Gang Li Date: Wed, 14 Oct 2020 14:08:27 +0800 Subject: [PATCH 24/50] Update atlas to 1.1.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0cbfad048b..9674528003 100644 --- a/pom.xml +++ b/pom.xml @@ -85,7 +85,7 @@ 1.7 - 1.1.1-SNAPSHOT + 1.1.1 1.4 25 3.2.1 From e766f758981c9433df52273071e352d3b18f490c Mon Sep 17 00:00:00 2001 From: Gang Li Date: Sat, 10 Oct 2020 11:42:43 +0800 Subject: [PATCH 25/50] Update all commons-lang usage to commons-lang3 Seems the commons-lang has been removed from maven central, see https://repo.maven.apache.org/maven2/org/apache/commons/commons-lang/ --- .../bind/jaxrs/ContentBrowseResource.java | 2 +- .../servlet/ContentBrowseUIServlet.java | 2 +- .../indy/diag/data/DiagnosticsManager.java | 2 +- .../store/sub/ArtifactStoreSubStore.java | 2 +- .../indy/dotmaven/util/NameUtils.java | 2 +- .../dotmaven/util/SettingsURIMatcher.java | 2 +- .../indy/dotmaven/util/StoreURIMatcher.java | 6 ++--- ...mberAndVerifyExistsInTrackedGroupTest.java | 2 +- .../IndyHostedByArchiveClientModule.java | 2 +- .../hostedbyarc/HostedByArchiveManager.java | 2 +- .../jaxrs/IndyHostedByArchiveResource.java | 2 +- ...tProxRegisterSpecialPathStartupAction.java | 4 ++-- .../indy/httprox/util/HttpConduitWrapper.java | 2 +- .../indy/httprox/util/HttpProxyConstants.java | 2 +- .../httprox/util/ProxyResponseHelper.java | 2 +- .../change/ImpliedRepositoryDetector.java | 2 +- .../indy/implrepo/conf/ImpliedRepoConfig.java | 2 +- .../data/ImpliedReposQueryDelegate.java | 2 +- .../change/ImpliedRepositoryDetectorTest.java | 2 +- .../indy/koji/content/KojiBuildAuthority.java | 8 +++---- .../content/KojiPathPatternFormatter.java | 2 +- .../commonjava/indy/koji/util/KojiUtils.java | 2 +- .../indy/koji/ftest/AbstractKojiIT.java | 2 +- .../indy/koji/ftest/GetKojiMetadataTest.java | 2 +- ...venContentsFilteringTransferDecorator.java | 2 +- .../maven/content/MavenMetadataGenerator.java | 2 +- .../content/MavenMetadataGeneratorTest.java | 2 +- ...pMetaOverlapWithMetaOfHostedReposTest.java | 2 +- ...rlapWithNestedGroupOfHostRepoMetaTest.java | 2 +- ...apWithNestedGroupOfHostRepoNoMetaTest.java | 2 +- ...taOverlapWithoutMetaOfHostedReposTest.java | 2 +- ...upMetadataMergeWithInvalidVersionTest.java | 2 +- .../NPMGroupContentMergeRetrieveTest.java | 2 +- .../indy/promote/data/PromotionManager.java | 2 +- .../promote/validate/PromotionValidator.java | 4 ++-- ...CacheCheckingforPromoteWithRemoteTest.java | 2 +- ...upHostedMetadataRemergedOnPromoteTest.java | 2 +- ...tifactRefs_PromoteWithParent_RuleTest.java | 2 +- .../promote/model/ValidationCatalogDTO.java | 2 +- ...BrowseRemoteIndyListingRewriteManager.java | 2 +- ...epoProxyNPMHugeMetaContentRewriteTest.java | 2 +- ...ProxyCreatorWithNPMContentRewriteTest.java | 2 +- .../indy/revisions/RevisionsManager.java | 4 ++-- .../indy/revisions/RevisionsManagerTest.java | 2 +- api/pom.xml | 4 ++-- .../org/commonjava/indy/CustomJsonLayout.java | 2 +- .../indy/conf/DefaultIndyConfiguration.java | 4 ++-- .../indy/util/AcceptInfoParser.java | 2 +- .../indy/core/bind/jaxrs/NfcResource.java | 2 +- .../admin/DeprecatedStoreAdminHandler.java | 2 +- .../bind/jaxrs/admin/StoreAdminHandler.java | 2 +- .../indy/client/core/IndyClientHttp.java | 4 ++-- .../client/core/IndyResponseErrorDetails.java | 2 +- .../module/IndyMaintenanceClientModule.java | 2 +- .../core/module/IndyNfcClientModule.java | 2 +- .../indy/client/core/util/UrlUtils.java | 2 +- .../core/change/StoreEnablementManager.java | 2 +- .../core/content/DefaultContentManager.java | 2 +- .../group/GroupRepositoryFilterManager.java | 2 +- .../indy/core/ctl/IspnCacheController.java | 2 +- .../db/common/AbstractStoreDataManager.java | 4 ++-- .../infinispan/data/fixture/ThreadDumper.java | 2 +- .../indy/ftest/core/fixture/ThreadDumper.java | 2 +- ...GroupDownloadWithFirstRepoTimeoutTest.java | 2 +- ...upIgnoresDisabledRemoteRepositoryTest.java | 2 +- .../GroupMetadataMergeInfoGenTest.java | 2 +- ...adataMergeWhenConstituentDisabledTest.java | 2 +- ...geWhenGroupWithGroupMemberChangesTest.java | 2 +- ...nNewHostedAddedInMultiHostedGroupTest.java | 2 +- ...qNewHostedAddedInMultiHostedGroupTest.java | 2 +- .../GroupMetadataMergeWithRepoErrorTest.java | 2 +- ...GroupMetadataMergeWithRepoTimeoutTest.java | 2 +- ...ataRemergeWhenConstituentDisabledTest.java | 2 +- ...dataMergeRepoNoMetaListingTimeoutTest.java | 2 +- .../content/RepositoryFilterGACacheTest.java | 2 +- .../core/content/RepositoryFilterTest.java | 2 +- .../content/RepositoryPathMaskExistsTest.java | 2 +- .../content/RepositoryPathMaskExtTest.java | 2 +- ...RepositoryPathMaskMetadataExcludeTest.java | 2 +- .../RepositoryPathMaskMetadataTest.java | 2 +- .../core/content/RepositoryPathMaskTest.java | 2 +- ...toreFileAndVerifyExistenceInGroupTest.java | 2 +- .../core/content/StoreReverseMapInitTest.java | 2 +- .../content/StoreReverseMapMigrationTest.java | 2 +- ...eTwoFilesAndVerifyPresenceInGroupTest.java | 2 +- .../store/AbstractStoreManagementTest.java | 2 +- .../commonjava/indy/model/core/StoreKey.java | 3 +-- .../commonjava/indy/model/util/HttpUtils.java | 4 ++-- .../indy/stats/IndyDeprecatedApis.java | 22 +++++++++---------- .../subsys/cassandra/CassandraClient.java | 2 +- .../indy/subsys/git/GitManager.java | 4 ++-- .../indy/subsys/http/util/UserPass.java | 2 +- .../indy/subsys/infinispan/CacheHandle.java | 2 +- .../config/ISPNClusterConfiguration.java | 2 +- .../config/ISPNDBConfiguration.java | 2 +- .../indy/bind/jaxrs/ApiVersioningFilter.java | 2 +- .../indy/bind/jaxrs/MDCManager.java | 2 +- .../jaxrs/UnhandledIOExceptionHandler.java | 4 ++-- .../UnhandledRuntimeExceptionHandler.java | 4 ++-- .../bind/jaxrs/util/JaxRsUriFormatter.java | 2 +- .../subsys/prefetch/PrefetchFrontier.java | 2 +- .../prefetch/PrefetchRepoComparator.java | 2 +- 102 files changed, 127 insertions(+), 130 deletions(-) diff --git a/addons/content-browse/jaxrs/src/main/java/org/commonjava/indy/content/browse/bind/jaxrs/ContentBrowseResource.java b/addons/content-browse/jaxrs/src/main/java/org/commonjava/indy/content/browse/bind/jaxrs/ContentBrowseResource.java index f6180407c7..03ae103c0f 100644 --- a/addons/content-browse/jaxrs/src/main/java/org/commonjava/indy/content/browse/bind/jaxrs/ContentBrowseResource.java +++ b/addons/content-browse/jaxrs/src/main/java/org/commonjava/indy/content/browse/bind/jaxrs/ContentBrowseResource.java @@ -22,7 +22,7 @@ import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.indy.IndyWorkflowException; import org.commonjava.indy.bind.jaxrs.IndyResources; import org.commonjava.indy.bind.jaxrs.util.JaxRsRequestHelper; diff --git a/addons/content-browse/jaxrs/src/main/java/org/commonjava/indy/content/browse/servlet/ContentBrowseUIServlet.java b/addons/content-browse/jaxrs/src/main/java/org/commonjava/indy/content/browse/servlet/ContentBrowseUIServlet.java index 274ae463f7..097368e867 100644 --- a/addons/content-browse/jaxrs/src/main/java/org/commonjava/indy/content/browse/servlet/ContentBrowseUIServlet.java +++ b/addons/content-browse/jaxrs/src/main/java/org/commonjava/indy/content/browse/servlet/ContentBrowseUIServlet.java @@ -15,7 +15,7 @@ */ package org.commonjava.indy.content.browse.servlet; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.indy.bind.jaxrs.ui.AbstractUIServlet; import org.commonjava.indy.conf.UIConfiguration; import org.commonjava.indy.content.browse.conf.ContentBrowseConfig; diff --git a/addons/diagnostics/common/src/main/java/org/commonjava/indy/diag/data/DiagnosticsManager.java b/addons/diagnostics/common/src/main/java/org/commonjava/indy/diag/data/DiagnosticsManager.java index abc2ea17fa..7e08667b47 100644 --- a/addons/diagnostics/common/src/main/java/org/commonjava/indy/diag/data/DiagnosticsManager.java +++ b/addons/diagnostics/common/src/main/java/org/commonjava/indy/diag/data/DiagnosticsManager.java @@ -49,7 +49,7 @@ import java.util.zip.ZipOutputStream; import static org.apache.commons.io.IOUtils.toInputStream; -import static org.apache.commons.lang.StringUtils.join; +import static org.apache.commons.lang3.StringUtils.join; /** * Created by jdcasey on 1/11/17. diff --git a/addons/dot-maven/common/src/main/java/org/commonjava/indy/dotmaven/store/sub/ArtifactStoreSubStore.java b/addons/dot-maven/common/src/main/java/org/commonjava/indy/dotmaven/store/sub/ArtifactStoreSubStore.java index b73f96105e..64a1c775ba 100644 --- a/addons/dot-maven/common/src/main/java/org/commonjava/indy/dotmaven/store/sub/ArtifactStoreSubStore.java +++ b/addons/dot-maven/common/src/main/java/org/commonjava/indy/dotmaven/store/sub/ArtifactStoreSubStore.java @@ -52,7 +52,7 @@ import static org.apache.commons.io.IOUtils.closeQuietly; import static org.apache.commons.io.IOUtils.copy; -import static org.apache.commons.lang.StringUtils.isEmpty; +import static org.apache.commons.lang3.StringUtils.isEmpty; @ApplicationScoped @Named( "stores" ) diff --git a/addons/dot-maven/common/src/main/java/org/commonjava/indy/dotmaven/util/NameUtils.java b/addons/dot-maven/common/src/main/java/org/commonjava/indy/dotmaven/util/NameUtils.java index b34da39daa..3d06fd1115 100644 --- a/addons/dot-maven/common/src/main/java/org/commonjava/indy/dotmaven/util/NameUtils.java +++ b/addons/dot-maven/common/src/main/java/org/commonjava/indy/dotmaven/util/NameUtils.java @@ -15,7 +15,7 @@ */ package org.commonjava.indy.dotmaven.util; -import static org.apache.commons.lang.StringUtils.join; +import static org.apache.commons.lang3.StringUtils.join; import java.io.File; diff --git a/addons/dot-maven/common/src/main/java/org/commonjava/indy/dotmaven/util/SettingsURIMatcher.java b/addons/dot-maven/common/src/main/java/org/commonjava/indy/dotmaven/util/SettingsURIMatcher.java index 490314f6bf..737ce6e545 100644 --- a/addons/dot-maven/common/src/main/java/org/commonjava/indy/dotmaven/util/SettingsURIMatcher.java +++ b/addons/dot-maven/common/src/main/java/org/commonjava/indy/dotmaven/util/SettingsURIMatcher.java @@ -15,7 +15,7 @@ */ package org.commonjava.indy.dotmaven.util; -import static org.apache.commons.lang.StringUtils.isEmpty; +import static org.apache.commons.lang3.StringUtils.isEmpty; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/addons/dot-maven/common/src/main/java/org/commonjava/indy/dotmaven/util/StoreURIMatcher.java b/addons/dot-maven/common/src/main/java/org/commonjava/indy/dotmaven/util/StoreURIMatcher.java index 8e55c56562..d470c9f836 100644 --- a/addons/dot-maven/common/src/main/java/org/commonjava/indy/dotmaven/util/StoreURIMatcher.java +++ b/addons/dot-maven/common/src/main/java/org/commonjava/indy/dotmaven/util/StoreURIMatcher.java @@ -15,9 +15,9 @@ */ package org.commonjava.indy.dotmaven.util; -import static org.apache.commons.lang.StringUtils.isBlank; -import static org.apache.commons.lang.StringUtils.isEmpty; -import static org.apache.commons.lang.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.isEmpty; +import static org.apache.commons.lang3.StringUtils.isNotBlank; import static org.commonjava.indy.pkg.maven.model.MavenPackageTypeDescriptor.MAVEN_PKG_KEY; import java.util.regex.Matcher; diff --git a/addons/folo/ftests/src/main/java/org/commonjava/indy/folo/ftest/content/StoreInTrackedMemberAndVerifyExistsInTrackedGroupTest.java b/addons/folo/ftests/src/main/java/org/commonjava/indy/folo/ftest/content/StoreInTrackedMemberAndVerifyExistsInTrackedGroupTest.java index 0c8b4a6f61..af0a893f89 100644 --- a/addons/folo/ftests/src/main/java/org/commonjava/indy/folo/ftest/content/StoreInTrackedMemberAndVerifyExistsInTrackedGroupTest.java +++ b/addons/folo/ftests/src/main/java/org/commonjava/indy/folo/ftest/content/StoreInTrackedMemberAndVerifyExistsInTrackedGroupTest.java @@ -23,7 +23,7 @@ import java.io.ByteArrayInputStream; import java.io.InputStream; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.indy.folo.client.IndyFoloContentClientModule; import org.commonjava.indy.model.core.Group; import org.commonjava.indy.model.core.StoreKey; diff --git a/addons/hosted-by-archive/client-java/src/main/java/org/commonjava/indy/hostedbyarc/client/IndyHostedByArchiveClientModule.java b/addons/hosted-by-archive/client-java/src/main/java/org/commonjava/indy/hostedbyarc/client/IndyHostedByArchiveClientModule.java index 68f0d82e78..be0e9b4e0c 100644 --- a/addons/hosted-by-archive/client-java/src/main/java/org/commonjava/indy/hostedbyarc/client/IndyHostedByArchiveClientModule.java +++ b/addons/hosted-by-archive/client-java/src/main/java/org/commonjava/indy/hostedbyarc/client/IndyHostedByArchiveClientModule.java @@ -15,7 +15,7 @@ */ package org.commonjava.indy.hostedbyarc.client; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.http.HttpResponse; import org.apache.http.StatusLine; import org.apache.http.client.methods.HttpPost; diff --git a/addons/hosted-by-archive/common/src/main/java/org/commonjava/indy/hostedbyarc/HostedByArchiveManager.java b/addons/hosted-by-archive/common/src/main/java/org/commonjava/indy/hostedbyarc/HostedByArchiveManager.java index ffd072e269..7499accd15 100644 --- a/addons/hosted-by-archive/common/src/main/java/org/commonjava/indy/hostedbyarc/HostedByArchiveManager.java +++ b/addons/hosted-by-archive/common/src/main/java/org/commonjava/indy/hostedbyarc/HostedByArchiveManager.java @@ -15,7 +15,7 @@ */ package org.commonjava.indy.hostedbyarc; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.indy.IndyWorkflowException; import org.commonjava.indy.audit.ChangeSummary; import org.commonjava.indy.content.ContentManager; diff --git a/addons/hosted-by-archive/jaxrs/src/main/java/org/commonjava/indy/hostedbyarc/bind/jaxrs/IndyHostedByArchiveResource.java b/addons/hosted-by-archive/jaxrs/src/main/java/org/commonjava/indy/hostedbyarc/bind/jaxrs/IndyHostedByArchiveResource.java index 3ac4c03585..0310940a90 100644 --- a/addons/hosted-by-archive/jaxrs/src/main/java/org/commonjava/indy/hostedbyarc/bind/jaxrs/IndyHostedByArchiveResource.java +++ b/addons/hosted-by-archive/jaxrs/src/main/java/org/commonjava/indy/hostedbyarc/bind/jaxrs/IndyHostedByArchiveResource.java @@ -22,7 +22,7 @@ import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.indy.IndyWorkflowException; import org.commonjava.indy.bind.jaxrs.IndyResources; import org.commonjava.indy.bind.jaxrs.SecurityManager; diff --git a/addons/httprox/common/src/main/java/org/commonjava/indy/httprox/data/HttProxRegisterSpecialPathStartupAction.java b/addons/httprox/common/src/main/java/org/commonjava/indy/httprox/data/HttProxRegisterSpecialPathStartupAction.java index 8f0d2cfdf4..67c22686fd 100644 --- a/addons/httprox/common/src/main/java/org/commonjava/indy/httprox/data/HttProxRegisterSpecialPathStartupAction.java +++ b/addons/httprox/common/src/main/java/org/commonjava/indy/httprox/data/HttProxRegisterSpecialPathStartupAction.java @@ -15,7 +15,7 @@ */ package org.commonjava.indy.httprox.data; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.indy.action.IndyLifecycleException; import org.commonjava.indy.action.StartupAction; import org.commonjava.indy.content.SpecialPathSetProducer; @@ -31,7 +31,7 @@ import java.util.ArrayList; import java.util.List; -import static org.apache.commons.lang.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.isNotBlank; import static org.commonjava.maven.galley.io.SpecialPathConstants.PKG_TYPE_GENERIC_HTTP; /** diff --git a/addons/httprox/common/src/main/java/org/commonjava/indy/httprox/util/HttpConduitWrapper.java b/addons/httprox/common/src/main/java/org/commonjava/indy/httprox/util/HttpConduitWrapper.java index 467bd8d255..0c53bb00b6 100644 --- a/addons/httprox/common/src/main/java/org/commonjava/indy/httprox/util/HttpConduitWrapper.java +++ b/addons/httprox/common/src/main/java/org/commonjava/indy/httprox/util/HttpConduitWrapper.java @@ -15,7 +15,7 @@ */ package org.commonjava.indy.httprox.util; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.http.Header; import org.apache.http.HttpRequest; import org.commonjava.indy.IndyWorkflowException; diff --git a/addons/httprox/common/src/main/java/org/commonjava/indy/httprox/util/HttpProxyConstants.java b/addons/httprox/common/src/main/java/org/commonjava/indy/httprox/util/HttpProxyConstants.java index b5890a03db..0e095e1612 100644 --- a/addons/httprox/common/src/main/java/org/commonjava/indy/httprox/util/HttpProxyConstants.java +++ b/addons/httprox/common/src/main/java/org/commonjava/indy/httprox/util/HttpProxyConstants.java @@ -20,7 +20,7 @@ import java.util.HashSet; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; public final class HttpProxyConstants { diff --git a/addons/httprox/common/src/main/java/org/commonjava/indy/httprox/util/ProxyResponseHelper.java b/addons/httprox/common/src/main/java/org/commonjava/indy/httprox/util/ProxyResponseHelper.java index 8793a3ee6a..227fe1d7f8 100644 --- a/addons/httprox/common/src/main/java/org/commonjava/indy/httprox/util/ProxyResponseHelper.java +++ b/addons/httprox/common/src/main/java/org/commonjava/indy/httprox/util/ProxyResponseHelper.java @@ -17,7 +17,7 @@ import com.codahale.metrics.MetricRegistry; import com.codahale.metrics.Timer; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.http.HttpRequest; import org.commonjava.indy.IndyWorkflowException; import org.commonjava.indy.audit.ChangeSummary; diff --git a/addons/implied-repos/common/src/main/java/org/commonjava/indy/implrepo/change/ImpliedRepositoryDetector.java b/addons/implied-repos/common/src/main/java/org/commonjava/indy/implrepo/change/ImpliedRepositoryDetector.java index 01d813a3f3..7a1b09e23f 100644 --- a/addons/implied-repos/common/src/main/java/org/commonjava/indy/implrepo/change/ImpliedRepositoryDetector.java +++ b/addons/implied-repos/common/src/main/java/org/commonjava/indy/implrepo/change/ImpliedRepositoryDetector.java @@ -16,7 +16,7 @@ package org.commonjava.indy.implrepo.change; import com.fasterxml.jackson.core.JsonProcessingException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.cdi.util.weft.ExecutorConfig; import org.commonjava.cdi.util.weft.WeftManaged; import org.commonjava.indy.audit.ChangeSummary; diff --git a/addons/implied-repos/common/src/main/java/org/commonjava/indy/implrepo/conf/ImpliedRepoConfig.java b/addons/implied-repos/common/src/main/java/org/commonjava/indy/implrepo/conf/ImpliedRepoConfig.java index a7d4c4750e..32dd075347 100644 --- a/addons/implied-repos/common/src/main/java/org/commonjava/indy/implrepo/conf/ImpliedRepoConfig.java +++ b/addons/implied-repos/common/src/main/java/org/commonjava/indy/implrepo/conf/ImpliedRepoConfig.java @@ -15,7 +15,7 @@ */ package org.commonjava.indy.implrepo.conf; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.indy.conf.IndyConfigInfo; import org.commonjava.propulsor.config.ConfigurationException; import org.commonjava.propulsor.config.annotation.SectionName; diff --git a/addons/implied-repos/common/src/main/java/org/commonjava/indy/implrepo/data/ImpliedReposQueryDelegate.java b/addons/implied-repos/common/src/main/java/org/commonjava/indy/implrepo/data/ImpliedReposQueryDelegate.java index 424af8f9cb..0fbd8b9769 100644 --- a/addons/implied-repos/common/src/main/java/org/commonjava/indy/implrepo/data/ImpliedReposQueryDelegate.java +++ b/addons/implied-repos/common/src/main/java/org/commonjava/indy/implrepo/data/ImpliedReposQueryDelegate.java @@ -15,7 +15,7 @@ */ package org.commonjava.indy.implrepo.data; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.indy.data.DelegatingArtifactStoreQuery; import org.commonjava.indy.data.IndyDataException; import org.commonjava.indy.data.ArtifactStoreQuery; diff --git a/addons/implied-repos/common/src/test/java/org/commonjava/indy/implrepo/change/ImpliedRepositoryDetectorTest.java b/addons/implied-repos/common/src/test/java/org/commonjava/indy/implrepo/change/ImpliedRepositoryDetectorTest.java index ff6e39ee7d..8dd061ffb1 100644 --- a/addons/implied-repos/common/src/test/java/org/commonjava/indy/implrepo/change/ImpliedRepositoryDetectorTest.java +++ b/addons/implied-repos/common/src/test/java/org/commonjava/indy/implrepo/change/ImpliedRepositoryDetectorTest.java @@ -16,7 +16,7 @@ package org.commonjava.indy.implrepo.change; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.indy.audit.ChangeSummary; import org.commonjava.indy.data.ArtifactStoreValidator; import org.commonjava.indy.data.IndyDataException; diff --git a/addons/koji/common/src/main/java/org/commonjava/indy/koji/content/KojiBuildAuthority.java b/addons/koji/common/src/main/java/org/commonjava/indy/koji/content/KojiBuildAuthority.java index d36ff12e38..247807cf3a 100644 --- a/addons/koji/common/src/main/java/org/commonjava/indy/koji/content/KojiBuildAuthority.java +++ b/addons/koji/common/src/main/java/org/commonjava/indy/koji/content/KojiBuildAuthority.java @@ -29,7 +29,6 @@ import org.commonjava.indy.data.StoreDataManager; import org.commonjava.indy.koji.conf.IndyKojiConfig; import org.commonjava.indy.measure.annotation.Measure; -import org.commonjava.indy.measure.annotation.MetricNamed; import org.commonjava.indy.model.core.ArtifactStore; import org.commonjava.indy.model.core.StoreKey; import org.commonjava.indy.subsys.infinispan.CacheProducer; @@ -57,10 +56,9 @@ import java.util.stream.Collectors; import static java.lang.Boolean.TRUE; -import static org.apache.commons.lang.StringUtils.contains; -import static org.apache.commons.lang.StringUtils.isNotBlank; -import static org.apache.commons.lang.StringUtils.trimToEmpty; -import static org.commonjava.indy.measure.annotation.MetricNamed.DEFAULT; +import static org.apache.commons.lang3.StringUtils.contains; +import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.trimToEmpty; import static org.commonjava.maven.galley.io.ChecksummingTransferDecorator.FORCE_CHECKSUM; /** 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 5b3ae508e6..4c67c213b7 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 @@ -16,7 +16,7 @@ package org.commonjava.indy.koji.content; import com.redhat.red.build.koji.model.xmlrpc.KojiArchiveInfo; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.atlas.maven.ident.ref.ArtifactRef; import org.commonjava.atlas.maven.ident.ref.SimpleProjectRef; import org.commonjava.indy.koji.util.KojiUtils; diff --git a/addons/koji/common/src/main/java/org/commonjava/indy/koji/util/KojiUtils.java b/addons/koji/common/src/main/java/org/commonjava/indy/koji/util/KojiUtils.java index 5de1101343..0c9ca11f3a 100644 --- a/addons/koji/common/src/main/java/org/commonjava/indy/koji/util/KojiUtils.java +++ b/addons/koji/common/src/main/java/org/commonjava/indy/koji/util/KojiUtils.java @@ -37,7 +37,7 @@ import java.net.MalformedURLException; import java.util.regex.Pattern; -import static org.apache.commons.lang.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.isBlank; import static org.commonjava.maven.galley.util.UrlUtils.buildUrl; /** diff --git a/addons/koji/ftests/src/main/java/org/commonjava/indy/koji/ftest/AbstractKojiIT.java b/addons/koji/ftests/src/main/java/org/commonjava/indy/koji/ftest/AbstractKojiIT.java index 6c45cebfcd..3d63f670ba 100644 --- a/addons/koji/ftests/src/main/java/org/commonjava/indy/koji/ftest/AbstractKojiIT.java +++ b/addons/koji/ftests/src/main/java/org/commonjava/indy/koji/ftest/AbstractKojiIT.java @@ -16,7 +16,7 @@ package org.commonjava.indy.koji.ftest; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpPut; diff --git a/addons/koji/ftests/src/main/java/org/commonjava/indy/koji/ftest/GetKojiMetadataTest.java b/addons/koji/ftests/src/main/java/org/commonjava/indy/koji/ftest/GetKojiMetadataTest.java index f5f88f14c5..5ba3c6e237 100644 --- a/addons/koji/ftests/src/main/java/org/commonjava/indy/koji/ftest/GetKojiMetadataTest.java +++ b/addons/koji/ftests/src/main/java/org/commonjava/indy/koji/ftest/GetKojiMetadataTest.java @@ -26,7 +26,7 @@ import java.io.InputStream; -import static org.apache.commons.lang.StringUtils.join; +import static org.apache.commons.lang3.StringUtils.join; import static org.commonjava.indy.model.core.StoreType.group; import static org.commonjava.indy.pkg.maven.model.MavenPackageTypeDescriptor.MAVEN_PKG_KEY; import static org.hamcrest.CoreMatchers.equalTo; diff --git a/addons/pkg-maven/common/src/main/java/org/commonjava/indy/pkg/maven/content/MavenContentsFilteringTransferDecorator.java b/addons/pkg-maven/common/src/main/java/org/commonjava/indy/pkg/maven/content/MavenContentsFilteringTransferDecorator.java index df0ec29047..57442b6cf4 100644 --- a/addons/pkg-maven/common/src/main/java/org/commonjava/indy/pkg/maven/content/MavenContentsFilteringTransferDecorator.java +++ b/addons/pkg-maven/common/src/main/java/org/commonjava/indy/pkg/maven/content/MavenContentsFilteringTransferDecorator.java @@ -35,7 +35,7 @@ import com.codahale.metrics.Timer; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.atlas.maven.ident.util.SnapshotUtils; import org.commonjava.atlas.maven.ident.version.part.SnapshotPart; import org.commonjava.indy.metrics.IndyMetricsManager; 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 0ceae8f344..76c88a119e 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 @@ -16,7 +16,7 @@ package org.commonjava.indy.pkg.maven.content; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.maven.artifact.repository.metadata.Metadata; import org.apache.maven.artifact.repository.metadata.Plugin; import org.apache.maven.artifact.repository.metadata.SnapshotVersion; diff --git a/addons/pkg-maven/common/src/test/java/org/commonjava/indy/pkg/maven/content/MavenMetadataGeneratorTest.java b/addons/pkg-maven/common/src/test/java/org/commonjava/indy/pkg/maven/content/MavenMetadataGeneratorTest.java index 94cf7f2148..5393d5ff5f 100644 --- a/addons/pkg-maven/common/src/test/java/org/commonjava/indy/pkg/maven/content/MavenMetadataGeneratorTest.java +++ b/addons/pkg-maven/common/src/test/java/org/commonjava/indy/pkg/maven/content/MavenMetadataGeneratorTest.java @@ -15,7 +15,7 @@ */ package org.commonjava.indy.pkg.maven.content; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.cdi.util.weft.PoolWeftExecutorService; import org.commonjava.cdi.util.weft.WeftExecutorService; import org.commonjava.indy.audit.ChangeSummary; diff --git a/addons/pkg-maven/ftests/src/main/java/org/commonjava/indy/pkg/maven/content/GroupMetaOverlapWithMetaOfHostedReposTest.java b/addons/pkg-maven/ftests/src/main/java/org/commonjava/indy/pkg/maven/content/GroupMetaOverlapWithMetaOfHostedReposTest.java index 4cd67449e6..95da94f647 100644 --- a/addons/pkg-maven/ftests/src/main/java/org/commonjava/indy/pkg/maven/content/GroupMetaOverlapWithMetaOfHostedReposTest.java +++ b/addons/pkg-maven/ftests/src/main/java/org/commonjava/indy/pkg/maven/content/GroupMetaOverlapWithMetaOfHostedReposTest.java @@ -16,7 +16,7 @@ package org.commonjava.indy.pkg.maven.content; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.indy.client.core.helper.PathInfo; import org.commonjava.indy.ftest.core.AbstractContentManagementTest; import org.commonjava.indy.ftest.core.category.EventDependent; diff --git a/addons/pkg-maven/ftests/src/main/java/org/commonjava/indy/pkg/maven/content/GroupMetaOverlapWithNestedGroupOfHostRepoMetaTest.java b/addons/pkg-maven/ftests/src/main/java/org/commonjava/indy/pkg/maven/content/GroupMetaOverlapWithNestedGroupOfHostRepoMetaTest.java index a0b527936d..40188ad47d 100644 --- a/addons/pkg-maven/ftests/src/main/java/org/commonjava/indy/pkg/maven/content/GroupMetaOverlapWithNestedGroupOfHostRepoMetaTest.java +++ b/addons/pkg-maven/ftests/src/main/java/org/commonjava/indy/pkg/maven/content/GroupMetaOverlapWithNestedGroupOfHostRepoMetaTest.java @@ -16,7 +16,7 @@ package org.commonjava.indy.pkg.maven.content; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.indy.client.core.helper.PathInfo; import org.commonjava.indy.ftest.core.AbstractContentManagementTest; import org.commonjava.indy.ftest.core.category.EventDependent; diff --git a/addons/pkg-maven/ftests/src/main/java/org/commonjava/indy/pkg/maven/content/GroupMetaOverlapWithNestedGroupOfHostRepoNoMetaTest.java b/addons/pkg-maven/ftests/src/main/java/org/commonjava/indy/pkg/maven/content/GroupMetaOverlapWithNestedGroupOfHostRepoNoMetaTest.java index 99fae0b93c..7fe8500896 100644 --- a/addons/pkg-maven/ftests/src/main/java/org/commonjava/indy/pkg/maven/content/GroupMetaOverlapWithNestedGroupOfHostRepoNoMetaTest.java +++ b/addons/pkg-maven/ftests/src/main/java/org/commonjava/indy/pkg/maven/content/GroupMetaOverlapWithNestedGroupOfHostRepoNoMetaTest.java @@ -16,7 +16,7 @@ package org.commonjava.indy.pkg.maven.content; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.indy.client.core.helper.PathInfo; import org.commonjava.indy.ftest.core.AbstractContentManagementTest; import org.commonjava.indy.ftest.core.category.EventDependent; diff --git a/addons/pkg-maven/ftests/src/main/java/org/commonjava/indy/pkg/maven/content/GroupMetaOverlapWithoutMetaOfHostedReposTest.java b/addons/pkg-maven/ftests/src/main/java/org/commonjava/indy/pkg/maven/content/GroupMetaOverlapWithoutMetaOfHostedReposTest.java index 7dfeef28da..7aedc15371 100644 --- a/addons/pkg-maven/ftests/src/main/java/org/commonjava/indy/pkg/maven/content/GroupMetaOverlapWithoutMetaOfHostedReposTest.java +++ b/addons/pkg-maven/ftests/src/main/java/org/commonjava/indy/pkg/maven/content/GroupMetaOverlapWithoutMetaOfHostedReposTest.java @@ -16,7 +16,7 @@ package org.commonjava.indy.pkg.maven.content; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.indy.client.core.helper.PathInfo; import org.commonjava.indy.ftest.core.AbstractContentManagementTest; import org.commonjava.indy.ftest.core.category.EventDependent; diff --git a/addons/pkg-maven/ftests/src/main/java/org/commonjava/indy/pkg/maven/content/GroupMetadataMergeWithInvalidVersionTest.java b/addons/pkg-maven/ftests/src/main/java/org/commonjava/indy/pkg/maven/content/GroupMetadataMergeWithInvalidVersionTest.java index f47a332265..c3c5c1ca69 100644 --- a/addons/pkg-maven/ftests/src/main/java/org/commonjava/indy/pkg/maven/content/GroupMetadataMergeWithInvalidVersionTest.java +++ b/addons/pkg-maven/ftests/src/main/java/org/commonjava/indy/pkg/maven/content/GroupMetadataMergeWithInvalidVersionTest.java @@ -15,7 +15,7 @@ */ package org.commonjava.indy.pkg.maven.content; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.indy.client.core.IndyClientException; import org.commonjava.indy.ftest.core.AbstractContentManagementTest; import org.commonjava.indy.ftest.core.category.EventDependent; diff --git a/addons/pkg-npm/ftests/src/main/java/org/commonjava/indy/pkg/npm/content/NPMGroupContentMergeRetrieveTest.java b/addons/pkg-npm/ftests/src/main/java/org/commonjava/indy/pkg/npm/content/NPMGroupContentMergeRetrieveTest.java index 7c555b55c5..bfa5f76cf9 100644 --- a/addons/pkg-npm/ftests/src/main/java/org/commonjava/indy/pkg/npm/content/NPMGroupContentMergeRetrieveTest.java +++ b/addons/pkg-npm/ftests/src/main/java/org/commonjava/indy/pkg/npm/content/NPMGroupContentMergeRetrieveTest.java @@ -16,7 +16,7 @@ package org.commonjava.indy.pkg.npm.content; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.indy.client.core.util.UrlUtils; import org.commonjava.indy.ftest.core.AbstractContentManagementTest; import org.commonjava.indy.model.core.Group; 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 7258180abd..63048fcf4f 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 @@ -15,7 +15,7 @@ */ package org.commonjava.indy.promote.data; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.cdi.util.weft.DrainingExecutorCompletionService; import org.commonjava.cdi.util.weft.ExecutorConfig; import org.commonjava.cdi.util.weft.Locker; 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 24aa0de8f2..bf8d614d99 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 @@ -15,7 +15,7 @@ */ package org.commonjava.indy.promote.validate; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.ClassUtils; import org.commonjava.cdi.util.weft.DrainingExecutorCompletionService; import org.commonjava.cdi.util.weft.ExecutorConfig; @@ -59,7 +59,7 @@ import static com.codahale.metrics.MetricRegistry.name; import static java.lang.String.format; -import static org.apache.commons.lang.StringUtils.join; +import static org.apache.commons.lang3.StringUtils.join; import static org.commonjava.indy.core.ctl.PoolUtils.detectOverloadVoid; /** diff --git a/addons/promote/ftests/src/main/java/org/commonjava/indy/promote/ftest/CacheCheckingforPromoteWithRemoteTest.java b/addons/promote/ftests/src/main/java/org/commonjava/indy/promote/ftest/CacheCheckingforPromoteWithRemoteTest.java index 160c5243a0..93ff5ff19f 100644 --- a/addons/promote/ftests/src/main/java/org/commonjava/indy/promote/ftest/CacheCheckingforPromoteWithRemoteTest.java +++ b/addons/promote/ftests/src/main/java/org/commonjava/indy/promote/ftest/CacheCheckingforPromoteWithRemoteTest.java @@ -16,7 +16,7 @@ package org.commonjava.indy.promote.ftest; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.indy.client.core.IndyClientException; import org.commonjava.indy.client.core.IndyClientModule; import org.commonjava.indy.ftest.core.AbstractIndyFunctionalTest; diff --git a/addons/promote/ftests/src/main/java/org/commonjava/indy/promote/ftest/GroupHostedMetadataRemergedOnPromoteTest.java b/addons/promote/ftests/src/main/java/org/commonjava/indy/promote/ftest/GroupHostedMetadataRemergedOnPromoteTest.java index 44a30fd19d..b863cab3a7 100644 --- a/addons/promote/ftests/src/main/java/org/commonjava/indy/promote/ftest/GroupHostedMetadataRemergedOnPromoteTest.java +++ b/addons/promote/ftests/src/main/java/org/commonjava/indy/promote/ftest/GroupHostedMetadataRemergedOnPromoteTest.java @@ -16,7 +16,7 @@ package org.commonjava.indy.promote.ftest; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.indy.client.core.IndyClientException; import org.commonjava.indy.client.core.IndyClientModule; import org.commonjava.indy.client.core.helper.PathInfo; diff --git a/addons/promote/ftests/src/main/java/org/commonjava/indy/promote/ftest/rule/ArtifactRefs_PromoteWithParent_RuleTest.java b/addons/promote/ftests/src/main/java/org/commonjava/indy/promote/ftest/rule/ArtifactRefs_PromoteWithParent_RuleTest.java index 8adf52dcb2..49ad69322a 100644 --- a/addons/promote/ftests/src/main/java/org/commonjava/indy/promote/ftest/rule/ArtifactRefs_PromoteWithParent_RuleTest.java +++ b/addons/promote/ftests/src/main/java/org/commonjava/indy/promote/ftest/rule/ArtifactRefs_PromoteWithParent_RuleTest.java @@ -16,7 +16,7 @@ package org.commonjava.indy.promote.ftest.rule; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.indy.ftest.core.category.EventDependent; import org.commonjava.indy.model.core.Group; import org.commonjava.indy.model.core.HostedRepository; diff --git a/addons/promote/model-java/src/main/java/org/commonjava/indy/promote/model/ValidationCatalogDTO.java b/addons/promote/model-java/src/main/java/org/commonjava/indy/promote/model/ValidationCatalogDTO.java index 8a49a3451b..9daa003216 100644 --- a/addons/promote/model-java/src/main/java/org/commonjava/indy/promote/model/ValidationCatalogDTO.java +++ b/addons/promote/model-java/src/main/java/org/commonjava/indy/promote/model/ValidationCatalogDTO.java @@ -15,7 +15,7 @@ */ package org.commonjava.indy.promote.model; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.util.Collections; import java.util.Map; diff --git a/addons/repo-proxy/common/src/main/java/org/commonjava/indy/repo/proxy/ContentBrowseRemoteIndyListingRewriteManager.java b/addons/repo-proxy/common/src/main/java/org/commonjava/indy/repo/proxy/ContentBrowseRemoteIndyListingRewriteManager.java index bbf36d5400..1fa85b44d8 100644 --- a/addons/repo-proxy/common/src/main/java/org/commonjava/indy/repo/proxy/ContentBrowseRemoteIndyListingRewriteManager.java +++ b/addons/repo-proxy/common/src/main/java/org/commonjava/indy/repo/proxy/ContentBrowseRemoteIndyListingRewriteManager.java @@ -15,7 +15,7 @@ */ package org.commonjava.indy.repo.proxy; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.indy.client.core.Indy; import org.commonjava.indy.client.core.IndyClientException; import org.commonjava.indy.content.browse.client.IndyContentBrowseClientModule; diff --git a/addons/repo-proxy/ftests/src/main/java/org/commonjava/indy/repo/proxy/ftest/RepoProxyNPMHugeMetaContentRewriteTest.java b/addons/repo-proxy/ftests/src/main/java/org/commonjava/indy/repo/proxy/ftest/RepoProxyNPMHugeMetaContentRewriteTest.java index 81fe715979..a2b2fd403a 100644 --- a/addons/repo-proxy/ftests/src/main/java/org/commonjava/indy/repo/proxy/ftest/RepoProxyNPMHugeMetaContentRewriteTest.java +++ b/addons/repo-proxy/ftests/src/main/java/org/commonjava/indy/repo/proxy/ftest/RepoProxyNPMHugeMetaContentRewriteTest.java @@ -16,7 +16,7 @@ package org.commonjava.indy.repo.proxy.ftest; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.indy.ftest.core.AbstractContentManagementTest; import org.commonjava.indy.model.core.HostedRepository; import org.commonjava.indy.model.core.RemoteRepository; diff --git a/addons/repo-proxy/ftests/src/main/java/org/commonjava/indy/repo/proxy/ftest/create/RepoProxyCreatorWithNPMContentRewriteTest.java b/addons/repo-proxy/ftests/src/main/java/org/commonjava/indy/repo/proxy/ftest/create/RepoProxyCreatorWithNPMContentRewriteTest.java index 2a6f9b9729..2328fcfc6f 100644 --- a/addons/repo-proxy/ftests/src/main/java/org/commonjava/indy/repo/proxy/ftest/create/RepoProxyCreatorWithNPMContentRewriteTest.java +++ b/addons/repo-proxy/ftests/src/main/java/org/commonjava/indy/repo/proxy/ftest/create/RepoProxyCreatorWithNPMContentRewriteTest.java @@ -16,7 +16,7 @@ package org.commonjava.indy.repo.proxy.ftest.create; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.indy.ftest.core.AbstractContentManagementTest; import org.commonjava.indy.model.core.Group; import org.commonjava.indy.model.core.RemoteRepository; diff --git a/addons/revisions/common/src/main/java/org/commonjava/indy/revisions/RevisionsManager.java b/addons/revisions/common/src/main/java/org/commonjava/indy/revisions/RevisionsManager.java index aea97aef47..8341334b15 100644 --- a/addons/revisions/common/src/main/java/org/commonjava/indy/revisions/RevisionsManager.java +++ b/addons/revisions/common/src/main/java/org/commonjava/indy/revisions/RevisionsManager.java @@ -15,8 +15,8 @@ */ package org.commonjava.indy.revisions; -import static org.apache.commons.lang.StringUtils.isEmpty; -import static org.apache.commons.lang.StringUtils.join; +import static org.apache.commons.lang3.StringUtils.isEmpty; +import static org.apache.commons.lang3.StringUtils.join; import static org.commonjava.indy.audit.ChangeSummary.SYSTEM_USER; import java.io.File; diff --git a/addons/revisions/common/src/test/java/org/commonjava/indy/revisions/RevisionsManagerTest.java b/addons/revisions/common/src/test/java/org/commonjava/indy/revisions/RevisionsManagerTest.java index ef4d8ade03..109eb364e8 100644 --- a/addons/revisions/common/src/test/java/org/commonjava/indy/revisions/RevisionsManagerTest.java +++ b/addons/revisions/common/src/test/java/org/commonjava/indy/revisions/RevisionsManagerTest.java @@ -15,7 +15,7 @@ */ package org.commonjava.indy.revisions; -import static org.apache.commons.lang.StringUtils.join; +import static org.apache.commons.lang3.StringUtils.join; import static org.commonjava.indy.audit.ChangeSummary.SYSTEM_USER; import static org.commonjava.indy.subsys.git.GitManager.COMMIT_CHANGELOG_ENTRIES; import static org.hamcrest.CoreMatchers.equalTo; diff --git a/api/pom.xml b/api/pom.xml index 1bb84c0950..c876b6aa3b 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -37,8 +37,8 @@ propulsor-configuration-core - commons-lang - commons-lang + org.apache.commons + commons-lang3 org.commonjava.maven.galley diff --git a/api/src/main/java/org/commonjava/indy/CustomJsonLayout.java b/api/src/main/java/org/commonjava/indy/CustomJsonLayout.java index ae2f9cdd7b..4ef032bf0b 100644 --- a/api/src/main/java/org/commonjava/indy/CustomJsonLayout.java +++ b/api/src/main/java/org/commonjava/indy/CustomJsonLayout.java @@ -17,7 +17,7 @@ import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.contrib.json.classic.JsonLayout; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/api/src/main/java/org/commonjava/indy/conf/DefaultIndyConfiguration.java b/api/src/main/java/org/commonjava/indy/conf/DefaultIndyConfiguration.java index 0dceaa4b37..decec8fb33 100644 --- a/api/src/main/java/org/commonjava/indy/conf/DefaultIndyConfiguration.java +++ b/api/src/main/java/org/commonjava/indy/conf/DefaultIndyConfiguration.java @@ -25,8 +25,8 @@ import java.io.InputStream; import java.util.Properties; -import static org.apache.commons.lang.StringUtils.isBlank; -import static org.apache.commons.lang.StringUtils.isEmpty; +import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.isEmpty; @SectionName @ApplicationScoped diff --git a/api/src/main/java/org/commonjava/indy/util/AcceptInfoParser.java b/api/src/main/java/org/commonjava/indy/util/AcceptInfoParser.java index 6235cd58af..668b0281ff 100644 --- a/api/src/main/java/org/commonjava/indy/util/AcceptInfoParser.java +++ b/api/src/main/java/org/commonjava/indy/util/AcceptInfoParser.java @@ -15,7 +15,7 @@ */ package org.commonjava.indy.util; -import static org.apache.commons.lang.StringUtils.join; +import static org.apache.commons.lang3.StringUtils.join; import java.util.ArrayList; import java.util.Arrays; diff --git a/bindings/jaxrs/src/main/java/org/commonjava/indy/core/bind/jaxrs/NfcResource.java b/bindings/jaxrs/src/main/java/org/commonjava/indy/core/bind/jaxrs/NfcResource.java index faa456f33f..a631b9ea36 100644 --- a/bindings/jaxrs/src/main/java/org/commonjava/indy/core/bind/jaxrs/NfcResource.java +++ b/bindings/jaxrs/src/main/java/org/commonjava/indy/core/bind/jaxrs/NfcResource.java @@ -46,7 +46,7 @@ import javax.ws.rs.core.Response; import java.nio.file.Paths; -import static org.apache.commons.lang.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.isBlank; import static org.commonjava.indy.pkg.maven.model.MavenPackageTypeDescriptor.MAVEN_PKG_KEY; @Api( description = "REST resource that manages the not-found cache", value = "Not-Found Cache" ) diff --git a/bindings/jaxrs/src/main/java/org/commonjava/indy/core/bind/jaxrs/admin/DeprecatedStoreAdminHandler.java b/bindings/jaxrs/src/main/java/org/commonjava/indy/core/bind/jaxrs/admin/DeprecatedStoreAdminHandler.java index 0714352336..2dc2fe2a02 100644 --- a/bindings/jaxrs/src/main/java/org/commonjava/indy/core/bind/jaxrs/admin/DeprecatedStoreAdminHandler.java +++ b/bindings/jaxrs/src/main/java/org/commonjava/indy/core/bind/jaxrs/admin/DeprecatedStoreAdminHandler.java @@ -68,7 +68,7 @@ import static javax.ws.rs.core.Response.notModified; import static javax.ws.rs.core.Response.ok; import static javax.ws.rs.core.Response.status; -import static org.apache.commons.lang.StringUtils.isEmpty; +import static org.apache.commons.lang3.StringUtils.isEmpty; import static org.commonjava.indy.model.core.ArtifactStore.METADATA_CHANGELOG; import static org.commonjava.indy.util.ApplicationContent.application_json; diff --git a/bindings/jaxrs/src/main/java/org/commonjava/indy/core/bind/jaxrs/admin/StoreAdminHandler.java b/bindings/jaxrs/src/main/java/org/commonjava/indy/core/bind/jaxrs/admin/StoreAdminHandler.java index f91189cd23..1820c632a3 100644 --- a/bindings/jaxrs/src/main/java/org/commonjava/indy/core/bind/jaxrs/admin/StoreAdminHandler.java +++ b/bindings/jaxrs/src/main/java/org/commonjava/indy/core/bind/jaxrs/admin/StoreAdminHandler.java @@ -21,7 +21,7 @@ import static javax.ws.rs.core.Response.notModified; import static javax.ws.rs.core.Response.ok; import static javax.ws.rs.core.Response.status; -import static org.apache.commons.lang.StringUtils.isEmpty; +import static org.apache.commons.lang3.StringUtils.isEmpty; import static org.commonjava.indy.model.core.ArtifactStore.METADATA_CHANGELOG; import static org.commonjava.indy.util.ApplicationContent.application_json; diff --git a/clients/core-java/src/main/java/org/commonjava/indy/client/core/IndyClientHttp.java b/clients/core-java/src/main/java/org/commonjava/indy/client/core/IndyClientHttp.java index 104a738054..8fc3f63a66 100644 --- a/clients/core-java/src/main/java/org/commonjava/indy/client/core/IndyClientHttp.java +++ b/clients/core-java/src/main/java/org/commonjava/indy/client/core/IndyClientHttp.java @@ -16,7 +16,7 @@ package org.commonjava.indy.client.core; import com.fasterxml.jackson.core.type.TypeReference; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.http.Header; import org.apache.http.HttpRequest; import org.apache.http.HttpResponse; @@ -65,7 +65,7 @@ import java.util.Map; import java.util.function.Supplier; -import static org.apache.commons.lang.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.isNotBlank; import static org.commonjava.indy.IndyContentConstants.CHECK_CACHE_ONLY; import static org.commonjava.indy.client.core.helper.HttpResources.cleanupResources; import static org.commonjava.indy.client.core.helper.HttpResources.entityToString; diff --git a/clients/core-java/src/main/java/org/commonjava/indy/client/core/IndyResponseErrorDetails.java b/clients/core-java/src/main/java/org/commonjava/indy/client/core/IndyResponseErrorDetails.java index 0bee7c840b..bc9c468ff7 100644 --- a/clients/core-java/src/main/java/org/commonjava/indy/client/core/IndyResponseErrorDetails.java +++ b/clients/core-java/src/main/java/org/commonjava/indy/client/core/IndyResponseErrorDetails.java @@ -17,7 +17,7 @@ import java.io.IOException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.http.HttpResponse; import org.apache.http.ParseException; import org.apache.http.ProtocolVersion; diff --git a/clients/core-java/src/main/java/org/commonjava/indy/client/core/module/IndyMaintenanceClientModule.java b/clients/core-java/src/main/java/org/commonjava/indy/client/core/module/IndyMaintenanceClientModule.java index b0b6c923bb..f43a7cd693 100644 --- a/clients/core-java/src/main/java/org/commonjava/indy/client/core/module/IndyMaintenanceClientModule.java +++ b/clients/core-java/src/main/java/org/commonjava/indy/client/core/module/IndyMaintenanceClientModule.java @@ -15,7 +15,7 @@ */ package org.commonjava.indy.client.core.module; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.indy.client.core.IndyClientException; import org.commonjava.indy.client.core.IndyClientModule; import org.commonjava.indy.client.core.util.UrlUtils; diff --git a/clients/core-java/src/main/java/org/commonjava/indy/client/core/module/IndyNfcClientModule.java b/clients/core-java/src/main/java/org/commonjava/indy/client/core/module/IndyNfcClientModule.java index e999c77ae6..83aea9ade7 100644 --- a/clients/core-java/src/main/java/org/commonjava/indy/client/core/module/IndyNfcClientModule.java +++ b/clients/core-java/src/main/java/org/commonjava/indy/client/core/module/IndyNfcClientModule.java @@ -28,7 +28,7 @@ import java.net.URI; import java.net.URISyntaxException; -import static org.apache.commons.lang.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.isBlank; public class IndyNfcClientModule extends IndyClientModule diff --git a/clients/core-java/src/main/java/org/commonjava/indy/client/core/util/UrlUtils.java b/clients/core-java/src/main/java/org/commonjava/indy/client/core/util/UrlUtils.java index ef1bcd14cb..5eddc155b3 100644 --- a/clients/core-java/src/main/java/org/commonjava/indy/client/core/util/UrlUtils.java +++ b/clients/core-java/src/main/java/org/commonjava/indy/client/core/util/UrlUtils.java @@ -23,7 +23,7 @@ import java.util.Map; import java.util.function.Supplier; -import static org.apache.commons.lang.StringUtils.join; +import static org.apache.commons.lang3.StringUtils.join; public final class UrlUtils { diff --git a/core/src/main/java/org/commonjava/indy/core/change/StoreEnablementManager.java b/core/src/main/java/org/commonjava/indy/core/change/StoreEnablementManager.java index b445800f26..6e47c86afb 100644 --- a/core/src/main/java/org/commonjava/indy/core/change/StoreEnablementManager.java +++ b/core/src/main/java/org/commonjava/indy/core/change/StoreEnablementManager.java @@ -15,7 +15,7 @@ */ package org.commonjava.indy.core.change; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.indy.audit.ChangeSummary; import org.commonjava.indy.change.event.ArtifactStoreEnablementEvent; import org.commonjava.indy.change.event.ArtifactStorePostUpdateEvent; diff --git a/core/src/main/java/org/commonjava/indy/core/content/DefaultContentManager.java b/core/src/main/java/org/commonjava/indy/core/content/DefaultContentManager.java index 4c19aec9d9..cd0a3dff2a 100644 --- a/core/src/main/java/org/commonjava/indy/core/content/DefaultContentManager.java +++ b/core/src/main/java/org/commonjava/indy/core/content/DefaultContentManager.java @@ -16,7 +16,7 @@ package org.commonjava.indy.core.content; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.indy.IndyWorkflowException; import org.commonjava.indy.conf.IndyConfiguration; import org.commonjava.indy.content.ContentDigester; diff --git a/core/src/main/java/org/commonjava/indy/core/content/group/GroupRepositoryFilterManager.java b/core/src/main/java/org/commonjava/indy/core/content/group/GroupRepositoryFilterManager.java index 7376ffc961..9a9010a2d9 100644 --- a/core/src/main/java/org/commonjava/indy/core/content/group/GroupRepositoryFilterManager.java +++ b/core/src/main/java/org/commonjava/indy/core/content/group/GroupRepositoryFilterManager.java @@ -15,7 +15,7 @@ */ package org.commonjava.indy.core.content.group; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.indy.conf.IndyConfiguration; import org.commonjava.indy.content.GroupRepositoryFilter; import org.commonjava.indy.model.core.ArtifactStore; diff --git a/core/src/main/java/org/commonjava/indy/core/ctl/IspnCacheController.java b/core/src/main/java/org/commonjava/indy/core/ctl/IspnCacheController.java index cd1d33461b..374f830420 100644 --- a/core/src/main/java/org/commonjava/indy/core/ctl/IspnCacheController.java +++ b/core/src/main/java/org/commonjava/indy/core/ctl/IspnCacheController.java @@ -31,7 +31,7 @@ import java.util.HashMap; import java.util.Map; -import static org.apache.commons.lang.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.isNotBlank; @ApplicationScoped public class IspnCacheController diff --git a/db/common/src/main/java/org/commonjava/indy/db/common/AbstractStoreDataManager.java b/db/common/src/main/java/org/commonjava/indy/db/common/AbstractStoreDataManager.java index e6ec14fc0b..10ce67c5e4 100644 --- a/db/common/src/main/java/org/commonjava/indy/db/common/AbstractStoreDataManager.java +++ b/db/common/src/main/java/org/commonjava/indy/db/common/AbstractStoreDataManager.java @@ -15,7 +15,7 @@ */ package org.commonjava.indy.db.common; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.cdi.util.weft.ExecutorConfig; import org.commonjava.cdi.util.weft.Locker; import org.commonjava.cdi.util.weft.WeftManaged; @@ -61,7 +61,7 @@ import java.util.stream.Stream; import static java.util.Collections.emptySet; -import static org.apache.commons.lang.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.isBlank; import static org.apache.commons.lang3.StringUtils.isNotBlank; import static org.commonjava.indy.db.common.StoreUpdateAction.DELETE; import static org.commonjava.indy.db.common.StoreUpdateAction.STORE; diff --git a/db/memory/src/test/java/org/commonjava/indy/infinispan/data/fixture/ThreadDumper.java b/db/memory/src/test/java/org/commonjava/indy/infinispan/data/fixture/ThreadDumper.java index 4b824d7dbd..3d680f6f6f 100644 --- a/db/memory/src/test/java/org/commonjava/indy/infinispan/data/fixture/ThreadDumper.java +++ b/db/memory/src/test/java/org/commonjava/indy/infinispan/data/fixture/ThreadDumper.java @@ -31,7 +31,7 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Stream; -import static org.apache.commons.lang.StringUtils.join; +import static org.apache.commons.lang3.StringUtils.join; /** * Created by jdcasey on 11/28/16. diff --git a/ftests/common/src/main/java/org/commonjava/indy/ftest/core/fixture/ThreadDumper.java b/ftests/common/src/main/java/org/commonjava/indy/ftest/core/fixture/ThreadDumper.java index 12bc2d0235..443b79cb85 100644 --- a/ftests/common/src/main/java/org/commonjava/indy/ftest/core/fixture/ThreadDumper.java +++ b/ftests/common/src/main/java/org/commonjava/indy/ftest/core/fixture/ThreadDumper.java @@ -31,7 +31,7 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Stream; -import static org.apache.commons.lang.StringUtils.join; +import static org.apache.commons.lang3.StringUtils.join; /** * Created by jdcasey on 11/28/16. diff --git a/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/GroupDownloadWithFirstRepoTimeoutTest.java b/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/GroupDownloadWithFirstRepoTimeoutTest.java index 5436ab1acb..74fde6860b 100644 --- a/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/GroupDownloadWithFirstRepoTimeoutTest.java +++ b/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/GroupDownloadWithFirstRepoTimeoutTest.java @@ -16,7 +16,7 @@ package org.commonjava.indy.ftest.core.content; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.indy.ftest.core.AbstractContentManagementTest; import org.commonjava.indy.model.core.Group; import org.commonjava.indy.model.core.RemoteRepository; diff --git a/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/GroupIgnoresDisabledRemoteRepositoryTest.java b/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/GroupIgnoresDisabledRemoteRepositoryTest.java index 05883d10a1..5217be5f69 100644 --- a/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/GroupIgnoresDisabledRemoteRepositoryTest.java +++ b/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/GroupIgnoresDisabledRemoteRepositoryTest.java @@ -16,7 +16,7 @@ package org.commonjava.indy.ftest.core.content; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.indy.ftest.core.AbstractContentManagementTest; import org.commonjava.indy.model.core.Group; import org.commonjava.indy.model.core.RemoteRepository; diff --git a/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/GroupMetadataMergeInfoGenTest.java b/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/GroupMetadataMergeInfoGenTest.java index ab59ed2259..9626fb2fd9 100644 --- a/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/GroupMetadataMergeInfoGenTest.java +++ b/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/GroupMetadataMergeInfoGenTest.java @@ -16,7 +16,7 @@ package org.commonjava.indy.ftest.core.content; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.indy.core.content.group.GroupMergeHelper; import org.commonjava.indy.ftest.core.AbstractContentManagementTest; import org.commonjava.indy.model.core.ArtifactStore; diff --git a/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/GroupMetadataMergeWhenConstituentDisabledTest.java b/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/GroupMetadataMergeWhenConstituentDisabledTest.java index 4591ec3034..dee1a2a8c5 100644 --- a/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/GroupMetadataMergeWhenConstituentDisabledTest.java +++ b/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/GroupMetadataMergeWhenConstituentDisabledTest.java @@ -16,7 +16,7 @@ package org.commonjava.indy.ftest.core.content; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.indy.ftest.core.AbstractContentManagementTest; import org.commonjava.indy.ftest.core.category.EventDependent; import org.commonjava.indy.model.core.Group; diff --git a/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/GroupMetadataMergeWhenGroupWithGroupMemberChangesTest.java b/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/GroupMetadataMergeWhenGroupWithGroupMemberChangesTest.java index 6d8aa9659a..ab13b55d43 100644 --- a/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/GroupMetadataMergeWhenGroupWithGroupMemberChangesTest.java +++ b/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/GroupMetadataMergeWhenGroupWithGroupMemberChangesTest.java @@ -16,7 +16,7 @@ package org.commonjava.indy.ftest.core.content; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.indy.client.core.IndyClientException; import org.commonjava.indy.ftest.core.AbstractContentManagementTest; import org.commonjava.indy.model.core.Group; diff --git a/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/GroupMetadataMergeWhenNewHostedAddedInMultiHostedGroupTest.java b/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/GroupMetadataMergeWhenNewHostedAddedInMultiHostedGroupTest.java index e0b56c3f77..d5229928c6 100644 --- a/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/GroupMetadataMergeWhenNewHostedAddedInMultiHostedGroupTest.java +++ b/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/GroupMetadataMergeWhenNewHostedAddedInMultiHostedGroupTest.java @@ -16,7 +16,7 @@ package org.commonjava.indy.ftest.core.content; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.indy.client.core.IndyClientException; import org.commonjava.indy.ftest.core.AbstractContentManagementTest; import org.commonjava.indy.model.core.Group; diff --git a/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/GroupMetadataMergeWhenSeqNewHostedAddedInMultiHostedGroupTest.java b/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/GroupMetadataMergeWhenSeqNewHostedAddedInMultiHostedGroupTest.java index d8d5aa06aa..1ef6f5343e 100644 --- a/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/GroupMetadataMergeWhenSeqNewHostedAddedInMultiHostedGroupTest.java +++ b/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/GroupMetadataMergeWhenSeqNewHostedAddedInMultiHostedGroupTest.java @@ -16,7 +16,7 @@ package org.commonjava.indy.ftest.core.content; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.indy.client.core.IndyClientException; import org.commonjava.indy.ftest.core.AbstractContentManagementTest; import org.commonjava.indy.model.core.Group; diff --git a/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/GroupMetadataMergeWithRepoErrorTest.java b/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/GroupMetadataMergeWithRepoErrorTest.java index caa47876ee..cbe8eacf1c 100644 --- a/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/GroupMetadataMergeWithRepoErrorTest.java +++ b/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/GroupMetadataMergeWithRepoErrorTest.java @@ -23,7 +23,7 @@ import java.io.InputStream; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.indy.ftest.core.AbstractContentManagementTest; import org.commonjava.indy.model.core.Group; import org.commonjava.indy.model.core.RemoteRepository; diff --git a/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/GroupMetadataMergeWithRepoTimeoutTest.java b/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/GroupMetadataMergeWithRepoTimeoutTest.java index f42dbaf778..a01753a5ee 100644 --- a/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/GroupMetadataMergeWithRepoTimeoutTest.java +++ b/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/GroupMetadataMergeWithRepoTimeoutTest.java @@ -24,7 +24,7 @@ import java.io.InputStream; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.indy.ftest.core.AbstractContentManagementTest; import org.commonjava.indy.model.core.Group; import org.commonjava.indy.model.core.RemoteRepository; diff --git a/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/GroupMetadataRemergeWhenConstituentDisabledTest.java b/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/GroupMetadataRemergeWhenConstituentDisabledTest.java index 5eff63e20c..35e04eb523 100644 --- a/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/GroupMetadataRemergeWhenConstituentDisabledTest.java +++ b/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/GroupMetadataRemergeWhenConstituentDisabledTest.java @@ -16,7 +16,7 @@ package org.commonjava.indy.ftest.core.content; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.indy.client.core.IndyClientException; import org.commonjava.indy.ftest.core.AbstractContentManagementTest; import org.commonjava.indy.model.core.Group; diff --git a/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/MetadataMergeRepoNoMetaListingTimeoutTest.java b/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/MetadataMergeRepoNoMetaListingTimeoutTest.java index f6c71be4ff..02f6a51748 100644 --- a/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/MetadataMergeRepoNoMetaListingTimeoutTest.java +++ b/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/MetadataMergeRepoNoMetaListingTimeoutTest.java @@ -22,7 +22,7 @@ import java.io.IOException; import java.io.InputStream; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.indy.ftest.core.AbstractContentManagementTest; import org.commonjava.indy.ftest.core.category.EventDependent; import org.commonjava.indy.model.core.Group; diff --git a/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/RepositoryFilterGACacheTest.java b/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/RepositoryFilterGACacheTest.java index 8b581c6a32..46d021529a 100644 --- a/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/RepositoryFilterGACacheTest.java +++ b/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/RepositoryFilterGACacheTest.java @@ -18,7 +18,7 @@ import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.AppenderBase; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.indy.client.core.IndyClientException; import org.commonjava.indy.core.content.group.GroupRepositoryFilterManager; import org.commonjava.indy.ftest.core.AbstractContentManagementTest; diff --git a/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/RepositoryFilterTest.java b/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/RepositoryFilterTest.java index 07f693b1c2..74e261a83e 100644 --- a/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/RepositoryFilterTest.java +++ b/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/RepositoryFilterTest.java @@ -16,7 +16,7 @@ package org.commonjava.indy.ftest.core.content; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.indy.ftest.core.AbstractContentManagementTest; import org.commonjava.indy.model.core.Group; import org.commonjava.indy.model.core.HostedRepository; diff --git a/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/RepositoryPathMaskExistsTest.java b/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/RepositoryPathMaskExistsTest.java index cef4952ac6..baed1e4540 100644 --- a/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/RepositoryPathMaskExistsTest.java +++ b/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/RepositoryPathMaskExistsTest.java @@ -16,7 +16,7 @@ package org.commonjava.indy.ftest.core.content; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.indy.ftest.core.AbstractContentManagementTest; import org.commonjava.indy.model.core.Group; import org.commonjava.indy.model.core.RemoteRepository; diff --git a/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/RepositoryPathMaskExtTest.java b/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/RepositoryPathMaskExtTest.java index 5611dd2cb8..83572f99c1 100644 --- a/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/RepositoryPathMaskExtTest.java +++ b/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/RepositoryPathMaskExtTest.java @@ -16,7 +16,7 @@ package org.commonjava.indy.ftest.core.content; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.indy.ftest.core.AbstractContentManagementTest; import org.commonjava.indy.model.core.Group; import org.commonjava.indy.model.core.HostedRepository; diff --git a/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/RepositoryPathMaskMetadataExcludeTest.java b/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/RepositoryPathMaskMetadataExcludeTest.java index 03fb5a9d01..3acc4bba8f 100644 --- a/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/RepositoryPathMaskMetadataExcludeTest.java +++ b/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/RepositoryPathMaskMetadataExcludeTest.java @@ -16,7 +16,7 @@ package org.commonjava.indy.ftest.core.content; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.indy.ftest.core.AbstractContentManagementTest; import org.commonjava.indy.model.core.Group; import org.commonjava.indy.model.core.HostedRepository; diff --git a/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/RepositoryPathMaskMetadataTest.java b/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/RepositoryPathMaskMetadataTest.java index 203e89abce..88858442bd 100644 --- a/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/RepositoryPathMaskMetadataTest.java +++ b/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/RepositoryPathMaskMetadataTest.java @@ -16,7 +16,7 @@ package org.commonjava.indy.ftest.core.content; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.indy.ftest.core.AbstractContentManagementTest; import org.commonjava.indy.model.core.Group; import org.commonjava.indy.model.core.HostedRepository; diff --git a/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/RepositoryPathMaskTest.java b/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/RepositoryPathMaskTest.java index 97885d08cd..cbd57085e0 100644 --- a/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/RepositoryPathMaskTest.java +++ b/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/RepositoryPathMaskTest.java @@ -16,7 +16,7 @@ package org.commonjava.indy.ftest.core.content; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.indy.ftest.core.AbstractContentManagementTest; import org.commonjava.indy.model.core.Group; import org.commonjava.indy.model.core.RemoteRepository; diff --git a/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/StoreFileAndVerifyExistenceInGroupTest.java b/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/StoreFileAndVerifyExistenceInGroupTest.java index 63a7c19f58..3fb68a6d77 100644 --- a/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/StoreFileAndVerifyExistenceInGroupTest.java +++ b/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/StoreFileAndVerifyExistenceInGroupTest.java @@ -23,7 +23,7 @@ import java.io.ByteArrayInputStream; import java.io.InputStream; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.indy.ftest.core.AbstractContentManagementTest; import org.commonjava.indy.model.core.Group; import org.commonjava.indy.model.core.StoreKey; diff --git a/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/StoreReverseMapInitTest.java b/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/StoreReverseMapInitTest.java index cc85e44195..72748c972b 100644 --- a/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/StoreReverseMapInitTest.java +++ b/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/StoreReverseMapInitTest.java @@ -16,7 +16,7 @@ package org.commonjava.indy.ftest.core.content; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.indy.ftest.core.AbstractContentManagementTest; import org.commonjava.indy.ftest.core.fixture.StoreTestDataBootupAction; import org.commonjava.indy.model.core.Group; diff --git a/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/StoreReverseMapMigrationTest.java b/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/StoreReverseMapMigrationTest.java index e86dc250e4..f9748ea5ad 100644 --- a/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/StoreReverseMapMigrationTest.java +++ b/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/StoreReverseMapMigrationTest.java @@ -17,7 +17,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.indy.client.core.IndyClientException; import org.commonjava.indy.ftest.core.AbstractContentManagementTest; import org.commonjava.indy.model.core.Group; diff --git a/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/StoreTwoFilesAndVerifyPresenceInGroupTest.java b/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/StoreTwoFilesAndVerifyPresenceInGroupTest.java index 1ed889f28d..9013784066 100644 --- a/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/StoreTwoFilesAndVerifyPresenceInGroupTest.java +++ b/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/StoreTwoFilesAndVerifyPresenceInGroupTest.java @@ -22,7 +22,7 @@ import java.io.ByteArrayInputStream; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.indy.ftest.core.AbstractContentManagementTest; import org.commonjava.indy.model.core.Group; import org.commonjava.indy.model.core.StoreKey; diff --git a/ftests/core/src/main/java/org/commonjava/indy/ftest/core/store/AbstractStoreManagementTest.java b/ftests/core/src/main/java/org/commonjava/indy/ftest/core/store/AbstractStoreManagementTest.java index cacb454e74..b3a7389843 100644 --- a/ftests/core/src/main/java/org/commonjava/indy/ftest/core/store/AbstractStoreManagementTest.java +++ b/ftests/core/src/main/java/org/commonjava/indy/ftest/core/store/AbstractStoreManagementTest.java @@ -15,7 +15,7 @@ */ package org.commonjava.indy.ftest.core.store; -import static org.apache.commons.lang.StringUtils.join; +import static org.apache.commons.lang3.StringUtils.join; import static org.hamcrest.CoreMatchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/models/core-java/src/main/java/org/commonjava/indy/model/core/StoreKey.java b/models/core-java/src/main/java/org/commonjava/indy/model/core/StoreKey.java index f3e3b8e4ee..d98a5c47cf 100644 --- a/models/core-java/src/main/java/org/commonjava/indy/model/core/StoreKey.java +++ b/models/core-java/src/main/java/org/commonjava/indy/model/core/StoreKey.java @@ -22,11 +22,10 @@ import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; -import java.io.Serializable; import java.util.Arrays; import java.util.concurrent.ConcurrentHashMap; -import static org.apache.commons.lang.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.isBlank; import static org.commonjava.indy.pkg.maven.model.MavenPackageTypeDescriptor.MAVEN_PKG_KEY; public final class StoreKey diff --git a/models/core-java/src/main/java/org/commonjava/indy/model/util/HttpUtils.java b/models/core-java/src/main/java/org/commonjava/indy/model/util/HttpUtils.java index b013b57b30..71d0ded61a 100644 --- a/models/core-java/src/main/java/org/commonjava/indy/model/util/HttpUtils.java +++ b/models/core-java/src/main/java/org/commonjava/indy/model/util/HttpUtils.java @@ -15,7 +15,7 @@ */ package org.commonjava.indy.model.util; -import static org.apache.commons.lang.StringUtils.isEmpty; +import static org.apache.commons.lang3.StringUtils.isEmpty; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -25,7 +25,7 @@ import java.util.Map; import java.util.TimeZone; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/models/core-java/src/main/java/org/commonjava/indy/stats/IndyDeprecatedApis.java b/models/core-java/src/main/java/org/commonjava/indy/stats/IndyDeprecatedApis.java index 649ec24925..3a31e66a9b 100644 --- a/models/core-java/src/main/java/org/commonjava/indy/stats/IndyDeprecatedApis.java +++ b/models/core-java/src/main/java/org/commonjava/indy/stats/IndyDeprecatedApis.java @@ -15,7 +15,7 @@ */ package org.commonjava.indy.stats; -import org.apache.commons.lang.math.FloatRange; +import org.apache.commons.lang3.Range; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -29,7 +29,7 @@ import static java.util.Optional.empty; import static java.util.Optional.of; -import static org.apache.commons.lang.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.isBlank; @Alternative @Named @@ -47,7 +47,7 @@ public IndyDeprecatedApis( Properties props ) { this.props = props; - Float minVersion = 0f; + float minVersion = 0f; Set keys = props.stringPropertyNames(); for ( String key : keys ) @@ -55,16 +55,16 @@ public IndyDeprecatedApis( Properties props ) DeprecatedApiEntry et; String value = props.getProperty( key ); - Float startVersion; - Float endVersion; + float startVersion; + float endVersion; - if ( key.indexOf( "," ) >= 0 ) // range + if ( key.contains( "," ) ) // range { key = key.replaceAll( "[\\[|\\]]", "" ); // strip off square brackets if present String[] kv = key.split( "," ); startVersion = Float.parseFloat( kv[0].trim() ); endVersion = Float.parseFloat( kv[1].trim() ); - et = new DeprecatedApiEntry( new FloatRange( startVersion, endVersion ), value); + et = new DeprecatedApiEntry( Range.between( startVersion, endVersion ), value); } else { @@ -80,7 +80,7 @@ public IndyDeprecatedApis( Properties props ) deprecatedApis.add( et ); } - minApiVersion = minVersion.toString(); + minApiVersion = Float.toString(minVersion); logger.debug( "Parsed deprecatedApis:{}, minApiVersion:{}", deprecatedApis, minApiVersion ); } @@ -105,7 +105,7 @@ public Optional getDeprecated( String reqApiVersion ) // the scopes may overlap, we go through range entries first and other entries next for ( DeprecatedApiEntry et : deprecatedApis ) { - if ( et.range != null && et.range.containsFloat( reqVer ) ) + if ( et.range != null && et.range.contains( reqVer ) ) { return of( et ); } @@ -129,7 +129,7 @@ public String getMinApiVersion() public static class DeprecatedApiEntry { - private FloatRange range; + private Range range; private Float endVersion; @@ -146,7 +146,7 @@ public boolean isOff() this.value = value; } - public DeprecatedApiEntry( FloatRange floatRange, String value ) + public DeprecatedApiEntry( Range floatRange, String value ) { this.range = floatRange; this.value = value; diff --git a/subsys/cassandra/src/main/java/org/commonjava/indy/subsys/cassandra/CassandraClient.java b/subsys/cassandra/src/main/java/org/commonjava/indy/subsys/cassandra/CassandraClient.java index da25e6684e..2c32daae7f 100644 --- a/subsys/cassandra/src/main/java/org/commonjava/indy/subsys/cassandra/CassandraClient.java +++ b/subsys/cassandra/src/main/java/org/commonjava/indy/subsys/cassandra/CassandraClient.java @@ -29,7 +29,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import static org.apache.commons.lang.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.isNotBlank; @ApplicationScoped public class CassandraClient diff --git a/subsys/git/src/main/java/org/commonjava/indy/subsys/git/GitManager.java b/subsys/git/src/main/java/org/commonjava/indy/subsys/git/GitManager.java index 0de78b85fe..815c835457 100644 --- a/subsys/git/src/main/java/org/commonjava/indy/subsys/git/GitManager.java +++ b/subsys/git/src/main/java/org/commonjava/indy/subsys/git/GitManager.java @@ -69,8 +69,8 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.ReentrantLock; -import static org.apache.commons.lang.StringUtils.isEmpty; -import static org.apache.commons.lang.StringUtils.join; +import static org.apache.commons.lang3.StringUtils.isEmpty; +import static org.apache.commons.lang3.StringUtils.join; import static org.commonjava.indy.audit.ChangeSummary.SYSTEM_USER; @ApplicationScoped diff --git a/subsys/http/src/main/java/org/commonjava/indy/subsys/http/util/UserPass.java b/subsys/http/src/main/java/org/commonjava/indy/subsys/http/util/UserPass.java index 4f7df8df4d..11f5a58d1a 100644 --- a/subsys/http/src/main/java/org/commonjava/indy/subsys/http/util/UserPass.java +++ b/subsys/http/src/main/java/org/commonjava/indy/subsys/http/util/UserPass.java @@ -16,7 +16,7 @@ package org.commonjava.indy.subsys.http.util; import org.apache.commons.codec.binary.Base64; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.http.Header; import org.apache.http.HttpRequest; import org.commonjava.indy.util.ApplicationHeader; diff --git a/subsys/infinispan/src/main/java/org/commonjava/indy/subsys/infinispan/CacheHandle.java b/subsys/infinispan/src/main/java/org/commonjava/indy/subsys/infinispan/CacheHandle.java index a8a8f0c63f..56cb511212 100644 --- a/subsys/infinispan/src/main/java/org/commonjava/indy/subsys/infinispan/CacheHandle.java +++ b/subsys/infinispan/src/main/java/org/commonjava/indy/subsys/infinispan/CacheHandle.java @@ -15,7 +15,7 @@ */ package org.commonjava.indy.subsys.infinispan; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.indy.metrics.IndyMetricsManager; import org.infinispan.Cache; import org.slf4j.Logger; diff --git a/subsys/infinispan/src/main/java/org/commonjava/indy/subsys/infinispan/config/ISPNClusterConfiguration.java b/subsys/infinispan/src/main/java/org/commonjava/indy/subsys/infinispan/config/ISPNClusterConfiguration.java index 77042a8b8c..0d48d11bd3 100644 --- a/subsys/infinispan/src/main/java/org/commonjava/indy/subsys/infinispan/config/ISPNClusterConfiguration.java +++ b/subsys/infinispan/src/main/java/org/commonjava/indy/subsys/infinispan/config/ISPNClusterConfiguration.java @@ -15,7 +15,7 @@ */ package org.commonjava.indy.subsys.infinispan.config; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.indy.conf.IndyConfigInfo; import org.commonjava.indy.conf.SystemPropertyProvider; import org.commonjava.propulsor.config.annotation.ConfigName; diff --git a/subsys/infinispan/src/main/java/org/commonjava/indy/subsys/infinispan/config/ISPNDBConfiguration.java b/subsys/infinispan/src/main/java/org/commonjava/indy/subsys/infinispan/config/ISPNDBConfiguration.java index f5e5836181..4210feaa30 100644 --- a/subsys/infinispan/src/main/java/org/commonjava/indy/subsys/infinispan/config/ISPNDBConfiguration.java +++ b/subsys/infinispan/src/main/java/org/commonjava/indy/subsys/infinispan/config/ISPNDBConfiguration.java @@ -15,7 +15,7 @@ */ package org.commonjava.indy.subsys.infinispan.config; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.indy.conf.IndyConfigInfo; import org.commonjava.indy.conf.SystemPropertyProvider; import org.commonjava.propulsor.config.annotation.ConfigName; diff --git a/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/ApiVersioningFilter.java b/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/ApiVersioningFilter.java index 3fd9c543a8..d0ea69f00e 100644 --- a/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/ApiVersioningFilter.java +++ b/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/ApiVersioningFilter.java @@ -39,7 +39,7 @@ import java.util.Optional; import static io.undertow.util.StatusCodes.GONE; -import static org.apache.commons.lang.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.isBlank; import static org.commonjava.indy.stats.IndyVersioning.HEADER_INDY_API_VERSION; import static org.commonjava.indy.stats.IndyVersioning.HEADER_INDY_CUR_API_VERSION; import static org.commonjava.indy.stats.IndyVersioning.HEADER_INDY_MIN_API_VERSION; 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 dee83f1f18..e0d574b03f 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 @@ -31,7 +31,7 @@ import java.util.List; import java.util.UUID; -import static org.apache.commons.lang.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.isNotBlank; import static org.commonjava.indy.metrics.RequestContextHelper.CLIENT_ADDR; import static org.commonjava.indy.metrics.RequestContextHelper.COMPONENT_ID; import static org.commonjava.indy.metrics.RequestContextHelper.EXTERNAL_TRACE_ID; diff --git a/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/UnhandledIOExceptionHandler.java b/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/UnhandledIOExceptionHandler.java index 4b51146e6e..e9dc2751b2 100644 --- a/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/UnhandledIOExceptionHandler.java +++ b/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/UnhandledIOExceptionHandler.java @@ -15,7 +15,7 @@ */ package org.commonjava.indy.bind.jaxrs; -import org.apache.commons.lang.exception.ExceptionUtils; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,7 +39,7 @@ public Response toResponse( IOException exception ) logger.error( "Unhandled exception: " + exception.getMessage(), exception ); return Response.status( Response.Status.INTERNAL_SERVER_ERROR ) - .entity( ExceptionUtils.getFullStackTrace( exception ) ) + .entity( ExceptionUtils.getStackTrace( exception ) ) .type( MediaType.TEXT_PLAIN ) .build(); } diff --git a/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/UnhandledRuntimeExceptionHandler.java b/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/UnhandledRuntimeExceptionHandler.java index 0b6f4c6dbd..3e319a0d9a 100644 --- a/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/UnhandledRuntimeExceptionHandler.java +++ b/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/UnhandledRuntimeExceptionHandler.java @@ -15,7 +15,7 @@ */ package org.commonjava.indy.bind.jaxrs; -import org.apache.commons.lang.exception.ExceptionUtils; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,7 +39,7 @@ public Response toResponse( RuntimeException exception ) logger.error( "Unhandled exception: " + exception.getMessage(), exception ); return Response.status( Response.Status.INTERNAL_SERVER_ERROR ) - .entity( ExceptionUtils.getFullStackTrace( exception ) ) + .entity( ExceptionUtils.getStackTrace( exception ) ) .type( MediaType.TEXT_PLAIN ) .build(); } diff --git a/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/util/JaxRsUriFormatter.java b/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/util/JaxRsUriFormatter.java index 3356421ca6..ceb192d611 100644 --- a/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/util/JaxRsUriFormatter.java +++ b/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/util/JaxRsUriFormatter.java @@ -15,7 +15,7 @@ */ package org.commonjava.indy.bind.jaxrs.util; -import static org.apache.commons.lang.StringUtils.join; +import static org.apache.commons.lang3.StringUtils.join; import java.net.MalformedURLException; diff --git a/subsys/prefetch/src/main/java/org/commonjava/indy/subsys/prefetch/PrefetchFrontier.java b/subsys/prefetch/src/main/java/org/commonjava/indy/subsys/prefetch/PrefetchFrontier.java index 3b5ce57ef2..a00f15bb1c 100644 --- a/subsys/prefetch/src/main/java/org/commonjava/indy/subsys/prefetch/PrefetchFrontier.java +++ b/subsys/prefetch/src/main/java/org/commonjava/indy/subsys/prefetch/PrefetchFrontier.java @@ -15,7 +15,7 @@ */ package org.commonjava.indy.subsys.prefetch; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.cdi.util.weft.Locker; import org.commonjava.indy.audit.ChangeSummary; import org.commonjava.indy.content.StoreResource; diff --git a/subsys/prefetch/src/main/java/org/commonjava/indy/subsys/prefetch/PrefetchRepoComparator.java b/subsys/prefetch/src/main/java/org/commonjava/indy/subsys/prefetch/PrefetchRepoComparator.java index 118b0b920a..7d28c2037b 100644 --- a/subsys/prefetch/src/main/java/org/commonjava/indy/subsys/prefetch/PrefetchRepoComparator.java +++ b/subsys/prefetch/src/main/java/org/commonjava/indy/subsys/prefetch/PrefetchRepoComparator.java @@ -15,7 +15,7 @@ */ package org.commonjava.indy.subsys.prefetch; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.indy.model.core.RemoteRepository; import java.time.ZoneId; From d67a3c24641a1ea82ea3e1a8c866c7f2500c02bd Mon Sep 17 00:00:00 2001 From: shokakucarrier Date: Wed, 14 Oct 2020 09:10:25 +0000 Subject: [PATCH 26/50] Update license header --- .../org/commonjava/indy/bind/jaxrs/SlashTolerationFilter.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/SlashTolerationFilter.java b/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/SlashTolerationFilter.java index 77040e6aed..7be0517d58 100644 --- a/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/SlashTolerationFilter.java +++ b/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/SlashTolerationFilter.java @@ -12,8 +12,7 @@ * 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 javax.enterprise.context.ApplicationScoped; import javax.servlet.*; import javax.servlet.http.HttpServletRequest; From a71e4767ea285e3ff56a73898db928c978c89227 Mon Sep 17 00:00:00 2001 From: Gang Li Date: Wed, 14 Oct 2020 17:58:18 +0800 Subject: [PATCH 27/50] Fix a wrong line problem This problem will cause compilation error when after license header formatting, which is caused by the package line removed. --- .../org/commonjava/indy/bind/jaxrs/SlashTolerationFilter.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/SlashTolerationFilter.java b/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/SlashTolerationFilter.java index 7be0517d58..80c88a3fb9 100644 --- a/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/SlashTolerationFilter.java +++ b/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/SlashTolerationFilter.java @@ -13,6 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +package org.commonjava.indy.bind.jaxrs; + import javax.enterprise.context.ApplicationScoped; import javax.servlet.*; import javax.servlet.http.HttpServletRequest; From f84fa2af353466d3ab3f7369ac669452d3ea06bf Mon Sep 17 00:00:00 2001 From: shokakucarrier Date: Wed, 14 Oct 2020 11:00:02 +0000 Subject: [PATCH 28/50] [maven-release-plugin] prepare release indy-parent-2.5.0 --- addons/changelog/client-java/pom.xml | 2 +- addons/changelog/common/pom.xml | 2 +- addons/changelog/ftests/pom.xml | 2 +- addons/changelog/jaxrs/pom.xml | 2 +- addons/changelog/pom.xml | 2 +- addons/content-browse/client-java/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/event-audit/common/pom.xml | 2 +- addons/event-audit/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/path-mapped/common/pom.xml | 2 +- addons/path-mapped/jaxrs/pom.xml | 2 +- addons/path-mapped/model-java/pom.xml | 2 +- addons/path-mapped/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/repo-proxy/common/pom.xml | 2 +- addons/repo-proxy/ftests/pom.xml | 2 +- addons/repo-proxy/jaxrs/pom.xml | 2 +- addons/repo-proxy/pom.xml | 2 +- addons/revisions/common/pom.xml | 2 +- addons/revisions/jaxrs/pom.xml | 2 +- addons/revisions/pom.xml | 2 +- addons/sli/pom.xml | 2 +- api/pom.xml | 2 +- bindings/jaxrs/pom.xml | 2 +- bindings/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/common/pom.xml | 2 +- db/flat/pom.xml | 2 +- db/infinispan/pom.xml | 2 +- db/memory/pom.xml | 2 +- db/metrics/pom.xml | 2 +- db/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 | 254 +++++++++---------- rest/api/pom.xml | 2 +- rest/pom.xml | 2 +- subsys/cassandra/pom.xml | 2 +- subsys/cpool/pom.xml | 2 +- subsys/flatfile/pom.xml | 2 +- subsys/git/pom.xml | 2 +- subsys/groovy/pom.xml | 2 +- subsys/honeycomb/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/prometheus/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 +- 131 files changed, 257 insertions(+), 257 deletions(-) diff --git a/addons/changelog/client-java/pom.xml b/addons/changelog/client-java/pom.xml index 2f1177cae8..6b99f8db58 100644 --- a/addons/changelog/client-java/pom.xml +++ b/addons/changelog/client-java/pom.xml @@ -20,7 +20,7 @@ indy-changelog org.commonjava.indy - 2.5.0-SNAPSHOT + 2.5.0 4.0.0 diff --git a/addons/changelog/common/pom.xml b/addons/changelog/common/pom.xml index cd7057c3c3..bdcb9aad7f 100644 --- a/addons/changelog/common/pom.xml +++ b/addons/changelog/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.5.0-SNAPSHOT + 2.5.0 indy-changelog-common Indy :: Add-Ons :: ChangeLog :: Common diff --git a/addons/changelog/ftests/pom.xml b/addons/changelog/ftests/pom.xml index ced20cdb4c..a941cbd30f 100644 --- a/addons/changelog/ftests/pom.xml +++ b/addons/changelog/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.5.0-SNAPSHOT + 2.5.0 indy-ftests-changelog diff --git a/addons/changelog/jaxrs/pom.xml b/addons/changelog/jaxrs/pom.xml index a5c0500beb..d1a462eff7 100644 --- a/addons/changelog/jaxrs/pom.xml +++ b/addons/changelog/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.5.0-SNAPSHOT + 2.5.0 indy-changelog-jaxrs diff --git a/addons/changelog/pom.xml b/addons/changelog/pom.xml index 0d8f5c7235..4d56ee4b40 100644 --- a/addons/changelog/pom.xml +++ b/addons/changelog/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.0-SNAPSHOT + 2.5.0 indy-changelog Indy :: Add-Ons :: ChangeLog :: Parent diff --git a/addons/content-browse/client-java/pom.xml b/addons/content-browse/client-java/pom.xml index e32476a070..c00e21cb7e 100644 --- a/addons/content-browse/client-java/pom.xml +++ b/addons/content-browse/client-java/pom.xml @@ -20,7 +20,7 @@ indy-content-browse org.commonjava.indy - 2.5.0-SNAPSHOT + 2.5.0 4.0.0 diff --git a/addons/content-browse/common/pom.xml b/addons/content-browse/common/pom.xml index 54dc4de9d6..0cb7be8b36 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 - 2.5.0-SNAPSHOT + 2.5.0 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 757e2a7a4e..1437e83148 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 - 2.5.0-SNAPSHOT + 2.5.0 indy-ftests-content-browse diff --git a/addons/content-browse/jaxrs/pom.xml b/addons/content-browse/jaxrs/pom.xml index 757ddd3627..8222a27aac 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 - 2.5.0-SNAPSHOT + 2.5.0 indy-content-browse-jaxrs diff --git a/addons/content-browse/model-java/pom.xml b/addons/content-browse/model-java/pom.xml index 18c6ae5d09..2b5e246454 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 - 2.5.0-SNAPSHOT + 2.5.0 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 6ab297685f..fbb774a3cd 100644 --- a/addons/content-browse/pom.xml +++ b/addons/content-browse/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.0-SNAPSHOT + 2.5.0 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 110af35ae3..4b28bf3285 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 - 2.5.0-SNAPSHOT + 2.5.0 4.0.0 diff --git a/addons/content-index/pom.xml b/addons/content-index/pom.xml index 6bd7738201..7ad9bcc3c8 100644 --- a/addons/content-index/pom.xml +++ b/addons/content-index/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.0-SNAPSHOT + 2.5.0 indy-content-index diff --git a/addons/diagnostics/client-java/pom.xml b/addons/diagnostics/client-java/pom.xml index 6f773d73d6..1edd64b107 100644 --- a/addons/diagnostics/client-java/pom.xml +++ b/addons/diagnostics/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.5.0-SNAPSHOT + 2.5.0 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 80e7252b2f..c5c3fde61f 100644 --- a/addons/diagnostics/common/pom.xml +++ b/addons/diagnostics/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.5.0-SNAPSHOT + 2.5.0 indy-diagnostics-common Indy :: Add-Ons :: Diagnostic Tools :: Common diff --git a/addons/diagnostics/ftests/pom.xml b/addons/diagnostics/ftests/pom.xml index 0cd3def46b..9573dbaa85 100644 --- a/addons/diagnostics/ftests/pom.xml +++ b/addons/diagnostics/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.5.0-SNAPSHOT + 2.5.0 indy-ftests-diagnostics diff --git a/addons/diagnostics/jaxrs/pom.xml b/addons/diagnostics/jaxrs/pom.xml index 2fd23197bc..c351fdb3ca 100644 --- a/addons/diagnostics/jaxrs/pom.xml +++ b/addons/diagnostics/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.5.0-SNAPSHOT + 2.5.0 indy-diagnostics-jaxrs diff --git a/addons/diagnostics/pom.xml b/addons/diagnostics/pom.xml index ab7b6298f2..9f73045fc7 100644 --- a/addons/diagnostics/pom.xml +++ b/addons/diagnostics/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.0-SNAPSHOT + 2.5.0 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 0ab1b2e390..355e82868c 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 - 2.5.0-SNAPSHOT + 2.5.0 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 89cff3f379..971732971c 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 - 2.5.0-SNAPSHOT + 2.5.0 indy-ftests-dot-maven diff --git a/addons/dot-maven/jaxrs/pom.xml b/addons/dot-maven/jaxrs/pom.xml index ff1f9dbb34..d83ee6817a 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 - 2.5.0-SNAPSHOT + 2.5.0 indy-dot-maven-jaxrs diff --git a/addons/dot-maven/pom.xml b/addons/dot-maven/pom.xml index 5b6cffa300..8ca07ad1b1 100644 --- a/addons/dot-maven/pom.xml +++ b/addons/dot-maven/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.0-SNAPSHOT + 2.5.0 indy-dot-maven diff --git a/addons/event-audit/common/pom.xml b/addons/event-audit/common/pom.xml index 3daa31158a..17bf169b56 100644 --- a/addons/event-audit/common/pom.xml +++ b/addons/event-audit/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-event-audit - 2.5.0-SNAPSHOT + 2.5.0 indy-event-audit-common diff --git a/addons/event-audit/pom.xml b/addons/event-audit/pom.xml index f6b883afa9..ed482671be 100644 --- a/addons/event-audit/pom.xml +++ b/addons/event-audit/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.0-SNAPSHOT + 2.5.0 indy-event-audit diff --git a/addons/folo/client-java/pom.xml b/addons/folo/client-java/pom.xml index 72502b1d35..de034120d3 100644 --- a/addons/folo/client-java/pom.xml +++ b/addons/folo/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.5.0-SNAPSHOT + 2.5.0 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 4f310732a2..d9e4f3ded9 100644 --- a/addons/folo/common/pom.xml +++ b/addons/folo/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.5.0-SNAPSHOT + 2.5.0 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 0483190c36..5d0f67ee66 100644 --- a/addons/folo/ftests/pom.xml +++ b/addons/folo/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.5.0-SNAPSHOT + 2.5.0 indy-ftests-folo diff --git a/addons/folo/jaxrs/pom.xml b/addons/folo/jaxrs/pom.xml index 4a8a7cca4f..f08e751ea2 100644 --- a/addons/folo/jaxrs/pom.xml +++ b/addons/folo/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.5.0-SNAPSHOT + 2.5.0 indy-folo-jaxrs diff --git a/addons/folo/model-java/pom.xml b/addons/folo/model-java/pom.xml index 697dadb1c6..4bc77a7bcf 100644 --- a/addons/folo/model-java/pom.xml +++ b/addons/folo/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.5.0-SNAPSHOT + 2.5.0 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 a94b281106..e8fe054b72 100644 --- a/addons/folo/pom.xml +++ b/addons/folo/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.0-SNAPSHOT + 2.5.0 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 461104bce2..26704ea7fc 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 - 2.5.0-SNAPSHOT + 2.5.0 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 84a16f4706..fd2a970037 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 - 2.5.0-SNAPSHOT + 2.5.0 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 26fe5f18a7..53c182b6bd 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 - 2.5.0-SNAPSHOT + 2.5.0 indy-ftests-hosted-by-archive diff --git a/addons/hosted-by-archive/jaxrs/pom.xml b/addons/hosted-by-archive/jaxrs/pom.xml index e1d447755e..0a016a2fc9 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 - 2.5.0-SNAPSHOT + 2.5.0 indy-hosted-by-archive-jaxrs diff --git a/addons/hosted-by-archive/pom.xml b/addons/hosted-by-archive/pom.xml index 12831ed86c..dcdda8d2b1 100644 --- a/addons/hosted-by-archive/pom.xml +++ b/addons/hosted-by-archive/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.0-SNAPSHOT + 2.5.0 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 40670bd56a..41e023d414 100644 --- a/addons/httprox/common/pom.xml +++ b/addons/httprox/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.5.0-SNAPSHOT + 2.5.0 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 d93a27c7ec..3cd3ef174d 100644 --- a/addons/httprox/ftests/pom.xml +++ b/addons/httprox/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.5.0-SNAPSHOT + 2.5.0 indy-ftests-httprox diff --git a/addons/httprox/jaxrs/pom.xml b/addons/httprox/jaxrs/pom.xml index f1d1674a1c..c253ae9d74 100644 --- a/addons/httprox/jaxrs/pom.xml +++ b/addons/httprox/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.5.0-SNAPSHOT + 2.5.0 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 771aa8fe2c..421a9e8c15 100644 --- a/addons/httprox/pom.xml +++ b/addons/httprox/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.0-SNAPSHOT + 2.5.0 indy-httprox diff --git a/addons/implied-repos/client-java/pom.xml b/addons/implied-repos/client-java/pom.xml index c55d908592..ec49a7acfe 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 - 2.5.0-SNAPSHOT + 2.5.0 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 a07167e7ae..6b5ac94de2 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 - 2.5.0-SNAPSHOT + 2.5.0 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 cfb470900b..5d97ea2520 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 - 2.5.0-SNAPSHOT + 2.5.0 indy-ftests-implied-repos diff --git a/addons/implied-repos/model-java/pom.xml b/addons/implied-repos/model-java/pom.xml index 296ce38958..7c9f6b3d1f 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 - 2.5.0-SNAPSHOT + 2.5.0 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 6aca63aa42..6592cea794 100644 --- a/addons/implied-repos/pom.xml +++ b/addons/implied-repos/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.0-SNAPSHOT + 2.5.0 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 f625e88f04..cb02cd3b89 100644 --- a/addons/koji/client-java/pom.xml +++ b/addons/koji/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.5.0-SNAPSHOT + 2.5.0 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 0b4afef4e2..79dfe53cd9 100644 --- a/addons/koji/common/pom.xml +++ b/addons/koji/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.5.0-SNAPSHOT + 2.5.0 indy-koji-common Indy :: Add-Ons :: Koji Integration :: Common diff --git a/addons/koji/jaxrs/pom.xml b/addons/koji/jaxrs/pom.xml index 5608e4269b..df2bc3d7c3 100644 --- a/addons/koji/jaxrs/pom.xml +++ b/addons/koji/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.5.0-SNAPSHOT + 2.5.0 indy-koji-jaxrs diff --git a/addons/koji/model-java/pom.xml b/addons/koji/model-java/pom.xml index e670c2781d..1f95171b0c 100644 --- a/addons/koji/model-java/pom.xml +++ b/addons/koji/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.5.0-SNAPSHOT + 2.5.0 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 dcd5757804..b3d2e52394 100644 --- a/addons/koji/pom.xml +++ b/addons/koji/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.0-SNAPSHOT + 2.5.0 indy-koji Indy :: Add-Ons :: Koji Integration :: Parent diff --git a/addons/path-mapped/common/pom.xml b/addons/path-mapped/common/pom.xml index cd452acb6b..3abb3fd791 100644 --- a/addons/path-mapped/common/pom.xml +++ b/addons/path-mapped/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.5.0-SNAPSHOT + 2.5.0 indy-path-mapped-common diff --git a/addons/path-mapped/jaxrs/pom.xml b/addons/path-mapped/jaxrs/pom.xml index d26589f11d..5efd02e473 100644 --- a/addons/path-mapped/jaxrs/pom.xml +++ b/addons/path-mapped/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.5.0-SNAPSHOT + 2.5.0 indy-path-mapped-jaxrs diff --git a/addons/path-mapped/model-java/pom.xml b/addons/path-mapped/model-java/pom.xml index e4fc2cb8ca..32a15b19a3 100644 --- a/addons/path-mapped/model-java/pom.xml +++ b/addons/path-mapped/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.5.0-SNAPSHOT + 2.5.0 indy-path-mapped-model-java diff --git a/addons/path-mapped/pom.xml b/addons/path-mapped/pom.xml index 1e4e391c76..decc106352 100644 --- a/addons/path-mapped/pom.xml +++ b/addons/path-mapped/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.0-SNAPSHOT + 2.5.0 indy-path-mapped Indy :: Add-Ons :: Path Mapped :: Parent diff --git a/addons/pkg-maven/common/pom.xml b/addons/pkg-maven/common/pom.xml index 682e024c47..418b775660 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 - 2.5.0-SNAPSHOT + 2.5.0 4.0.0 diff --git a/addons/pkg-maven/ftests/pom.xml b/addons/pkg-maven/ftests/pom.xml index e9fe8b84c7..bdb81e0bf3 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 - 2.5.0-SNAPSHOT + 2.5.0 4.0.0 diff --git a/addons/pkg-maven/jaxrs/pom.xml b/addons/pkg-maven/jaxrs/pom.xml index 293b74211c..18314d16f5 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 - 2.5.0-SNAPSHOT + 2.5.0 4.0.0 diff --git a/addons/pkg-maven/pom.xml b/addons/pkg-maven/pom.xml index 1641bdb7c9..1ecb013bf3 100644 --- a/addons/pkg-maven/pom.xml +++ b/addons/pkg-maven/pom.xml @@ -20,7 +20,7 @@ indy-addons org.commonjava.indy - 2.5.0-SNAPSHOT + 2.5.0 4.0.0 diff --git a/addons/pkg-npm/common/pom.xml b/addons/pkg-npm/common/pom.xml index 0b4d8aec6a..5df1bf54d3 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 - 2.5.0-SNAPSHOT + 2.5.0 4.0.0 diff --git a/addons/pkg-npm/ftests/pom.xml b/addons/pkg-npm/ftests/pom.xml index 5c786f34d8..ab05dc7409 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 - 2.5.0-SNAPSHOT + 2.5.0 4.0.0 diff --git a/addons/pkg-npm/jaxrs/pom.xml b/addons/pkg-npm/jaxrs/pom.xml index 05e73cfab9..7b2fdd6380 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 - 2.5.0-SNAPSHOT + 2.5.0 4.0.0 diff --git a/addons/pkg-npm/model-java/pom.xml b/addons/pkg-npm/model-java/pom.xml index f1b92013b3..11a5d1ac99 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 - 2.5.0-SNAPSHOT + 2.5.0 4.0.0 diff --git a/addons/pkg-npm/pom.xml b/addons/pkg-npm/pom.xml index a867b4b1e6..2a2c3adfe8 100644 --- a/addons/pkg-npm/pom.xml +++ b/addons/pkg-npm/pom.xml @@ -20,7 +20,7 @@ indy-addons org.commonjava.indy - 2.5.0-SNAPSHOT + 2.5.0 4.0.0 diff --git a/addons/pom.xml b/addons/pom.xml index 939cdd027c..3cf1e54f59 100644 --- a/addons/pom.xml +++ b/addons/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-parent - 2.5.0-SNAPSHOT + 2.5.0 indy-addons diff --git a/addons/promote/client-java/pom.xml b/addons/promote/client-java/pom.xml index d1c167100c..bae2d1578b 100644 --- a/addons/promote/client-java/pom.xml +++ b/addons/promote/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.5.0-SNAPSHOT + 2.5.0 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 188183cb66..a72e1c830e 100644 --- a/addons/promote/common/pom.xml +++ b/addons/promote/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.5.0-SNAPSHOT + 2.5.0 indy-promote-common Indy :: Add-Ons :: Artifact Promotion :: Common diff --git a/addons/promote/ftests/pom.xml b/addons/promote/ftests/pom.xml index 365d61ae38..17c0f9d5cd 100644 --- a/addons/promote/ftests/pom.xml +++ b/addons/promote/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.5.0-SNAPSHOT + 2.5.0 indy-ftests-promote diff --git a/addons/promote/jaxrs/pom.xml b/addons/promote/jaxrs/pom.xml index b0443cd821..94c9b1ea20 100644 --- a/addons/promote/jaxrs/pom.xml +++ b/addons/promote/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.5.0-SNAPSHOT + 2.5.0 indy-promote-jaxrs diff --git a/addons/promote/model-java/pom.xml b/addons/promote/model-java/pom.xml index 6bef8c14cc..1219c20d73 100644 --- a/addons/promote/model-java/pom.xml +++ b/addons/promote/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.5.0-SNAPSHOT + 2.5.0 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 4a05e64190..4b301eabcd 100644 --- a/addons/promote/pom.xml +++ b/addons/promote/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.0-SNAPSHOT + 2.5.0 indy-promote Indy :: Add-Ons :: Artifact Promotion :: Parent diff --git a/addons/repo-proxy/common/pom.xml b/addons/repo-proxy/common/pom.xml index a10f215134..7661b183be 100644 --- a/addons/repo-proxy/common/pom.xml +++ b/addons/repo-proxy/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-repo-proxy - 2.5.0-SNAPSHOT + 2.5.0 indy-repo-proxy-common Indy :: Add-Ons :: Repository-Proxy :: Common diff --git a/addons/repo-proxy/ftests/pom.xml b/addons/repo-proxy/ftests/pom.xml index d328ee4603..56f1b2c4d7 100644 --- a/addons/repo-proxy/ftests/pom.xml +++ b/addons/repo-proxy/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-repo-proxy - 2.5.0-SNAPSHOT + 2.5.0 indy-ftests-repo-proxy diff --git a/addons/repo-proxy/jaxrs/pom.xml b/addons/repo-proxy/jaxrs/pom.xml index 10c1e461f7..8bb77ae1a4 100644 --- a/addons/repo-proxy/jaxrs/pom.xml +++ b/addons/repo-proxy/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-repo-proxy - 2.5.0-SNAPSHOT + 2.5.0 indy-repo-proxy-jaxrs diff --git a/addons/repo-proxy/pom.xml b/addons/repo-proxy/pom.xml index cca67a9da2..f4c89ab939 100644 --- a/addons/repo-proxy/pom.xml +++ b/addons/repo-proxy/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.0-SNAPSHOT + 2.5.0 indy-repo-proxy Indy :: Add-Ons :: Repository-Proxy :: Parent diff --git a/addons/revisions/common/pom.xml b/addons/revisions/common/pom.xml index 1b56c77d87..7d307d0ac0 100644 --- a/addons/revisions/common/pom.xml +++ b/addons/revisions/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-revisions - 2.5.0-SNAPSHOT + 2.5.0 indy-revisions-common Indy :: Add-Ons :: Revisions :: Common diff --git a/addons/revisions/jaxrs/pom.xml b/addons/revisions/jaxrs/pom.xml index ed3483b9b3..b217ba1a41 100644 --- a/addons/revisions/jaxrs/pom.xml +++ b/addons/revisions/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-revisions - 2.5.0-SNAPSHOT + 2.5.0 indy-revisions-jaxrs diff --git a/addons/revisions/pom.xml b/addons/revisions/pom.xml index e9bb98adff..57d16ae5c7 100644 --- a/addons/revisions/pom.xml +++ b/addons/revisions/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.0-SNAPSHOT + 2.5.0 indy-revisions Indy :: Add-Ons :: Revisions :: Parent diff --git a/addons/sli/pom.xml b/addons/sli/pom.xml index 89d9c3dc02..c6c2f5e789 100644 --- a/addons/sli/pom.xml +++ b/addons/sli/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.0-SNAPSHOT + 2.5.0 indy-sli Indy :: Add-Ons :: Service Level Indicators Reporting :: JAX-RS diff --git a/api/pom.xml b/api/pom.xml index c876b6aa3b..90df8a0b12 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.0-SNAPSHOT + 2.5.0 indy-api diff --git a/bindings/jaxrs/pom.xml b/bindings/jaxrs/pom.xml index 80d18f26cb..fe545ddc54 100644 --- a/bindings/jaxrs/pom.xml +++ b/bindings/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-bindings - 2.5.0-SNAPSHOT + 2.5.0 indy-bindings-jaxrs diff --git a/bindings/pom.xml b/bindings/pom.xml index 7c690ff5b9..8a89cbe8b7 100644 --- a/bindings/pom.xml +++ b/bindings/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-parent - 2.5.0-SNAPSHOT + 2.5.0 indy-bindings diff --git a/boot/jaxrs/pom.xml b/boot/jaxrs/pom.xml index de2baf1e35..b4e0ddc4b3 100644 --- a/boot/jaxrs/pom.xml +++ b/boot/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.boot indy-booters - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy.boot diff --git a/boot/pom.xml b/boot/pom.xml index f0ca808ca6..ed62e4537f 100644 --- a/boot/pom.xml +++ b/boot/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy.boot diff --git a/clients/core-java/pom.xml b/clients/core-java/pom.xml index 9d77a821f9..db49944604 100644 --- a/clients/core-java/pom.xml +++ b/clients/core-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-clients-parent - 2.5.0-SNAPSHOT + 2.5.0 indy-client-core-java diff --git a/clients/pom.xml b/clients/pom.xml index 4ee0032e14..3a8ed2f881 100644 --- a/clients/pom.xml +++ b/clients/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.0-SNAPSHOT + 2.5.0 indy-clients-parent diff --git a/core/pom.xml b/core/pom.xml index 2bd51baae7..0cd86a3324 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.0-SNAPSHOT + 2.5.0 indy-core diff --git a/db/common/pom.xml b/db/common/pom.xml index 15c49b51dd..14cb425de0 100644 --- a/db/common/pom.xml +++ b/db/common/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-db - 2.5.0-SNAPSHOT + 2.5.0 indy-db-common diff --git a/db/flat/pom.xml b/db/flat/pom.xml index 8e3eba17a5..504f5fea19 100644 --- a/db/flat/pom.xml +++ b/db/flat/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.5.0-SNAPSHOT + 2.5.0 indy-db-flat diff --git a/db/infinispan/pom.xml b/db/infinispan/pom.xml index f74dfb0265..dc5c3df5c3 100644 --- a/db/infinispan/pom.xml +++ b/db/infinispan/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-db - 2.5.0-SNAPSHOT + 2.5.0 indy-db-infinispan diff --git a/db/memory/pom.xml b/db/memory/pom.xml index d6da54f697..045f976948 100644 --- a/db/memory/pom.xml +++ b/db/memory/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.5.0-SNAPSHOT + 2.5.0 indy-db-memory diff --git a/db/metrics/pom.xml b/db/metrics/pom.xml index 0d40130ed0..68d8bdd7f5 100644 --- a/db/metrics/pom.xml +++ b/db/metrics/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.5.0-SNAPSHOT + 2.5.0 indy-db-metrics diff --git a/db/pom.xml b/db/pom.xml index 3093c04b54..6c28e1c4f5 100644 --- a/db/pom.xml +++ b/db/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.0-SNAPSHOT + 2.5.0 indy-db diff --git a/deployments/launcher/pom.xml b/deployments/launcher/pom.xml index ce10598ad3..b823802461 100644 --- a/deployments/launcher/pom.xml +++ b/deployments/launcher/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-deployments - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy.launch diff --git a/deployments/pom.xml b/deployments/pom.xml index 8b2637de94..06312ac02b 100644 --- a/deployments/pom.xml +++ b/deployments/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.0-SNAPSHOT + 2.5.0 indy-deployments diff --git a/embedder/pom.xml b/embedder/pom.xml index bbe429bc1a..c9d8ecf572 100644 --- a/embedder/pom.xml +++ b/embedder/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy.embed diff --git a/filers/default/pom.xml b/filers/default/pom.xml index 1ca1028a61..d2ecefaaea 100644 --- a/filers/default/pom.xml +++ b/filers/default/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-file-managers - 2.5.0-SNAPSHOT + 2.5.0 indy-filer-default diff --git a/filers/pom.xml b/filers/pom.xml index 1ae625d20b..b154b3496d 100644 --- a/filers/pom.xml +++ b/filers/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.0-SNAPSHOT + 2.5.0 indy-file-managers diff --git a/ftests/common/pom.xml b/ftests/common/pom.xml index 2c0c695de6..6ee6ea2ec7 100644 --- a/ftests/common/pom.xml +++ b/ftests/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-ftests-parent - 2.5.0-SNAPSHOT + 2.5.0 indy-ftests-common diff --git a/ftests/core/pom.xml b/ftests/core/pom.xml index 018ba2a166..dac8d76edc 100644 --- a/ftests/core/pom.xml +++ b/ftests/core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-ftests-parent - 2.5.0-SNAPSHOT + 2.5.0 indy-ftests-core diff --git a/ftests/metrics/pom.xml b/ftests/metrics/pom.xml index 6a0272afc1..64f0a2ed82 100644 --- a/ftests/metrics/pom.xml +++ b/ftests/metrics/pom.xml @@ -20,7 +20,7 @@ indy-ftests-parent org.commonjava.indy - 2.5.0-SNAPSHOT + 2.5.0 4.0.0 diff --git a/ftests/pom.xml b/ftests/pom.xml index be0bd23b72..ff31123ca8 100644 --- a/ftests/pom.xml +++ b/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.0-SNAPSHOT + 2.5.0 indy-ftests-parent diff --git a/models/core-java/pom.xml b/models/core-java/pom.xml index 0c2d1cf54b..cc6b538320 100644 --- a/models/core-java/pom.xml +++ b/models/core-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-models-parent - 2.5.0-SNAPSHOT + 2.5.0 indy-model-core-java diff --git a/models/pom.xml b/models/pom.xml index 3363172699..ce41928aa7 100644 --- a/models/pom.xml +++ b/models/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.0-SNAPSHOT + 2.5.0 indy-models-parent diff --git a/pom.xml b/pom.xml index 9674528003..8841615de1 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.commonjava.indy indy-parent - 2.5.0-SNAPSHOT + 2.5.0 pom @@ -37,7 +37,7 @@ scm:git:https://github.com/CommonJava/indy scm:git:https://github.com/CommonJava/indy http://github.com/Commonjava/indy - HEAD + indy-parent-2.5.0 @@ -187,7 +187,7 @@ org.commonjava.indy.ui indy-ui-layover - 2.5.0-SNAPSHOT + 2.5.0 runtime @@ -195,22 +195,22 @@ org.commonjava.indy indy-model-core-java - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-api - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-core - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-core - 2.5.0-SNAPSHOT + 2.5.0 tar.gz confset provided @@ -218,32 +218,32 @@ org.commonjava.indy indy-db-flat - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-db-metrics - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-db-common - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-db-infinispan - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-bindings-jaxrs - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy.launch indy-launcher - 2.5.0-SNAPSHOT + 2.5.0 tar.gz skinny provided @@ -251,7 +251,7 @@ org.commonjava.indy.launch indy-launcher - 2.5.0-SNAPSHOT + 2.5.0 tar.gz complete provided @@ -259,7 +259,7 @@ org.commonjava.indy.launch indy-launcher - 2.5.0-SNAPSHOT + 2.5.0 tar.gz data provided @@ -267,7 +267,7 @@ org.commonjava.indy.launch indy-launcher - 2.5.0-SNAPSHOT + 2.5.0 tar.gz etc provided @@ -276,17 +276,17 @@ org.commonjava.indy indy-revisions-jaxrs - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-revisions-common - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-revisions-common - 2.5.0-SNAPSHOT + 2.5.0 tar.gz confset provided @@ -294,7 +294,7 @@ org.commonjava.indy indy-revisions-common - 2.5.0-SNAPSHOT + 2.5.0 tar.gz uiset provided @@ -302,12 +302,12 @@ org.commonjava.indy indy-dot-maven-common - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-dot-maven-common - 2.5.0-SNAPSHOT + 2.5.0 tar.gz dataset provided @@ -315,22 +315,22 @@ org.commonjava.indy indy-dot-maven-jaxrs - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-ftests-dot-maven - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-httprox-common - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-httprox-common - 2.5.0-SNAPSHOT + 2.5.0 tar.gz confset provided @@ -338,17 +338,17 @@ org.commonjava.indy indy-ftests-httprox - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-content-index - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-content-index - 2.5.0-SNAPSHOT + 2.5.0 tar.gz confset provided @@ -356,51 +356,51 @@ org.commonjava.indy indy-db-memory - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-test-db - 2.5.0-SNAPSHOT + 2.5.0 test org.commonjava.indy indy-test-fixtures-core - 2.5.0-SNAPSHOT + 2.5.0 test org.commonjava.indy indy-test-providers-core - 2.5.0-SNAPSHOT + 2.5.0 test org.commonjava.indy indy-test-utils - 2.5.0-SNAPSHOT + 2.5.0 test org.commonjava.indy indy-filer-default - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-subsys-jaxrs - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-subsys-honeycomb - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-subsys-honeycomb - 2.5.0-SNAPSHOT + 2.5.0 tar.gz confset provided @@ -408,17 +408,17 @@ org.commonjava.indy indy-subsys-flatfile - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-subsys-cassandra - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-subsys-cassandra - 2.5.0-SNAPSHOT + 2.5.0 tar.gz confset provided @@ -426,79 +426,79 @@ org.commonjava.indy indy-subsys-infinispan - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-subsys-http - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-subsys-git - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-subsys-groovy - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-subsys-prefetch - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-subsys-cpool - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-client-core-java - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-ftests-common - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-ftests-core - 2.5.0-SNAPSHOT + 2.5.0 test org.commonjava.indy indy-folo-jaxrs - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-ftests-folo - 2.5.0-SNAPSHOT + 2.5.0 test org.commonjava.indy indy-folo-client-java - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-folo-model-java - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-folo-common - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-folo-common - 2.5.0-SNAPSHOT + 2.5.0 tar.gz dataset provided @@ -506,7 +506,7 @@ org.commonjava.indy indy-folo-common - 2.5.0-SNAPSHOT + 2.5.0 tar.gz confset provided @@ -514,33 +514,33 @@ org.commonjava.indy indy-promote-jaxrs - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-ftests-promote - 2.5.0-SNAPSHOT + 2.5.0 test org.commonjava.indy indy-promote-client-java - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-promote-model-java - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-promote-common - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-promote-common - 2.5.0-SNAPSHOT + 2.5.0 tar.gz confset provided @@ -548,7 +548,7 @@ org.commonjava.indy indy-promote-common - 2.5.0-SNAPSHOT + 2.5.0 tar.gz dataset provided @@ -556,19 +556,19 @@ org.commonjava.indy indy-promote-common - 2.5.0-SNAPSHOT + 2.5.0 dataset provided org.commonjava.indy indy-implied-repos-common - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-implied-repos-common - 2.5.0-SNAPSHOT + 2.5.0 tar.gz confset provided @@ -576,37 +576,37 @@ org.commonjava.indy indy-implied-repos-model-java - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-implied-repos-client-java - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-ftests-implied-repos - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy.embed indy-embedder - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy.boot indy-booter-jaxrs - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-subsys-keycloak - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-subsys-keycloak - 2.5.0-SNAPSHOT + 2.5.0 tar.gz confset provided @@ -614,7 +614,7 @@ org.commonjava.indy indy-subsys-infinispan - 2.5.0-SNAPSHOT + 2.5.0 tar.gz confset provided @@ -622,7 +622,7 @@ org.commonjava.indy indy-subsys-prefetch - 2.5.0-SNAPSHOT + 2.5.0 tar.gz confset provided @@ -631,7 +631,7 @@ org.commonjava.indy indy-koji-common - 2.5.0-SNAPSHOT + 2.5.0 tar.gz confset provided @@ -639,103 +639,103 @@ org.commonjava.indy indy-koji-common - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-koji-model-java - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-koji-client-java - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-koji-jaxrs - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-path-mapped-common - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-path-mapped-model-java - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-path-mapped-jaxrs - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-pkg-maven-common - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-pkg-maven-jaxrs - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-pkg-npm-jaxrs - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-ftests-pkg-maven - 2.5.0-SNAPSHOT + 2.5.0 test org.commonjava.indy indy-ftests-pkg-npm - 2.5.0-SNAPSHOT + 2.5.0 test org.commonjava.indy indy-pkg-npm-common - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-pkg-npm-model-java - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-diagnostics-jaxrs - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-diagnostics-client-java - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-diagnostics-common - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-ftests-diagnostics - 2.5.0-SNAPSHOT + 2.5.0 test org.commonjava.indy indy-diagnostics-common - 2.5.0-SNAPSHOT + 2.5.0 confset tar.gz provided @@ -743,28 +743,28 @@ org.commonjava.indy indy-hosted-by-archive-common - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-hosted-by-archive-client-java - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-ftests-hosted-by-archive - 2.5.0-SNAPSHOT + 2.5.0 test org.commonjava.indy indy-hosted-by-archive-jaxrs - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-hosted-by-archive-common - 2.5.0-SNAPSHOT + 2.5.0 confset tar.gz @@ -772,22 +772,22 @@ org.commonjava.indy indy-subsys-metrics-core - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-subsys-metrics-reporter - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-subsys-metrics-prometheus - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-subsys-metrics-reporter - 2.5.0-SNAPSHOT + 2.5.0 confset tar.gz provided @@ -796,28 +796,28 @@ org.commonjava.indy indy-ftests-metrics - 2.5.0-SNAPSHOT + 2.5.0 test org.commonjava.indy indy-sli - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy.rest indy-rest-api yaml - 2.5.0-SNAPSHOT + 2.5.0 provided org.commonjava.indy.rest indy-rest-api json - 2.5.0-SNAPSHOT + 2.5.0 provided @@ -856,33 +856,33 @@ org.commonjava.indy indy-content-browse-common - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-content-browse-jaxrs - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-ftests-content-browse - 2.5.0-SNAPSHOT + 2.5.0 test org.commonjava.indy indy-content-browse-model-java - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-content-browse-client-java - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-content-browse-common - 2.5.0-SNAPSHOT + 2.5.0 confset tar.gz provided @@ -890,35 +890,35 @@ org.commonjava.indy indy-content-browse-ui - 2.5.0-SNAPSHOT + 2.5.0 reactui tar.gz org.commonjava.indy indy-changelog-common - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-changelog-client-java - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-ftests-changelog - 2.5.0-SNAPSHOT + 2.5.0 test org.commonjava.indy indy-changelog-jaxrs - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-changelog-common - 2.5.0-SNAPSHOT + 2.5.0 confset tar.gz @@ -936,12 +936,12 @@ org.commonjava.indy indy-event-audit-common - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-event-audit-common - 2.5.0-SNAPSHOT + 2.5.0 confset tar.gz provided @@ -956,23 +956,23 @@ org.commonjava.indy indy-repo-proxy-common - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-repo-proxy-jaxrs - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy indy-ftests-repo-proxy - 2.5.0-SNAPSHOT + 2.5.0 test org.commonjava.indy indy-repo-proxy-common - 2.5.0-SNAPSHOT + 2.5.0 confset tar.gz diff --git a/rest/api/pom.xml b/rest/api/pom.xml index c1c3de3ce8..77200b4270 100644 --- a/rest/api/pom.xml +++ b/rest/api/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.rest indy-rest-parent - 2.5.0-SNAPSHOT + 2.5.0 indy-rest-api diff --git a/rest/pom.xml b/rest/pom.xml index 1c03f17dc3..30b38043c4 100644 --- a/rest/pom.xml +++ b/rest/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy.rest diff --git a/subsys/cassandra/pom.xml b/subsys/cassandra/pom.xml index 73f1a32b37..8c083af871 100644 --- a/subsys/cassandra/pom.xml +++ b/subsys/cassandra/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-subsystems - 2.5.0-SNAPSHOT + 2.5.0 indy-subsys-cassandra diff --git a/subsys/cpool/pom.xml b/subsys/cpool/pom.xml index 41337e705f..fa9146a4bb 100644 --- a/subsys/cpool/pom.xml +++ b/subsys/cpool/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.0-SNAPSHOT + 2.5.0 indy-subsys-cpool diff --git a/subsys/flatfile/pom.xml b/subsys/flatfile/pom.xml index 4466c76176..f31c60a3da 100644 --- a/subsys/flatfile/pom.xml +++ b/subsys/flatfile/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.0-SNAPSHOT + 2.5.0 indy-subsys-flatfile diff --git a/subsys/git/pom.xml b/subsys/git/pom.xml index 55581c327b..23ef8913d0 100644 --- a/subsys/git/pom.xml +++ b/subsys/git/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.0-SNAPSHOT + 2.5.0 indy-subsys-git diff --git a/subsys/groovy/pom.xml b/subsys/groovy/pom.xml index b14ec17259..ff36c4a55f 100644 --- a/subsys/groovy/pom.xml +++ b/subsys/groovy/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.0-SNAPSHOT + 2.5.0 indy-subsys-groovy diff --git a/subsys/honeycomb/pom.xml b/subsys/honeycomb/pom.xml index 042d6aa45d..128726621c 100644 --- a/subsys/honeycomb/pom.xml +++ b/subsys/honeycomb/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.5.0-SNAPSHOT + 2.5.0 4.0.0 diff --git a/subsys/http/pom.xml b/subsys/http/pom.xml index 9404f19721..59dd76141b 100644 --- a/subsys/http/pom.xml +++ b/subsys/http/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.0-SNAPSHOT + 2.5.0 indy-subsys-http diff --git a/subsys/infinispan/pom.xml b/subsys/infinispan/pom.xml index c9ef021f8d..d402f26692 100644 --- a/subsys/infinispan/pom.xml +++ b/subsys/infinispan/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.0-SNAPSHOT + 2.5.0 indy-subsys-infinispan diff --git a/subsys/jaxrs/pom.xml b/subsys/jaxrs/pom.xml index 4b8afbfb68..c823db3c00 100644 --- a/subsys/jaxrs/pom.xml +++ b/subsys/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.0-SNAPSHOT + 2.5.0 indy-subsys-jaxrs diff --git a/subsys/kafka/pom.xml b/subsys/kafka/pom.xml index 02dc9bfe94..407df13aef 100644 --- a/subsys/kafka/pom.xml +++ b/subsys/kafka/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.5.0-SNAPSHOT + 2.5.0 4.0.0 diff --git a/subsys/keycloak/pom.xml b/subsys/keycloak/pom.xml index 927be371e5..d2fc88f00f 100644 --- a/subsys/keycloak/pom.xml +++ b/subsys/keycloak/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.0-SNAPSHOT + 2.5.0 indy-subsys-keycloak Indy :: Subsystems :: Keycloak diff --git a/subsys/metrics/core/pom.xml b/subsys/metrics/core/pom.xml index 08e45b58f7..0cfaa3a157 100644 --- a/subsys/metrics/core/pom.xml +++ b/subsys/metrics/core/pom.xml @@ -20,7 +20,7 @@ indy-subsys-metrics org.commonjava.indy - 2.5.0-SNAPSHOT + 2.5.0 4.0.0 diff --git a/subsys/metrics/pom.xml b/subsys/metrics/pom.xml index d9037171e9..b02898532c 100644 --- a/subsys/metrics/pom.xml +++ b/subsys/metrics/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.5.0-SNAPSHOT + 2.5.0 4.0.0 diff --git a/subsys/metrics/prometheus/pom.xml b/subsys/metrics/prometheus/pom.xml index 66fd59a8ae..4f922a1463 100644 --- a/subsys/metrics/prometheus/pom.xml +++ b/subsys/metrics/prometheus/pom.xml @@ -20,7 +20,7 @@ indy-subsys-metrics org.commonjava.indy - 2.5.0-SNAPSHOT + 2.5.0 4.0.0 diff --git a/subsys/metrics/reporter/pom.xml b/subsys/metrics/reporter/pom.xml index 7c4a6133ae..9c93af87b1 100644 --- a/subsys/metrics/reporter/pom.xml +++ b/subsys/metrics/reporter/pom.xml @@ -20,7 +20,7 @@ indy-subsys-metrics org.commonjava.indy - 2.5.0-SNAPSHOT + 2.5.0 4.0.0 diff --git a/subsys/pom.xml b/subsys/pom.xml index 041822a437..e851016834 100644 --- a/subsys/pom.xml +++ b/subsys/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.0-SNAPSHOT + 2.5.0 indy-subsystems diff --git a/subsys/prefetch/pom.xml b/subsys/prefetch/pom.xml index 26f7fc53b8..1184a91e5a 100644 --- a/subsys/prefetch/pom.xml +++ b/subsys/prefetch/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.5.0-SNAPSHOT + 2.5.0 4.0.0 diff --git a/test/db/pom.xml b/test/db/pom.xml index 284f76dc42..6919e2407d 100644 --- a/test/db/pom.xml +++ b/test/db/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.5.0-SNAPSHOT + 2.5.0 indy-test-db diff --git a/test/fixtures-core/pom.xml b/test/fixtures-core/pom.xml index 05b3a46114..23f3d660df 100644 --- a/test/fixtures-core/pom.xml +++ b/test/fixtures-core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.5.0-SNAPSHOT + 2.5.0 indy-test-fixtures-core diff --git a/test/pom.xml b/test/pom.xml index 5584dbb28b..b0c4a32d31 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.0-SNAPSHOT + 2.5.0 indy-test diff --git a/test/providers-core/pom.xml b/test/providers-core/pom.xml index 7bc2122956..8b1a21da59 100644 --- a/test/providers-core/pom.xml +++ b/test/providers-core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.5.0-SNAPSHOT + 2.5.0 indy-test-providers-core diff --git a/test/utils/pom.xml b/test/utils/pom.xml index a7689acc55..9678dd256a 100644 --- a/test/utils/pom.xml +++ b/test/utils/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.5.0-SNAPSHOT + 2.5.0 indy-test-utils diff --git a/tools/assemblies/pom.xml b/tools/assemblies/pom.xml index 77630871ac..a49eaa6bc2 100644 --- a/tools/assemblies/pom.xml +++ b/tools/assemblies/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.tools indy-tools - 2.5.0-SNAPSHOT + 2.5.0 indy-assemblies diff --git a/tools/pom.xml b/tools/pom.xml index f96cae1d75..1d770d14e6 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy.tools diff --git a/uis/layover/pom.xml b/uis/layover/pom.xml index baad9464fa..a6ba4d8489 100644 --- a/uis/layover/pom.xml +++ b/uis/layover/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.ui indy-uis - 2.5.0-SNAPSHOT + 2.5.0 indy-ui-layover diff --git a/uis/pom.xml b/uis/pom.xml index a1a3f11af7..d16ef1a9f5 100644 --- a/uis/pom.xml +++ b/uis/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.0-SNAPSHOT + 2.5.0 org.commonjava.indy.ui From f7b19cf141a01acd4154c5996525056642f3a7ad Mon Sep 17 00:00:00 2001 From: shokakucarrier Date: Wed, 14 Oct 2020 11:00:10 +0000 Subject: [PATCH 29/50] [maven-release-plugin] prepare for next development iteration --- addons/changelog/client-java/pom.xml | 2 +- addons/changelog/common/pom.xml | 2 +- addons/changelog/ftests/pom.xml | 2 +- addons/changelog/jaxrs/pom.xml | 2 +- addons/changelog/pom.xml | 2 +- addons/content-browse/client-java/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/event-audit/common/pom.xml | 2 +- addons/event-audit/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/path-mapped/common/pom.xml | 2 +- addons/path-mapped/jaxrs/pom.xml | 2 +- addons/path-mapped/model-java/pom.xml | 2 +- addons/path-mapped/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/repo-proxy/common/pom.xml | 2 +- addons/repo-proxy/ftests/pom.xml | 2 +- addons/repo-proxy/jaxrs/pom.xml | 2 +- addons/repo-proxy/pom.xml | 2 +- addons/revisions/common/pom.xml | 2 +- addons/revisions/jaxrs/pom.xml | 2 +- addons/revisions/pom.xml | 2 +- addons/sli/pom.xml | 2 +- api/pom.xml | 2 +- bindings/jaxrs/pom.xml | 2 +- bindings/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/common/pom.xml | 2 +- db/flat/pom.xml | 2 +- db/infinispan/pom.xml | 2 +- db/memory/pom.xml | 2 +- db/metrics/pom.xml | 2 +- db/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 | 254 +++++++++---------- rest/api/pom.xml | 2 +- rest/pom.xml | 2 +- subsys/cassandra/pom.xml | 2 +- subsys/cpool/pom.xml | 2 +- subsys/flatfile/pom.xml | 2 +- subsys/git/pom.xml | 2 +- subsys/groovy/pom.xml | 2 +- subsys/honeycomb/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/prometheus/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 +- 131 files changed, 257 insertions(+), 257 deletions(-) diff --git a/addons/changelog/client-java/pom.xml b/addons/changelog/client-java/pom.xml index 6b99f8db58..981f5a56cc 100644 --- a/addons/changelog/client-java/pom.xml +++ b/addons/changelog/client-java/pom.xml @@ -20,7 +20,7 @@ indy-changelog org.commonjava.indy - 2.5.0 + 2.5.1-SNAPSHOT 4.0.0 diff --git a/addons/changelog/common/pom.xml b/addons/changelog/common/pom.xml index bdcb9aad7f..14118c2030 100644 --- a/addons/changelog/common/pom.xml +++ b/addons/changelog/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.5.0 + 2.5.1-SNAPSHOT indy-changelog-common Indy :: Add-Ons :: ChangeLog :: Common diff --git a/addons/changelog/ftests/pom.xml b/addons/changelog/ftests/pom.xml index a941cbd30f..d73ae640f0 100644 --- a/addons/changelog/ftests/pom.xml +++ b/addons/changelog/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.5.0 + 2.5.1-SNAPSHOT indy-ftests-changelog diff --git a/addons/changelog/jaxrs/pom.xml b/addons/changelog/jaxrs/pom.xml index d1a462eff7..c5ee1725eb 100644 --- a/addons/changelog/jaxrs/pom.xml +++ b/addons/changelog/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.5.0 + 2.5.1-SNAPSHOT indy-changelog-jaxrs diff --git a/addons/changelog/pom.xml b/addons/changelog/pom.xml index 4d56ee4b40..486ae1f96d 100644 --- a/addons/changelog/pom.xml +++ b/addons/changelog/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.0 + 2.5.1-SNAPSHOT indy-changelog Indy :: Add-Ons :: ChangeLog :: Parent diff --git a/addons/content-browse/client-java/pom.xml b/addons/content-browse/client-java/pom.xml index c00e21cb7e..f54bb01670 100644 --- a/addons/content-browse/client-java/pom.xml +++ b/addons/content-browse/client-java/pom.xml @@ -20,7 +20,7 @@ indy-content-browse org.commonjava.indy - 2.5.0 + 2.5.1-SNAPSHOT 4.0.0 diff --git a/addons/content-browse/common/pom.xml b/addons/content-browse/common/pom.xml index 0cb7be8b36..97a5b1800e 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 - 2.5.0 + 2.5.1-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 1437e83148..645271c9d5 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 - 2.5.0 + 2.5.1-SNAPSHOT indy-ftests-content-browse diff --git a/addons/content-browse/jaxrs/pom.xml b/addons/content-browse/jaxrs/pom.xml index 8222a27aac..035f401528 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 - 2.5.0 + 2.5.1-SNAPSHOT indy-content-browse-jaxrs diff --git a/addons/content-browse/model-java/pom.xml b/addons/content-browse/model-java/pom.xml index 2b5e246454..f1531855fc 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 - 2.5.0 + 2.5.1-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 fbb774a3cd..db1c71def3 100644 --- a/addons/content-browse/pom.xml +++ b/addons/content-browse/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.0 + 2.5.1-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 4b28bf3285..06961ea94c 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 - 2.5.0 + 2.5.1-SNAPSHOT 4.0.0 diff --git a/addons/content-index/pom.xml b/addons/content-index/pom.xml index 7ad9bcc3c8..b1ec69d16c 100644 --- a/addons/content-index/pom.xml +++ b/addons/content-index/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.0 + 2.5.1-SNAPSHOT indy-content-index diff --git a/addons/diagnostics/client-java/pom.xml b/addons/diagnostics/client-java/pom.xml index 1edd64b107..be9a884a5b 100644 --- a/addons/diagnostics/client-java/pom.xml +++ b/addons/diagnostics/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.5.0 + 2.5.1-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 c5c3fde61f..cfa63ac617 100644 --- a/addons/diagnostics/common/pom.xml +++ b/addons/diagnostics/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.5.0 + 2.5.1-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 9573dbaa85..ba6ffe7337 100644 --- a/addons/diagnostics/ftests/pom.xml +++ b/addons/diagnostics/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.5.0 + 2.5.1-SNAPSHOT indy-ftests-diagnostics diff --git a/addons/diagnostics/jaxrs/pom.xml b/addons/diagnostics/jaxrs/pom.xml index c351fdb3ca..59d1f42d51 100644 --- a/addons/diagnostics/jaxrs/pom.xml +++ b/addons/diagnostics/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.5.0 + 2.5.1-SNAPSHOT indy-diagnostics-jaxrs diff --git a/addons/diagnostics/pom.xml b/addons/diagnostics/pom.xml index 9f73045fc7..3ceff76a08 100644 --- a/addons/diagnostics/pom.xml +++ b/addons/diagnostics/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.0 + 2.5.1-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 355e82868c..22d6dabd70 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 - 2.5.0 + 2.5.1-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 971732971c..1f23babe51 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 - 2.5.0 + 2.5.1-SNAPSHOT indy-ftests-dot-maven diff --git a/addons/dot-maven/jaxrs/pom.xml b/addons/dot-maven/jaxrs/pom.xml index d83ee6817a..fc38de3e8d 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 - 2.5.0 + 2.5.1-SNAPSHOT indy-dot-maven-jaxrs diff --git a/addons/dot-maven/pom.xml b/addons/dot-maven/pom.xml index 8ca07ad1b1..192b76237a 100644 --- a/addons/dot-maven/pom.xml +++ b/addons/dot-maven/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.0 + 2.5.1-SNAPSHOT indy-dot-maven diff --git a/addons/event-audit/common/pom.xml b/addons/event-audit/common/pom.xml index 17bf169b56..783789a8f2 100644 --- a/addons/event-audit/common/pom.xml +++ b/addons/event-audit/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-event-audit - 2.5.0 + 2.5.1-SNAPSHOT indy-event-audit-common diff --git a/addons/event-audit/pom.xml b/addons/event-audit/pom.xml index ed482671be..2eb6ee331a 100644 --- a/addons/event-audit/pom.xml +++ b/addons/event-audit/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.0 + 2.5.1-SNAPSHOT indy-event-audit diff --git a/addons/folo/client-java/pom.xml b/addons/folo/client-java/pom.xml index de034120d3..3b3a7a8f38 100644 --- a/addons/folo/client-java/pom.xml +++ b/addons/folo/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.5.0 + 2.5.1-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 d9e4f3ded9..382332d2d1 100644 --- a/addons/folo/common/pom.xml +++ b/addons/folo/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.5.0 + 2.5.1-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 5d0f67ee66..aafd212f60 100644 --- a/addons/folo/ftests/pom.xml +++ b/addons/folo/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.5.0 + 2.5.1-SNAPSHOT indy-ftests-folo diff --git a/addons/folo/jaxrs/pom.xml b/addons/folo/jaxrs/pom.xml index f08e751ea2..83a4e1b243 100644 --- a/addons/folo/jaxrs/pom.xml +++ b/addons/folo/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.5.0 + 2.5.1-SNAPSHOT indy-folo-jaxrs diff --git a/addons/folo/model-java/pom.xml b/addons/folo/model-java/pom.xml index 4bc77a7bcf..97dc26cdc6 100644 --- a/addons/folo/model-java/pom.xml +++ b/addons/folo/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.5.0 + 2.5.1-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 e8fe054b72..13288dd558 100644 --- a/addons/folo/pom.xml +++ b/addons/folo/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.0 + 2.5.1-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 26704ea7fc..a4b2fc3323 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 - 2.5.0 + 2.5.1-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 fd2a970037..d2cc25ed0e 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 - 2.5.0 + 2.5.1-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 53c182b6bd..d419de2044 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 - 2.5.0 + 2.5.1-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 0a016a2fc9..0a495b37de 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 - 2.5.0 + 2.5.1-SNAPSHOT indy-hosted-by-archive-jaxrs diff --git a/addons/hosted-by-archive/pom.xml b/addons/hosted-by-archive/pom.xml index dcdda8d2b1..585b4818ca 100644 --- a/addons/hosted-by-archive/pom.xml +++ b/addons/hosted-by-archive/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.0 + 2.5.1-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 41e023d414..c0d0658918 100644 --- a/addons/httprox/common/pom.xml +++ b/addons/httprox/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.5.0 + 2.5.1-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 3cd3ef174d..03c003093b 100644 --- a/addons/httprox/ftests/pom.xml +++ b/addons/httprox/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.5.0 + 2.5.1-SNAPSHOT indy-ftests-httprox diff --git a/addons/httprox/jaxrs/pom.xml b/addons/httprox/jaxrs/pom.xml index c253ae9d74..c97acd719b 100644 --- a/addons/httprox/jaxrs/pom.xml +++ b/addons/httprox/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.5.0 + 2.5.1-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 421a9e8c15..f2b96f6878 100644 --- a/addons/httprox/pom.xml +++ b/addons/httprox/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.0 + 2.5.1-SNAPSHOT indy-httprox diff --git a/addons/implied-repos/client-java/pom.xml b/addons/implied-repos/client-java/pom.xml index ec49a7acfe..12b3572908 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 - 2.5.0 + 2.5.1-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 6b5ac94de2..a044de0d21 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 - 2.5.0 + 2.5.1-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 5d97ea2520..ca5897bce8 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 - 2.5.0 + 2.5.1-SNAPSHOT indy-ftests-implied-repos diff --git a/addons/implied-repos/model-java/pom.xml b/addons/implied-repos/model-java/pom.xml index 7c9f6b3d1f..c6207cb887 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 - 2.5.0 + 2.5.1-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 6592cea794..a80d4df87b 100644 --- a/addons/implied-repos/pom.xml +++ b/addons/implied-repos/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.0 + 2.5.1-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 cb02cd3b89..f637ce8639 100644 --- a/addons/koji/client-java/pom.xml +++ b/addons/koji/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.5.0 + 2.5.1-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 79dfe53cd9..bb1a8f709a 100644 --- a/addons/koji/common/pom.xml +++ b/addons/koji/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.5.0 + 2.5.1-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 df2bc3d7c3..42004609b5 100644 --- a/addons/koji/jaxrs/pom.xml +++ b/addons/koji/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.5.0 + 2.5.1-SNAPSHOT indy-koji-jaxrs diff --git a/addons/koji/model-java/pom.xml b/addons/koji/model-java/pom.xml index 1f95171b0c..ea363fcca2 100644 --- a/addons/koji/model-java/pom.xml +++ b/addons/koji/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.5.0 + 2.5.1-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 b3d2e52394..a805bcdd29 100644 --- a/addons/koji/pom.xml +++ b/addons/koji/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.0 + 2.5.1-SNAPSHOT indy-koji Indy :: Add-Ons :: Koji Integration :: Parent diff --git a/addons/path-mapped/common/pom.xml b/addons/path-mapped/common/pom.xml index 3abb3fd791..66064a3393 100644 --- a/addons/path-mapped/common/pom.xml +++ b/addons/path-mapped/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.5.0 + 2.5.1-SNAPSHOT indy-path-mapped-common diff --git a/addons/path-mapped/jaxrs/pom.xml b/addons/path-mapped/jaxrs/pom.xml index 5efd02e473..88af8a9009 100644 --- a/addons/path-mapped/jaxrs/pom.xml +++ b/addons/path-mapped/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.5.0 + 2.5.1-SNAPSHOT indy-path-mapped-jaxrs diff --git a/addons/path-mapped/model-java/pom.xml b/addons/path-mapped/model-java/pom.xml index 32a15b19a3..5f778234cb 100644 --- a/addons/path-mapped/model-java/pom.xml +++ b/addons/path-mapped/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.5.0 + 2.5.1-SNAPSHOT indy-path-mapped-model-java diff --git a/addons/path-mapped/pom.xml b/addons/path-mapped/pom.xml index decc106352..3577767247 100644 --- a/addons/path-mapped/pom.xml +++ b/addons/path-mapped/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.0 + 2.5.1-SNAPSHOT indy-path-mapped Indy :: Add-Ons :: Path Mapped :: Parent diff --git a/addons/pkg-maven/common/pom.xml b/addons/pkg-maven/common/pom.xml index 418b775660..a7f9726630 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 - 2.5.0 + 2.5.1-SNAPSHOT 4.0.0 diff --git a/addons/pkg-maven/ftests/pom.xml b/addons/pkg-maven/ftests/pom.xml index bdb81e0bf3..c96d73815b 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 - 2.5.0 + 2.5.1-SNAPSHOT 4.0.0 diff --git a/addons/pkg-maven/jaxrs/pom.xml b/addons/pkg-maven/jaxrs/pom.xml index 18314d16f5..26ba4fdc42 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 - 2.5.0 + 2.5.1-SNAPSHOT 4.0.0 diff --git a/addons/pkg-maven/pom.xml b/addons/pkg-maven/pom.xml index 1ecb013bf3..ad855531c9 100644 --- a/addons/pkg-maven/pom.xml +++ b/addons/pkg-maven/pom.xml @@ -20,7 +20,7 @@ indy-addons org.commonjava.indy - 2.5.0 + 2.5.1-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/common/pom.xml b/addons/pkg-npm/common/pom.xml index 5df1bf54d3..8e4d9878a9 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 - 2.5.0 + 2.5.1-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/ftests/pom.xml b/addons/pkg-npm/ftests/pom.xml index ab05dc7409..60b6e4999d 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 - 2.5.0 + 2.5.1-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/jaxrs/pom.xml b/addons/pkg-npm/jaxrs/pom.xml index 7b2fdd6380..dd1750433c 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 - 2.5.0 + 2.5.1-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/model-java/pom.xml b/addons/pkg-npm/model-java/pom.xml index 11a5d1ac99..469d42eb88 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 - 2.5.0 + 2.5.1-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/pom.xml b/addons/pkg-npm/pom.xml index 2a2c3adfe8..be30dd1079 100644 --- a/addons/pkg-npm/pom.xml +++ b/addons/pkg-npm/pom.xml @@ -20,7 +20,7 @@ indy-addons org.commonjava.indy - 2.5.0 + 2.5.1-SNAPSHOT 4.0.0 diff --git a/addons/pom.xml b/addons/pom.xml index 3cf1e54f59..20069d2ec1 100644 --- a/addons/pom.xml +++ b/addons/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-parent - 2.5.0 + 2.5.1-SNAPSHOT indy-addons diff --git a/addons/promote/client-java/pom.xml b/addons/promote/client-java/pom.xml index bae2d1578b..4cd83d94a8 100644 --- a/addons/promote/client-java/pom.xml +++ b/addons/promote/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.5.0 + 2.5.1-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 a72e1c830e..74faba7cf3 100644 --- a/addons/promote/common/pom.xml +++ b/addons/promote/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.5.0 + 2.5.1-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 17c0f9d5cd..bea93a4bd3 100644 --- a/addons/promote/ftests/pom.xml +++ b/addons/promote/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.5.0 + 2.5.1-SNAPSHOT indy-ftests-promote diff --git a/addons/promote/jaxrs/pom.xml b/addons/promote/jaxrs/pom.xml index 94c9b1ea20..86ca4292fd 100644 --- a/addons/promote/jaxrs/pom.xml +++ b/addons/promote/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.5.0 + 2.5.1-SNAPSHOT indy-promote-jaxrs diff --git a/addons/promote/model-java/pom.xml b/addons/promote/model-java/pom.xml index 1219c20d73..419ccc121d 100644 --- a/addons/promote/model-java/pom.xml +++ b/addons/promote/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.5.0 + 2.5.1-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 4b301eabcd..8fcd5468df 100644 --- a/addons/promote/pom.xml +++ b/addons/promote/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.0 + 2.5.1-SNAPSHOT indy-promote Indy :: Add-Ons :: Artifact Promotion :: Parent diff --git a/addons/repo-proxy/common/pom.xml b/addons/repo-proxy/common/pom.xml index 7661b183be..a4795abcfd 100644 --- a/addons/repo-proxy/common/pom.xml +++ b/addons/repo-proxy/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-repo-proxy - 2.5.0 + 2.5.1-SNAPSHOT indy-repo-proxy-common Indy :: Add-Ons :: Repository-Proxy :: Common diff --git a/addons/repo-proxy/ftests/pom.xml b/addons/repo-proxy/ftests/pom.xml index 56f1b2c4d7..95483ef907 100644 --- a/addons/repo-proxy/ftests/pom.xml +++ b/addons/repo-proxy/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-repo-proxy - 2.5.0 + 2.5.1-SNAPSHOT indy-ftests-repo-proxy diff --git a/addons/repo-proxy/jaxrs/pom.xml b/addons/repo-proxy/jaxrs/pom.xml index 8bb77ae1a4..126cff3789 100644 --- a/addons/repo-proxy/jaxrs/pom.xml +++ b/addons/repo-proxy/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-repo-proxy - 2.5.0 + 2.5.1-SNAPSHOT indy-repo-proxy-jaxrs diff --git a/addons/repo-proxy/pom.xml b/addons/repo-proxy/pom.xml index f4c89ab939..a7ffad19e7 100644 --- a/addons/repo-proxy/pom.xml +++ b/addons/repo-proxy/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.0 + 2.5.1-SNAPSHOT indy-repo-proxy Indy :: Add-Ons :: Repository-Proxy :: Parent diff --git a/addons/revisions/common/pom.xml b/addons/revisions/common/pom.xml index 7d307d0ac0..a16099005d 100644 --- a/addons/revisions/common/pom.xml +++ b/addons/revisions/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-revisions - 2.5.0 + 2.5.1-SNAPSHOT indy-revisions-common Indy :: Add-Ons :: Revisions :: Common diff --git a/addons/revisions/jaxrs/pom.xml b/addons/revisions/jaxrs/pom.xml index b217ba1a41..23347232c0 100644 --- a/addons/revisions/jaxrs/pom.xml +++ b/addons/revisions/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-revisions - 2.5.0 + 2.5.1-SNAPSHOT indy-revisions-jaxrs diff --git a/addons/revisions/pom.xml b/addons/revisions/pom.xml index 57d16ae5c7..17c690b80e 100644 --- a/addons/revisions/pom.xml +++ b/addons/revisions/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.0 + 2.5.1-SNAPSHOT indy-revisions Indy :: Add-Ons :: Revisions :: Parent diff --git a/addons/sli/pom.xml b/addons/sli/pom.xml index c6c2f5e789..a816dda605 100644 --- a/addons/sli/pom.xml +++ b/addons/sli/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.0 + 2.5.1-SNAPSHOT indy-sli Indy :: Add-Ons :: Service Level Indicators Reporting :: JAX-RS diff --git a/api/pom.xml b/api/pom.xml index 90df8a0b12..f82c683c55 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.0 + 2.5.1-SNAPSHOT indy-api diff --git a/bindings/jaxrs/pom.xml b/bindings/jaxrs/pom.xml index fe545ddc54..01f93a9fa2 100644 --- a/bindings/jaxrs/pom.xml +++ b/bindings/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-bindings - 2.5.0 + 2.5.1-SNAPSHOT indy-bindings-jaxrs diff --git a/bindings/pom.xml b/bindings/pom.xml index 8a89cbe8b7..e293ca3e38 100644 --- a/bindings/pom.xml +++ b/bindings/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-parent - 2.5.0 + 2.5.1-SNAPSHOT indy-bindings diff --git a/boot/jaxrs/pom.xml b/boot/jaxrs/pom.xml index b4e0ddc4b3..993e7b941d 100644 --- a/boot/jaxrs/pom.xml +++ b/boot/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.boot indy-booters - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy.boot diff --git a/boot/pom.xml b/boot/pom.xml index ed62e4537f..98efeffe6d 100644 --- a/boot/pom.xml +++ b/boot/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy.boot diff --git a/clients/core-java/pom.xml b/clients/core-java/pom.xml index db49944604..50b6c62a8f 100644 --- a/clients/core-java/pom.xml +++ b/clients/core-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-clients-parent - 2.5.0 + 2.5.1-SNAPSHOT indy-client-core-java diff --git a/clients/pom.xml b/clients/pom.xml index 3a8ed2f881..44007e7013 100644 --- a/clients/pom.xml +++ b/clients/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.0 + 2.5.1-SNAPSHOT indy-clients-parent diff --git a/core/pom.xml b/core/pom.xml index 0cd86a3324..3b469eff65 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.0 + 2.5.1-SNAPSHOT indy-core diff --git a/db/common/pom.xml b/db/common/pom.xml index 14cb425de0..1e509ec0c9 100644 --- a/db/common/pom.xml +++ b/db/common/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-db - 2.5.0 + 2.5.1-SNAPSHOT indy-db-common diff --git a/db/flat/pom.xml b/db/flat/pom.xml index 504f5fea19..73d26dba14 100644 --- a/db/flat/pom.xml +++ b/db/flat/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.5.0 + 2.5.1-SNAPSHOT indy-db-flat diff --git a/db/infinispan/pom.xml b/db/infinispan/pom.xml index dc5c3df5c3..8339e5d765 100644 --- a/db/infinispan/pom.xml +++ b/db/infinispan/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-db - 2.5.0 + 2.5.1-SNAPSHOT indy-db-infinispan diff --git a/db/memory/pom.xml b/db/memory/pom.xml index 045f976948..67d48fe032 100644 --- a/db/memory/pom.xml +++ b/db/memory/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.5.0 + 2.5.1-SNAPSHOT indy-db-memory diff --git a/db/metrics/pom.xml b/db/metrics/pom.xml index 68d8bdd7f5..ecdda4cc6f 100644 --- a/db/metrics/pom.xml +++ b/db/metrics/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.5.0 + 2.5.1-SNAPSHOT indy-db-metrics diff --git a/db/pom.xml b/db/pom.xml index 6c28e1c4f5..d277b3fc3e 100644 --- a/db/pom.xml +++ b/db/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.0 + 2.5.1-SNAPSHOT indy-db diff --git a/deployments/launcher/pom.xml b/deployments/launcher/pom.xml index b823802461..194ea7aa7c 100644 --- a/deployments/launcher/pom.xml +++ b/deployments/launcher/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-deployments - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy.launch diff --git a/deployments/pom.xml b/deployments/pom.xml index 06312ac02b..41d7220c8d 100644 --- a/deployments/pom.xml +++ b/deployments/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.0 + 2.5.1-SNAPSHOT indy-deployments diff --git a/embedder/pom.xml b/embedder/pom.xml index c9d8ecf572..363792e7f8 100644 --- a/embedder/pom.xml +++ b/embedder/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy.embed diff --git a/filers/default/pom.xml b/filers/default/pom.xml index d2ecefaaea..2cb329892b 100644 --- a/filers/default/pom.xml +++ b/filers/default/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-file-managers - 2.5.0 + 2.5.1-SNAPSHOT indy-filer-default diff --git a/filers/pom.xml b/filers/pom.xml index b154b3496d..d839d21a35 100644 --- a/filers/pom.xml +++ b/filers/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.0 + 2.5.1-SNAPSHOT indy-file-managers diff --git a/ftests/common/pom.xml b/ftests/common/pom.xml index 6ee6ea2ec7..7f9a5bf843 100644 --- a/ftests/common/pom.xml +++ b/ftests/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-ftests-parent - 2.5.0 + 2.5.1-SNAPSHOT indy-ftests-common diff --git a/ftests/core/pom.xml b/ftests/core/pom.xml index dac8d76edc..024638fbb1 100644 --- a/ftests/core/pom.xml +++ b/ftests/core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-ftests-parent - 2.5.0 + 2.5.1-SNAPSHOT indy-ftests-core diff --git a/ftests/metrics/pom.xml b/ftests/metrics/pom.xml index 64f0a2ed82..8c9bfb2387 100644 --- a/ftests/metrics/pom.xml +++ b/ftests/metrics/pom.xml @@ -20,7 +20,7 @@ indy-ftests-parent org.commonjava.indy - 2.5.0 + 2.5.1-SNAPSHOT 4.0.0 diff --git a/ftests/pom.xml b/ftests/pom.xml index ff31123ca8..349687d916 100644 --- a/ftests/pom.xml +++ b/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.0 + 2.5.1-SNAPSHOT indy-ftests-parent diff --git a/models/core-java/pom.xml b/models/core-java/pom.xml index cc6b538320..7e48e35080 100644 --- a/models/core-java/pom.xml +++ b/models/core-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-models-parent - 2.5.0 + 2.5.1-SNAPSHOT indy-model-core-java diff --git a/models/pom.xml b/models/pom.xml index ce41928aa7..10501befd8 100644 --- a/models/pom.xml +++ b/models/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.0 + 2.5.1-SNAPSHOT indy-models-parent diff --git a/pom.xml b/pom.xml index 8841615de1..729291d390 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.commonjava.indy indy-parent - 2.5.0 + 2.5.1-SNAPSHOT pom @@ -37,7 +37,7 @@ scm:git:https://github.com/CommonJava/indy scm:git:https://github.com/CommonJava/indy http://github.com/Commonjava/indy - indy-parent-2.5.0 + HEAD @@ -187,7 +187,7 @@ org.commonjava.indy.ui indy-ui-layover - 2.5.0 + 2.5.1-SNAPSHOT runtime @@ -195,22 +195,22 @@ org.commonjava.indy indy-model-core-java - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-api - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-core - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-core - 2.5.0 + 2.5.1-SNAPSHOT tar.gz confset provided @@ -218,32 +218,32 @@ org.commonjava.indy indy-db-flat - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-db-metrics - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-db-common - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-db-infinispan - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-bindings-jaxrs - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy.launch indy-launcher - 2.5.0 + 2.5.1-SNAPSHOT tar.gz skinny provided @@ -251,7 +251,7 @@ org.commonjava.indy.launch indy-launcher - 2.5.0 + 2.5.1-SNAPSHOT tar.gz complete provided @@ -259,7 +259,7 @@ org.commonjava.indy.launch indy-launcher - 2.5.0 + 2.5.1-SNAPSHOT tar.gz data provided @@ -267,7 +267,7 @@ org.commonjava.indy.launch indy-launcher - 2.5.0 + 2.5.1-SNAPSHOT tar.gz etc provided @@ -276,17 +276,17 @@ org.commonjava.indy indy-revisions-jaxrs - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-revisions-common - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-revisions-common - 2.5.0 + 2.5.1-SNAPSHOT tar.gz confset provided @@ -294,7 +294,7 @@ org.commonjava.indy indy-revisions-common - 2.5.0 + 2.5.1-SNAPSHOT tar.gz uiset provided @@ -302,12 +302,12 @@ org.commonjava.indy indy-dot-maven-common - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-dot-maven-common - 2.5.0 + 2.5.1-SNAPSHOT tar.gz dataset provided @@ -315,22 +315,22 @@ org.commonjava.indy indy-dot-maven-jaxrs - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-ftests-dot-maven - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-httprox-common - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-httprox-common - 2.5.0 + 2.5.1-SNAPSHOT tar.gz confset provided @@ -338,17 +338,17 @@ org.commonjava.indy indy-ftests-httprox - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-content-index - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-content-index - 2.5.0 + 2.5.1-SNAPSHOT tar.gz confset provided @@ -356,51 +356,51 @@ org.commonjava.indy indy-db-memory - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-test-db - 2.5.0 + 2.5.1-SNAPSHOT test org.commonjava.indy indy-test-fixtures-core - 2.5.0 + 2.5.1-SNAPSHOT test org.commonjava.indy indy-test-providers-core - 2.5.0 + 2.5.1-SNAPSHOT test org.commonjava.indy indy-test-utils - 2.5.0 + 2.5.1-SNAPSHOT test org.commonjava.indy indy-filer-default - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-subsys-jaxrs - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-subsys-honeycomb - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-subsys-honeycomb - 2.5.0 + 2.5.1-SNAPSHOT tar.gz confset provided @@ -408,17 +408,17 @@ org.commonjava.indy indy-subsys-flatfile - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-subsys-cassandra - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-subsys-cassandra - 2.5.0 + 2.5.1-SNAPSHOT tar.gz confset provided @@ -426,79 +426,79 @@ org.commonjava.indy indy-subsys-infinispan - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-subsys-http - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-subsys-git - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-subsys-groovy - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-subsys-prefetch - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-subsys-cpool - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-client-core-java - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-ftests-common - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-ftests-core - 2.5.0 + 2.5.1-SNAPSHOT test org.commonjava.indy indy-folo-jaxrs - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-ftests-folo - 2.5.0 + 2.5.1-SNAPSHOT test org.commonjava.indy indy-folo-client-java - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-folo-model-java - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-folo-common - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-folo-common - 2.5.0 + 2.5.1-SNAPSHOT tar.gz dataset provided @@ -506,7 +506,7 @@ org.commonjava.indy indy-folo-common - 2.5.0 + 2.5.1-SNAPSHOT tar.gz confset provided @@ -514,33 +514,33 @@ org.commonjava.indy indy-promote-jaxrs - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-ftests-promote - 2.5.0 + 2.5.1-SNAPSHOT test org.commonjava.indy indy-promote-client-java - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-promote-model-java - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-promote-common - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-promote-common - 2.5.0 + 2.5.1-SNAPSHOT tar.gz confset provided @@ -548,7 +548,7 @@ org.commonjava.indy indy-promote-common - 2.5.0 + 2.5.1-SNAPSHOT tar.gz dataset provided @@ -556,19 +556,19 @@ org.commonjava.indy indy-promote-common - 2.5.0 + 2.5.1-SNAPSHOT dataset provided org.commonjava.indy indy-implied-repos-common - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-implied-repos-common - 2.5.0 + 2.5.1-SNAPSHOT tar.gz confset provided @@ -576,37 +576,37 @@ org.commonjava.indy indy-implied-repos-model-java - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-implied-repos-client-java - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-ftests-implied-repos - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy.embed indy-embedder - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy.boot indy-booter-jaxrs - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-subsys-keycloak - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-subsys-keycloak - 2.5.0 + 2.5.1-SNAPSHOT tar.gz confset provided @@ -614,7 +614,7 @@ org.commonjava.indy indy-subsys-infinispan - 2.5.0 + 2.5.1-SNAPSHOT tar.gz confset provided @@ -622,7 +622,7 @@ org.commonjava.indy indy-subsys-prefetch - 2.5.0 + 2.5.1-SNAPSHOT tar.gz confset provided @@ -631,7 +631,7 @@ org.commonjava.indy indy-koji-common - 2.5.0 + 2.5.1-SNAPSHOT tar.gz confset provided @@ -639,103 +639,103 @@ org.commonjava.indy indy-koji-common - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-koji-model-java - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-koji-client-java - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-koji-jaxrs - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-path-mapped-common - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-path-mapped-model-java - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-path-mapped-jaxrs - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-pkg-maven-common - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-pkg-maven-jaxrs - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-pkg-npm-jaxrs - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-ftests-pkg-maven - 2.5.0 + 2.5.1-SNAPSHOT test org.commonjava.indy indy-ftests-pkg-npm - 2.5.0 + 2.5.1-SNAPSHOT test org.commonjava.indy indy-pkg-npm-common - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-pkg-npm-model-java - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-diagnostics-jaxrs - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-diagnostics-client-java - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-diagnostics-common - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-ftests-diagnostics - 2.5.0 + 2.5.1-SNAPSHOT test org.commonjava.indy indy-diagnostics-common - 2.5.0 + 2.5.1-SNAPSHOT confset tar.gz provided @@ -743,28 +743,28 @@ org.commonjava.indy indy-hosted-by-archive-common - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-hosted-by-archive-client-java - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-ftests-hosted-by-archive - 2.5.0 + 2.5.1-SNAPSHOT test org.commonjava.indy indy-hosted-by-archive-jaxrs - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-hosted-by-archive-common - 2.5.0 + 2.5.1-SNAPSHOT confset tar.gz @@ -772,22 +772,22 @@ org.commonjava.indy indy-subsys-metrics-core - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-subsys-metrics-reporter - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-subsys-metrics-prometheus - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-subsys-metrics-reporter - 2.5.0 + 2.5.1-SNAPSHOT confset tar.gz provided @@ -796,28 +796,28 @@ org.commonjava.indy indy-ftests-metrics - 2.5.0 + 2.5.1-SNAPSHOT test org.commonjava.indy indy-sli - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy.rest indy-rest-api yaml - 2.5.0 + 2.5.1-SNAPSHOT provided org.commonjava.indy.rest indy-rest-api json - 2.5.0 + 2.5.1-SNAPSHOT provided @@ -856,33 +856,33 @@ org.commonjava.indy indy-content-browse-common - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-content-browse-jaxrs - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-ftests-content-browse - 2.5.0 + 2.5.1-SNAPSHOT test org.commonjava.indy indy-content-browse-model-java - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-content-browse-client-java - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-content-browse-common - 2.5.0 + 2.5.1-SNAPSHOT confset tar.gz provided @@ -890,35 +890,35 @@ org.commonjava.indy indy-content-browse-ui - 2.5.0 + 2.5.1-SNAPSHOT reactui tar.gz org.commonjava.indy indy-changelog-common - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-changelog-client-java - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-ftests-changelog - 2.5.0 + 2.5.1-SNAPSHOT test org.commonjava.indy indy-changelog-jaxrs - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-changelog-common - 2.5.0 + 2.5.1-SNAPSHOT confset tar.gz @@ -936,12 +936,12 @@ org.commonjava.indy indy-event-audit-common - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-event-audit-common - 2.5.0 + 2.5.1-SNAPSHOT confset tar.gz provided @@ -956,23 +956,23 @@ org.commonjava.indy indy-repo-proxy-common - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-repo-proxy-jaxrs - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy indy-ftests-repo-proxy - 2.5.0 + 2.5.1-SNAPSHOT test org.commonjava.indy indy-repo-proxy-common - 2.5.0 + 2.5.1-SNAPSHOT confset tar.gz diff --git a/rest/api/pom.xml b/rest/api/pom.xml index 77200b4270..7788a22ea4 100644 --- a/rest/api/pom.xml +++ b/rest/api/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.rest indy-rest-parent - 2.5.0 + 2.5.1-SNAPSHOT indy-rest-api diff --git a/rest/pom.xml b/rest/pom.xml index 30b38043c4..74a446ceb4 100644 --- a/rest/pom.xml +++ b/rest/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy.rest diff --git a/subsys/cassandra/pom.xml b/subsys/cassandra/pom.xml index 8c083af871..134001fc77 100644 --- a/subsys/cassandra/pom.xml +++ b/subsys/cassandra/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-subsystems - 2.5.0 + 2.5.1-SNAPSHOT indy-subsys-cassandra diff --git a/subsys/cpool/pom.xml b/subsys/cpool/pom.xml index fa9146a4bb..72c43d0224 100644 --- a/subsys/cpool/pom.xml +++ b/subsys/cpool/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.0 + 2.5.1-SNAPSHOT indy-subsys-cpool diff --git a/subsys/flatfile/pom.xml b/subsys/flatfile/pom.xml index f31c60a3da..bffb78efae 100644 --- a/subsys/flatfile/pom.xml +++ b/subsys/flatfile/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.0 + 2.5.1-SNAPSHOT indy-subsys-flatfile diff --git a/subsys/git/pom.xml b/subsys/git/pom.xml index 23ef8913d0..a3265ca102 100644 --- a/subsys/git/pom.xml +++ b/subsys/git/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.0 + 2.5.1-SNAPSHOT indy-subsys-git diff --git a/subsys/groovy/pom.xml b/subsys/groovy/pom.xml index ff36c4a55f..2184d7783f 100644 --- a/subsys/groovy/pom.xml +++ b/subsys/groovy/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.0 + 2.5.1-SNAPSHOT indy-subsys-groovy diff --git a/subsys/honeycomb/pom.xml b/subsys/honeycomb/pom.xml index 128726621c..b8cce85bb9 100644 --- a/subsys/honeycomb/pom.xml +++ b/subsys/honeycomb/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.5.0 + 2.5.1-SNAPSHOT 4.0.0 diff --git a/subsys/http/pom.xml b/subsys/http/pom.xml index 59dd76141b..47883c2f19 100644 --- a/subsys/http/pom.xml +++ b/subsys/http/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.0 + 2.5.1-SNAPSHOT indy-subsys-http diff --git a/subsys/infinispan/pom.xml b/subsys/infinispan/pom.xml index d402f26692..68ab1ad583 100644 --- a/subsys/infinispan/pom.xml +++ b/subsys/infinispan/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.0 + 2.5.1-SNAPSHOT indy-subsys-infinispan diff --git a/subsys/jaxrs/pom.xml b/subsys/jaxrs/pom.xml index c823db3c00..0492810151 100644 --- a/subsys/jaxrs/pom.xml +++ b/subsys/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.0 + 2.5.1-SNAPSHOT indy-subsys-jaxrs diff --git a/subsys/kafka/pom.xml b/subsys/kafka/pom.xml index 407df13aef..6d30864bfd 100644 --- a/subsys/kafka/pom.xml +++ b/subsys/kafka/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.5.0 + 2.5.1-SNAPSHOT 4.0.0 diff --git a/subsys/keycloak/pom.xml b/subsys/keycloak/pom.xml index d2fc88f00f..84f814b137 100644 --- a/subsys/keycloak/pom.xml +++ b/subsys/keycloak/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.0 + 2.5.1-SNAPSHOT indy-subsys-keycloak Indy :: Subsystems :: Keycloak diff --git a/subsys/metrics/core/pom.xml b/subsys/metrics/core/pom.xml index 0cfaa3a157..e6cb57b07f 100644 --- a/subsys/metrics/core/pom.xml +++ b/subsys/metrics/core/pom.xml @@ -20,7 +20,7 @@ indy-subsys-metrics org.commonjava.indy - 2.5.0 + 2.5.1-SNAPSHOT 4.0.0 diff --git a/subsys/metrics/pom.xml b/subsys/metrics/pom.xml index b02898532c..9f1af6a15a 100644 --- a/subsys/metrics/pom.xml +++ b/subsys/metrics/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.5.0 + 2.5.1-SNAPSHOT 4.0.0 diff --git a/subsys/metrics/prometheus/pom.xml b/subsys/metrics/prometheus/pom.xml index 4f922a1463..6541bdc5ff 100644 --- a/subsys/metrics/prometheus/pom.xml +++ b/subsys/metrics/prometheus/pom.xml @@ -20,7 +20,7 @@ indy-subsys-metrics org.commonjava.indy - 2.5.0 + 2.5.1-SNAPSHOT 4.0.0 diff --git a/subsys/metrics/reporter/pom.xml b/subsys/metrics/reporter/pom.xml index 9c93af87b1..ed9e35b81f 100644 --- a/subsys/metrics/reporter/pom.xml +++ b/subsys/metrics/reporter/pom.xml @@ -20,7 +20,7 @@ indy-subsys-metrics org.commonjava.indy - 2.5.0 + 2.5.1-SNAPSHOT 4.0.0 diff --git a/subsys/pom.xml b/subsys/pom.xml index e851016834..7dc07eaa85 100644 --- a/subsys/pom.xml +++ b/subsys/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.0 + 2.5.1-SNAPSHOT indy-subsystems diff --git a/subsys/prefetch/pom.xml b/subsys/prefetch/pom.xml index 1184a91e5a..baf36af786 100644 --- a/subsys/prefetch/pom.xml +++ b/subsys/prefetch/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.5.0 + 2.5.1-SNAPSHOT 4.0.0 diff --git a/test/db/pom.xml b/test/db/pom.xml index 6919e2407d..f766a232e7 100644 --- a/test/db/pom.xml +++ b/test/db/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.5.0 + 2.5.1-SNAPSHOT indy-test-db diff --git a/test/fixtures-core/pom.xml b/test/fixtures-core/pom.xml index 23f3d660df..cae70f8fc7 100644 --- a/test/fixtures-core/pom.xml +++ b/test/fixtures-core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.5.0 + 2.5.1-SNAPSHOT indy-test-fixtures-core diff --git a/test/pom.xml b/test/pom.xml index b0c4a32d31..609428a0de 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.0 + 2.5.1-SNAPSHOT indy-test diff --git a/test/providers-core/pom.xml b/test/providers-core/pom.xml index 8b1a21da59..7bd0bd67d5 100644 --- a/test/providers-core/pom.xml +++ b/test/providers-core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.5.0 + 2.5.1-SNAPSHOT indy-test-providers-core diff --git a/test/utils/pom.xml b/test/utils/pom.xml index 9678dd256a..becff4c07e 100644 --- a/test/utils/pom.xml +++ b/test/utils/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.5.0 + 2.5.1-SNAPSHOT indy-test-utils diff --git a/tools/assemblies/pom.xml b/tools/assemblies/pom.xml index a49eaa6bc2..b7cca6fdca 100644 --- a/tools/assemblies/pom.xml +++ b/tools/assemblies/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.tools indy-tools - 2.5.0 + 2.5.1-SNAPSHOT indy-assemblies diff --git a/tools/pom.xml b/tools/pom.xml index 1d770d14e6..b24ab6d924 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy.tools diff --git a/uis/layover/pom.xml b/uis/layover/pom.xml index a6ba4d8489..8f4e3b8162 100644 --- a/uis/layover/pom.xml +++ b/uis/layover/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.ui indy-uis - 2.5.0 + 2.5.1-SNAPSHOT indy-ui-layover diff --git a/uis/pom.xml b/uis/pom.xml index d16ef1a9f5..deafb12a35 100644 --- a/uis/pom.xml +++ b/uis/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.0 + 2.5.1-SNAPSHOT org.commonjava.indy.ui From 2bedfec11fb7c22d7c85240a6e9408fe806d726a Mon Sep 17 00:00:00 2001 From: John Casey Date: Tue, 19 Jan 2021 14:55:28 -0600 Subject: [PATCH 30/50] Update maint branch with Indy 2.5.3-SNAPSHOT code (#1836) * Merge o11yphant to master (#1724) * Move metrics/core and honeycomb to o11yphant * Refactor metric reporter module * Implement o11 config * Apply o11 vertical interceptors * Apply o11 flat interceptors * Revert "Add a new flag in RemoteRepository to identify if remote host is a indy instance" Seems this commit will break current repository data store deserilization. As it is not needed now, I'll revert it. This reverts commit c05504b260d0daeea73ef5aec3a840842c9e222b. * Remove metrics/reporter/zabbix * Accommodate the metrics config/interceptor change for o11yphant * Apply o11 MetricsManager * Apply o11 api and remove direct codahale.metric dependency * Rename artifact subsys-metrics-core * Fix import issues * Apply o11 env mappings in config * Update sample conf * Move IndyEventPostProcessor to o11 * Add IndyCassandraConnectionRootSpanFields * fix cpnames * Fix leaked version * Adopt galley/weft/pathmap/kojiji o11 changes * Apply recent o11 changes * Apply o11 GoldenSignals api * Fix test that complains weld unsatisfied dependencies * Fix compile issue due to package name change Co-authored-by: Gang Li * Fix NPE from IndyCassandraConnectionRootSpanFields constructor * Npm schedule: enhance ftest for remote pkg metadata timeout * Add debug to GoldenSignalsFilter * Add honeycomb console transport for debug purpose (#1731) * Add honeycomb console transport for debug purpose * Fix test * Fix test * Move GoldenSignalsFilter to o11 (#1733) * Move GoldenSignalsFilter to o11 * Fix test * Fix test * Update all commons-lang usage to commons-lang3 Seems the commons-lang has been removed from maven central, see https://repo.maven.apache.org/maven2/org/apache/commons/commons-lang/ * Update propulsor to 1.5-SNAPSHOT for http/2 * Add IndyCustomTraceIdProvider to produce same traceId as preferedId (#1740) * Add some missing direct dependencies When I do pure build in my machine, I found these missing direct deps cause build error, so here add them. * Revert propulsorVersion to 1.4 * Update atlas to 1.1.1 * Update license header * Fix a wrong line problem This problem will cause compilation error when after license header formatting, which is caused by the package line removed. * [maven-release-plugin] prepare release indy-parent-2.5.0 * [maven-release-plugin] prepare for next development iteration * Set UndertowOptions.ENABLE_HTTP2 * Add flag for koji server.pem * Cache the group name. * Improved pattern matching processing during promotion. * Fix koji config error message * Add configuration for all durable state * Add content limiting via expiration and eviction for repo-proxy in Indy * fixing REST API generation * Add .gitignore checking for folo lifecycle start As we have dropped the usage of git to manage data dir, and we have switched to use infinispan to manage folo records, I don't think this folo lifecycle action is still needed. But for safety, I just added deprecated, and a .gitignore file existence checking here. * Add remote filter for RepoProxyContentLimiter * Refactor schedule expiration to use ispn query api (#1762) We found that the ScheduleManager.cancel method will trigger the full table scan of the ScheduleCache because of the looping in its stream usage. This caused really bad performance impact on indy-static server. This commit is addressing this problem. It refactor the cache value object from a Map to a pojo which contains that map, and do indexing from ispn level. And then replace the stream looping with ispn query api. * Fix scheduler causing blocked threads * Update SNAPSHOT version for deps path-mapped-storage to 1.8 o11yphant to 1.0 galley to 1.5 kojiji to 2.13 weft to 1.18 * Dump the folo record into zip files in batch ``` dump folo-sealed /folo.zip -i /infinispan.xml -b 100 ``` * Update license header * [maven-release-plugin] prepare release indy-parent-2.5.1 * [maven-release-plugin] prepare for next development iteration * enable filtering of prometheus metrics * ensure o11yphant metrics reporters are initialized, and add a bit more startup-mode info to logs * use o11yphant 1.1 release * Update o11 to 1.2-SNAPSHOT * Fix ScheduleValue Class is non-public or has no public no-arg constructor * Add setters * Do sorting for versions of npm metadata merging * Update o11 to 1.2 * Update license header * [maven-release-plugin] prepare release indy-parent-2.5.2 * use latest o11yphant and express prom-specific node label config (#1831) * Fix missing deps for new o11yphant:1.3-SNAPSHOT * bump version to 2.5.3-SNAPSHOT Co-authored-by: Rui Han Co-authored-by: Gang Li Co-authored-by: Gang Li Co-authored-by: shokakucarrier Co-authored-by: Wenjie Guo Co-authored-by: Jeremy Whiting --- addons/changelog/client-java/pom.xml | 2 +- addons/changelog/common/pom.xml | 2 +- addons/changelog/ftests/pom.xml | 2 +- addons/changelog/jaxrs/pom.xml | 2 +- addons/changelog/pom.xml | 2 +- addons/content-browse/client-java/pom.xml | 2 +- addons/content-browse/common/pom.xml | 2 +- .../browse/ContentBrowseController.java | 4 +- 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 +- .../content/index/ContentIndexActions.java | 2 +- .../index/DefaultContentIndexManager.java | 3 +- .../IndexingContentManagerDecorator.java | 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/event-audit/common/pom.xml | 2 +- addons/event-audit/pom.xml | 2 +- addons/folo/client-java/pom.xml | 2 +- addons/folo/common/pom.xml | 2 +- .../folo/data/FoloLifecycleParticipant.java | 3 +- .../indy/folo/data/FoloRecordCache.java | 5 +- addons/folo/ftests/pom.xml | 2 +- addons/folo/jaxrs/pom.xml | 2 +- .../jaxrs/FoloMavenContentAccessResource.java | 5 +- .../jaxrs/FoloNPMContentAccessResource.java | 5 +- 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 +- .../httprox/handler/ProxyAcceptHandler.java | 30 +- .../httprox/handler/ProxyResponseWriter.java | 34 +- .../indy/httprox/util/HttpConduitWrapper.java | 4 +- .../indy/httprox/util/ProxyMeter.java | 24 +- .../httprox/util/ProxyResponseHelper.java | 39 +- 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 | 4 +- .../indy/koji/conf/IndyKojiConfig.java | 20 +- .../indy/koji/content/KojiBuildAuthority.java | 2 +- .../content/KojiContentManagerDecorator.java | 9 +- .../content/KojiMavenMetadataProvider.java | 6 +- .../data/KojiRemovePemMigrationAction.java | 127 ++++ .../indy/koji/inject/KojijiProvider.java | 4 +- addons/koji/jaxrs/pom.xml | 2 +- addons/koji/model-java/pom.xml | 2 +- addons/koji/pom.xml | 2 +- addons/path-mapped/common/pom.xml | 2 +- addons/path-mapped/jaxrs/pom.xml | 2 +- addons/path-mapped/model-java/pom.xml | 2 +- addons/path-mapped/pom.xml | 2 +- addons/pkg-maven/common/pom.xml | 8 +- ...venContentsFilteringTransferDecorator.java | 10 +- .../maven/content/MavenMetadataGenerator.java | 2 +- .../maven/content/MetadataMergeListener.java | 2 +- ...ContentFilteringTransferDecoratorTest.java | 7 +- 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 +- .../NPMPackageMaskingTransferDecorator.java | 12 +- .../npm/content/NPMStoragePathCalculator.java | 2 +- .../npm/content/PackageMetadataGenerator.java | 17 +- addons/pkg-npm/ftests/pom.xml | 2 +- .../NPMMetadataRevisitTimeoutTest.java | 12 +- .../npm/content/NPMMetadataTimeoutTest.java | 63 +- .../NPMMetadataWithContentTimeoutTest.java | 122 ++++ .../resources/babel-parser-7.0.0-beta.48.json | 51 ++ addons/pkg-npm/jaxrs/pom.xml | 2 +- addons/pkg-npm/model-java/pom.xml | 2 +- .../indy/pkg/npm/model/PackageMetadata.java | 26 +- addons/pkg-npm/pom.xml | 2 +- addons/pom.xml | 2 +- addons/promote/client-java/pom.xml | 2 +- addons/promote/common/pom.xml | 4 +- .../maven-project-version-pattern.groovy | 8 +- .../promote/rules/npm-version-pattern.groovy | 20 +- .../indy/promote/data/PromotionManager.java | 4 +- .../indy/promote/metrics/PathGauges.java | 8 +- .../validate/PromotionValidationTools.java | 4 +- .../promote/validate/PromotionValidator.java | 13 +- .../validate/model/ValidationRequest.java | 54 +- addons/promote/ftests/pom.xml | 2 +- addons/promote/jaxrs/pom.xml | 2 +- addons/promote/model-java/pom.xml | 2 +- .../indy/promote/model/ValidationRuleSet.java | 30 + addons/promote/pom.xml | 2 +- addons/repo-proxy/common/pom.xml | 2 +- .../indy/repo/proxy/RepoProxyController.java | 4 +- .../indy/repo/proxy/conf/RepoProxyConfig.java | 15 + .../proxy/content/RepoProxyCacheProducer.java | 43 ++ .../proxy/content/RepoProxyContentCache.java | 24 +- .../content/RepoProxyContentLimiter.java | 141 ++++ addons/repo-proxy/ftests/pom.xml | 2 +- addons/repo-proxy/jaxrs/pom.xml | 2 +- addons/repo-proxy/pom.xml | 2 +- addons/revisions/common/pom.xml | 2 +- .../indy/revisions/RevisionsManager.java | 5 +- addons/revisions/jaxrs/pom.xml | 2 +- addons/revisions/pom.xml | 2 +- addons/sli/pom.xml | 4 +- .../metrics/GoldenSignalsFunctionMetrics.java | 102 --- .../sli/metrics/GoldenSignalsMetricSet.java | 67 -- .../metrics/IndyGoldenSignalsMetricSet.java | 21 +- ...> IndyGoldenSignalsMetricSetProvider.java} | 18 +- api/pom.xml | 2 +- .../indy/action/IndyLifecycleManager.java | 17 +- .../RequestContextHelper.java | 2 +- bin/test-setup.sh | 2 + bindings/jaxrs/pom.xml | 2 +- .../core/bind/jaxrs/ContentAccessHandler.java | 19 +- .../util/TransferCountingInputStream.java | 17 +- .../jaxrs/util/TransferStreamingOutput.java | 18 +- bindings/pom.xml | 2 +- boot/jaxrs/pom.xml | 2 +- .../indy/boot/jaxrs/IndyDeployer.java | 7 +- boot/pom.xml | 2 +- clients/core-java/pom.xml | 2 +- clients/pom.xml | 2 +- core/pom.xml | 4 +- core/src/main/conf/conf.d/durable-state.conf | 4 + .../core/change/StoreContentListener.java | 2 +- .../core/change/StoreEnablementManager.java | 2 +- .../core/conf/IndyDurableStateConfig.java | 116 ++++ .../indy/core/conf/IndyWeftConfig.java | 5 +- .../AbstractMergedContentGenerator.java | 3 +- .../core/content/ContentGeneratorManager.java | 2 +- .../core/content/DefaultContentManager.java | 2 +- .../content/DefaultDirectContentAccess.java | 2 +- .../core/content/DefaultDownloadManager.java | 4 +- .../indy/core/ctl/ContentController.java | 2 +- .../indy/core/ctl/SchedulerController.java | 20 +- .../indy/core/expire/ScheduleKey.java | 18 +- .../indy/core/expire/ScheduleManager.java | 34 +- .../indy/core/expire/ScheduleValue.java | 84 +++ .../indy/core/expire/StoreKeyMatcher.java | 25 +- .../expire/cache/ScheduleCacheProducer.java | 3 +- .../core/inject/CassandraNotFoundCache.java | 2 +- .../indy/core/inject/IspnNotFoundCache.java | 5 +- .../indy/core/inject/NFCMetricsDecorator.java | 3 +- .../main/resources/default-durable-state.conf | 4 + .../indy/core/expire/ScheduleManagerTest.java | 2 +- ...leyProvider.java => MockTestProvider.java} | 34 +- core/src/test/resources/META-INF/beans.xml | 3 +- db/common/pom.xml | 4 +- .../db/common/AbstractStoreDataManager.java | 2 +- .../db/common/DefaultArtifactStoreQuery.java | 3 +- db/flat/pom.xml | 2 +- db/infinispan/pom.xml | 4 +- .../data/InfinispanStoreDataManager.java | 2 +- db/memory/pom.xml | 4 +- db/metrics/pom.xml | 8 +- ...easuringArtifactStoreQueryInterceptor.java | 4 +- .../indy/db/metered/MeasuringStoreQuery.java | 7 +- db/pom.xml | 2 +- .../org/commonjava/indy/tools/cache/Main.java | 94 ++- .../indy/tools/cache/MigrationOptions.java | 13 + deployments/docker/pom.xml | 2 +- deployments/launcher/pom.xml | 4 +- .../src/main/resources/META-INF/beans.xml | 10 +- deployments/pom.xml | 2 +- deployments/standalone/launcher/pom.xml | 2 +- .../src/main/resources/META-INF/beans.xml | 10 +- deployments/standalone/pom.xml | 2 +- embedder-tests/pom.xml | 2 +- embedder-tests/sonar-report/pom.xml | 8 +- embedder/pom.xml | 22 +- embedder/src/it/resources/logback.xml | 2 +- .../src/main/resources/META-INF/beans.xml | 10 +- embedder/src/test/resources/logback-test.xml | 4 +- filers/default/pom.xml | 4 +- .../def/DefaultGalleyStorageProvider.java | 30 +- .../indy/filer/def/IOLatencyDecorator.java | 3 +- .../indy/filer/def/IndyTimingProvider.java | 6 +- .../indy/filer/def/TimingInputStream.java | 5 +- .../indy/filer/def/TimingOutputStream.java | 6 +- .../metrics/DefaultStoragePathProvider.java | 4 +- filers/pom.xml | 2 +- ftests/common/pom.xml | 2 +- ftests/core/pom.xml | 2 +- ftests/metrics/pom.xml | 70 -- .../indy/ftest/metrics/IndyMetricsTest.java | 93 --- .../ftest/metrics/ZabbixCacheStorageTest.java | 84 --- .../client/IndyMetricsFtestClientModule.java | 75 --- .../ZabbixCacheStorageTestClientModule.java | 52 -- .../metrics/jaxrs/MetricsTestResource.java | 123 ---- .../jaxrs/ZabbixCacheStorageResource.java | 80 --- .../src/main/resources/META-INF/beans.xml | 19 - .../main/resources/default-test-metrics.conf | 77 --- ftests/pom.xml | 3 +- models/core-java/pom.xml | 6 +- models/pom.xml | 2 +- pom.xml | 333 +++++----- rest/api/pom.xml | 2 +- rest/pom.xml | 2 +- subsys/cassandra/pom.xml | 2 +- .../subsys/cassandra/CassandraClient.java | 5 + subsys/cpool/pom.xml | 6 +- .../subsys/cpool/ConnectionPoolProvider.java | 76 +-- subsys/flatfile/pom.xml | 2 +- subsys/git/pom.xml | 2 +- subsys/groovy/pom.xml | 11 +- .../fixture/MockStoragePathProvider.java | 2 +- .../subsys/template/fixture/TestProvider.java | 13 + subsys/honeycomb/pom.xml | 14 +- .../src/main/conf/conf.d/honeycomb.conf | 3 + .../honeycomb/HoneycombContextualizer.java | 105 --- .../subsys/honeycomb/HoneycombFilter.java | 116 ---- .../subsys/honeycomb/HoneycombManager.java | 222 ------- ...IndyCassandraConnectionRootSpanFields.java | 45 ++ ...xt.java => IndyCustomTraceIdProvider.java} | 45 +- .../honeycomb/IndyEventPostProcessor.java | 58 -- .../subsys/honeycomb/IndyTraceSampler.java | 93 --- .../subsys/honeycomb/IndyTracingContext.java | 121 ---- .../config/HoneycombConfiguration.java | 237 ------- .../config/IndyHoneycombConfiguration.java | 212 ++++++ .../HoneycombInterceptorUtils.java | 67 -- .../HoneycombMeasureInterceptor.java | 100 --- .../HoneycombWrapperEndInterceptor.java | 86 --- .../HoneycombWrapperInterceptor.java | 86 --- .../HoneycombWrapperStartInterceptor.java | 82 --- .../src/main/resources/default-honeycomb.conf | 5 + subsys/http/pom.xml | 2 +- subsys/infinispan/pom.xml | 8 +- .../subsys/infinispan/BasicCacheHandle.java | 8 +- .../indy/subsys/infinispan/CacheHandle.java | 4 +- .../indy/subsys/infinispan/CacheProducer.java | 9 +- .../subsys/infinispan/RemoteCacheHandle.java | 6 +- .../metrics/IspnCheckRegistrySet.java | 8 +- .../metrics/IspnRegistrySetProvider.java | 33 +- subsys/jaxrs/pom.xml | 4 +- .../indy/bind/jaxrs/GoldenSignalsFilter.java | 133 ---- .../indy/bind/jaxrs/IndyDeployment.java | 3 +- .../indy/bind/jaxrs/MDCManager.java | 24 +- .../bind/jaxrs/ResourceManagementFilter.java | 25 +- .../indy/bind/jaxrs/ThreadContextFilter.java | 3 +- .../IndyHealthCheckDeploymentProvider.java | 33 +- ...IndyHealthCheckServletContextListener.java | 30 - .../IndyPrometheusDeploymentProvider.java} | 26 +- .../bind/jaxrs/util/DTOStreamingOutput.java | 21 +- .../indy/bind/jaxrs/util/ResponseHelper.java | 12 +- .../indy/bind/jaxrs/util/RestInterceptor.java | 12 +- subsys/kafka/pom.xml | 2 +- subsys/keycloak/pom.xml | 2 +- subsys/metrics/core/pom.xml | 56 -- .../indy/measure/annotation/Measure.java | 32 - .../indy/measure/annotation/MetricNamed.java | 38 -- .../measure/annotation/MetricWrapperEnd.java | 31 - .../annotation/MetricWrapperNamed.java | 32 - .../annotation/MetricWrapperStart.java | 31 - .../indy/metrics/IndyMetricsConstants.java | 79 --- .../indy/metrics/MetricSetProvider.java | 23 - .../exception/IndyMetricsException.java | 36 -- .../metrics/healthcheck/IndyComponentHC.java | 20 - .../healthcheck/IndyCompoundHealthCheck.java | 30 - .../metrics/healthcheck/IndyHealthCheck.java | 34 - .../IndyHealthCheckRegistrySet.java | 82 --- .../healthcheck/impl/DeadlockHealthCheck.java | 36 -- .../healthcheck/impl/HeapHealthCheck.java | 71 --- .../healthcheck/impl/SummaryHealthCheck.java | 83 --- .../metrics/jvm/IndyJVMInstrumentation.java | 59 -- .../metrics/system/StoragePathProvider.java | 23 - .../indy/metrics/system/SystemGaugesSet.java | 123 ---- .../indy/metrics/util/NameUtils.java | 28 - subsys/metrics/pom.xml | 49 +- subsys/metrics/prometheus/pom.xml | 61 -- .../metrics/prometheus/IndySampleBuilder.java | 51 -- .../prometheus/PrometheusDeployment.java | 72 --- subsys/metrics/reporter/pom.xml | 95 --- .../main/conf/conf.d/elasticsearch.properties | 21 - .../src/main/conf/conf.d/metrics.conf | 119 ---- .../indy/metrics/IndyMetricsManager.java | 391 ------------ .../indy/metrics/MetricsConstants.java | 26 - .../indy/metrics/conf/IndyMetricsConfig.java | 575 ----------------- .../jaxrs/interceptor/MetricsInterceptor.java | 143 ----- .../metrics/reporter/ReporterIntializer.java | 214 ------- .../metrics/zabbix/api/IndyZabbixApi.java | 285 --------- .../indy/metrics/zabbix/api/Request.java | 98 --- .../metrics/zabbix/api/RequestBuilder.java | 74 --- .../indy/metrics/zabbix/api/ZabbixApi.java | 46 -- .../zabbix/cache/ZabbixCacheStorage.java | 186 ------ .../metrics/zabbix/reporter/HostUtil.java | 93 --- .../zabbix/reporter/IndyZabbixReporter.java | 339 ---------- .../metrics/zabbix/sender/DataObject.java | 135 ---- .../zabbix/sender/IndyZabbixSender.java | 601 ------------------ .../metrics/zabbix/sender/SenderRequest.java | 120 ---- .../metrics/zabbix/sender/SenderResult.java | 95 --- .../metrics/zabbix/sender/ZabbixSender.java | 193 ------ .../src/main/resources/META-INF/beans.xml | 4 - .../indy/metrics/socket/Capitalizer.java | 123 ---- .../indy/metrics/socket/Expectation.java | 52 -- .../indy/metrics/socket/ZabbixResult.java | 50 -- .../metrics/socket/ZabbixSocketServer.java | 99 --- .../metrics/zabbix/api/ZabbixAPITest.java | 68 -- .../metrics/zabbix/api/ZabbxiAPIHandler.java | 86 --- .../zabbix/sender/ZabbixSenderTest.java | 91 --- .../main/conf/conf.d/elasticsearch.properties | 0 .../src/main/conf/conf.d/metrics.conf | 32 +- .../metrics/IndyMetricsStartupAction.java} | 47 +- .../metrics/IndyTrafficClassifier.java} | 87 +-- .../IndyTrafficClassifierConstants.java} | 18 +- .../IndyTransportMetricConfigProducer.java | 120 ++++ .../metrics/conf/IndyMetricsConfig.java | 424 ++++++++++++ .../src/main/resources/META-INF/beans.xml | 2 +- .../src/main/resources/default-metrics.conf | 32 +- subsys/pom.xml | 2 +- subsys/prefetch/pom.xml | 2 +- test/db/pom.xml | 2 +- test/docker/gogs-test-appliance/pom.xml | 2 +- test/docker/keycloak-test-appliance/pom.xml | 2 +- test/docker/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/app/favicon.ico | Bin 0 -> 1150 bytes uis/layover/pom.xml | 2 +- uis/pom.xml | 2 +- 341 files changed, 2758 insertions(+), 9054 deletions(-) create mode 100644 addons/koji/common/src/main/java/org/commonjava/indy/koji/data/KojiRemovePemMigrationAction.java create mode 100644 addons/pkg-npm/ftests/src/main/java/org/commonjava/indy/pkg/npm/content/NPMMetadataWithContentTimeoutTest.java create mode 100644 addons/pkg-npm/ftests/src/main/resources/babel-parser-7.0.0-beta.48.json create mode 100644 addons/repo-proxy/common/src/main/java/org/commonjava/indy/repo/proxy/content/RepoProxyCacheProducer.java rename subsys/metrics/core/src/main/java/org/commonjava/indy/measure/annotation/MetricWrapper.java => addons/repo-proxy/common/src/main/java/org/commonjava/indy/repo/proxy/content/RepoProxyContentCache.java (62%) create mode 100644 addons/repo-proxy/common/src/main/java/org/commonjava/indy/repo/proxy/content/RepoProxyContentLimiter.java delete mode 100644 addons/sli/src/main/java/org/commonjava/indy/sli/metrics/GoldenSignalsFunctionMetrics.java delete mode 100644 addons/sli/src/main/java/org/commonjava/indy/sli/metrics/GoldenSignalsMetricSet.java rename core/src/test/java/org/commonjava/indy/fixture/MockWeftProvider.java => addons/sli/src/main/java/org/commonjava/indy/sli/metrics/IndyGoldenSignalsMetricSet.java (62%) rename addons/sli/src/main/java/org/commonjava/indy/sli/metrics/{GoldenSignalsMetricSetProvider.java => IndyGoldenSignalsMetricSetProvider.java} (70%) rename api/src/main/java/org/commonjava/indy/{metrics => util}/RequestContextHelper.java (99%) create mode 100644 core/src/main/conf/conf.d/durable-state.conf create mode 100644 core/src/main/java/org/commonjava/indy/core/conf/IndyDurableStateConfig.java create mode 100644 core/src/main/java/org/commonjava/indy/core/expire/ScheduleValue.java create mode 100644 core/src/main/resources/default-durable-state.conf rename core/src/test/java/org/commonjava/indy/fixture/{MockGalleyProvider.java => MockTestProvider.java} (73%) delete mode 100644 ftests/metrics/pom.xml delete mode 100644 ftests/metrics/src/main/java/org/commonjava/indy/ftest/metrics/IndyMetricsTest.java delete mode 100644 ftests/metrics/src/main/java/org/commonjava/indy/ftest/metrics/ZabbixCacheStorageTest.java delete mode 100644 ftests/metrics/src/main/java/org/commonjava/indy/ftest/metrics/client/IndyMetricsFtestClientModule.java delete mode 100644 ftests/metrics/src/main/java/org/commonjava/indy/ftest/metrics/client/ZabbixCacheStorageTestClientModule.java delete mode 100644 ftests/metrics/src/main/java/org/commonjava/indy/ftest/metrics/jaxrs/MetricsTestResource.java delete mode 100644 ftests/metrics/src/main/java/org/commonjava/indy/ftest/metrics/jaxrs/ZabbixCacheStorageResource.java delete mode 100644 ftests/metrics/src/main/resources/META-INF/beans.xml delete mode 100644 ftests/metrics/src/main/resources/default-test-metrics.conf delete mode 100644 subsys/honeycomb/src/main/java/org/commonjava/indy/subsys/honeycomb/HoneycombContextualizer.java delete mode 100644 subsys/honeycomb/src/main/java/org/commonjava/indy/subsys/honeycomb/HoneycombFilter.java delete mode 100644 subsys/honeycomb/src/main/java/org/commonjava/indy/subsys/honeycomb/HoneycombManager.java create mode 100644 subsys/honeycomb/src/main/java/org/commonjava/indy/subsys/honeycomb/IndyCassandraConnectionRootSpanFields.java rename subsys/honeycomb/src/main/java/org/commonjava/indy/subsys/honeycomb/{SpanContext.java => IndyCustomTraceIdProvider.java} (50%) delete mode 100644 subsys/honeycomb/src/main/java/org/commonjava/indy/subsys/honeycomb/IndyEventPostProcessor.java delete mode 100644 subsys/honeycomb/src/main/java/org/commonjava/indy/subsys/honeycomb/IndyTraceSampler.java delete mode 100644 subsys/honeycomb/src/main/java/org/commonjava/indy/subsys/honeycomb/IndyTracingContext.java delete mode 100644 subsys/honeycomb/src/main/java/org/commonjava/indy/subsys/honeycomb/config/HoneycombConfiguration.java create mode 100644 subsys/honeycomb/src/main/java/org/commonjava/indy/subsys/honeycomb/config/IndyHoneycombConfiguration.java delete mode 100644 subsys/honeycomb/src/main/java/org/commonjava/indy/subsys/honeycomb/interceptor/HoneycombInterceptorUtils.java delete mode 100644 subsys/honeycomb/src/main/java/org/commonjava/indy/subsys/honeycomb/interceptor/HoneycombMeasureInterceptor.java delete mode 100644 subsys/honeycomb/src/main/java/org/commonjava/indy/subsys/honeycomb/interceptor/HoneycombWrapperEndInterceptor.java delete mode 100644 subsys/honeycomb/src/main/java/org/commonjava/indy/subsys/honeycomb/interceptor/HoneycombWrapperInterceptor.java delete mode 100644 subsys/honeycomb/src/main/java/org/commonjava/indy/subsys/honeycomb/interceptor/HoneycombWrapperStartInterceptor.java delete mode 100644 subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/GoldenSignalsFilter.java delete mode 100644 subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/metrics/IndyHealthCheckServletContextListener.java rename subsys/{metrics/reporter/src/main/java/org/commonjava/indy/metrics/system/SystemGaugesSetProvider.java => jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/metrics/IndyPrometheusDeploymentProvider.java} (55%) delete mode 100644 subsys/metrics/core/pom.xml delete mode 100644 subsys/metrics/core/src/main/java/org/commonjava/indy/measure/annotation/Measure.java delete mode 100644 subsys/metrics/core/src/main/java/org/commonjava/indy/measure/annotation/MetricNamed.java delete mode 100644 subsys/metrics/core/src/main/java/org/commonjava/indy/measure/annotation/MetricWrapperEnd.java delete mode 100644 subsys/metrics/core/src/main/java/org/commonjava/indy/measure/annotation/MetricWrapperNamed.java delete mode 100644 subsys/metrics/core/src/main/java/org/commonjava/indy/measure/annotation/MetricWrapperStart.java delete mode 100644 subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/IndyMetricsConstants.java delete mode 100644 subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/MetricSetProvider.java delete mode 100644 subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/exception/IndyMetricsException.java delete mode 100644 subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/healthcheck/IndyComponentHC.java delete mode 100644 subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/healthcheck/IndyCompoundHealthCheck.java delete mode 100644 subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/healthcheck/IndyHealthCheck.java delete mode 100644 subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/healthcheck/IndyHealthCheckRegistrySet.java delete mode 100644 subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/healthcheck/impl/DeadlockHealthCheck.java delete mode 100644 subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/healthcheck/impl/HeapHealthCheck.java delete mode 100644 subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/healthcheck/impl/SummaryHealthCheck.java delete mode 100644 subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/jvm/IndyJVMInstrumentation.java delete mode 100644 subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/system/StoragePathProvider.java delete mode 100644 subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/system/SystemGaugesSet.java delete mode 100644 subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/util/NameUtils.java delete mode 100644 subsys/metrics/prometheus/pom.xml delete mode 100644 subsys/metrics/prometheus/src/main/java/org/commonjava/indy/metrics/prometheus/IndySampleBuilder.java delete mode 100644 subsys/metrics/prometheus/src/main/java/org/commonjava/indy/metrics/prometheus/PrometheusDeployment.java delete mode 100644 subsys/metrics/reporter/pom.xml delete mode 100644 subsys/metrics/reporter/src/main/conf/conf.d/elasticsearch.properties delete mode 100644 subsys/metrics/reporter/src/main/conf/conf.d/metrics.conf delete mode 100644 subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/IndyMetricsManager.java delete mode 100644 subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/MetricsConstants.java delete mode 100644 subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/conf/IndyMetricsConfig.java delete mode 100644 subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/jaxrs/interceptor/MetricsInterceptor.java delete mode 100644 subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/reporter/ReporterIntializer.java delete mode 100644 subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/zabbix/api/IndyZabbixApi.java delete mode 100644 subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/zabbix/api/Request.java delete mode 100644 subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/zabbix/api/RequestBuilder.java delete mode 100644 subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/zabbix/api/ZabbixApi.java delete mode 100644 subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/zabbix/cache/ZabbixCacheStorage.java delete mode 100644 subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/zabbix/reporter/HostUtil.java delete mode 100644 subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/zabbix/reporter/IndyZabbixReporter.java delete mode 100644 subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/zabbix/sender/DataObject.java delete mode 100644 subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/zabbix/sender/IndyZabbixSender.java delete mode 100644 subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/zabbix/sender/SenderRequest.java delete mode 100644 subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/zabbix/sender/SenderResult.java delete mode 100644 subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/zabbix/sender/ZabbixSender.java delete mode 100644 subsys/metrics/reporter/src/main/resources/META-INF/beans.xml delete mode 100644 subsys/metrics/reporter/src/test/java/org/commonjava/indy/metrics/socket/Capitalizer.java delete mode 100644 subsys/metrics/reporter/src/test/java/org/commonjava/indy/metrics/socket/Expectation.java delete mode 100644 subsys/metrics/reporter/src/test/java/org/commonjava/indy/metrics/socket/ZabbixResult.java delete mode 100644 subsys/metrics/reporter/src/test/java/org/commonjava/indy/metrics/socket/ZabbixSocketServer.java delete mode 100644 subsys/metrics/reporter/src/test/java/org/commonjava/indy/metrics/zabbix/api/ZabbixAPITest.java delete mode 100644 subsys/metrics/reporter/src/test/java/org/commonjava/indy/metrics/zabbix/api/ZabbxiAPIHandler.java delete mode 100644 subsys/metrics/reporter/src/test/java/org/commonjava/indy/metrics/zabbix/sender/ZabbixSenderTest.java rename subsys/metrics/{core => }/src/main/conf/conf.d/elasticsearch.properties (100%) rename subsys/metrics/{core => }/src/main/conf/conf.d/metrics.conf (68%) rename subsys/metrics/{reporter/src/main/java/org/commonjava/indy/metrics/jaxrs/producer/IndyMetricProducer.java => src/main/java/org/commonjava/indy/subsys/metrics/IndyMetricsStartupAction.java} (55%) rename subsys/metrics/{core/src/main/java/org/commonjava/indy/metrics/TrafficClassifier.java => src/main/java/org/commonjava/indy/subsys/metrics/IndyTrafficClassifier.java} (75%) rename subsys/metrics/{core/src/main/java/org/commonjava/indy/metrics/TrafficClassifierConstants.java => src/main/java/org/commonjava/indy/subsys/metrics/IndyTrafficClassifierConstants.java} (75%) create mode 100644 subsys/metrics/src/main/java/org/commonjava/indy/subsys/metrics/IndyTransportMetricConfigProducer.java create mode 100644 subsys/metrics/src/main/java/org/commonjava/indy/subsys/metrics/conf/IndyMetricsConfig.java rename subsys/metrics/{core => }/src/main/resources/META-INF/beans.xml (76%) rename subsys/metrics/{reporter => }/src/main/resources/default-metrics.conf (68%) create mode 100644 uis/layover/app/favicon.ico diff --git a/addons/changelog/client-java/pom.xml b/addons/changelog/client-java/pom.xml index 981f5a56cc..fccfa6ecea 100644 --- a/addons/changelog/client-java/pom.xml +++ b/addons/changelog/client-java/pom.xml @@ -20,7 +20,7 @@ indy-changelog org.commonjava.indy - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT 4.0.0 diff --git a/addons/changelog/common/pom.xml b/addons/changelog/common/pom.xml index 14118c2030..57d5b3b209 100644 --- a/addons/changelog/common/pom.xml +++ b/addons/changelog/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-changelog-common Indy :: Add-Ons :: ChangeLog :: Common diff --git a/addons/changelog/ftests/pom.xml b/addons/changelog/ftests/pom.xml index d73ae640f0..96c7f39d3b 100644 --- a/addons/changelog/ftests/pom.xml +++ b/addons/changelog/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-ftests-changelog diff --git a/addons/changelog/jaxrs/pom.xml b/addons/changelog/jaxrs/pom.xml index c5ee1725eb..6c79eb16ab 100644 --- a/addons/changelog/jaxrs/pom.xml +++ b/addons/changelog/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-changelog-jaxrs diff --git a/addons/changelog/pom.xml b/addons/changelog/pom.xml index 486ae1f96d..8ae602d314 100644 --- a/addons/changelog/pom.xml +++ b/addons/changelog/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-changelog Indy :: Add-Ons :: ChangeLog :: Parent diff --git a/addons/content-browse/client-java/pom.xml b/addons/content-browse/client-java/pom.xml index f54bb01670..f266cc9edb 100644 --- a/addons/content-browse/client-java/pom.xml +++ b/addons/content-browse/client-java/pom.xml @@ -20,7 +20,7 @@ indy-content-browse org.commonjava.indy - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT 4.0.0 diff --git a/addons/content-browse/common/pom.xml b/addons/content-browse/common/pom.xml index 97a5b1800e..ce4e3f236c 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 - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-content-browse-common Indy :: Add-Ons :: Directory Content Browse :: Common diff --git a/addons/content-browse/common/src/main/java/org/commonjava/indy/content/browse/ContentBrowseController.java b/addons/content-browse/common/src/main/java/org/commonjava/indy/content/browse/ContentBrowseController.java index c3a80d2ece..e4f44a6082 100644 --- a/addons/content-browse/common/src/main/java/org/commonjava/indy/content/browse/ContentBrowseController.java +++ b/addons/content-browse/common/src/main/java/org/commonjava/indy/content/browse/ContentBrowseController.java @@ -21,8 +21,7 @@ import org.commonjava.indy.content.browse.model.ContentBrowseResult; import org.commonjava.indy.data.IndyDataException; import org.commonjava.indy.data.StoreDataManager; -import org.commonjava.indy.measure.annotation.Measure; -import org.commonjava.indy.measure.annotation.MetricNamed; +import org.commonjava.o11yphant.metrics.annotation.Measure; import org.commonjava.indy.model.core.ArtifactStore; import org.commonjava.indy.model.core.StoreKey; import org.commonjava.indy.model.galley.KeyedLocation; @@ -44,7 +43,6 @@ import java.util.Set; import java.util.TreeMap; -import static org.commonjava.indy.measure.annotation.MetricNamed.DEFAULT; import static org.commonjava.maven.galley.util.PathUtils.normalize; import static org.commonjava.maven.galley.util.PathUtils.parentPath; diff --git a/addons/content-browse/ftests/pom.xml b/addons/content-browse/ftests/pom.xml index 645271c9d5..012f84fc22 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 - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-ftests-content-browse diff --git a/addons/content-browse/jaxrs/pom.xml b/addons/content-browse/jaxrs/pom.xml index 035f401528..ae423857d5 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 - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-content-browse-jaxrs diff --git a/addons/content-browse/model-java/pom.xml b/addons/content-browse/model-java/pom.xml index f1531855fc..a7af392084 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 - 2.5.1-SNAPSHOT + 2.5.3-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 db1c71def3..5ff13e35fe 100644 --- a/addons/content-browse/pom.xml +++ b/addons/content-browse/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.1-SNAPSHOT + 2.5.3-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 06961ea94c..66daedc465 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 - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT 4.0.0 diff --git a/addons/content-index/pom.xml b/addons/content-index/pom.xml index b1ec69d16c..c2322d7b31 100644 --- a/addons/content-index/pom.xml +++ b/addons/content-index/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-content-index diff --git a/addons/content-index/src/main/java/org/commonjava/indy/content/index/ContentIndexActions.java b/addons/content-index/src/main/java/org/commonjava/indy/content/index/ContentIndexActions.java index ba33a74815..8999552eb8 100644 --- a/addons/content-index/src/main/java/org/commonjava/indy/content/index/ContentIndexActions.java +++ b/addons/content-index/src/main/java/org/commonjava/indy/content/index/ContentIndexActions.java @@ -18,7 +18,7 @@ import org.commonjava.cdi.util.weft.ThreadContext; import org.commonjava.indy.content.MergedContentAction; import org.commonjava.indy.content.StoreContentAction; -import org.commonjava.indy.measure.annotation.Measure; +import org.commonjava.o11yphant.metrics.annotation.Measure; import org.commonjava.indy.model.core.ArtifactStore; import org.commonjava.indy.model.core.Group; import org.commonjava.indy.model.core.StoreKey; diff --git a/addons/content-index/src/main/java/org/commonjava/indy/content/index/DefaultContentIndexManager.java b/addons/content-index/src/main/java/org/commonjava/indy/content/index/DefaultContentIndexManager.java index 28a4f1e801..34fd59087d 100644 --- a/addons/content-index/src/main/java/org/commonjava/indy/content/index/DefaultContentIndexManager.java +++ b/addons/content-index/src/main/java/org/commonjava/indy/content/index/DefaultContentIndexManager.java @@ -19,11 +19,10 @@ import org.commonjava.indy.action.ShutdownAction; import org.commonjava.indy.content.index.conf.ContentIndexConfig; import org.commonjava.indy.data.StoreDataManager; -import org.commonjava.indy.measure.annotation.Measure; +import org.commonjava.o11yphant.metrics.annotation.Measure; import org.commonjava.indy.model.core.ArtifactStore; import org.commonjava.indy.model.core.Group; import org.commonjava.indy.model.core.StoreKey; -import org.commonjava.indy.subsys.infinispan.BasicCacheHandle; import org.commonjava.indy.subsys.infinispan.CacheHandle; import org.commonjava.indy.util.LocationUtils; import org.commonjava.maven.galley.model.Transfer; diff --git a/addons/content-index/src/main/java/org/commonjava/indy/content/index/IndexingContentManagerDecorator.java b/addons/content-index/src/main/java/org/commonjava/indy/content/index/IndexingContentManagerDecorator.java index 70436bef45..5fb5ba6e10 100644 --- a/addons/content-index/src/main/java/org/commonjava/indy/content/index/IndexingContentManagerDecorator.java +++ b/addons/content-index/src/main/java/org/commonjava/indy/content/index/IndexingContentManagerDecorator.java @@ -21,7 +21,7 @@ import org.commonjava.indy.core.content.PathMaskChecker; import org.commonjava.indy.data.IndyDataException; import org.commonjava.indy.data.StoreDataManager; -import org.commonjava.indy.measure.annotation.Measure; +import org.commonjava.o11yphant.metrics.annotation.Measure; import org.commonjava.indy.model.core.ArtifactStore; import org.commonjava.indy.model.core.Group; import org.commonjava.indy.model.core.HostedRepository; diff --git a/addons/diagnostics/client-java/pom.xml b/addons/diagnostics/client-java/pom.xml index be9a884a5b..c5ede55489 100644 --- a/addons/diagnostics/client-java/pom.xml +++ b/addons/diagnostics/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.5.1-SNAPSHOT + 2.5.3-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 cfa63ac617..aebef84fff 100644 --- a/addons/diagnostics/common/pom.xml +++ b/addons/diagnostics/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.5.1-SNAPSHOT + 2.5.3-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 ba6ffe7337..f3ebf54396 100644 --- a/addons/diagnostics/ftests/pom.xml +++ b/addons/diagnostics/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-ftests-diagnostics diff --git a/addons/diagnostics/jaxrs/pom.xml b/addons/diagnostics/jaxrs/pom.xml index 59d1f42d51..9337e870c6 100644 --- a/addons/diagnostics/jaxrs/pom.xml +++ b/addons/diagnostics/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-diagnostics-jaxrs diff --git a/addons/diagnostics/pom.xml b/addons/diagnostics/pom.xml index 3ceff76a08..9110ded1cd 100644 --- a/addons/diagnostics/pom.xml +++ b/addons/diagnostics/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.1-SNAPSHOT + 2.5.3-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 22d6dabd70..8045a14493 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 - 2.5.1-SNAPSHOT + 2.5.3-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 1f23babe51..ce858ac4af 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 - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-ftests-dot-maven diff --git a/addons/dot-maven/jaxrs/pom.xml b/addons/dot-maven/jaxrs/pom.xml index fc38de3e8d..e83c3af8d1 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 - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-dot-maven-jaxrs diff --git a/addons/dot-maven/pom.xml b/addons/dot-maven/pom.xml index 192b76237a..d032b641d9 100644 --- a/addons/dot-maven/pom.xml +++ b/addons/dot-maven/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-dot-maven diff --git a/addons/event-audit/common/pom.xml b/addons/event-audit/common/pom.xml index 783789a8f2..03dc6ea910 100644 --- a/addons/event-audit/common/pom.xml +++ b/addons/event-audit/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-event-audit - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-event-audit-common diff --git a/addons/event-audit/pom.xml b/addons/event-audit/pom.xml index 2eb6ee331a..b3575aa795 100644 --- a/addons/event-audit/pom.xml +++ b/addons/event-audit/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-event-audit diff --git a/addons/folo/client-java/pom.xml b/addons/folo/client-java/pom.xml index 3b3a7a8f38..44424706cb 100644 --- a/addons/folo/client-java/pom.xml +++ b/addons/folo/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.5.1-SNAPSHOT + 2.5.3-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 382332d2d1..07a797e179 100644 --- a/addons/folo/common/pom.xml +++ b/addons/folo/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-folo-common Indy :: Add-Ons :: Folo Usage Tracker :: Common diff --git a/addons/folo/common/src/main/java/org/commonjava/indy/folo/data/FoloLifecycleParticipant.java b/addons/folo/common/src/main/java/org/commonjava/indy/folo/data/FoloLifecycleParticipant.java index c2b44828d6..9369dc9324 100644 --- a/addons/folo/common/src/main/java/org/commonjava/indy/folo/data/FoloLifecycleParticipant.java +++ b/addons/folo/common/src/main/java/org/commonjava/indy/folo/data/FoloLifecycleParticipant.java @@ -29,6 +29,7 @@ import org.commonjava.indy.subsys.datafile.DataFileManager; @Named +@Deprecated public class FoloLifecycleParticipant implements StartupAction { @@ -69,7 +70,7 @@ public void start() { final DataFile dataFile = dataFileManager.getDataFile( ".gitignore" ); final List lines = dataFile.exists() ? dataFile.readLines() : new ArrayList(); - if ( !lines.contains( FOLO_DIRECTORY_IGNORE ) ) + if ( dataFile.exists() && !lines.contains( FOLO_DIRECTORY_IGNORE ) ) { lines.add( FOLO_DIRECTORY_IGNORE ); diff --git a/addons/folo/common/src/main/java/org/commonjava/indy/folo/data/FoloRecordCache.java b/addons/folo/common/src/main/java/org/commonjava/indy/folo/data/FoloRecordCache.java index 33223c46d6..fd20d7ce11 100644 --- a/addons/folo/common/src/main/java/org/commonjava/indy/folo/data/FoloRecordCache.java +++ b/addons/folo/common/src/main/java/org/commonjava/indy/folo/data/FoloRecordCache.java @@ -22,8 +22,7 @@ import org.commonjava.indy.folo.model.TrackedContent; import org.commonjava.indy.folo.model.TrackedContentEntry; import org.commonjava.indy.folo.model.TrackingKey; -import org.commonjava.indy.measure.annotation.Measure; -import org.commonjava.indy.measure.annotation.MetricNamed; +import org.commonjava.o11yphant.metrics.annotation.Measure; import org.commonjava.indy.subsys.infinispan.CacheHandle; import org.infinispan.Cache; import org.infinispan.commons.api.BasicCache; @@ -43,8 +42,6 @@ import java.util.function.BiFunction; import java.util.stream.Collectors; -import static org.commonjava.indy.measure.annotation.MetricNamed.DEFAULT; - @ApplicationScoped public class FoloRecordCache { diff --git a/addons/folo/ftests/pom.xml b/addons/folo/ftests/pom.xml index aafd212f60..3fc7b8391b 100644 --- a/addons/folo/ftests/pom.xml +++ b/addons/folo/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-ftests-folo diff --git a/addons/folo/jaxrs/pom.xml b/addons/folo/jaxrs/pom.xml index 83a4e1b243..e9eee682f4 100644 --- a/addons/folo/jaxrs/pom.xml +++ b/addons/folo/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-folo-jaxrs diff --git a/addons/folo/jaxrs/src/main/java/org/commonjava/indy/folo/bind/jaxrs/FoloMavenContentAccessResource.java b/addons/folo/jaxrs/src/main/java/org/commonjava/indy/folo/bind/jaxrs/FoloMavenContentAccessResource.java index 1129d1d1ea..251858ee80 100644 --- a/addons/folo/jaxrs/src/main/java/org/commonjava/indy/folo/bind/jaxrs/FoloMavenContentAccessResource.java +++ b/addons/folo/jaxrs/src/main/java/org/commonjava/indy/folo/bind/jaxrs/FoloMavenContentAccessResource.java @@ -26,12 +26,11 @@ import org.commonjava.indy.core.bind.jaxrs.ContentAccessHandler; import org.commonjava.indy.core.bind.jaxrs.util.RequestUtils; import org.commonjava.indy.folo.model.TrackingKey; -import org.commonjava.indy.metrics.RequestContextHelper; +import org.commonjava.indy.util.RequestContextHelper; import org.commonjava.indy.model.core.AccessChannel; import org.commonjava.maven.galley.event.EventMetadata; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.commonjava.indy.metrics.RequestContextHelper; import javax.inject.Inject; import javax.servlet.http.HttpServletRequest; @@ -47,7 +46,7 @@ import javax.ws.rs.core.UriInfo; import static org.commonjava.indy.IndyContentConstants.CHECK_CACHE_ONLY; -import static org.commonjava.indy.metrics.RequestContextHelper.CONTENT_TRACKING_ID; +import static org.commonjava.indy.util.RequestContextHelper.CONTENT_TRACKING_ID; import static org.commonjava.indy.folo.ctl.FoloConstants.ACCESS_CHANNEL; import static org.commonjava.indy.folo.ctl.FoloConstants.TRACKING_KEY; import static org.commonjava.indy.pkg.PackageTypeConstants.PKG_TYPE_MAVEN; diff --git a/addons/folo/jaxrs/src/main/java/org/commonjava/indy/folo/bind/jaxrs/FoloNPMContentAccessResource.java b/addons/folo/jaxrs/src/main/java/org/commonjava/indy/folo/bind/jaxrs/FoloNPMContentAccessResource.java index 6ffc21dc88..f491b9a060 100644 --- a/addons/folo/jaxrs/src/main/java/org/commonjava/indy/folo/bind/jaxrs/FoloNPMContentAccessResource.java +++ b/addons/folo/jaxrs/src/main/java/org/commonjava/indy/folo/bind/jaxrs/FoloNPMContentAccessResource.java @@ -25,14 +25,13 @@ import org.commonjava.indy.bind.jaxrs.util.REST; import org.commonjava.indy.core.bind.jaxrs.util.RequestUtils; import org.commonjava.indy.folo.model.TrackingKey; -import org.commonjava.indy.metrics.RequestContextHelper; +import org.commonjava.indy.util.RequestContextHelper; import org.commonjava.indy.model.core.AccessChannel; import org.commonjava.indy.pkg.npm.inject.NPMContentHandler; import org.commonjava.indy.pkg.npm.jaxrs.NPMContentAccessHandler; import org.commonjava.maven.galley.event.EventMetadata; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.commonjava.indy.metrics.RequestContextHelper; import javax.inject.Inject; import javax.servlet.http.HttpServletRequest; @@ -49,7 +48,7 @@ import java.nio.file.Paths; import static org.commonjava.indy.IndyContentConstants.CHECK_CACHE_ONLY; -import static org.commonjava.indy.metrics.RequestContextHelper.CONTENT_TRACKING_ID; +import static org.commonjava.indy.util.RequestContextHelper.CONTENT_TRACKING_ID; import static org.commonjava.indy.folo.ctl.FoloConstants.ACCESS_CHANNEL; import static org.commonjava.indy.folo.ctl.FoloConstants.TRACKING_KEY; import static org.commonjava.indy.pkg.PackageTypeConstants.PKG_TYPE_NPM; diff --git a/addons/folo/model-java/pom.xml b/addons/folo/model-java/pom.xml index 97dc26cdc6..9302df6fc9 100644 --- a/addons/folo/model-java/pom.xml +++ b/addons/folo/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.5.1-SNAPSHOT + 2.5.3-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 13288dd558..65a989cf91 100644 --- a/addons/folo/pom.xml +++ b/addons/folo/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.1-SNAPSHOT + 2.5.3-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 a4b2fc3323..f393f99240 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 - 2.5.1-SNAPSHOT + 2.5.3-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 d2cc25ed0e..5fc39b61c8 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 - 2.5.1-SNAPSHOT + 2.5.3-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 d419de2044..52573d66cf 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 - 2.5.1-SNAPSHOT + 2.5.3-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 0a495b37de..a05f372309 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 - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-hosted-by-archive-jaxrs diff --git a/addons/hosted-by-archive/pom.xml b/addons/hosted-by-archive/pom.xml index 585b4818ca..1e941e0413 100644 --- a/addons/hosted-by-archive/pom.xml +++ b/addons/hosted-by-archive/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.1-SNAPSHOT + 2.5.3-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 c0d0658918..2c1406629e 100644 --- a/addons/httprox/common/pom.xml +++ b/addons/httprox/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-httprox-common Indy :: Add-Ons :: HTTProx (HTTP Proxy) :: Common Core diff --git a/addons/httprox/common/src/main/java/org/commonjava/indy/httprox/handler/ProxyAcceptHandler.java b/addons/httprox/common/src/main/java/org/commonjava/indy/httprox/handler/ProxyAcceptHandler.java index 9c89c77980..c071989ce7 100644 --- a/addons/httprox/common/src/main/java/org/commonjava/indy/httprox/handler/ProxyAcceptHandler.java +++ b/addons/httprox/common/src/main/java/org/commonjava/indy/httprox/handler/ProxyAcceptHandler.java @@ -15,24 +15,20 @@ */ package org.commonjava.indy.httprox.handler; -import com.codahale.metrics.MetricRegistry; - -import org.commonjava.cdi.util.weft.ExecutorConfig; -import org.commonjava.cdi.util.weft.WeftExecutorService; -import org.commonjava.cdi.util.weft.WeftManaged; import org.commonjava.indy.bind.jaxrs.MDCManager; -import org.commonjava.indy.metrics.RequestContextHelper; +import org.commonjava.indy.util.RequestContextHelper; import org.commonjava.indy.core.ctl.ContentController; import org.commonjava.indy.data.StoreDataManager; import org.commonjava.indy.httprox.conf.HttproxConfig; import org.commonjava.indy.httprox.keycloak.KeycloakProxyAuthenticator; -import org.commonjava.indy.metrics.conf.IndyMetricsConfig; +import org.commonjava.indy.subsys.metrics.conf.IndyMetricsConfig; import org.commonjava.indy.model.core.AccessChannel; -import org.commonjava.indy.sli.metrics.GoldenSignalsMetricSet; +import org.commonjava.indy.sli.metrics.IndyGoldenSignalsMetricSet; import org.commonjava.indy.subsys.infinispan.CacheProducer; import org.commonjava.indy.subsys.template.IndyGroovyException; import org.commonjava.indy.subsys.template.ScriptEngine; import org.commonjava.maven.galley.spi.cache.CacheProvider; +import org.commonjava.o11yphant.metrics.MetricsManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.xnio.ChannelListener; @@ -44,10 +40,10 @@ import javax.inject.Inject; import java.io.IOException; -import static org.commonjava.indy.metrics.RequestContextHelper.PACKAGE_TYPE; -import static org.commonjava.indy.metrics.RequestContextHelper.REQUEST_PHASE; -import static org.commonjava.indy.metrics.RequestContextHelper.REQUEST_PHASE_START; -import static org.commonjava.indy.metrics.RequestContextHelper.setContext; +import static org.commonjava.indy.util.RequestContextHelper.PACKAGE_TYPE; +import static org.commonjava.indy.util.RequestContextHelper.REQUEST_PHASE; +import static org.commonjava.indy.util.RequestContextHelper.REQUEST_PHASE_START; +import static org.commonjava.indy.util.RequestContextHelper.setContext; import static org.commonjava.indy.httprox.util.HttpProxyConstants.PROXY_METRIC_LOGGER; import static org.commonjava.indy.pkg.PackageTypeConstants.PKG_TYPE_GENERIC_HTTP; @@ -83,7 +79,7 @@ public class ProxyAcceptHandler private MDCManager mdcManager; @Inject - MetricRegistry metricRegistry; + private MetricsManager metricsManager; @Inject private IndyMetricsConfig metricsConfig; @@ -92,7 +88,7 @@ public class ProxyAcceptHandler private CacheProducer cacheProducer; @Inject - private GoldenSignalsMetricSet sliMetricSet; + private IndyGoldenSignalsMetricSet sliMetricSet; @Inject private ProxyTransfersExecutor proxyExecutor; @@ -104,7 +100,7 @@ protected ProxyAcceptHandler() public ProxyAcceptHandler( HttproxConfig config, StoreDataManager storeManager, ContentController contentController, KeycloakProxyAuthenticator proxyAuthenticator, CacheProvider cacheProvider, ScriptEngine scriptEngine, MDCManager mdcManager, - IndyMetricsConfig metricsConfig, MetricRegistry metricRegistry, + IndyMetricsConfig metricsConfig, MetricsManager metricsManager, CacheProducer cacheProducer, ProxyTransfersExecutor executor ) { this.config = config; @@ -115,7 +111,7 @@ public ProxyAcceptHandler( HttproxConfig config, StoreDataManager storeManager, this.scriptEngine = scriptEngine; this.mdcManager = mdcManager; this.metricsConfig = metricsConfig; - this.metricRegistry = metricRegistry; + this.metricsManager = metricsManager; this.cacheProducer = cacheProducer; this.proxyExecutor = executor; } @@ -179,7 +175,7 @@ public void handleEvent( AcceptingChannel channel ) final ProxyResponseWriter writer = new ProxyResponseWriter( config, storeManager, contentController, proxyAuthenticator, cacheProvider, mdcManager, creator, accepted, - metricsConfig, metricRegistry, sliMetricSet, cacheProducer, start, + metricsConfig, metricsManager, sliMetricSet, cacheProducer, start, proxyExecutor.getExecutor() ); logger.debug( "Setting writer: {}", writer ); diff --git a/addons/httprox/common/src/main/java/org/commonjava/indy/httprox/handler/ProxyResponseWriter.java b/addons/httprox/common/src/main/java/org/commonjava/indy/httprox/handler/ProxyResponseWriter.java index 899aee266e..f63ffc0925 100644 --- a/addons/httprox/common/src/main/java/org/commonjava/indy/httprox/handler/ProxyResponseWriter.java +++ b/addons/httprox/common/src/main/java/org/commonjava/indy/httprox/handler/ProxyResponseWriter.java @@ -15,14 +15,12 @@ */ package org.commonjava.indy.httprox.handler; -import com.codahale.metrics.MetricRegistry; -import com.codahale.metrics.Timer; import org.apache.commons.lang3.ClassUtils; import org.apache.http.HttpRequest; import org.apache.http.RequestLine; import org.commonjava.indy.IndyWorkflowException; import org.commonjava.indy.bind.jaxrs.MDCManager; -import org.commonjava.indy.metrics.RequestContextHelper; +import org.commonjava.indy.util.RequestContextHelper; import org.commonjava.indy.core.ctl.ContentController; import org.commonjava.indy.data.IndyDataException; import org.commonjava.indy.data.StoreDataManager; @@ -33,9 +31,9 @@ import org.commonjava.indy.httprox.util.HttpConduitWrapper; import org.commonjava.indy.httprox.util.ProxyMeter; import org.commonjava.indy.httprox.util.ProxyResponseHelper; -import org.commonjava.indy.metrics.conf.IndyMetricsConfig; +import org.commonjava.indy.subsys.metrics.conf.IndyMetricsConfig; import org.commonjava.indy.model.core.ArtifactStore; -import org.commonjava.indy.sli.metrics.GoldenSignalsMetricSet; +import org.commonjava.indy.sli.metrics.IndyGoldenSignalsMetricSet; import org.commonjava.indy.subsys.http.HttpWrapper; import org.commonjava.indy.subsys.http.util.UserPass; import org.commonjava.indy.subsys.infinispan.CacheHandle; @@ -43,6 +41,8 @@ import org.commonjava.indy.util.ApplicationHeader; import org.commonjava.indy.util.ApplicationStatus; import org.commonjava.maven.galley.spi.cache.CacheProvider; +import org.commonjava.o11yphant.metrics.api.Timer; +import org.commonjava.o11yphant.metrics.MetricsManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.xnio.ChannelListener; @@ -54,19 +54,12 @@ import java.net.SocketAddress; import java.net.URL; import java.nio.channels.SocketChannel; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import javax.inject.Inject; - import org.commonjava.cdi.util.weft.WeftExecutorService; -import static com.codahale.metrics.MetricRegistry.name; import static java.lang.Integer.parseInt; import static org.apache.commons.codec.digest.DigestUtils.sha256Hex; -import static org.commonjava.indy.metrics.RequestContextHelper.getContext; import static org.commonjava.indy.httprox.util.HttpProxyConstants.ALLOW_HEADER_VALUE; import static org.commonjava.indy.httprox.util.HttpProxyConstants.CONNECT_METHOD; import static org.commonjava.indy.httprox.util.HttpProxyConstants.GET_METHOD; @@ -77,6 +70,7 @@ import static org.commonjava.indy.subsys.http.util.UserPass.parse; import static org.commonjava.indy.util.ApplicationHeader.proxy_authenticate; import static org.commonjava.indy.util.ApplicationStatus.PROXY_AUTHENTICATION_REQUIRED; +import static org.commonjava.o11yphant.metrics.util.NameUtils.name; public final class ProxyResponseWriter implements ChannelListener @@ -118,9 +112,9 @@ public final class ProxyResponseWriter private final MDCManager mdcManager; - private final MetricRegistry metricRegistry; + private final MetricsManager metricManager; - private GoldenSignalsMetricSet sliMetricSet; + private IndyGoldenSignalsMetricSet sliMetricSet; private long startNanos; @@ -139,7 +133,7 @@ public ProxyResponseWriter( final HttproxConfig config, final StoreDataManager s final KeycloakProxyAuthenticator proxyAuthenticator, final CacheProvider cacheProvider, final MDCManager mdcManager, final ProxyRepositoryCreator repoCreator, final StreamConnection accepted, final IndyMetricsConfig metricsConfig, - final MetricRegistry metricRegistry, final GoldenSignalsMetricSet sliMetricSet, + final MetricsManager metricManager, final IndyGoldenSignalsMetricSet sliMetricSet, final CacheProducer cacheProducer, final long start, final WeftExecutorService executor ) { @@ -153,7 +147,7 @@ public ProxyResponseWriter( final HttproxConfig config, final StoreDataManager s this.peerAddress = accepted.getPeerAddress(); this.sourceChannel = accepted.getSourceChannel(); this.metricsConfig = metricsConfig; - this.metricRegistry = metricRegistry; + this.metricManager = metricManager; this.sliMetricSet = sliMetricSet; startNanos = start; this.cls = ClassUtils.getAbbreviatedName( getClass().getName(), 1 ); // e.g., foo.bar.ClassA -> f.b.ClassA @@ -169,14 +163,14 @@ public void setProxyRequestReader( ProxyRequestReader proxyRequestReader ) @Override public void handleEvent( final ConduitStreamSinkChannel channel ) { - if ( metricsConfig == null || metricRegistry == null ) + if ( metricsConfig == null || metricManager == null ) { doHandleEvent( channel ); return; } - Timer timer = metricRegistry.timer( name( metricsConfig.getNodePrefix(), cls, "handleEvent" ) ); - Timer.Context timerContext = timer.time(); + Timer.Context timerContext = + metricManager.startTimer( name( metricsConfig.getNodePrefix(), cls, "handleEvent" ) ); try { doHandleEvent( channel ); @@ -243,7 +237,7 @@ private void doHandleEvent( final ConduitStreamSinkChannel sinkChannel ) { ProxyResponseHelper proxyResponseHelper = new ProxyResponseHelper( httpRequest, config, contentController, repoCreator, storeManager, - metricsConfig, metricRegistry, cls ); + metricsConfig, metricManager, cls ); try { if ( repoCreator == null ) diff --git a/addons/httprox/common/src/main/java/org/commonjava/indy/httprox/util/HttpConduitWrapper.java b/addons/httprox/common/src/main/java/org/commonjava/indy/httprox/util/HttpConduitWrapper.java index 0c53bb00b6..709dc1c4ca 100644 --- a/addons/httprox/common/src/main/java/org/commonjava/indy/httprox/util/HttpConduitWrapper.java +++ b/addons/httprox/common/src/main/java/org/commonjava/indy/httprox/util/HttpConduitWrapper.java @@ -39,8 +39,8 @@ import java.util.List; import java.util.Map; -import static org.commonjava.indy.metrics.RequestContextHelper.HTTP_STATUS; -import static org.commonjava.indy.metrics.RequestContextHelper.setContext; +import static org.commonjava.indy.util.RequestContextHelper.HTTP_STATUS; +import static org.commonjava.indy.util.RequestContextHelper.setContext; import static org.commonjava.indy.httprox.util.ChannelUtils.DEFAULT_READ_BUF_SIZE; import static org.commonjava.indy.httprox.util.ChannelUtils.flush; import static org.commonjava.indy.httprox.util.ChannelUtils.write; diff --git a/addons/httprox/common/src/main/java/org/commonjava/indy/httprox/util/ProxyMeter.java b/addons/httprox/common/src/main/java/org/commonjava/indy/httprox/util/ProxyMeter.java index 942c557bcf..eebdfca78e 100644 --- a/addons/httprox/common/src/main/java/org/commonjava/indy/httprox/util/ProxyMeter.java +++ b/addons/httprox/common/src/main/java/org/commonjava/indy/httprox/util/ProxyMeter.java @@ -15,21 +15,21 @@ */ package org.commonjava.indy.httprox.util; -import org.commonjava.indy.sli.metrics.GoldenSignalsMetricSet; +import org.commonjava.indy.sli.metrics.IndyGoldenSignalsMetricSet; import org.slf4j.Logger; -import org.commonjava.indy.metrics.RequestContextHelper; +import org.commonjava.indy.util.RequestContextHelper; import java.net.SocketAddress; import static java.lang.Integer.parseInt; -import static org.commonjava.indy.metrics.RequestContextHelper.HTTP_METHOD; -import static org.commonjava.indy.metrics.RequestContextHelper.HTTP_STATUS; -import static org.commonjava.indy.metrics.RequestContextHelper.REQUEST_LATENCY_NS; -import static org.commonjava.indy.metrics.RequestContextHelper.REQUEST_PHASE; -import static org.commonjava.indy.metrics.RequestContextHelper.REQUEST_PHASE_END; -import static org.commonjava.indy.metrics.RequestContextHelper.getContext; -import static org.commonjava.indy.metrics.RequestContextHelper.setContext; -import static org.commonjava.indy.metrics.TrafficClassifierConstants.FN_CONTENT_GENERIC; +import static org.commonjava.indy.util.RequestContextHelper.HTTP_METHOD; +import static org.commonjava.indy.util.RequestContextHelper.HTTP_STATUS; +import static org.commonjava.indy.util.RequestContextHelper.REQUEST_LATENCY_NS; +import static org.commonjava.indy.util.RequestContextHelper.REQUEST_PHASE; +import static org.commonjava.indy.util.RequestContextHelper.REQUEST_PHASE_END; +import static org.commonjava.indy.util.RequestContextHelper.getContext; +import static org.commonjava.indy.util.RequestContextHelper.setContext; +import static org.commonjava.indy.subsys.metrics.IndyTrafficClassifierConstants.FN_CONTENT_GENERIC; public class ProxyMeter { @@ -41,13 +41,13 @@ public class ProxyMeter private final long startNanos; - private final GoldenSignalsMetricSet sliMetricSet; + private final IndyGoldenSignalsMetricSet sliMetricSet; private final Logger restLogger; private final SocketAddress peerAddress; - public ProxyMeter( final String method, final String requestLine, final long startNanos, final GoldenSignalsMetricSet sliMetricSet, final Logger restLogger, + public ProxyMeter( final String method, final String requestLine, final long startNanos, final IndyGoldenSignalsMetricSet sliMetricSet, final Logger restLogger, final SocketAddress peerAddress ) { this.method = method; diff --git a/addons/httprox/common/src/main/java/org/commonjava/indy/httprox/util/ProxyResponseHelper.java b/addons/httprox/common/src/main/java/org/commonjava/indy/httprox/util/ProxyResponseHelper.java index 227fe1d7f8..b2e4bffc78 100644 --- a/addons/httprox/common/src/main/java/org/commonjava/indy/httprox/util/ProxyResponseHelper.java +++ b/addons/httprox/common/src/main/java/org/commonjava/indy/httprox/util/ProxyResponseHelper.java @@ -15,8 +15,6 @@ */ package org.commonjava.indy.httprox.util; -import com.codahale.metrics.MetricRegistry; -import com.codahale.metrics.Timer; import org.apache.commons.lang3.StringUtils; import org.apache.http.HttpRequest; import org.commonjava.indy.IndyWorkflowException; @@ -31,7 +29,7 @@ import org.commonjava.indy.httprox.handler.AbstractProxyRepositoryCreator; import org.commonjava.indy.httprox.handler.ProxyCreationResult; import org.commonjava.indy.httprox.handler.ProxyRepositoryCreator; -import org.commonjava.indy.metrics.conf.IndyMetricsConfig; +import org.commonjava.indy.subsys.metrics.conf.IndyMetricsConfig; import org.commonjava.indy.model.core.AccessChannel; import org.commonjava.indy.model.core.ArtifactStore; import org.commonjava.indy.model.core.Group; @@ -45,6 +43,8 @@ import org.commonjava.maven.galley.TransferException; import org.commonjava.maven.galley.event.EventMetadata; import org.commonjava.maven.galley.model.Transfer; +import org.commonjava.o11yphant.metrics.api.Timer; +import org.commonjava.o11yphant.metrics.MetricsManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -54,17 +54,15 @@ import java.util.function.Predicate; import java.util.stream.Collectors; -import static com.codahale.metrics.MetricRegistry.name; -import static java.lang.Integer.parseInt; -import static org.commonjava.indy.metrics.RequestContextHelper.CONTENT_ENTRY_POINT; -import static org.commonjava.indy.metrics.RequestContextHelper.METADATA_CONTENT; -import static org.commonjava.indy.metrics.RequestContextHelper.PACKAGE_TYPE; -import static org.commonjava.indy.metrics.RequestContextHelper.PATH; -import static org.commonjava.indy.metrics.RequestContextHelper.getContext; -import static org.commonjava.indy.metrics.RequestContextHelper.setContext; +import static org.commonjava.indy.util.RequestContextHelper.CONTENT_ENTRY_POINT; +import static org.commonjava.indy.util.RequestContextHelper.METADATA_CONTENT; +import static org.commonjava.indy.util.RequestContextHelper.PACKAGE_TYPE; +import static org.commonjava.indy.util.RequestContextHelper.PATH; +import static org.commonjava.indy.util.RequestContextHelper.setContext; import static org.commonjava.indy.model.core.ArtifactStore.TRACKING_ID; import static org.commonjava.indy.model.core.GenericPackageTypeDescriptor.GENERIC_PKG_KEY; import static org.commonjava.maven.galley.io.SpecialPathConstants.PKG_TYPE_GENERIC_HTTP; +import static org.commonjava.o11yphant.metrics.util.NameUtils.name; /** * Created by ruhan on 9/20/18. @@ -83,7 +81,7 @@ public class ProxyResponseHelper private final IndyMetricsConfig metricsConfig; - private final MetricRegistry metricRegistry; + private final MetricsManager metricsManager; private final String cls; @@ -94,7 +92,8 @@ public class ProxyResponseHelper private boolean transferred; public ProxyResponseHelper( HttpRequest httpRequest, HttproxConfig config, ContentController contentController, - ProxyRepositoryCreator repoCreator, StoreDataManager storeManager, IndyMetricsConfig metricsConfig, MetricRegistry metricRegistry, String cls ) + ProxyRepositoryCreator repoCreator, StoreDataManager storeManager, + IndyMetricsConfig metricsConfig, MetricsManager metricsManager, String cls ) { this.httpRequest = httpRequest; this.config = config; @@ -102,7 +101,7 @@ public ProxyResponseHelper( HttpRequest httpRequest, HttproxConfig config, Conte this.repoCreator = repoCreator; this.storeManager = storeManager; this.metricsConfig = metricsConfig; - this.metricRegistry = metricRegistry; + this.metricsManager = metricsManager; this.cls = cls; } @@ -110,15 +109,15 @@ public ArtifactStore getArtifactStore( String trackingId, final URL url ) throws IndyDataException { ArtifactStore store = null; - if ( metricsConfig == null || metricRegistry == null ) + if ( metricsConfig == null || metricsManager == null ) { store = doGetArtifactStore( trackingId, url ); } if ( store == null ) { - Timer timer = metricRegistry.timer( name( metricsConfig.getNodePrefix(), cls, "getArtifactStore" ) ); - Timer.Context timerContext = timer.time(); + Timer.Context timerContext = + metricsManager.startTimer( name( metricsConfig.getNodePrefix(), cls, "getArtifactStore" ) ); try { store = doGetArtifactStore( trackingId, url ); @@ -295,14 +294,14 @@ public void transfer( final HttpConduitWrapper http, final ArtifactStore store, setContext( PATH, path ); setContext( METADATA_CONTENT, Boolean.toString( false ) ); - if ( metricsConfig == null || metricRegistry == null ) + if ( metricsConfig == null || metricsManager == null ) { doTransfer( http, store, path, writeBody, proxyUserPass, meter ); return; } - Timer timer = metricRegistry.timer( name( metricsConfig.getNodePrefix(), cls, "transfer" ) ); - Timer.Context timerContext = timer.time(); + Timer.Context timerContext = + metricsManager.startTimer( name( metricsConfig.getNodePrefix(), cls, "transfer" ) ); try { doTransfer( http, store, path, writeBody, proxyUserPass, meter ); diff --git a/addons/httprox/ftests/pom.xml b/addons/httprox/ftests/pom.xml index 03c003093b..16ec5c4230 100644 --- a/addons/httprox/ftests/pom.xml +++ b/addons/httprox/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-ftests-httprox diff --git a/addons/httprox/jaxrs/pom.xml b/addons/httprox/jaxrs/pom.xml index c97acd719b..c813ea8749 100644 --- a/addons/httprox/jaxrs/pom.xml +++ b/addons/httprox/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.5.1-SNAPSHOT + 2.5.3-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 f2b96f6878..c0d53e9dbd 100644 --- a/addons/httprox/pom.xml +++ b/addons/httprox/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-httprox diff --git a/addons/implied-repos/client-java/pom.xml b/addons/implied-repos/client-java/pom.xml index 12b3572908..b817ad2682 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 - 2.5.1-SNAPSHOT + 2.5.3-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 a044de0d21..2f5cac73db 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 - 2.5.1-SNAPSHOT + 2.5.3-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 ca5897bce8..5e0444dc41 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 - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-ftests-implied-repos diff --git a/addons/implied-repos/model-java/pom.xml b/addons/implied-repos/model-java/pom.xml index c6207cb887..baea66f227 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 - 2.5.1-SNAPSHOT + 2.5.3-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 a80d4df87b..b7269f3537 100644 --- a/addons/implied-repos/pom.xml +++ b/addons/implied-repos/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.1-SNAPSHOT + 2.5.3-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 f637ce8639..db6cae9c6b 100644 --- a/addons/koji/client-java/pom.xml +++ b/addons/koji/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.5.1-SNAPSHOT + 2.5.3-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 bb1a8f709a..36ab28333d 100644 --- a/addons/koji/common/pom.xml +++ b/addons/koji/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-koji-common Indy :: Add-Ons :: Koji Integration :: Common @@ -108,7 +108,7 @@ org.commonjava.indy - indy-subsys-metrics-core + indy-subsys-metrics diff --git a/addons/koji/common/src/main/java/org/commonjava/indy/koji/conf/IndyKojiConfig.java b/addons/koji/common/src/main/java/org/commonjava/indy/koji/conf/IndyKojiConfig.java index 5e0ef08cff..4dc0f61c59 100644 --- a/addons/koji/common/src/main/java/org/commonjava/indy/koji/conf/IndyKojiConfig.java +++ b/addons/koji/common/src/main/java/org/commonjava/indy/koji/conf/IndyKojiConfig.java @@ -77,6 +77,8 @@ public class IndyKojiConfig private static final int DEFAULT_QUERY_CACHE_EXPIRATION_HOURS = 3; // 3 hours for volatile caches + private static final Boolean DEFAULT_SERVER_PEM_ENABLED = true; + private Boolean enabled; private String url; @@ -85,6 +87,8 @@ public class IndyKojiConfig private String serverPemPath; + private Boolean serverPemEnabled; + private String keyPassword; private Integer maxConnections; @@ -247,6 +251,11 @@ public String getServerPemPath() return serverPemPath; } + public Boolean getServerPemEnabled() + { + return serverPemEnabled == null ? DEFAULT_SERVER_PEM_ENABLED : serverPemEnabled; + } + public String getClientPemPath() { return clientPemPath; @@ -317,6 +326,8 @@ public void setServerPemPath( String serverPemPath ) this.serverPemPath = serverPemPath; } + public void setServerPemEnabled ( Boolean serverPemEnabled ) { this.serverPemEnabled = serverPemEnabled; } + public void setKeyPassword( String keyPassword ) { this.keyPassword = keyPassword; @@ -582,6 +593,11 @@ public void parameter( final String name, final String value ) this.serverPemPath = value; break; } + case "server.pem.enabled": + { + this.serverPemEnabled = Boolean.valueOf( value.trim() ); + break; + } case "max.connections": { this.maxConnections = Integer.valueOf( value ); @@ -627,9 +643,7 @@ public void parameter( final String name, final String value ) } else { - throw new ConfigurationException( - "Invalid parameter: '%s'.", - value, name, SECTION_NAME ); + throw new ConfigurationException( "Invalid KOJI config parameter: %s=%s", name, value ); } } } diff --git a/addons/koji/common/src/main/java/org/commonjava/indy/koji/content/KojiBuildAuthority.java b/addons/koji/common/src/main/java/org/commonjava/indy/koji/content/KojiBuildAuthority.java index 247807cf3a..7916088dc0 100644 --- a/addons/koji/common/src/main/java/org/commonjava/indy/koji/content/KojiBuildAuthority.java +++ b/addons/koji/common/src/main/java/org/commonjava/indy/koji/content/KojiBuildAuthority.java @@ -28,7 +28,7 @@ import org.commonjava.indy.data.IndyDataException; import org.commonjava.indy.data.StoreDataManager; import org.commonjava.indy.koji.conf.IndyKojiConfig; -import org.commonjava.indy.measure.annotation.Measure; +import org.commonjava.o11yphant.metrics.annotation.Measure; import org.commonjava.indy.model.core.ArtifactStore; import org.commonjava.indy.model.core.StoreKey; import org.commonjava.indy.subsys.infinispan.CacheProducer; diff --git a/addons/koji/common/src/main/java/org/commonjava/indy/koji/content/KojiContentManagerDecorator.java b/addons/koji/common/src/main/java/org/commonjava/indy/koji/content/KojiContentManagerDecorator.java index f5197bba10..123b3d343b 100644 --- a/addons/koji/common/src/main/java/org/commonjava/indy/koji/content/KojiContentManagerDecorator.java +++ b/addons/koji/common/src/main/java/org/commonjava/indy/koji/content/KojiContentManagerDecorator.java @@ -31,8 +31,7 @@ import org.commonjava.indy.data.StoreDataManager; import org.commonjava.indy.koji.conf.IndyKojiConfig; import org.commonjava.indy.koji.util.KojiUtils; -import org.commonjava.indy.measure.annotation.Measure; -import org.commonjava.indy.measure.annotation.MetricNamed; +import org.commonjava.o11yphant.metrics.annotation.Measure; import org.commonjava.indy.model.core.ArtifactStore; import org.commonjava.indy.model.core.Group; import org.commonjava.indy.model.core.RemoteRepository; @@ -63,7 +62,6 @@ import static org.commonjava.indy.koji.model.IndyKojiConstants.KOJI_ORIGIN; import static org.commonjava.indy.koji.model.IndyKojiConstants.KOJI_ORIGIN_BINARY; -import static org.commonjava.indy.measure.annotation.MetricNamed.DEFAULT; import static org.commonjava.indy.model.core.StoreType.group; import static org.commonjava.maven.galley.maven.util.ArtifactPathUtils.formatMetadataPath; @@ -449,7 +447,10 @@ private RemoteRepository createRemoteRepository( StoreKey inStore, ArtifactRef a kojiUtils.formatStorageUrl( config.getStorageRootUrl(), build ), config.getDownloadTimeoutSeconds() ); - remote.setServerCertPem( config.getServerPemContent() ); + if ( config.getServerPemEnabled() ) + { + remote.setServerCertPem( config.getServerPemContent() ); + } if ( isBinaryBuild ) { diff --git a/addons/koji/common/src/main/java/org/commonjava/indy/koji/content/KojiMavenMetadataProvider.java b/addons/koji/common/src/main/java/org/commonjava/indy/koji/content/KojiMavenMetadataProvider.java index 95ccfd8034..56261a3244 100644 --- a/addons/koji/common/src/main/java/org/commonjava/indy/koji/content/KojiMavenMetadataProvider.java +++ b/addons/koji/common/src/main/java/org/commonjava/indy/koji/content/KojiMavenMetadataProvider.java @@ -44,14 +44,10 @@ import org.commonjava.indy.koji.conf.IndyKojiConfig; import org.commonjava.indy.koji.inject.KojiMavenVersionMetadataCache; import org.commonjava.indy.koji.inject.KojiMavenVersionMetadataLocks; -import org.commonjava.indy.measure.annotation.Measure; +import org.commonjava.o11yphant.metrics.annotation.Measure; import org.commonjava.indy.model.core.Group; import org.commonjava.indy.model.core.StoreKey; import org.commonjava.indy.pkg.maven.content.MetadataCacheManager; -import org.commonjava.indy.pkg.maven.content.MetadataInfo; -import org.commonjava.indy.pkg.maven.content.MetadataKey; -import org.commonjava.indy.pkg.maven.content.cache.MavenMetadataCache; -import org.commonjava.indy.pkg.maven.content.cache.MavenMetadataKeyCache; import org.commonjava.indy.pkg.maven.content.group.MavenMetadataProvider; import org.commonjava.indy.subsys.infinispan.CacheHandle; import org.commonjava.indy.subsys.infinispan.CacheProducer; diff --git a/addons/koji/common/src/main/java/org/commonjava/indy/koji/data/KojiRemovePemMigrationAction.java b/addons/koji/common/src/main/java/org/commonjava/indy/koji/data/KojiRemovePemMigrationAction.java new file mode 100644 index 0000000000..7e612bc39a --- /dev/null +++ b/addons/koji/common/src/main/java/org/commonjava/indy/koji/data/KojiRemovePemMigrationAction.java @@ -0,0 +1,127 @@ +/** + * Copyright (C) 2011-2020 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.koji.data; + +import org.commonjava.indy.action.IndyLifecycleException; +import org.commonjava.indy.action.MigrationAction; +import org.commonjava.indy.audit.ChangeSummary; +import org.commonjava.indy.data.IndyDataException; +import org.commonjava.indy.data.StoreDataManager; +import org.commonjava.indy.koji.conf.IndyKojiConfig; +import org.commonjava.indy.model.core.RemoteRepository; +import org.commonjava.indy.pkg.PackageTypeConstants; +import org.commonjava.maven.galley.event.EventMetadata; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.inject.Inject; +import java.util.ArrayList; +import java.util.List; + +public class KojiRemovePemMigrationAction + implements MigrationAction +{ + + private final Logger logger = LoggerFactory.getLogger( getClass() ); + + @Inject + private StoreDataManager storeDataManager; + + @Inject + private IndyKojiConfig config; + + protected KojiRemovePemMigrationAction() { } + + public KojiRemovePemMigrationAction( final StoreDataManager storeDataManager, final IndyKojiConfig config ) + { + this.storeDataManager = storeDataManager; + this.config = config; + } + + @Override + public String getId() + { + return "Remove server PEM from Koji repos."; + } + + @Override + public boolean migrate() throws IndyLifecycleException + { + if ( config.getServerPemEnabled() ) + { + logger.info( "Skip the migration if the server pem is needed. " ); + return true; + } + + logger.info( "Starting to remove server PEM from Koji repo." ); + return doMigrate(); + } + + private boolean doMigrate() throws IndyLifecycleException + { + + List repos; + try + { + repos = storeDataManager.query().packageType( PackageTypeConstants.PKG_TYPE_MAVEN ).getAllRemoteRepositories(); + } + catch ( IndyDataException e ) + { + throw new IndyLifecycleException( "Cannot retrieve all remote repositories. Reason: %s", e, + e.getMessage() ); + } + + List toStore = new ArrayList<>(); + repos.forEach( repo -> { + if ( repo.getDescription() != null && repo.getDescription().contains( "Koji build" ) && repo.getServerCertPem() != null ) + { + repo.setServerCertPem( null ); + toStore.add( repo ); + } + } ); + + final ChangeSummary changeSummary = + new ChangeSummary( ChangeSummary.SYSTEM_USER, "Remove the server PEM from Koji repo." ); + + for ( RemoteRepository repo : toStore ) + { + try + { + storeDataManager.storeArtifactStore( repo, changeSummary, false, false, new EventMetadata() ); + } + catch ( IndyDataException e ) + { + throw new IndyLifecycleException( "Failed to store %s. Reason: %s", + e, repo == null ? "NULL REPO" : repo.getKey(), e.getMessage() ); + } + } + + logger.info( "Remove server PEM from Koji repo migration done. Result: {}", toStore.size() ); + if ( logger.isDebugEnabled() ) + { + toStore.forEach( ( s ) -> logger.debug( s.getKey().toString() ) ); + } + + return !toStore.isEmpty(); + } + + @Override + public int getMigrationPriority() + { + return 99; + } + +} diff --git a/addons/koji/common/src/main/java/org/commonjava/indy/koji/inject/KojijiProvider.java b/addons/koji/common/src/main/java/org/commonjava/indy/koji/inject/KojijiProvider.java index 4fc624f4ea..329f617d77 100644 --- a/addons/koji/common/src/main/java/org/commonjava/indy/koji/inject/KojijiProvider.java +++ b/addons/koji/common/src/main/java/org/commonjava/indy/koji/inject/KojijiProvider.java @@ -15,7 +15,6 @@ */ package org.commonjava.indy.koji.inject; -import com.codahale.metrics.MetricRegistry; import com.redhat.red.build.koji.KojiClient; import com.redhat.red.build.koji.KojiClientException; import org.commonjava.cdi.util.weft.ExecutorConfig; @@ -25,8 +24,9 @@ import org.commonjava.indy.action.ShutdownAction; import org.commonjava.indy.action.StartupAction; import org.commonjava.indy.koji.conf.IndyKojiConfig; -import org.commonjava.indy.metrics.conf.IndyMetricsConfig; +import org.commonjava.indy.subsys.metrics.conf.IndyMetricsConfig; import org.commonjava.atlas.maven.ident.ref.ProjectRef; +import org.commonjava.o11yphant.metrics.api.MetricRegistry; import org.commonjava.util.jhttpc.auth.MemoryPasswordManager; import org.commonjava.util.jhttpc.auth.PasswordManager; import org.commonjava.util.jhttpc.auth.PasswordType; diff --git a/addons/koji/jaxrs/pom.xml b/addons/koji/jaxrs/pom.xml index 42004609b5..537cc4d342 100644 --- a/addons/koji/jaxrs/pom.xml +++ b/addons/koji/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-koji-jaxrs diff --git a/addons/koji/model-java/pom.xml b/addons/koji/model-java/pom.xml index ea363fcca2..d1cc4b2440 100644 --- a/addons/koji/model-java/pom.xml +++ b/addons/koji/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.5.1-SNAPSHOT + 2.5.3-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 a805bcdd29..d1e14b69a9 100644 --- a/addons/koji/pom.xml +++ b/addons/koji/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-koji Indy :: Add-Ons :: Koji Integration :: Parent diff --git a/addons/path-mapped/common/pom.xml b/addons/path-mapped/common/pom.xml index 66064a3393..d53a7ce146 100644 --- a/addons/path-mapped/common/pom.xml +++ b/addons/path-mapped/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-path-mapped-common diff --git a/addons/path-mapped/jaxrs/pom.xml b/addons/path-mapped/jaxrs/pom.xml index 88af8a9009..d78848c213 100644 --- a/addons/path-mapped/jaxrs/pom.xml +++ b/addons/path-mapped/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-path-mapped-jaxrs diff --git a/addons/path-mapped/model-java/pom.xml b/addons/path-mapped/model-java/pom.xml index 5f778234cb..b924330151 100644 --- a/addons/path-mapped/model-java/pom.xml +++ b/addons/path-mapped/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-path-mapped-model-java diff --git a/addons/path-mapped/pom.xml b/addons/path-mapped/pom.xml index 3577767247..aad7b46715 100644 --- a/addons/path-mapped/pom.xml +++ b/addons/path-mapped/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-path-mapped Indy :: Add-Ons :: Path Mapped :: Parent diff --git a/addons/pkg-maven/common/pom.xml b/addons/pkg-maven/common/pom.xml index a7f9726630..068b5cef9a 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 - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT 4.0.0 @@ -41,6 +41,10 @@ org.commonjava.indy indy-core + + org.commonjava.atlas + atlas-identities + org.apache.maven.archetype archetype-catalog @@ -93,7 +97,7 @@ org.commonjava.indy - indy-subsys-metrics-core + indy-subsys-metrics diff --git a/addons/pkg-maven/common/src/main/java/org/commonjava/indy/pkg/maven/content/MavenContentsFilteringTransferDecorator.java b/addons/pkg-maven/common/src/main/java/org/commonjava/indy/pkg/maven/content/MavenContentsFilteringTransferDecorator.java index 57442b6cf4..c160f61f83 100644 --- a/addons/pkg-maven/common/src/main/java/org/commonjava/indy/pkg/maven/content/MavenContentsFilteringTransferDecorator.java +++ b/addons/pkg-maven/common/src/main/java/org/commonjava/indy/pkg/maven/content/MavenContentsFilteringTransferDecorator.java @@ -33,12 +33,12 @@ import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; -import com.codahale.metrics.Timer; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.commonjava.atlas.maven.ident.util.SnapshotUtils; import org.commonjava.atlas.maven.ident.version.part.SnapshotPart; -import org.commonjava.indy.metrics.IndyMetricsManager; +import org.commonjava.o11yphant.metrics.api.Timer; +import org.commonjava.o11yphant.metrics.DefaultMetricsManager; import org.commonjava.maven.galley.event.EventMetadata; import org.commonjava.maven.galley.io.AbstractTransferDecorator; import org.commonjava.maven.galley.model.Location; @@ -70,7 +70,7 @@ public class MavenContentsFilteringTransferDecorator private final Logger logger = LoggerFactory.getLogger( this.getClass() ); @Inject - private IndyMetricsManager metricsManager; + private DefaultMetricsManager metricsManager; @Override public OverriddenBooleanValue decorateExists( final Transfer transfer, final EventMetadata metadata ) @@ -205,11 +205,11 @@ private static class MetadataFilteringOutputStream private Transfer transfer; - private IndyMetricsManager metricsManager; + private DefaultMetricsManager metricsManager; private MetadataFilteringOutputStream( final OutputStream stream, final boolean allowsSnapshots, final boolean allowsReleases, Transfer transfer, - final IndyMetricsManager metricsManager ) + final DefaultMetricsManager metricsManager ) { super( stream ); this.allowsSnapshots = allowsSnapshots; 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 76c88a119e..a08b221431 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 @@ -42,7 +42,7 @@ import org.commonjava.indy.core.content.AbstractMergedContentGenerator; import org.commonjava.indy.core.content.group.GroupMergeHelper; import org.commonjava.indy.data.StoreDataManager; -import org.commonjava.indy.measure.annotation.Measure; +import org.commonjava.o11yphant.metrics.annotation.Measure; import org.commonjava.indy.model.core.ArtifactStore; import org.commonjava.indy.model.core.Group; import org.commonjava.indy.model.core.StoreKey; diff --git a/addons/pkg-maven/common/src/main/java/org/commonjava/indy/pkg/maven/content/MetadataMergeListener.java b/addons/pkg-maven/common/src/main/java/org/commonjava/indy/pkg/maven/content/MetadataMergeListener.java index ff66ed36ae..73daf587cb 100644 --- a/addons/pkg-maven/common/src/main/java/org/commonjava/indy/pkg/maven/content/MetadataMergeListener.java +++ b/addons/pkg-maven/common/src/main/java/org/commonjava/indy/pkg/maven/content/MetadataMergeListener.java @@ -17,7 +17,7 @@ import org.commonjava.indy.content.DirectContentAccess; import org.commonjava.indy.content.MergedContentAction; -import org.commonjava.indy.measure.annotation.Measure; +import org.commonjava.o11yphant.metrics.annotation.Measure; import org.commonjava.indy.model.core.ArtifactStore; import org.commonjava.indy.model.core.Group; import org.slf4j.Logger; diff --git a/addons/pkg-maven/common/src/test/java/org/commonjava/indy/pkg/maven/content/MavenContentFilteringTransferDecoratorTest.java b/addons/pkg-maven/common/src/test/java/org/commonjava/indy/pkg/maven/content/MavenContentFilteringTransferDecoratorTest.java index 74c6520dfb..4b2eae1c55 100644 --- a/addons/pkg-maven/common/src/test/java/org/commonjava/indy/pkg/maven/content/MavenContentFilteringTransferDecoratorTest.java +++ b/addons/pkg-maven/common/src/test/java/org/commonjava/indy/pkg/maven/content/MavenContentFilteringTransferDecoratorTest.java @@ -15,7 +15,6 @@ */ package org.commonjava.indy.pkg.maven.content; -import com.codahale.metrics.MetricRegistry; import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.commons.io.IOUtils; import org.commonjava.indy.test.fixture.core.HttpTestFixture; @@ -27,6 +26,7 @@ import org.commonjava.maven.galley.model.TransferOperation; import org.commonjava.maven.galley.transport.htcli.internal.HttpDownload; import org.commonjava.maven.galley.transport.htcli.model.SimpleHttpLocation; +import org.commonjava.o11yphant.metrics.DefaultMetricRegistry; import org.hamcrest.CoreMatchers; import org.junit.Rule; import org.junit.Test; @@ -37,6 +37,7 @@ import java.util.HashMap; import java.util.List; +import static org.commonjava.o11yphant.metrics.util.MetricUtils.newDefaultMetricRegistry; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.notNullValue; import static org.junit.Assert.assertThat; @@ -46,7 +47,7 @@ public class MavenContentFilteringTransferDecoratorTest @Rule public HttpTestFixture fixture = new HttpTestFixture( "test", new MavenContentsFilteringTransferDecorator() ); - private static MetricRegistry metricRegistry = new MetricRegistry(); + private static DefaultMetricRegistry metricRegistry = newDefaultMetricRegistry(); private static TransportMetricConfig metricConfig = new TransportMetricConfig() { @@ -153,7 +154,7 @@ private Transfer getTestHttpTransfer(final String path, final String content) th assertThat( transfer.exists(), equalTo( false ) ); HttpDownload dl = new HttpDownload( url, location, transfer, new HashMap<>(), new EventMetadata(), - fixture.getHttp().getHttp(), new ObjectMapper(), metricRegistry, metricConfig ); + fixture.getHttp().getHttp(), new ObjectMapper(), metricRegistry, metricConfig, null ); return dl.call().getTransfer(); } diff --git a/addons/pkg-maven/ftests/pom.xml b/addons/pkg-maven/ftests/pom.xml index c96d73815b..49fc2c2c86 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 - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT 4.0.0 diff --git a/addons/pkg-maven/jaxrs/pom.xml b/addons/pkg-maven/jaxrs/pom.xml index 26ba4fdc42..b0242ebb50 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 - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT 4.0.0 diff --git a/addons/pkg-maven/pom.xml b/addons/pkg-maven/pom.xml index ad855531c9..c031f32be5 100644 --- a/addons/pkg-maven/pom.xml +++ b/addons/pkg-maven/pom.xml @@ -20,7 +20,7 @@ indy-addons org.commonjava.indy - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/common/pom.xml b/addons/pkg-npm/common/pom.xml index 8e4d9878a9..65074d1ca8 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 - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/common/src/main/java/org/commonjava/indy/pkg/npm/content/NPMPackageMaskingTransferDecorator.java b/addons/pkg-npm/common/src/main/java/org/commonjava/indy/pkg/npm/content/NPMPackageMaskingTransferDecorator.java index 73ff93c551..61b4ea1359 100644 --- a/addons/pkg-npm/common/src/main/java/org/commonjava/indy/pkg/npm/content/NPMPackageMaskingTransferDecorator.java +++ b/addons/pkg-npm/common/src/main/java/org/commonjava/indy/pkg/npm/content/NPMPackageMaskingTransferDecorator.java @@ -15,9 +15,8 @@ */ package org.commonjava.indy.pkg.npm.content; -import com.codahale.metrics.MetricRegistry; -import com.codahale.metrics.Timer; -import org.commonjava.indy.metrics.IndyMetricsManager; +import org.commonjava.o11yphant.metrics.api.Timer; +import org.commonjava.o11yphant.metrics.DefaultMetricsManager; import org.commonjava.indy.model.core.StoreKey; import org.commonjava.indy.model.galley.KeyedLocation; import org.commonjava.maven.galley.event.EventMetadata; @@ -32,7 +31,6 @@ import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; import java.io.ByteArrayOutputStream; -import java.io.FilterInputStream; import java.io.IOException; import java.io.InputStream; @@ -49,7 +47,7 @@ public class NPMPackageMaskingTransferDecorator private final Logger logger = LoggerFactory.getLogger( this.getClass() ); @Inject - private IndyMetricsManager metricsManager; + private DefaultMetricsManager metricsManager; public NPMPackageMaskingTransferDecorator() { @@ -102,7 +100,7 @@ private static class PackageMaskingInputStream private String contextURL; - private IndyMetricsManager metricsManager; + private DefaultMetricsManager metricsManager; private byte[] bytes; @@ -111,7 +109,7 @@ private static class PackageMaskingInputStream private static final int SIZE = 1024; private PackageMaskingInputStream( final InputStream stream, final String contextURL, - final IndyMetricsManager metricsManager ) + final DefaultMetricsManager metricsManager ) { super( stream ); this.contextURL = contextURL; diff --git a/addons/pkg-npm/common/src/main/java/org/commonjava/indy/pkg/npm/content/NPMStoragePathCalculator.java b/addons/pkg-npm/common/src/main/java/org/commonjava/indy/pkg/npm/content/NPMStoragePathCalculator.java index c245e1c1fa..f85400a2f5 100644 --- a/addons/pkg-npm/common/src/main/java/org/commonjava/indy/pkg/npm/content/NPMStoragePathCalculator.java +++ b/addons/pkg-npm/common/src/main/java/org/commonjava/indy/pkg/npm/content/NPMStoragePathCalculator.java @@ -18,8 +18,8 @@ import org.apache.commons.io.FilenameUtils; import org.commonjava.cdi.util.weft.ThreadContext; import org.commonjava.indy.content.StoragePathCalculator; -import org.commonjava.indy.metrics.RequestContextHelper; import org.commonjava.indy.model.core.StoreKey; +import org.commonjava.indy.util.RequestContextHelper; import org.commonjava.maven.galley.io.SpecialPathConstants; import org.commonjava.maven.galley.model.SpecialPathInfo; import org.commonjava.maven.galley.spi.io.SpecialPathManager; diff --git a/addons/pkg-npm/common/src/main/java/org/commonjava/indy/pkg/npm/content/PackageMetadataGenerator.java b/addons/pkg-npm/common/src/main/java/org/commonjava/indy/pkg/npm/content/PackageMetadataGenerator.java index 0ad0d02559..3efc8dfd4a 100644 --- a/addons/pkg-npm/common/src/main/java/org/commonjava/indy/pkg/npm/content/PackageMetadataGenerator.java +++ b/addons/pkg-npm/common/src/main/java/org/commonjava/indy/pkg/npm/content/PackageMetadataGenerator.java @@ -47,6 +47,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.nio.charset.StandardCharsets; import java.nio.file.Paths; import java.util.ArrayList; import java.util.Comparator; @@ -63,8 +64,8 @@ public class PackageMetadataGenerator extends AbstractMergedContentGenerator { - @Inject - private TypeMapper typeMapper; +// @Inject +// private TypeMapper typeMapper; @Inject private PackageMetadataMerger merger; @@ -92,7 +93,7 @@ public PackageMetadataGenerator( final DirectContentAccess fileManager, final St { super( fileManager, storeManager, mergeHelper, nfc, mergedContentActions ); this.downloadManager = downloadManager; - this.typeMapper = typeMapper; +// this.typeMapper = typeMapper; this.pathGenerator = pathGenerator; this.merger = merger; this.storagePathCalculator = storagePathCalculator; @@ -328,6 +329,7 @@ private boolean writePackageMetadata( List firstLevelFiles, Artif packageMetadata.setKeywords( keywords ); } + versions = sortVersions( versions ); packageMetadata.setVersions( versions ); packageMetadata.setDistTags( distTags ); @@ -336,7 +338,7 @@ private boolean writePackageMetadata( List firstLevelFiles, Artif { String output = mapper.writeValueAsString( packageMetadata ); stream = metadataFile.openOutputStream( TransferOperation.GENERATE, true, eventMetadata ); - stream.write( output.getBytes( "UTF-8" ) ); + stream.write( output.getBytes( StandardCharsets.UTF_8 ) ); } catch ( IOException e ) { @@ -351,6 +353,13 @@ private boolean writePackageMetadata( List firstLevelFiles, Artif return true; } + private Map sortVersions( Map versions ) + { + final Map sorted = new LinkedHashMap<>( versions.size() ); + new ArrayList<>( versions.keySet() ).stream().sorted().forEach( k -> sorted.put( k, versions.get( k ) ) ); + return sorted; + } + private Transfer extractMetaFileFromTarballAndStore( ArtifactStore store, String versionPath, Transfer tar ) { diff --git a/addons/pkg-npm/ftests/pom.xml b/addons/pkg-npm/ftests/pom.xml index 60b6e4999d..6703bbcb9f 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 - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/ftests/src/main/java/org/commonjava/indy/pkg/npm/content/NPMMetadataRevisitTimeoutTest.java b/addons/pkg-npm/ftests/src/main/java/org/commonjava/indy/pkg/npm/content/NPMMetadataRevisitTimeoutTest.java index 2a6cd3b357..81e0c348cb 100644 --- a/addons/pkg-npm/ftests/src/main/java/org/commonjava/indy/pkg/npm/content/NPMMetadataRevisitTimeoutTest.java +++ b/addons/pkg-npm/ftests/src/main/java/org/commonjava/indy/pkg/npm/content/NPMMetadataRevisitTimeoutTest.java @@ -18,12 +18,14 @@ import org.apache.commons.io.IOUtils; import org.commonjava.indy.client.core.IndyClientException; import org.commonjava.indy.ftest.core.AbstractContentManagementTest; +import org.commonjava.indy.ftest.core.category.TimingDependent; import org.commonjava.indy.model.core.RemoteRepository; import org.commonjava.indy.model.core.io.IndyObjectMapper; import org.commonjava.indy.pkg.npm.model.DistTag; import org.commonjava.indy.pkg.npm.model.PackageMetadata; import org.commonjava.indy.test.fixture.core.CoreServerFixture; import org.junit.Test; +import org.junit.experimental.categories.Category; import java.io.IOException; import java.io.InputStream; @@ -61,6 +63,7 @@ public class NPMMetadataRevisitTimeoutTest private static final String PATH = "jquery"; @Test + @Category( TimingDependent.class ) public void test() throws Exception { @@ -77,15 +80,6 @@ public void test() resp.getWriter().flush(); } ); - //FIXME: After using galley-0.16.8, I'm not sure the second retrieval of npm metadata will get path of - // "A/jquery/package.json" while the first retrieval is "A/jquery". So I add a new expectation here - // to let the second retrieval can work. Need further checking. - // server.expect( "GET", server.formatUrl( REPO, PATH+"/package.json" ), (req, resp)->{ - // resp.setStatus( 200 ); - // mapper.writeValue( resp.getWriter(), src ); - // resp.getWriter().flush(); - // } ); - final int METADATA_TIMEOUT_SECOND = 3; final int TIMEOUT_WAIT_MILLI_S = 1000; diff --git a/addons/pkg-npm/ftests/src/main/java/org/commonjava/indy/pkg/npm/content/NPMMetadataTimeoutTest.java b/addons/pkg-npm/ftests/src/main/java/org/commonjava/indy/pkg/npm/content/NPMMetadataTimeoutTest.java index bcae207016..8349d16869 100644 --- a/addons/pkg-npm/ftests/src/main/java/org/commonjava/indy/pkg/npm/content/NPMMetadataTimeoutTest.java +++ b/addons/pkg-npm/ftests/src/main/java/org/commonjava/indy/pkg/npm/content/NPMMetadataTimeoutTest.java @@ -18,12 +18,17 @@ import org.apache.commons.io.IOUtils; import org.commonjava.indy.client.core.IndyClientException; import org.commonjava.indy.ftest.core.AbstractContentManagementTest; +import org.commonjava.indy.ftest.core.category.TimingDependent; import org.commonjava.indy.model.core.RemoteRepository; import org.commonjava.indy.model.core.io.IndyObjectMapper; import org.commonjava.indy.pkg.npm.model.DistTag; import org.commonjava.indy.pkg.npm.model.PackageMetadata; +import org.commonjava.indy.util.LocationUtils; +import org.commonjava.maven.galley.model.Location; import org.junit.Test; +import org.junit.experimental.categories.Category; +import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -46,15 +51,19 @@ * */ public class NPMMetadataTimeoutTest - extends AbstractContentManagementTest + extends AbstractContentManagementTest { private static final String REPO = "A"; - private static final String PATH = "jquery"; + private static final String PATH_JQUERY = "jquery"; + + private static final String PATH_BABEL_PARSER = "@babel/parser"; @Test - public void test() throws Exception + @Category( TimingDependent.class ) + public void test() + throws Exception { IndyObjectMapper mapper = new IndyObjectMapper( true ); @@ -63,20 +72,17 @@ public void test() throws Exception dts.setBeta( "1" ); src.setDistTags( dts ); - server.expect( "GET", server.formatUrl( REPO, PATH ), (req, resp)->{ + server.expect( "GET", server.formatUrl( REPO, PATH_JQUERY ), ( req, resp ) -> { resp.setStatus( 200 ); mapper.writeValue( resp.getWriter(), src ); resp.getWriter().flush(); } ); - //FIXME: After using galley-0.16.8, I'm not sure the second retrieval of npm metadata will get path of - // "A/jquery/package.json" while the first retrieval is "A/jquery". So I add a new expectation here - // to let the second retrieval can work. Need further checking. -// server.expect( "GET", server.formatUrl( REPO, PATH+"/package.json" ), (req, resp)->{ -// resp.setStatus( 200 ); -// mapper.writeValue( resp.getWriter(), src ); -// resp.getWriter().flush(); -// } ); + server.expect( "GET", server.formatUrl( REPO, PATH_BABEL_PARSER ), ( req, resp ) -> { + resp.setStatus( 200 ); + mapper.writeValue( resp.getWriter(), src ); + resp.getWriter().flush(); + } ); final RemoteRepository repo = new RemoteRepository( NPM_PKG_KEY, REPO, server.formatUrl( REPO ) ); repo.setMetadataTimeoutSeconds( 1 ); @@ -84,24 +90,45 @@ public void test() throws Exception client.stores().create( repo, "adding npm remote repo", RemoteRepository.class ); // First retrieval - verifyMetadataBetaTag( "1", repo ); + verifyMetadataBetaTag( "1", PATH_JQUERY, repo ); + assertThat( "Metadata not retrieved!", client.content().exists( repo.getKey(), PATH_JQUERY, true ), + equalTo( true ) ); + assertThat( "Metadata not retrieved!", + client.content().exists( repo.getKey(), PATH_JQUERY + "/package.json", true ), equalTo( true ) ); + + verifyMetadataBetaTag( "1", PATH_BABEL_PARSER, repo ); + assertThat( "Metadata not retrieved!", client.content().exists( repo.getKey(), PATH_BABEL_PARSER, true ), + equalTo( true ) ); + assertThat( "Metadata not retrieved!", + client.content().exists( repo.getKey(), PATH_BABEL_PARSER + "/package.json", true ), + equalTo( true ) ); // wait for repo metadata timeout - Thread.sleep( 2000 ); + Thread.sleep( 3000 ); + + assertThat( "Metadata not cleaned up!", client.content().exists( repo.getKey(), PATH_JQUERY, true ), + equalTo( false ) ); + assertThat( "Metadata not cleaned up!", + client.content().exists( repo.getKey(), PATH_JQUERY + "/package.json", true ), equalTo( false ) ); - assertThat( "Metadata not cleaned up!", client.content().exists( repo.getKey(), PATH + "/package.json", true ), equalTo( false ) ); + assertThat( "Metadata not cleaned up!", client.content().exists( repo.getKey(), PATH_BABEL_PARSER, true ), + equalTo( false ) ); + assertThat( "Metadata not cleaned up!", + client.content().exists( repo.getKey(), PATH_BABEL_PARSER + "/package.json", true ), + equalTo( false ) ); logger.info( "\n\n\n\nRE-REQUEST STARTS HERE\n\n\n\n" ); // Second retrieval dts.setBeta( "2" ); - verifyMetadataBetaTag( "2", repo ); + verifyMetadataBetaTag( "2", PATH_JQUERY, repo ); + verifyMetadataBetaTag( "2", PATH_BABEL_PARSER, repo ); } - private void verifyMetadataBetaTag( final String betaTag, RemoteRepository repo ) + private void verifyMetadataBetaTag( final String betaTag, final String path, RemoteRepository repo ) throws IndyClientException, IOException { - try(InputStream remote = client.content().get( repo.getKey(), PATH )) + try (InputStream remote = client.content().get( repo.getKey(), path )) { assertThat( remote, notNullValue() ); diff --git a/addons/pkg-npm/ftests/src/main/java/org/commonjava/indy/pkg/npm/content/NPMMetadataWithContentTimeoutTest.java b/addons/pkg-npm/ftests/src/main/java/org/commonjava/indy/pkg/npm/content/NPMMetadataWithContentTimeoutTest.java new file mode 100644 index 0000000000..ff7b44836e --- /dev/null +++ b/addons/pkg-npm/ftests/src/main/java/org/commonjava/indy/pkg/npm/content/NPMMetadataWithContentTimeoutTest.java @@ -0,0 +1,122 @@ +/** + * Copyright (C) 2011-2020 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.npm.content; + +import org.commonjava.indy.client.core.helper.PathInfo; +import org.commonjava.indy.ftest.core.AbstractContentManagementTest; +import org.commonjava.indy.ftest.core.category.TimingDependent; +import org.commonjava.indy.model.core.RemoteRepository; +import org.commonjava.indy.pkg.PackageTypeConstants; +import org.commonjava.indy.util.LocationUtils; +import org.commonjava.maven.galley.model.Location; +import org.commonjava.test.http.expect.ExpectationServer; +import org.junit.Rule; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +import java.io.File; +import java.io.InputStream; + +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.CoreMatchers.notNullValue; +import static org.junit.Assert.assertThat; + +/** + * This case tests if remote package.json will timeout correctly + * when:
+ *
    + *
  • remote repo A contains package.json with real content for a given package
    • + *
  • package.json is retrieved via remote repo A by client
    • + *
  • package.json metadata timeout is scheduled
    • + *
+ * then:
+ *
    + *
  • package.json expires with metadata timeout and is removed from local storage in remote repository A
    • + *
+ */ +public class NPMMetadataWithContentTimeoutTest + extends AbstractContentManagementTest +{ + @Rule + public ExpectationServer server = new ExpectationServer( "repos" ); + + @Test + @Category( TimingDependent.class ) + public void timeout() + throws Exception + { + final int METADATA_TIMEOUT_SECONDS = 4; + final int METADATA_TIMEOUT_WAITING_MILLISECONDS = 2500; + + final String repoId = "test-repo"; + final String pkgPath = "@babel/parser"; + final String pkgMetaPath = pkgPath + "/package.json"; + + final String metadataUrl = server.formatUrl( repoId, pkgPath ); + + // mocking up a http server that expects access to metadata + try (InputStream is = getClass().getResourceAsStream( "babel-parser-7.0.0-beta.48.json" )) + { + server.expect( metadataUrl, 200, is ); + } + + // set up remote repository pointing to the test http server, and timeout little later + final String changelog = "Timeout Testing: " + name.getMethodName(); + final RemoteRepository repository = + new RemoteRepository( PackageTypeConstants.PKG_TYPE_NPM, repoId, server.formatUrl( repoId ) ); + repository.setMetadataTimeoutSeconds( METADATA_TIMEOUT_SECONDS ); + client.stores().create( repository, changelog, RemoteRepository.class ); + + // first time trigger normal content storage with timeout, should be 4s + PathInfo pkgPathFile = client.content().getInfo( repository.getKey(), pkgPath ); + client.content().get( repository.getKey(), pkgPath ).close(); // force storage + assertThat( "no metadata result", pkgPathFile, notNullValue() ); + assertThat( "metadata doesn't exist", pkgPathFile.exists(), equalTo( true ) ); + + pkgPathFile = client.content().getInfo( repository.getKey(), pkgMetaPath ); + client.content().get( repository.getKey(), pkgPath ).close(); + assertThat( "no metadata result", pkgPathFile, notNullValue() ); + assertThat( "metadata doesn't exist", pkgPathFile.exists(), equalTo( true ) ); + + Location location = LocationUtils.toLocation( repository ); + File pkgFile = getPhysicalStorageFile( location, pkgPath ); + File pkgMetaFile = getPhysicalStorageFile( location, pkgMetaPath ); + + assertThat( "pkg dir doesn't exist", pkgFile.exists(), equalTo( true ) ); + assertThat( "metadata doesn't exist", pkgMetaFile.exists(), equalTo( true ) ); + + // wait for first 2.5s + sleepAndRunFileGC( METADATA_TIMEOUT_WAITING_MILLISECONDS ); + + // as the metadata content re-request, the metadata timeout interval should NOT be re-scheduled + client.content().get( repository.getKey(), pkgPath ).close(); + client.content().get( repository.getKey(), pkgMetaPath ).close(); + + // will wait another 4s + sleepAndRunFileGC( METADATA_TIMEOUT_WAITING_MILLISECONDS + 1500 ); + // as rescheduled, the artifact should not be deleted + assertThat( "artifact should be removed as the rescheduled of metadata should not succeed", + pkgFile.exists(), equalTo( false ) ); + assertThat( "artifact should be removed as the rescheduled of metadata should not succeed", + pkgMetaFile.exists(), equalTo( false ) ); + } + + @Override + protected boolean createStandardTestStructures() + { + return false; + } +} diff --git a/addons/pkg-npm/ftests/src/main/resources/babel-parser-7.0.0-beta.48.json b/addons/pkg-npm/ftests/src/main/resources/babel-parser-7.0.0-beta.48.json new file mode 100644 index 0000000000..244828515c --- /dev/null +++ b/addons/pkg-npm/ftests/src/main/resources/babel-parser-7.0.0-beta.48.json @@ -0,0 +1,51 @@ +{ + "_id": "@babel/parser", + "_rev": "87-0bf11730f53724368fe4fc3bef482fed", + "name": "@babel/parser", + "dist-tags": { + "latest": "7.0.0-beta.48" + }, + "versions": { + "7.0.0-beta.48": { + "name": "@babel/parser", + "version": "7.0.0-beta.48", + "description": "A JavaScript parser", + "author": { + "name": "Sebastian McKenzie", + "email": "sebmck@gmail.com" + }, + "homepage": "https://babeljs.io/", + "license": "MIT", + "keywords": [ + "babel", + "javascript", + "parser", + "tc39", + "ecmascript", + "@babel/parser" + ], + "main": "lib/index.js", + "files": [ + "bin", + "lib" + ], + "engines": { + "node": ">=6.0.0" + }, + "bin": { + "parser": "./bin/babel-parser.js" + }, + "_id": "@babel/parser@7.0.0-beta.48", + "_npmVersion": "5.6.0", + "_nodeVersion": "8.10.0", + "dist": { + "integrity": "sha512-X3pKxvy7vL79zc/6XS6cCObyuRMnsRGRu7d3zVSPZGCdxkK0/wTeFRwseRjcvhReV/6LW2D8H8qHVFFL0c+5+w==", + "shasum": "f93895cbacee703c0ec98e5af3901c77edd9f1d7", + "tarball": "https://registry.npmjs.org/@babel/parser/-/parser-7.0.0-beta.48.tgz", + "fileCount": 6, + "unpackedSize": 380503, + "npm-signature": "-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJbBxCGCRA9TVsSAnZWagAALkIQAI8MHP43v0t5yW+5eb8a\nFvCKyfUV5pYIAgLwyT6QlxWhW37Yy2x1jqzQPVFDz3TEvXHSetOroranW1v6\nH3RrGgFfV6ouyrKnYgk8JpTXHWlHKXWB0m0BqkOrMQwDdQVVVeIxdpQr1yrb\noyt5AjRZ272dKN0Q4iQTeLqC6uxUXYlarbBRUgWXx5BuLh//rVjIJGQ5Fj2m\nZcFFGRjbyw9Hdb0/wo7x0lV6VEi4Oh2wRNZuskIFBRNAiHdrCLf1IZEDsQRE\nGRXuKXc6Xj8LeHvoS2V5Vvs7dbuUq5lq5oiRiTEkPt032MSftU8tsl4UysVn\n1krvHCQYqNCg5WgKJlqXZCae+AxUWj9UacC98aq4vAeZl3DVzoJ5n5ENcHcI\na9Wrs0qumfODoxaDOSs+DNXAYnSc91zoguH187OOCLfas2Gw1MyRIXnJwvnH\nVnwnQyFBuRDDigxBGrRVVFkY6cf+vzoSaVIs5VL8wI85FDtKK/JmTtGwWLtk\nE1xG2tQVl622gWNZqPvoKbS5U1glbq9oPq7ECkPwWA9DSzdBidXfdezyMxJe\n1weMKBjz4+cOvzDS5ybdDPjQE1HlfQ3ffWz8nMm1agoLMXBz5e9pqYo098sL\n+FbijDCbi2Db3fD3UT1DBFMp3+GHuhe4/Aiow2TgL6l9rPlijvXVtAZdnRPV\ng+id\r\n=kdOk\r\n-----END PGP SIGNATURE-----\r\n" + } + } + } +} \ No newline at end of file diff --git a/addons/pkg-npm/jaxrs/pom.xml b/addons/pkg-npm/jaxrs/pom.xml index dd1750433c..402e154d58 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 - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/model-java/pom.xml b/addons/pkg-npm/model-java/pom.xml index 469d42eb88..824b82cf32 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 - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/model-java/src/main/java/org/commonjava/indy/pkg/npm/model/PackageMetadata.java b/addons/pkg-npm/model-java/src/main/java/org/commonjava/indy/pkg/npm/model/PackageMetadata.java index 93bbe272e4..708de89141 100644 --- a/addons/pkg-npm/model-java/src/main/java/org/commonjava/indy/pkg/npm/model/PackageMetadata.java +++ b/addons/pkg-npm/model-java/src/main/java/org/commonjava/indy/pkg/npm/model/PackageMetadata.java @@ -28,9 +28,7 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; -import java.util.Collections; import java.util.Date; -import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -56,17 +54,17 @@ public class PackageMetadata @JsonProperty( "dist-tags" ) private DistTag distTags = new DistTag(); - private Map versions = new LinkedHashMap(); + private Map versions = new LinkedHashMap<>(); private List maintainers = new ArrayList<>(); - private Map time = new LinkedHashMap(); + private Map time = new LinkedHashMap<>(); private UserInfo author; - private Map users = new LinkedHashMap(); + private Map users = new LinkedHashMap<>(); - @ApiModelProperty( required = false, dataType = "Repository", value = "Specify the place where your code lives." ) + @ApiModelProperty( dataType = "Repository", value = "Specify the place where your code lives." ) private Repository repository; private String readme; @@ -77,7 +75,7 @@ public class PackageMetadata private List keywords = new ArrayList<>(); - @ApiModelProperty( required = false, dataType = "Bugs", value = "The issue tracker and / or the email address to which issues should be reported." ) + @ApiModelProperty( dataType = "Bugs", value = "The issue tracker and / or the email address to which issues should be reported." ) private Bugs bugs; private License license; @@ -309,10 +307,8 @@ public boolean merge( PackageMetadata source, boolean isForGroup ) } // merge maintainers list - Iterator maintainer = source.getMaintainers().iterator(); - while ( maintainer.hasNext() ) + for ( UserInfo m : source.getMaintainers() ) { - UserInfo m = (UserInfo) maintainer.next(); if ( m.getName() != null && !maintainers.contains( m ) ) { this.addMaintainers( new UserInfo( m.getName(), m.getEmail(), m.getUrl() ) ); @@ -321,10 +317,8 @@ public boolean merge( PackageMetadata source, boolean isForGroup ) } // merge keywords list - Iterator keyword = source.getKeywords().iterator(); - while ( keyword.hasNext() ) + for ( String key : source.getKeywords() ) { - String key = (String) keyword.next(); if ( !keywords.contains( key ) ) { this.addKeywords( key ); @@ -368,7 +362,7 @@ public boolean merge( PackageMetadata source, boolean isForGroup ) for ( final String key : sourceTimes.keySet() ) { String value = sourceTimes.get( key ); - Date date = null; + Date date; try { date = sdf.parse( value ); @@ -376,7 +370,9 @@ public boolean merge( PackageMetadata source, boolean isForGroup ) catch ( ParseException e ) { logger.error( String.format( "Cannot parse date: %s. Reason: %s", value, e ) ); + continue; } + // if source's version update time is more recent(sort as the letter order), will update it into the original map. if ( clone.containsKey( key ) && date.compareTo( clone.get( key ) ) <= 0 ) { @@ -393,7 +389,7 @@ public boolean merge( PackageMetadata source, boolean isForGroup ) // sort as the time value in map List> timeList = new ArrayList<>( clone.entrySet() ); // sort the time as value (update time) asc - Collections.sort( timeList, ( o1, o2 ) -> o1.getValue().compareTo( o2.getValue() ) ); + timeList.sort( Map.Entry.comparingByValue() ); Map result = new LinkedHashMap<>(); // make the 'modified' and 'created' value as the first two keys in final map diff --git a/addons/pkg-npm/pom.xml b/addons/pkg-npm/pom.xml index be30dd1079..2e2fd5cd71 100644 --- a/addons/pkg-npm/pom.xml +++ b/addons/pkg-npm/pom.xml @@ -20,7 +20,7 @@ indy-addons org.commonjava.indy - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT 4.0.0 diff --git a/addons/pom.xml b/addons/pom.xml index 20069d2ec1..f15cd80708 100644 --- a/addons/pom.xml +++ b/addons/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-parent - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-addons diff --git a/addons/promote/client-java/pom.xml b/addons/promote/client-java/pom.xml index 4cd83d94a8..bfc5587d6f 100644 --- a/addons/promote/client-java/pom.xml +++ b/addons/promote/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.5.1-SNAPSHOT + 2.5.3-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 74faba7cf3..3d9e859a46 100644 --- a/addons/promote/common/pom.xml +++ b/addons/promote/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-promote-common Indy :: Add-Ons :: Artifact Promotion :: Common @@ -71,7 +71,7 @@ org.commonjava.indy - indy-subsys-metrics-reporter + indy-subsys-metrics diff --git a/addons/promote/common/src/main/data/promote/rules/maven-project-version-pattern.groovy b/addons/promote/common/src/main/data/promote/rules/maven-project-version-pattern.groovy index cc3f2a38d3..ec113e10da 100644 --- a/addons/promote/common/src/main/data/promote/rules/maven-project-version-pattern.groovy +++ b/addons/promote/common/src/main/data/promote/rules/maven-project-version-pattern.groovy @@ -1,5 +1,6 @@ package org.commonjava.indy.promote.rules +import java.util.regex.Pattern import org.apache.commons.lang.StringUtils; import org.commonjava.indy.promote.validate.model.ValidationRequest import org.commonjava.indy.promote.validate.model.ValidationRule @@ -8,7 +9,7 @@ import org.slf4j.LoggerFactory class MavenProjectVersionPattern implements ValidationRule { String validate(ValidationRequest request) throws Exception { - def versionPattern = request.getValidationParameter("versionPattern") + def versionPattern = request.getVersionPattern() def errors = Collections.synchronizedList(new ArrayList()); if (versionPattern != null) { @@ -17,9 +18,10 @@ class MavenProjectVersionPattern implements ValidationRule { def ref = tools.getArtifact(it) if (ref != null) { def vs = ref.getVersionString() - if (!vs.matches(versionPattern)) { + def matcher = versionPattern.matcher(vs) + if (!matcher.matches()) { errors.add(String.format("%s does not match version pattern: '%s' (version was: '%s')", - it, versionPattern, vs)) + it, versionPattern.pattern(), vs)) } } }) diff --git a/addons/promote/common/src/main/data/promote/rules/npm-version-pattern.groovy b/addons/promote/common/src/main/data/promote/rules/npm-version-pattern.groovy index 74846ddd06..a8f7d03159 100644 --- a/addons/promote/common/src/main/data/promote/rules/npm-version-pattern.groovy +++ b/addons/promote/common/src/main/data/promote/rules/npm-version-pattern.groovy @@ -1,5 +1,6 @@ package org.commonjava.indy.promote.rules +import java.util.regex.Pattern import org.apache.commons.lang.StringUtils import org.commonjava.indy.pkg.PackageTypeConstants; import org.commonjava.indy.promote.validate.model.ValidationRequest @@ -8,8 +9,8 @@ import org.slf4j.LoggerFactory class NPMVersionPattern implements ValidationRule { String validate(ValidationRequest request) throws Exception { - def versionPattern = request.getValidationParameter("versionPattern") - def scopedVersionPattern = request.getValidationParameter("scopedVersionPattern") + def versionPattern = request.getVersionPattern() + def scopedVersionPattern = request.getScopedVersionPattern() def validScope = request.getValidationParameter("validScope") def errors = Collections.synchronizedList(new ArrayList()) def logger = LoggerFactory.getLogger(getClass()) @@ -28,21 +29,24 @@ class NPMVersionPattern implements ValidationRule { if (versionPattern != null) { def vs = pkgPath.version logger.info("Start to do version match for path {} with version {}", pkgPath, vs) - if (!vs.matches(versionPattern)) { + + def matcher = versionPattern.matcher(vs) + if (!matcher.matches()) { errors.add(String.format("%s is not %s scoped and does not match version pattern: '%s' (version was: '%s')", - it, validScope, versionPattern, vs)) + it, validScope, versionPattern.pattern(), vs)) } else { - logger.info("path {} with version {} matches with version pattern {}", pkgPath, vs, versionPattern) + logger.info("path {} with version {} matches with version pattern {}", pkgPath, vs, versionPattern.pattern()) } } } else if (scopedVersionPattern != null) { def vs = pkgPath.version logger.info("Start to do version match for path {} with version {}", pkgPath, vs) - if (!vs.matches(scopedVersionPattern)) { + def matcher = scopedVersionPattern.matcher(vs) + if (!matcher.matches()) { errors.add(String.format("%s is %s scoped and does not match scoped version pattern: '%s' (version was: '%s')", - it, validScope, scopedVersionPattern, vs)) + it, validScope, scopedVersionPattern.pattern(), vs)) } else { - logger.info("path {} with version {} matches with version pattern {}", pkgPath, vs, scopedVersionPattern) + logger.info("path {} with version {} matches with version pattern {}", pkgPath, vs, scopedVersionPattern.pattern()) } } } 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 63048fcf4f..70b5d859a9 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 @@ -29,7 +29,7 @@ import org.commonjava.indy.core.inject.GroupMembershipLocks; import org.commonjava.indy.data.IndyDataException; import org.commonjava.indy.data.StoreDataManager; -import org.commonjava.indy.measure.annotation.Measure; +import org.commonjava.o11yphant.metrics.annotation.Measure; import org.commonjava.indy.model.core.ArtifactStore; import org.commonjava.indy.model.core.Group; import org.commonjava.indy.model.core.HostedRepository; @@ -55,7 +55,7 @@ import org.commonjava.maven.galley.spi.nfc.NotFoundCache; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.commonjava.indy.metrics.RequestContextHelper; +import org.commonjava.indy.util.RequestContextHelper; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.event.Event; diff --git a/addons/promote/common/src/main/java/org/commonjava/indy/promote/metrics/PathGauges.java b/addons/promote/common/src/main/java/org/commonjava/indy/promote/metrics/PathGauges.java index 5d137bfa3d..c38fd92ea0 100644 --- a/addons/promote/common/src/main/java/org/commonjava/indy/promote/metrics/PathGauges.java +++ b/addons/promote/common/src/main/java/org/commonjava/indy/promote/metrics/PathGauges.java @@ -15,8 +15,8 @@ */ package org.commonjava.indy.promote.metrics; -import com.codahale.metrics.Gauge; -import org.commonjava.indy.metrics.IndyMetricsManager; +import org.commonjava.o11yphant.metrics.api.Gauge; +import org.commonjava.o11yphant.metrics.DefaultMetricsManager; import org.commonjava.indy.promote.model.PathsPromoteResult; import javax.annotation.PostConstruct; @@ -30,7 +30,7 @@ public class PathGauges { @Inject - private IndyMetricsManager metricsManager; + private DefaultMetricsManager metricsManager; private AtomicInteger total = new AtomicInteger(); @@ -48,7 +48,7 @@ public void init() registerPathPromotionGauges( metricsManager ); } - private void registerPathPromotionGauges( IndyMetricsManager metricsManager ) + private void registerPathPromotionGauges( DefaultMetricsManager metricsManager ) { Map> gauges = new HashMap<>(); gauges.put( "total", () -> getTotal() ); 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 8d67766cbc..2be85aea53 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,7 +27,7 @@ import org.commonjava.indy.data.IndyDataException; import org.commonjava.indy.data.StoreDataManager; import org.commonjava.indy.data.ArtifactStoreQuery; -import org.commonjava.indy.measure.annotation.Measure; +import org.commonjava.o11yphant.metrics.annotation.Measure; import org.commonjava.indy.model.core.ArtifactStore; import org.commonjava.indy.model.core.StoreKey; import org.commonjava.indy.model.core.io.IndyObjectMapper; @@ -60,7 +60,7 @@ import org.commonjava.maven.galley.transport.htcli.model.HttpExchangeMetadata; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.commonjava.indy.metrics.RequestContextHelper; +import org.commonjava.indy.util.RequestContextHelper; import org.slf4j.MDC; import javax.inject.Inject; 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 bf8d614d99..d863607a2e 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 @@ -27,8 +27,8 @@ import org.commonjava.indy.content.DownloadManager; 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.o11yphant.metrics.annotation.Measure; +import org.commonjava.o11yphant.metrics.DefaultMetricsManager; import org.commonjava.indy.model.core.ArtifactStore; import org.commonjava.indy.model.core.RemoteRepository; import org.commonjava.indy.promote.conf.PromoteConfig; @@ -43,8 +43,7 @@ import org.commonjava.maven.galley.model.Transfer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.commonjava.indy.metrics.RequestContextHelper; -import org.slf4j.MDC; +import org.commonjava.indy.util.RequestContextHelper; import javax.inject.Inject; import java.io.File; @@ -57,10 +56,10 @@ 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.lang3.StringUtils.join; import static org.commonjava.indy.core.ctl.PoolUtils.detectOverloadVoid; +import static org.commonjava.o11yphant.metrics.util.NameUtils.name; /** * Created by jdcasey on 9/11/15. @@ -89,7 +88,7 @@ public class PromotionValidator private PromoteConfig config; @Inject - private IndyMetricsManager metricsManager; + private DefaultMetricsManager metricsManager; @Inject @WeftManaged @@ -104,7 +103,7 @@ protected PromotionValidator() public PromotionValidator( PromoteValidationsManager validationsManager, PromotionValidationTools validationTools, StoreDataManager storeDataMgr, DownloadManager downloadManager, - WeftExecutorService validateService, IndyMetricsManager metricsManager ) + WeftExecutorService validateService, DefaultMetricsManager metricsManager ) { this.validationsManager = validationsManager; this.validationTools = validationTools; diff --git a/addons/promote/common/src/main/java/org/commonjava/indy/promote/validate/model/ValidationRequest.java b/addons/promote/common/src/main/java/org/commonjava/indy/promote/validate/model/ValidationRequest.java index 967f245995..098f4491df 100644 --- a/addons/promote/common/src/main/java/org/commonjava/indy/promote/validate/model/ValidationRequest.java +++ b/addons/promote/common/src/main/java/org/commonjava/indy/promote/validate/model/ValidationRequest.java @@ -18,7 +18,6 @@ import org.commonjava.cdi.util.weft.ThreadContext; import org.commonjava.indy.IndyWorkflowException; import org.commonjava.indy.content.StoreResource; -import org.commonjava.indy.metrics.RequestContextHelper; import org.commonjava.indy.model.core.ArtifactStore; import org.commonjava.indy.model.core.StoreKey; import org.commonjava.indy.promote.model.PathsPromoteRequest; @@ -26,12 +25,14 @@ import org.commonjava.indy.promote.model.ValidationRuleSet; import org.commonjava.indy.promote.validate.PromotionValidationException; import org.commonjava.indy.promote.validate.PromotionValidationTools; +import org.commonjava.indy.util.RequestContextHelper; import org.commonjava.maven.galley.model.Transfer; import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.function.Predicate; +import java.util.regex.Pattern; import java.util.stream.Collectors; /** @@ -49,6 +50,12 @@ public class ValidationRequest private final ArtifactStore sourceRepository; + private static final Predicate DEFAULT_FILTER = + getMetadataPredicate().negate().and( getChecksumPredicate().negate() ); + + private static final String VERSION_PATTERN = "versionPattern"; + private static final String SCOPED_VERSION_PATTERN = "scopedVersionPattern"; + public ValidationRequest( PromoteRequest promoteRequest, ValidationRuleSet ruleSet, PromotionValidationTools tools, ArtifactStore sourceRepository ) { this.promoteRequest = promoteRequest; @@ -59,11 +66,20 @@ public ValidationRequest( PromoteRequest promoteRequest, ValidationRuleSet ruleS public synchronized Set getSourcePaths() throws PromotionValidationException { - return getSourcePaths(false, false); + return getSourcePaths( false, false, DEFAULT_FILTER ); } public synchronized Set getSourcePaths( boolean includeMetadata, boolean includeChecksums ) throws PromotionValidationException + { + Predicate metadata = asPredicate( includeMetadata ).or( getMetadataPredicate().negate() ); + Predicate checksums = asPredicate( includeChecksums ).or( getChecksumPredicate().negate() ); + return getSourcePaths( includeMetadata, includeChecksums ,metadata.and( checksums ) ); + } + + private Set getSourcePaths( boolean includeMetadata, + boolean includeChecksums , Predicate filter ) + throws PromotionValidationException { if ( requestPaths == null ) { @@ -99,8 +115,6 @@ public synchronized Set getSourcePaths( boolean includeMetadata, boolean if ( !includeMetadata || !includeChecksums ) { - Predicate filter = ( path ) -> ( includeMetadata || !path.matches( ".+/maven-metadata\\.xml(\\.(md5|sha[0-9]+))?" ) ) - && ( includeChecksums || !path.matches( ".+\\.(md5|sha[0-9]+)" ) ); return requestPaths.stream().filter( filter ).collect( Collectors.toSet() ); } @@ -134,6 +148,18 @@ else if ( txfr.exists() ) } } + private Predicate asPredicate( boolean value ) { + return ( path ) -> value; + } + + private static Predicate getMetadataPredicate () { + return Pattern.compile( ".+/maven-metadata\\.xml(\\.(md5|sha[0-9]+))?" ).asPredicate(); + } + + private static Predicate getChecksumPredicate () { + return Pattern.compile( ".+\\.(md5|sha[0-9]+)" ).asPredicate(); + } + public PromoteRequest getPromoteRequest() { return promoteRequest; @@ -154,6 +180,26 @@ public String getValidationParameter( String key ) return ruleSet.getValidationParameter( key ); } + public Pattern getVersionPattern( String key ) + { + return ruleSet.getVersionPattern( key ); + } + + public Pattern getVersionPattern() + { + return ruleSet.getVersionPattern( VERSION_PATTERN ); + } + + public Pattern getScopedVersionPattern( String key ) + { + return ruleSet.getScopedVersionPattern( key ); + } + + public Pattern getScopedVersionPattern() + { + return ruleSet.getScopedVersionPattern( SCOPED_VERSION_PATTERN ); + } + public StoreKey getSource() { return sourceRepository.getKey(); diff --git a/addons/promote/ftests/pom.xml b/addons/promote/ftests/pom.xml index bea93a4bd3..bc0832acbe 100644 --- a/addons/promote/ftests/pom.xml +++ b/addons/promote/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-ftests-promote diff --git a/addons/promote/jaxrs/pom.xml b/addons/promote/jaxrs/pom.xml index 86ca4292fd..dfba29ca0a 100644 --- a/addons/promote/jaxrs/pom.xml +++ b/addons/promote/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-promote-jaxrs diff --git a/addons/promote/model-java/pom.xml b/addons/promote/model-java/pom.xml index 419ccc121d..97c033c405 100644 --- a/addons/promote/model-java/pom.xml +++ b/addons/promote/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-promote-model-java Indy :: Add-Ons :: Artifact Promotion :: Java Domain Model diff --git a/addons/promote/model-java/src/main/java/org/commonjava/indy/promote/model/ValidationRuleSet.java b/addons/promote/model-java/src/main/java/org/commonjava/indy/promote/model/ValidationRuleSet.java index 331be72142..736ddba9dd 100644 --- a/addons/promote/model-java/src/main/java/org/commonjava/indy/promote/model/ValidationRuleSet.java +++ b/addons/promote/model-java/src/main/java/org/commonjava/indy/promote/model/ValidationRuleSet.java @@ -21,6 +21,9 @@ import java.util.List; import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; +import java.util.regex.Pattern; /** * Created by jdcasey on 9/11/15. @@ -39,6 +42,9 @@ public class ValidationRuleSet @ApiModelProperty( "Key-value mapping of extra parameters that MAY be required for certain validation rules" ) private Map validationParameters; + private transient Pattern versionPattern; + private transient Pattern scopedVersionPattern; + public ValidationRuleSet(){} public ValidationRuleSet( String name, String storeKeyPattern, List ruleNames, Map validationParameters ) @@ -138,4 +144,28 @@ public String getValidationParameter( String key ) { return validationParameters == null ? null : validationParameters.get( key ); } + + public Pattern getVersionPattern( String key ) + { + if ( versionPattern == null ) + { + versionPattern = getPropertyAsPattern ( key ); + } + return versionPattern; + } + + public Pattern getScopedVersionPattern( String key ) + { + if ( scopedVersionPattern == null ) + { + scopedVersionPattern = getPropertyAsPattern ( key ); + } + return scopedVersionPattern; + } + + private Pattern getPropertyAsPattern ( String key ) + { + String value = validationParameters.get( key ); + return value == null ? null : Pattern.compile( value ); + } } diff --git a/addons/promote/pom.xml b/addons/promote/pom.xml index 8fcd5468df..30901b960b 100644 --- a/addons/promote/pom.xml +++ b/addons/promote/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-promote Indy :: Add-Ons :: Artifact Promotion :: Parent diff --git a/addons/repo-proxy/common/pom.xml b/addons/repo-proxy/common/pom.xml index a4795abcfd..6d21dfe1bc 100644 --- a/addons/repo-proxy/common/pom.xml +++ b/addons/repo-proxy/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-repo-proxy - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-repo-proxy-common Indy :: Add-Ons :: Repository-Proxy :: Common diff --git a/addons/repo-proxy/common/src/main/java/org/commonjava/indy/repo/proxy/RepoProxyController.java b/addons/repo-proxy/common/src/main/java/org/commonjava/indy/repo/proxy/RepoProxyController.java index 4066e816da..a48f771991 100644 --- a/addons/repo-proxy/common/src/main/java/org/commonjava/indy/repo/proxy/RepoProxyController.java +++ b/addons/repo-proxy/common/src/main/java/org/commonjava/indy/repo/proxy/RepoProxyController.java @@ -41,8 +41,6 @@ import static java.util.Optional.of; import static javax.servlet.http.HttpServletResponse.SC_MOVED_PERMANENTLY; import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND; -import static org.commonjava.indy.metrics.RequestContextHelper.HTTP_STATUS; -import static org.commonjava.indy.metrics.RequestContextHelper.setContext; import static org.commonjava.indy.pkg.npm.model.NPMPackageTypeDescriptor.NPM_PKG_KEY; import static org.commonjava.indy.repo.proxy.RepoProxyAddon.ADDON_NAME; import static org.commonjava.indy.repo.proxy.RepoProxyUtils.extractPath; @@ -50,6 +48,8 @@ import static org.commonjava.indy.repo.proxy.RepoProxyUtils.getOriginalStoreKeyFromPath; import static org.commonjava.indy.repo.proxy.RepoProxyUtils.getProxyTo; import static org.commonjava.indy.repo.proxy.RepoProxyUtils.isNPMMetaPath; +import static org.commonjava.indy.util.RequestContextHelper.HTTP_STATUS; +import static org.commonjava.indy.util.RequestContextHelper.setContext; @ApplicationScoped public class RepoProxyController diff --git a/addons/repo-proxy/common/src/main/java/org/commonjava/indy/repo/proxy/conf/RepoProxyConfig.java b/addons/repo-proxy/common/src/main/java/org/commonjava/indy/repo/proxy/conf/RepoProxyConfig.java index fee3d39208..5a3863a522 100644 --- a/addons/repo-proxy/common/src/main/java/org/commonjava/indy/repo/proxy/conf/RepoProxyConfig.java +++ b/addons/repo-proxy/common/src/main/java/org/commonjava/indy/repo/proxy/conf/RepoProxyConfig.java @@ -46,6 +46,8 @@ public class RepoProxyConfig private static final String ENABLED_PARAM = "enabled"; + private static final String CONTENT_LIMITER_ENABLED = "content.limiter.enabled"; + private static final String API_PATTERNS_PARAM = "api.url.patterns"; private static final String API_METHODS_PARAM = "api.methods"; @@ -74,6 +76,8 @@ public class RepoProxyConfig private static final Boolean DEFAULT_CONTENT_BROWSE_REWRITE_ENABLE = Boolean.TRUE; + private static final Boolean DEFAULT_CONTENT_LIMITER_ENABLE = Boolean.TRUE; + private static final Integer DEFAULT_REMOTE_INDY_REQUEST_TIMEOUT = 60; private String repoCreatorRuleBaseDir; @@ -90,6 +94,8 @@ public class RepoProxyConfig private Boolean contentBrowseRewriteEnabled; + private Boolean contentLimiterEnabled; + private String defaultRemoteIndyUrl; private Boolean remoteIndyListingRewriteEnabled; @@ -124,6 +130,12 @@ public Boolean isContentBrowseRewriteEnabled() this.contentBrowseRewriteEnabled; } + public Boolean isContentLimiterEnabled() + { + return this.contentLimiterEnabled == null ? DEFAULT_CONTENT_LIMITER_ENABLE : + this.contentLimiterEnabled; + } + public Set getApiPatterns() { if ( apiPatterns.isEmpty() ) @@ -220,6 +232,9 @@ public void parameter( final String name, final String value ) case REMOTE_INDY_REQUEST_TIMEOUT: this.remoteIndyRequestTimeout = Integer.parseInt( value.trim() ); break; + case CONTENT_LIMITER_ENABLED: + this.contentLimiterEnabled = Boolean.valueOf( value.trim() ); + break; default: break; } diff --git a/addons/repo-proxy/common/src/main/java/org/commonjava/indy/repo/proxy/content/RepoProxyCacheProducer.java b/addons/repo-proxy/common/src/main/java/org/commonjava/indy/repo/proxy/content/RepoProxyCacheProducer.java new file mode 100644 index 0000000000..45f0b9744f --- /dev/null +++ b/addons/repo-proxy/common/src/main/java/org/commonjava/indy/repo/proxy/content/RepoProxyCacheProducer.java @@ -0,0 +1,43 @@ +/** + * Copyright (C) 2011-2020 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.repo.proxy.content; + +import org.commonjava.indy.subsys.infinispan.CacheHandle; +import org.commonjava.indy.subsys.infinispan.CacheProducer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Produces; +import javax.inject.Inject; + +public class RepoProxyCacheProducer +{ + private final Logger logger = LoggerFactory.getLogger( getClass() ); + + @Inject + private CacheProducer cacheProducer; + + private static final String REPO_PROXY_CONTENT_CACHE = "repo-proxy-content"; + + @RepoProxyContentCache + @Produces + @ApplicationScoped + public CacheHandle scheduleExpireCache() + { + return cacheProducer.getCache( REPO_PROXY_CONTENT_CACHE ); + } +} diff --git a/subsys/metrics/core/src/main/java/org/commonjava/indy/measure/annotation/MetricWrapper.java b/addons/repo-proxy/common/src/main/java/org/commonjava/indy/repo/proxy/content/RepoProxyContentCache.java similarity index 62% rename from subsys/metrics/core/src/main/java/org/commonjava/indy/measure/annotation/MetricWrapper.java rename to addons/repo-proxy/common/src/main/java/org/commonjava/indy/repo/proxy/content/RepoProxyContentCache.java index 52b73480e2..65084cc76e 100644 --- a/subsys/metrics/core/src/main/java/org/commonjava/indy/measure/annotation/MetricWrapper.java +++ b/addons/repo-proxy/common/src/main/java/org/commonjava/indy/repo/proxy/content/RepoProxyContentCache.java @@ -13,20 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.commonjava.indy.measure.annotation; +package org.commonjava.indy.repo.proxy.content; -import javax.enterprise.util.Nonbinding; -import javax.interceptor.InterceptorBinding; +import javax.inject.Qualifier; +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -@InterceptorBinding -@Target( { METHOD, TYPE } ) -@Retention( RUNTIME ) -public @interface MetricWrapper +/** + * Qualifier used to supply "repo-proxy-content" cache + */ +@Qualifier +@Target( { ElementType.FIELD, ElementType.PARAMETER, ElementType.METHOD } ) +@Retention( RetentionPolicy.RUNTIME ) +@Documented +public @interface RepoProxyContentCache { } diff --git a/addons/repo-proxy/common/src/main/java/org/commonjava/indy/repo/proxy/content/RepoProxyContentLimiter.java b/addons/repo-proxy/common/src/main/java/org/commonjava/indy/repo/proxy/content/RepoProxyContentLimiter.java new file mode 100644 index 0000000000..3026c03762 --- /dev/null +++ b/addons/repo-proxy/common/src/main/java/org/commonjava/indy/repo/proxy/content/RepoProxyContentLimiter.java @@ -0,0 +1,141 @@ +/** + * Copyright (C) 2011-2020 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.repo.proxy.content; + +import org.commonjava.indy.IndyWorkflowException; +import org.commonjava.indy.content.ContentManager; +import org.commonjava.indy.data.IndyDataException; +import org.commonjava.indy.data.StoreDataManager; +import org.commonjava.indy.model.core.ArtifactStore; +import org.commonjava.indy.model.core.StoreKey; +import org.commonjava.indy.repo.proxy.conf.RepoProxyConfig; +import org.commonjava.indy.subsys.infinispan.CacheHandle; +import org.commonjava.indy.util.LocationUtils; +import org.commonjava.maven.galley.event.FileStorageEvent; +import org.infinispan.notifications.Listener; +import org.infinispan.notifications.cachelistener.annotation.CacheEntriesEvicted; +import org.infinispan.notifications.cachelistener.annotation.CacheEntryExpired; +import org.infinispan.notifications.cachelistener.event.CacheEntriesEvictedEvent; +import org.infinispan.notifications.cachelistener.event.CacheEntryExpiredEvent; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.event.Observes; +import javax.inject.Inject; +import java.util.Map; + +import static org.commonjava.indy.model.core.StoreType.remote; + +@ApplicationScoped +@Listener +public class RepoProxyContentLimiter +{ + + private final CacheHandle storedPaths; + + private final RepoProxyConfig config; + + private final StoreDataManager storeDataManager; + + private final ContentManager contentManager; + + private final Logger logger = LoggerFactory.getLogger( getClass() ); + + @Inject + public RepoProxyContentLimiter( @RepoProxyContentCache CacheHandle storedPaths, + StoreDataManager storeDataManager, ContentManager contentManager, + RepoProxyConfig config ) + { + this.storedPaths = storedPaths; + this.storeDataManager = storeDataManager; + this.contentManager = contentManager; + this.config = config; + } + + public void onContentStorage( @Observes FileStorageEvent storageEvent ) + { + if ( !isEnabled() ) + { + return; + } + + StoreKey storeKey = LocationUtils.getKey( storageEvent ); + if ( remote == storeKey.getType() ) + { + String path = storageEvent.getTransfer().getPath(); + String skp = storeKey.toString() + "#" + path; + + storedPaths.put( skp, skp ); + } + } + + private boolean isEnabled() + { + return config.isEnabled() && config.isContentLimiterEnabled(); + } + + @CacheEntryExpired + public void onContentExpiration( CacheEntryExpiredEvent event ) + { + if ( !isEnabled() ) + { + return; + } + + clearContent( event.getKey() ); + } + + @CacheEntriesEvicted + public void onContentEviction( CacheEntriesEvictedEvent event ) + { + if ( !isEnabled() ) + { + return; + } + + Map entries = event.getEntries(); + for ( String skp : entries.keySet() ) + { + clearContent( skp ); + } + } + + private void clearContent( String skp ) + { + String[] parts = skp.split( "#" ); + StoreKey storeKey = StoreKey.fromString( parts[0] ); + + if ( remote == storeKey.getType() ) + { + ArtifactStore store; + try + { + store = storeDataManager.getArtifactStore( storeKey ); + contentManager.delete( store, parts[1] ); + } + catch ( IndyDataException e ) + { + logger.warn( "Failed to lookup store: {} from event: {}", storeKey, skp ); + } + catch ( IndyWorkflowException e ) + { + logger.warn( "Failed to delete: {} from: {}, from event: {}", parts[1], storeKey, skp ); + } + } + } + +} diff --git a/addons/repo-proxy/ftests/pom.xml b/addons/repo-proxy/ftests/pom.xml index 95483ef907..f8d3cb8442 100644 --- a/addons/repo-proxy/ftests/pom.xml +++ b/addons/repo-proxy/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-repo-proxy - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-ftests-repo-proxy diff --git a/addons/repo-proxy/jaxrs/pom.xml b/addons/repo-proxy/jaxrs/pom.xml index 126cff3789..d44145e304 100644 --- a/addons/repo-proxy/jaxrs/pom.xml +++ b/addons/repo-proxy/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-repo-proxy - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-repo-proxy-jaxrs diff --git a/addons/repo-proxy/pom.xml b/addons/repo-proxy/pom.xml index a7ffad19e7..b8baa6c481 100644 --- a/addons/repo-proxy/pom.xml +++ b/addons/repo-proxy/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-repo-proxy Indy :: Add-Ons :: Repository-Proxy :: Parent diff --git a/addons/revisions/common/pom.xml b/addons/revisions/common/pom.xml index a16099005d..43f2f79b57 100644 --- a/addons/revisions/common/pom.xml +++ b/addons/revisions/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-revisions - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-revisions-common Indy :: Add-Ons :: Revisions :: Common diff --git a/addons/revisions/common/src/main/java/org/commonjava/indy/revisions/RevisionsManager.java b/addons/revisions/common/src/main/java/org/commonjava/indy/revisions/RevisionsManager.java index 8341334b15..dd375f5433 100644 --- a/addons/revisions/common/src/main/java/org/commonjava/indy/revisions/RevisionsManager.java +++ b/addons/revisions/common/src/main/java/org/commonjava/indy/revisions/RevisionsManager.java @@ -36,11 +36,10 @@ import org.commonjava.indy.audit.ChangeSummary; import org.commonjava.indy.change.event.IndyLifecycleEvent; import org.commonjava.indy.data.StoreDataManager; -import org.commonjava.indy.measure.annotation.Measure; -import org.commonjava.indy.measure.annotation.MetricNamed; +import org.commonjava.o11yphant.metrics.annotation.Measure; import static org.commonjava.indy.flat.data.DataFileStoreUtils.INDY_STORE; -import static org.commonjava.indy.metrics.IndyMetricsConstants.DEFAULT; + import org.commonjava.indy.model.core.StoreKey; import org.commonjava.indy.revisions.conf.RevisionsConfig; import org.commonjava.indy.subsys.datafile.DataFile; diff --git a/addons/revisions/jaxrs/pom.xml b/addons/revisions/jaxrs/pom.xml index 23347232c0..ca45c6db06 100644 --- a/addons/revisions/jaxrs/pom.xml +++ b/addons/revisions/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-revisions - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-revisions-jaxrs diff --git a/addons/revisions/pom.xml b/addons/revisions/pom.xml index 17c690b80e..fe1178d04c 100644 --- a/addons/revisions/pom.xml +++ b/addons/revisions/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-revisions Indy :: Add-Ons :: Revisions :: Parent diff --git a/addons/sli/pom.xml b/addons/sli/pom.xml index a816dda605..e0c6d912a5 100644 --- a/addons/sli/pom.xml +++ b/addons/sli/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-sli Indy :: Add-Ons :: Service Level Indicators Reporting :: JAX-RS @@ -29,7 +29,7 @@ org.commonjava.indy - indy-subsys-metrics-core + indy-subsys-metrics org.commonjava.indy diff --git a/addons/sli/src/main/java/org/commonjava/indy/sli/metrics/GoldenSignalsFunctionMetrics.java b/addons/sli/src/main/java/org/commonjava/indy/sli/metrics/GoldenSignalsFunctionMetrics.java deleted file mode 100644 index 45907c7578..0000000000 --- a/addons/sli/src/main/java/org/commonjava/indy/sli/metrics/GoldenSignalsFunctionMetrics.java +++ /dev/null @@ -1,102 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.sli.metrics; - -import com.codahale.metrics.Meter; -import com.codahale.metrics.Metric; -import com.codahale.metrics.Timer; -import com.codahale.metrics.health.HealthCheck; - -import java.util.HashMap; -import java.util.Map; - -import static java.util.concurrent.TimeUnit.NANOSECONDS; - -public class GoldenSignalsFunctionMetrics -{ - private String name; - - private Meter load = new Meter(); - - private Timer latency = new Timer(); - - private Meter errors = new Meter(); - - private Meter throughput = new Meter(); - - GoldenSignalsFunctionMetrics( String name ) - { - this.name = name; - } - - Map getMetrics() - { - Map metrics = new HashMap<>(); - metrics.put( name + ".latency", latency ); - metrics.put( name + ".errors", errors ); - metrics.put( name + ".throughput", throughput ); - metrics.put( name + ".load", load ); - - return metrics; - } - - public GoldenSignalsFunctionMetrics latency( long duration ) - { - latency.update( duration, NANOSECONDS ); - return this; - } - - public GoldenSignalsFunctionMetrics error() - { - errors.mark(); - return this; - } - - public GoldenSignalsFunctionMetrics call() - { - throughput.mark(); - return this; - } - - public HealthCheck getHealthCheck() - { - return new GSFunctionHealthCheck(); - } - - public GoldenSignalsFunctionMetrics started() - { - load.mark(); - return this; - } - - final class GSFunctionHealthCheck - extends HealthCheck - { - @Override - protected Result check() - throws Exception - { - // FIXME: We need need to incorporate the SLO targets to determine whether health / unhealthy. - return Result.builder() - .withDetail( "latency", latency.getSnapshot().get99thPercentile() ) - .withDetail( "errors", errors.getOneMinuteRate() ) - .withDetail( "throughput", throughput.getOneMinuteRate() ) - .withDetail( "load", load.getOneMinuteRate() ) - .healthy() - .build(); - } - } -} diff --git a/addons/sli/src/main/java/org/commonjava/indy/sli/metrics/GoldenSignalsMetricSet.java b/addons/sli/src/main/java/org/commonjava/indy/sli/metrics/GoldenSignalsMetricSet.java deleted file mode 100644 index 42bc5568ac..0000000000 --- a/addons/sli/src/main/java/org/commonjava/indy/sli/metrics/GoldenSignalsMetricSet.java +++ /dev/null @@ -1,67 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.sli.metrics; - -import com.codahale.metrics.Metric; -import com.codahale.metrics.MetricSet; -import com.codahale.metrics.health.HealthCheck; -import org.commonjava.indy.metrics.healthcheck.IndyCompoundHealthCheck; - -import javax.enterprise.context.ApplicationScoped; -import java.util.HashMap; -import java.util.Map; -import java.util.Optional; -import java.util.stream.Stream; - -import static org.commonjava.indy.metrics.TrafficClassifierConstants.FUNCTIONS; - -@ApplicationScoped -public class GoldenSignalsMetricSet - implements MetricSet, IndyCompoundHealthCheck -{ - private Map functionMetrics = new HashMap<>(); - - public GoldenSignalsMetricSet() - { - Stream.of( FUNCTIONS ) - .forEach( function -> { - System.out.println( "Wiring SLI metrics for: " + function ); - functionMetrics.put( function, new GoldenSignalsFunctionMetrics( function ) ); - } ); - } - - @Override - public Map getMetrics() - { - Map metrics = new HashMap<>(); - functionMetrics.values().forEach( ms -> metrics.putAll( ms.getMetrics() ) ); - - return metrics; - } - - public Optional function( String name ) - { - return functionMetrics.containsKey( name ) ? Optional.of( functionMetrics.get( name ) ) : Optional.empty(); - } - - @Override - public Map getHealthChecks() - { - Map checks = new HashMap<>(); - functionMetrics.forEach( (key,value)-> checks.put( "sli.golden." + key, value.getHealthCheck() ) ); - return checks; - } -} diff --git a/core/src/test/java/org/commonjava/indy/fixture/MockWeftProvider.java b/addons/sli/src/main/java/org/commonjava/indy/sli/metrics/IndyGoldenSignalsMetricSet.java similarity index 62% rename from core/src/test/java/org/commonjava/indy/fixture/MockWeftProvider.java rename to addons/sli/src/main/java/org/commonjava/indy/sli/metrics/IndyGoldenSignalsMetricSet.java index 9acfd3b69c..ded8e77a8c 100644 --- a/core/src/test/java/org/commonjava/indy/fixture/MockWeftProvider.java +++ b/addons/sli/src/main/java/org/commonjava/indy/sli/metrics/IndyGoldenSignalsMetricSet.java @@ -13,23 +13,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.commonjava.indy.fixture; +package org.commonjava.indy.sli.metrics; -import org.commonjava.cdi.util.weft.config.DefaultWeftConfig; -import org.commonjava.cdi.util.weft.config.WeftConfig; +import org.commonjava.o11yphant.metrics.sli.GoldenSignalsMetricSet; import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Alternative; -import javax.enterprise.inject.Produces; +import java.util.Arrays; +import java.util.Collection; + +import static org.commonjava.indy.subsys.metrics.IndyTrafficClassifierConstants.FUNCTIONS; @ApplicationScoped -@Alternative -public class MockWeftProvider +public class IndyGoldenSignalsMetricSet + extends GoldenSignalsMetricSet { - @Produces - public WeftConfig getWeftConfig() + @Override + protected Collection getFunctions() { - return new DefaultWeftConfig(); + return Arrays.asList( FUNCTIONS ); } } diff --git a/addons/sli/src/main/java/org/commonjava/indy/sli/metrics/GoldenSignalsMetricSetProvider.java b/addons/sli/src/main/java/org/commonjava/indy/sli/metrics/IndyGoldenSignalsMetricSetProvider.java similarity index 70% rename from addons/sli/src/main/java/org/commonjava/indy/sli/metrics/GoldenSignalsMetricSetProvider.java rename to addons/sli/src/main/java/org/commonjava/indy/sli/metrics/IndyGoldenSignalsMetricSetProvider.java index 9c81d545ba..2d65f5177a 100644 --- a/addons/sli/src/main/java/org/commonjava/indy/sli/metrics/GoldenSignalsMetricSetProvider.java +++ b/addons/sli/src/main/java/org/commonjava/indy/sli/metrics/IndyGoldenSignalsMetricSetProvider.java @@ -15,22 +15,28 @@ */ package org.commonjava.indy.sli.metrics; -import com.codahale.metrics.MetricRegistry; -import org.commonjava.indy.metrics.MetricSetProvider; +import org.commonjava.o11yphant.metrics.api.MetricSet; +import org.commonjava.o11yphant.metrics.MetricSetProvider; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; @ApplicationScoped -public class GoldenSignalsMetricSetProvider +public class IndyGoldenSignalsMetricSetProvider implements MetricSetProvider { @Inject - private GoldenSignalsMetricSet metricSet; + private IndyGoldenSignalsMetricSet metricSet; @Override - public void registerMetricSet( final MetricRegistry registry ) + public MetricSet getMetricSet() { - registry.register( "sli.golden", metricSet ); + return metricSet; + } + + @Override + public String getName() + { + return "sli.golden"; } } diff --git a/api/pom.xml b/api/pom.xml index f82c683c55..39212affa7 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-api diff --git a/api/src/main/java/org/commonjava/indy/action/IndyLifecycleManager.java b/api/src/main/java/org/commonjava/indy/action/IndyLifecycleManager.java index 91f9feec2f..310a511ab4 100644 --- a/api/src/main/java/org/commonjava/indy/action/IndyLifecycleManager.java +++ b/api/src/main/java/org/commonjava/indy/action/IndyLifecycleManager.java @@ -20,6 +20,7 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; +import java.util.stream.Collectors; import javax.annotation.PostConstruct; import javax.enterprise.context.ApplicationScoped; @@ -188,7 +189,9 @@ private void runBootupActions() if ( bootupActions != null ) { - logger.info( "Running bootup actions..." ); + logger.info( "Running bootup actions in the following order:\n\n{}", + bootupActions.stream().map( a -> a.getId() ).collect( Collectors.toList() ) ); + for ( final BootupAction action : bootupActions ) { logger.info( "Running bootup action: '{}'", action.getId() ); @@ -212,7 +215,9 @@ private void runMigrationActions() boolean changed = false; if ( migrationActions != null ) { - logger.info( "Running migration actions..." ); + logger.info( "Running migration actions in the following order:\n\n{}", + migrationActions.stream().map( a -> a.getId() ).collect( Collectors.toList() ) ); + for ( final MigrationAction action : migrationActions ) { logger.info( "Running migration action: '{}'", action.getId() ); @@ -235,7 +240,9 @@ private void runStartupActions() if ( startupActions != null ) { - logger.info( "Running startup actions..." ); + logger.info( "Running startup actions in the following order:\n\n{}", + startupActions.stream().map( a -> a.getId() ).collect( Collectors.toList() ) ); + for ( final StartupAction action : startupActions ) { logger.info( "Running startup action: '{}'", action.getId() ); @@ -258,7 +265,9 @@ private void runShutdownActions() if ( shutdownActions != null ) { - logger.info( "Running shutdown actions..." ); + logger.info( "Running shutdown actions in the following order:\n\n{}", + shutdownActions.stream().map( a -> a.getId() ).collect( Collectors.toList() ) ); + for ( final ShutdownAction action : shutdownActions ) { logger.info( "Running shutdown action: '{}'", action.getId() ); diff --git a/api/src/main/java/org/commonjava/indy/metrics/RequestContextHelper.java b/api/src/main/java/org/commonjava/indy/util/RequestContextHelper.java similarity index 99% rename from api/src/main/java/org/commonjava/indy/metrics/RequestContextHelper.java rename to api/src/main/java/org/commonjava/indy/util/RequestContextHelper.java index c9c3619772..1c5ec35a8e 100644 --- a/api/src/main/java/org/commonjava/indy/metrics/RequestContextHelper.java +++ b/api/src/main/java/org/commonjava/indy/util/RequestContextHelper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.commonjava.indy.metrics; +package org.commonjava.indy.util; import org.commonjava.cdi.util.weft.ThreadContext; diff --git a/bin/test-setup.sh b/bin/test-setup.sh index 2df694fbfe..4a28ebd767 100755 --- a/bin/test-setup.sh +++ b/bin/test-setup.sh @@ -56,6 +56,8 @@ else cat > $ETC_BASE/conf.d/default.conf <<-EOF [default] standalone=true +[_internal] +store.validation.enabled=false [ssl] remote.ssl.required=false EOF diff --git a/bindings/jaxrs/pom.xml b/bindings/jaxrs/pom.xml index 01f93a9fa2..9c12411f4a 100644 --- a/bindings/jaxrs/pom.xml +++ b/bindings/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-bindings - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-bindings-jaxrs diff --git a/bindings/jaxrs/src/main/java/org/commonjava/indy/core/bind/jaxrs/ContentAccessHandler.java b/bindings/jaxrs/src/main/java/org/commonjava/indy/core/bind/jaxrs/ContentAccessHandler.java index 3149aaf5c1..717444cb40 100644 --- a/bindings/jaxrs/src/main/java/org/commonjava/indy/core/bind/jaxrs/ContentAccessHandler.java +++ b/bindings/jaxrs/src/main/java/org/commonjava/indy/core/bind/jaxrs/ContentAccessHandler.java @@ -26,8 +26,8 @@ import org.commonjava.indy.core.bind.jaxrs.util.TransferCountingInputStream; import org.commonjava.indy.core.bind.jaxrs.util.TransferStreamingOutput; import org.commonjava.indy.core.ctl.ContentController; -import org.commonjava.indy.metrics.IndyMetricsManager; -import org.commonjava.indy.metrics.conf.IndyMetricsConfig; +import org.commonjava.o11yphant.metrics.DefaultMetricsManager; +import org.commonjava.indy.subsys.metrics.conf.IndyMetricsConfig; import org.commonjava.indy.model.core.BatchDeleteRequest; import org.commonjava.indy.model.core.PackageTypes; import org.commonjava.indy.model.core.StoreKey; @@ -66,13 +66,12 @@ import java.util.function.Supplier; import static org.commonjava.indy.core.bind.jaxrs.util.RequestUtils.isDirectoryPath; -import static org.commonjava.indy.core.ctl.ContentController.LISTING_HTML_FILE; -import static org.commonjava.indy.metrics.RequestContextHelper.CONTENT_ENTRY_POINT; -import static org.commonjava.indy.metrics.RequestContextHelper.HTTP_STATUS; -import static org.commonjava.indy.metrics.RequestContextHelper.METADATA_CONTENT; -import static org.commonjava.indy.metrics.RequestContextHelper.PACKAGE_TYPE; -import static org.commonjava.indy.metrics.RequestContextHelper.PATH; -import static org.commonjava.indy.metrics.RequestContextHelper.setContext; +import static org.commonjava.indy.util.RequestContextHelper.CONTENT_ENTRY_POINT; +import static org.commonjava.indy.util.RequestContextHelper.HTTP_STATUS; +import static org.commonjava.indy.util.RequestContextHelper.METADATA_CONTENT; +import static org.commonjava.indy.util.RequestContextHelper.PACKAGE_TYPE; +import static org.commonjava.indy.util.RequestContextHelper.PATH; +import static org.commonjava.indy.util.RequestContextHelper.setContext; import static org.commonjava.indy.pkg.npm.model.NPMPackageTypeDescriptor.NPM_PKG_KEY; @ApplicationScoped @@ -93,7 +92,7 @@ public class ContentAccessHandler protected JaxRsRequestHelper jaxRsRequestHelper; @Inject - protected IndyMetricsManager metricsManager; + protected DefaultMetricsManager metricsManager; @Inject protected IndyMetricsConfig metricsConfig; diff --git a/bindings/jaxrs/src/main/java/org/commonjava/indy/core/bind/jaxrs/util/TransferCountingInputStream.java b/bindings/jaxrs/src/main/java/org/commonjava/indy/core/bind/jaxrs/util/TransferCountingInputStream.java index 59355bb6d2..90f4614ac3 100644 --- a/bindings/jaxrs/src/main/java/org/commonjava/indy/core/bind/jaxrs/util/TransferCountingInputStream.java +++ b/bindings/jaxrs/src/main/java/org/commonjava/indy/core/bind/jaxrs/util/TransferCountingInputStream.java @@ -15,22 +15,21 @@ */ package org.commonjava.indy.core.bind.jaxrs.util; -import com.codahale.metrics.Meter; import org.apache.commons.io.input.CountingInputStream; -import org.commonjava.indy.metrics.IndyMetricsManager; -import org.commonjava.indy.metrics.conf.IndyMetricsConfig; +import org.commonjava.o11yphant.metrics.api.Meter; +import org.commonjava.o11yphant.metrics.DefaultMetricsManager; +import org.commonjava.indy.subsys.metrics.conf.IndyMetricsConfig; import org.commonjava.maven.galley.util.IdempotentCloseInputStream; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.FilterInputStream; import java.io.IOException; import java.io.InputStream; import static org.commonjava.indy.IndyContentConstants.NANOS_PER_SEC; -import static org.commonjava.indy.metrics.IndyMetricsConstants.METER; -import static org.commonjava.indy.metrics.IndyMetricsConstants.getDefaultName; -import static org.commonjava.indy.metrics.IndyMetricsConstants.getName; +import static org.commonjava.o11yphant.metrics.MetricsConstants.METER; +import static org.commonjava.o11yphant.metrics.util.NameUtils.getDefaultName; +import static org.commonjava.o11yphant.metrics.util.NameUtils.getName; public class TransferCountingInputStream extends IdempotentCloseInputStream @@ -38,7 +37,7 @@ public class TransferCountingInputStream private static final String TRANSFER_UPLOAD_METRIC_NAME = "indy.transferred.content.upload"; - private IndyMetricsManager metricsManager; + private DefaultMetricsManager metricsManager; private IndyMetricsConfig metricsConfig; @@ -49,7 +48,7 @@ protected TransferCountingInputStream( final InputStream stream ) super( new CountingInputStream( stream ) ); } - public TransferCountingInputStream( final InputStream stream, final IndyMetricsManager metricsManager, + public TransferCountingInputStream( final InputStream stream, final DefaultMetricsManager metricsManager, final IndyMetricsConfig metricsConfig ) { this( stream ); diff --git a/bindings/jaxrs/src/main/java/org/commonjava/indy/core/bind/jaxrs/util/TransferStreamingOutput.java b/bindings/jaxrs/src/main/java/org/commonjava/indy/core/bind/jaxrs/util/TransferStreamingOutput.java index 3b21319d80..c26129c25f 100644 --- a/bindings/jaxrs/src/main/java/org/commonjava/indy/core/bind/jaxrs/util/TransferStreamingOutput.java +++ b/bindings/jaxrs/src/main/java/org/commonjava/indy/core/bind/jaxrs/util/TransferStreamingOutput.java @@ -15,12 +15,12 @@ */ package org.commonjava.indy.core.bind.jaxrs.util; -import com.codahale.metrics.Meter; import org.apache.commons.io.IOUtils; import org.apache.commons.io.output.CountingOutputStream; -import org.commonjava.indy.measure.annotation.Measure; -import org.commonjava.indy.metrics.IndyMetricsManager; -import org.commonjava.indy.metrics.conf.IndyMetricsConfig; +import org.commonjava.o11yphant.metrics.annotation.Measure; +import org.commonjava.o11yphant.metrics.api.Meter; +import org.commonjava.o11yphant.metrics.DefaultMetricsManager; +import org.commonjava.indy.subsys.metrics.conf.IndyMetricsConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,9 +31,9 @@ import java.io.OutputStream; import static org.commonjava.indy.IndyContentConstants.NANOS_PER_SEC; -import static org.commonjava.indy.metrics.IndyMetricsConstants.METER; -import static org.commonjava.indy.metrics.IndyMetricsConstants.getDefaultName; -import static org.commonjava.indy.metrics.IndyMetricsConstants.getName; +import static org.commonjava.o11yphant.metrics.MetricsConstants.METER; +import static org.commonjava.o11yphant.metrics.util.NameUtils.getDefaultName; +import static org.commonjava.o11yphant.metrics.util.NameUtils.getName; public class TransferStreamingOutput implements StreamingOutput @@ -43,11 +43,11 @@ public class TransferStreamingOutput private InputStream stream; - private IndyMetricsManager metricsManager; + private DefaultMetricsManager metricsManager; private IndyMetricsConfig metricsConfig; - public TransferStreamingOutput( final InputStream stream, final IndyMetricsManager metricsManager, + public TransferStreamingOutput( final InputStream stream, final DefaultMetricsManager metricsManager, final IndyMetricsConfig metricsConfig ) { this.stream = stream; diff --git a/bindings/pom.xml b/bindings/pom.xml index e293ca3e38..97e8301eef 100644 --- a/bindings/pom.xml +++ b/bindings/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-parent - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-bindings diff --git a/boot/jaxrs/pom.xml b/boot/jaxrs/pom.xml index 993e7b941d..e3a571cc17 100644 --- a/boot/jaxrs/pom.xml +++ b/boot/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.boot indy-booters - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy.boot diff --git a/boot/jaxrs/src/main/java/org/commonjava/indy/boot/jaxrs/IndyDeployer.java b/boot/jaxrs/src/main/java/org/commonjava/indy/boot/jaxrs/IndyDeployer.java index 1d2d6ef698..9f798f1af2 100644 --- a/boot/jaxrs/src/main/java/org/commonjava/indy/boot/jaxrs/IndyDeployer.java +++ b/boot/jaxrs/src/main/java/org/commonjava/indy/boot/jaxrs/IndyDeployer.java @@ -16,6 +16,7 @@ package org.commonjava.indy.boot.jaxrs; import io.undertow.Undertow; +import io.undertow.UndertowOptions; import io.undertow.predicate.Predicate; import io.undertow.predicate.Predicates; import io.undertow.server.HttpServerExchange; @@ -136,8 +137,10 @@ public void deploy( BootOptions bootOptions ) private Undertow buildAndStartUndertow( DeploymentManager dm, Integer port, String bind, RestConfig restConfig ) throws Exception { - Undertow.Builder builder = - Undertow.builder().setHandler( getGzipEncodeHandler( dm ) ).addHttpListener( port, bind ); + Undertow.Builder builder = Undertow.builder() + .setServerOption( UndertowOptions.ENABLE_HTTP2, true ) + .setHandler( getGzipEncodeHandler( dm ) ) + .addHttpListener( port, bind ); restConfig.configureBuilder( builder ); Undertow t = builder.build(); t.start(); diff --git a/boot/pom.xml b/boot/pom.xml index 98efeffe6d..223a0fc7f2 100644 --- a/boot/pom.xml +++ b/boot/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy.boot diff --git a/clients/core-java/pom.xml b/clients/core-java/pom.xml index 50b6c62a8f..7ca907077d 100644 --- a/clients/core-java/pom.xml +++ b/clients/core-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-clients-parent - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-client-core-java diff --git a/clients/pom.xml b/clients/pom.xml index 44007e7013..a44df42b95 100644 --- a/clients/pom.xml +++ b/clients/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-clients-parent diff --git a/core/pom.xml b/core/pom.xml index 3b469eff65..1f38ce065f 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-core @@ -132,7 +132,7 @@ org.commonjava.indy - indy-subsys-metrics-core + indy-subsys-metrics org.jboss.resteasy diff --git a/core/src/main/conf/conf.d/durable-state.conf b/core/src/main/conf/conf.d/durable-state.conf new file mode 100644 index 0000000000..f9108b87b2 --- /dev/null +++ b/core/src/main/conf/conf.d/durable-state.conf @@ -0,0 +1,4 @@ +[durable-state] +folo.storage=infinispan +store.storage=infinispan +schedule.storage=infinispan \ No newline at end of file diff --git a/core/src/main/java/org/commonjava/indy/core/change/StoreContentListener.java b/core/src/main/java/org/commonjava/indy/core/change/StoreContentListener.java index f1bab9ad42..b9083e90c9 100644 --- a/core/src/main/java/org/commonjava/indy/core/change/StoreContentListener.java +++ b/core/src/main/java/org/commonjava/indy/core/change/StoreContentListener.java @@ -27,7 +27,7 @@ import org.commonjava.indy.content.StoreContentAction; import org.commonjava.indy.data.IndyDataException; import org.commonjava.indy.data.StoreDataManager; -import org.commonjava.indy.measure.annotation.Measure; +import org.commonjava.o11yphant.metrics.annotation.Measure; import org.commonjava.indy.model.core.ArtifactStore; import org.commonjava.indy.model.core.Group; import org.commonjava.indy.model.core.StoreKey; diff --git a/core/src/main/java/org/commonjava/indy/core/change/StoreEnablementManager.java b/core/src/main/java/org/commonjava/indy/core/change/StoreEnablementManager.java index 6e47c86afb..46c53264a0 100644 --- a/core/src/main/java/org/commonjava/indy/core/change/StoreEnablementManager.java +++ b/core/src/main/java/org/commonjava/indy/core/change/StoreEnablementManager.java @@ -27,7 +27,7 @@ import org.commonjava.indy.core.expire.SchedulerTriggerEvent; import org.commonjava.indy.data.IndyDataException; import org.commonjava.indy.data.StoreDataManager; -import org.commonjava.indy.measure.annotation.Measure; +import org.commonjava.o11yphant.metrics.annotation.Measure; import org.commonjava.indy.model.core.ArtifactStore; import org.commonjava.indy.model.core.StoreKey; import org.commonjava.indy.model.core.io.IndyObjectMapper; diff --git a/core/src/main/java/org/commonjava/indy/core/conf/IndyDurableStateConfig.java b/core/src/main/java/org/commonjava/indy/core/conf/IndyDurableStateConfig.java new file mode 100644 index 0000000000..f6f025fed3 --- /dev/null +++ b/core/src/main/java/org/commonjava/indy/core/conf/IndyDurableStateConfig.java @@ -0,0 +1,116 @@ +/** + * Copyright (C) 2011-2020 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.IndyConfigInfo; +import org.commonjava.propulsor.config.annotation.SectionName; +import org.commonjava.propulsor.config.section.MapSectionListener; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.enterprise.context.ApplicationScoped; +import java.io.InputStream; + +@ApplicationScoped +@SectionName(IndyDurableStateConfig.SECTION_NAME) +public class IndyDurableStateConfig + extends MapSectionListener + implements IndyConfigInfo +{ + + public static final String SECTION_NAME = "durable-state"; + + public static final String STORAGE_INFINISPAN = "infinispan"; + + public static final String STORAGE_CASSANDRA = "cassandra"; + + private String foloStorage; + + private String storeStorage; + + private String scheduleStorage; + + public String getFoloStorage() + { + return foloStorage; + } + + public void setFoloStorage( String foloStorage ) + { + this.foloStorage = foloStorage; + } + + public String getStoreStorage() + { + return storeStorage; + } + + public void setStoreStorage( String storeStorage ) + { + this.storeStorage = storeStorage; + } + + public String getScheduleStorage() + { + return scheduleStorage; + } + + public void setScheduleStorage( String scheduleStorage ) + { + this.scheduleStorage = scheduleStorage; + } + + @Override + public void parameter(String name, String value) + { + Logger logger = LoggerFactory.getLogger( getClass() ); + logger.trace( "Got durable-state config parameter: '{}' with value: '{}'", name, value ); + switch ( name ) + { + case "folo.storage": + { + this.foloStorage = value; + break; + } + case "store.storage": + { + this.storeStorage = value; + break; + } + case "schedule.storage": + { + this.scheduleStorage = value; + break; + } + default: break; + } + + } + + @Override + public String getDefaultConfigFileName() + { + return "conf.d/durable-state.conf"; + } + + @Override + public InputStream getDefaultConfig() + { + return Thread.currentThread() + .getContextClassLoader() + .getResourceAsStream( "default-durable-state.conf" ); + } +} diff --git a/core/src/main/java/org/commonjava/indy/core/conf/IndyWeftConfig.java b/core/src/main/java/org/commonjava/indy/core/conf/IndyWeftConfig.java index 73e93ff473..77d36967e8 100644 --- a/core/src/main/java/org/commonjava/indy/core/conf/IndyWeftConfig.java +++ b/core/src/main/java/org/commonjava/indy/core/conf/IndyWeftConfig.java @@ -18,6 +18,7 @@ import org.commonjava.cdi.util.weft.config.DefaultWeftConfig; import org.commonjava.indy.conf.IndyConfigInfo; import org.commonjava.indy.inject.Production; +import org.commonjava.indy.subsys.metrics.conf.IndyMetricsConfig; import org.commonjava.propulsor.config.ConfigurationException; import org.commonjava.propulsor.config.annotation.SectionName; import org.commonjava.propulsor.config.section.MapSectionListener; @@ -27,8 +28,6 @@ import javax.enterprise.inject.Produces; import java.io.InputStream; -import static org.commonjava.indy.metrics.conf.IndyMetricsConfig.INDY_METRICS_NODE_PREFIX; - @ApplicationScoped @SectionName( IndyWeftConfig.SECTION_NAME ) public class IndyWeftConfig @@ -46,7 +45,7 @@ public class IndyWeftConfig public static final String ENABLED = "enabled"; - public static final String NODE_PREFIX = INDY_METRICS_NODE_PREFIX; + public static final String NODE_PREFIX = IndyMetricsConfig.NODE_PREFIX; public static final String THREADS_SUFFIX = ".threads"; diff --git a/core/src/main/java/org/commonjava/indy/core/content/AbstractMergedContentGenerator.java b/core/src/main/java/org/commonjava/indy/core/content/AbstractMergedContentGenerator.java index 9adcd7e868..bc5483f64c 100644 --- a/core/src/main/java/org/commonjava/indy/core/content/AbstractMergedContentGenerator.java +++ b/core/src/main/java/org/commonjava/indy/core/content/AbstractMergedContentGenerator.java @@ -17,7 +17,6 @@ import java.io.IOException; import java.util.Arrays; -import java.util.Collections; import java.util.HashSet; import java.util.Set; import java.util.stream.Stream; @@ -34,7 +33,7 @@ import org.commonjava.indy.core.content.group.GroupMergeHelper; import org.commonjava.indy.data.IndyDataException; import org.commonjava.indy.data.StoreDataManager; -import org.commonjava.indy.measure.annotation.Measure; +import org.commonjava.o11yphant.metrics.annotation.Measure; import org.commonjava.indy.model.core.ArtifactStore; import org.commonjava.indy.model.core.Group; import org.commonjava.indy.model.core.StoreType; diff --git a/core/src/main/java/org/commonjava/indy/core/content/ContentGeneratorManager.java b/core/src/main/java/org/commonjava/indy/core/content/ContentGeneratorManager.java index ad7de7efb2..2df400ae62 100644 --- a/core/src/main/java/org/commonjava/indy/core/content/ContentGeneratorManager.java +++ b/core/src/main/java/org/commonjava/indy/core/content/ContentGeneratorManager.java @@ -18,7 +18,7 @@ import org.commonjava.indy.IndyWorkflowException; import org.commonjava.indy.content.ContentGenerator; import org.commonjava.indy.content.StoreResource; -import org.commonjava.indy.measure.annotation.Measure; +import org.commonjava.o11yphant.metrics.annotation.Measure; import org.commonjava.indy.model.core.ArtifactStore; import org.commonjava.indy.model.core.Group; import org.commonjava.indy.util.LocationUtils; diff --git a/core/src/main/java/org/commonjava/indy/core/content/DefaultContentManager.java b/core/src/main/java/org/commonjava/indy/core/content/DefaultContentManager.java index cd0a3dff2a..dc0a3ac377 100644 --- a/core/src/main/java/org/commonjava/indy/core/content/DefaultContentManager.java +++ b/core/src/main/java/org/commonjava/indy/core/content/DefaultContentManager.java @@ -26,7 +26,7 @@ import org.commonjava.indy.core.content.group.GroupRepositoryFilterManager; import org.commonjava.indy.data.IndyDataException; import org.commonjava.indy.data.StoreDataManager; -import org.commonjava.indy.measure.annotation.Measure; +import org.commonjava.o11yphant.metrics.annotation.Measure; import org.commonjava.indy.model.core.ArtifactStore; import org.commonjava.indy.model.core.Group; import org.commonjava.indy.model.core.StoreKey; diff --git a/core/src/main/java/org/commonjava/indy/core/content/DefaultDirectContentAccess.java b/core/src/main/java/org/commonjava/indy/core/content/DefaultDirectContentAccess.java index 8cd3df0a85..2a8e91d869 100644 --- a/core/src/main/java/org/commonjava/indy/core/content/DefaultDirectContentAccess.java +++ b/core/src/main/java/org/commonjava/indy/core/content/DefaultDirectContentAccess.java @@ -23,7 +23,7 @@ import org.commonjava.indy.content.DirectContentAccess; import org.commonjava.indy.content.DownloadManager; import org.commonjava.indy.content.StoreResource; -import org.commonjava.indy.measure.annotation.Measure; +import org.commonjava.o11yphant.metrics.annotation.Measure; import org.commonjava.indy.model.core.ArtifactStore; import org.commonjava.indy.model.core.StoreKey; import org.commonjava.maven.galley.event.EventMetadata; 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 fb24f8c620..069b17174a 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 @@ -28,9 +28,7 @@ import org.commonjava.indy.core.change.event.IndyFileEventManager; import org.commonjava.indy.data.IndyDataException; import org.commonjava.indy.data.StoreDataManager; -import org.commonjava.indy.measure.annotation.Measure; -import org.commonjava.indy.measure.annotation.MetricNamed; -import org.commonjava.indy.metrics.IndyMetricsManager; +import org.commonjava.o11yphant.metrics.annotation.Measure; import org.commonjava.indy.model.core.ArtifactStore; import org.commonjava.indy.model.core.HostedRepository; import org.commonjava.indy.model.core.RemoteRepository; diff --git a/core/src/main/java/org/commonjava/indy/core/ctl/ContentController.java b/core/src/main/java/org/commonjava/indy/core/ctl/ContentController.java index e401b200d6..889b9e656e 100644 --- a/core/src/main/java/org/commonjava/indy/core/ctl/ContentController.java +++ b/core/src/main/java/org/commonjava/indy/core/ctl/ContentController.java @@ -23,7 +23,7 @@ import org.commonjava.indy.content.StoreResource; import org.commonjava.indy.data.IndyDataException; import org.commonjava.indy.data.StoreDataManager; -import org.commonjava.indy.measure.annotation.Measure; +import org.commonjava.o11yphant.metrics.annotation.Measure; import org.commonjava.indy.model.core.ArtifactStore; import org.commonjava.indy.model.core.StoreKey; import org.commonjava.indy.model.core.StoreType; diff --git a/core/src/main/java/org/commonjava/indy/core/ctl/SchedulerController.java b/core/src/main/java/org/commonjava/indy/core/ctl/SchedulerController.java index b5478b8588..244eea5f4d 100644 --- a/core/src/main/java/org/commonjava/indy/core/ctl/SchedulerController.java +++ b/core/src/main/java/org/commonjava/indy/core/ctl/SchedulerController.java @@ -20,17 +20,22 @@ import org.commonjava.indy.core.expire.Expiration; import org.commonjava.indy.core.expire.ExpirationSet; import org.commonjava.indy.core.expire.ScheduleManager; +import org.commonjava.indy.core.expire.ScheduleValue; import org.commonjava.indy.core.expire.StoreKeyMatcher; import org.commonjava.indy.data.IndyDataException; import org.commonjava.indy.data.StoreDataManager; import org.commonjava.indy.model.core.ArtifactStore; import org.commonjava.indy.model.core.StoreKey; import org.infinispan.commons.api.BasicCache; +import org.infinispan.query.Search; +import org.infinispan.query.dsl.Query; +import org.infinispan.query.dsl.QueryFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; +import java.util.List; import java.util.stream.Collectors; @ApplicationScoped @@ -85,11 +90,16 @@ public ExpirationSet getDisabledStores() // This key matcher will compare with the cache key group to see if the group ends with the "Disable-Timeout"(jobtype) ExpirationSet expirations = scheduleManager.findMatchingExpirations( - cacheHandle -> cacheHandle.execute( BasicCache::keySet ) - .stream() - .filter( key -> key.getType() - .equals( StoreEnablementManager.DISABLE_TIMEOUT ) ) - .collect( Collectors.toSet() ) ); + cacheHandle -> { + QueryFactory queryFactory = Search.getQueryFactory( cacheHandle.getCache() ); + Query q = queryFactory.from( ScheduleValue.class ).having( "key.type" ).eq( StoreEnablementManager.DISABLE_TIMEOUT ).build(); + List list = q.list(); + return list.stream().map( ScheduleValue::getKey ).collect( Collectors.toSet()); +// cacheHandle.execute( BasicCache::keySet ) +// .stream() +// .filter( key -> key.getType().equals( StoreEnablementManager.DISABLE_TIMEOUT ) ) +// .collect( Collectors.toSet() ); + } ); // TODO: This seems REALLY inefficient... diff --git a/core/src/main/java/org/commonjava/indy/core/expire/ScheduleKey.java b/core/src/main/java/org/commonjava/indy/core/expire/ScheduleKey.java index 0ad60aa13a..64651eb4b1 100644 --- a/core/src/main/java/org/commonjava/indy/core/expire/ScheduleKey.java +++ b/core/src/main/java/org/commonjava/indy/core/expire/ScheduleKey.java @@ -17,6 +17,10 @@ import org.commonjava.indy.model.core.StoreKey; import org.commonjava.indy.model.core.StoreType; +import org.hibernate.search.annotations.Analyze; +import org.hibernate.search.annotations.Field; +import org.hibernate.search.annotations.Index; +import org.hibernate.search.annotations.Indexed; import java.io.Externalizable; import java.io.IOException; @@ -25,14 +29,21 @@ import java.io.Serializable; import java.util.Objects; +@Indexed public class ScheduleKey implements Externalizable, Serializable { + @Field( index = Index.YES, analyze = Analyze.NO ) private StoreKey storeKey; + @Field( index = Index.YES, analyze = Analyze.NO ) private String type; + @Field( index = Index.YES, analyze = Analyze.NO ) private String name; + @Field( index = Index.YES, analyze = Analyze.NO ) + private String groupName; + public ScheduleKey() { } @@ -42,6 +53,7 @@ public ScheduleKey( final StoreKey storeKey, final String type, final String nam this.storeKey = storeKey; this.type = type; this.name = name; + this.groupName = ScheduleManager.groupName( this.storeKey, this.type ); } public StoreKey getStoreKey() @@ -59,9 +71,9 @@ public String getName() return name; } - public String groupName() + public String getGroupName() { - return ScheduleManager.groupName( this.storeKey, this.type ); + return groupName; } public static ScheduleKey fromGroupWithName( final String group, final String name ) @@ -134,5 +146,7 @@ public void readExternal( ObjectInput in ) final String nameStr = (String) in.readObject(); name = "".equals( nameStr ) ? null : nameStr; + + groupName = ScheduleManager.groupName( storeKey, type ); } } diff --git a/core/src/main/java/org/commonjava/indy/core/expire/ScheduleManager.java b/core/src/main/java/org/commonjava/indy/core/expire/ScheduleManager.java index ddf6da34a5..571a08a714 100644 --- a/core/src/main/java/org/commonjava/indy/core/expire/ScheduleManager.java +++ b/core/src/main/java/org/commonjava/indy/core/expire/ScheduleManager.java @@ -126,10 +126,11 @@ public class ScheduleManager @Inject @ScheduleCache - private CacheHandle scheduleCache; + private CacheHandle scheduleCache; @Inject @ScheduleEventLockCache + @Deprecated private CacheHandle scheduleEventLockCache; @Inject @@ -185,7 +186,7 @@ public void rescheduleSnapshotTimeouts( final HostedRepository deploy ) for ( final ScheduleKey key : canceled ) { final String path = key.getName(); - final StoreKey sk = storeKeyFrom( key.groupName() ); + final StoreKey sk = storeKeyFrom( key.getGroupName() ); scheduleContentExpiration( sk, path, timeout ); } @@ -218,7 +219,7 @@ else if ( repo.isPassthrough() ) for ( final ScheduleKey key : canceled ) { final String path = key.getName(); - final StoreKey sk = storeKeyFrom( key.groupName() ); + final StoreKey sk = storeKeyFrom( key.getGroupName() ); scheduleContentExpiration( sk, path, timeout ); } @@ -286,8 +287,7 @@ public void setProxyTimeouts( final StoreKey key, final String path ) { // logger.info( "[PROXY TIMEOUT SET] {}/{}; {}", repo.getKey(), path, new Date( System.currentTimeMillis() // + timeout ) ); - cancel( new StoreKeyMatcher( key, CONTENT_JOB_TYPE ), path ); - + removeCache( new ScheduleKey( key, CONTENT_JOB_TYPE, path ) ); scheduleContentExpiration( key, path, timeout ); } } @@ -317,7 +317,7 @@ public void scheduleForStore( final StoreKey key, final String jobType, final St final ScheduleKey cacheKey = new ScheduleKey( key, jobType, jobName ); - scheduleCache.execute( cache -> cache.put( cacheKey, dataMap, startSeconds, TimeUnit.SECONDS ) ); + scheduleCache.execute( cache -> cache.put( cacheKey, new ScheduleValue( cacheKey, dataMap ), startSeconds, TimeUnit.SECONDS ) ); logger.debug( "Scheduled for the key {} with timeout: {} seconds", cacheKey, startSeconds ); } @@ -586,19 +586,20 @@ public ExpirationSet findMatchingExpirations( final CacheKeyMatcher private Expiration toExpiration( final ScheduleKey cacheKey ) { - return new Expiration( cacheKey.groupName(), cacheKey.getName(), getNextExpireTime( cacheKey ) ); + return new Expiration( cacheKey.getGroupName(), cacheKey.getName(), getNextExpireTime( cacheKey ) ); } private Date getNextExpireTime( final ScheduleKey cacheKey ) { return scheduleCache.executeCache( cache -> { - final CacheEntry entry = cache.getAdvancedCache().getCacheEntry( cacheKey ); + final CacheEntry entry = + cache.getAdvancedCache().getCacheEntry( cacheKey ); if ( entry != null ) { final Metadata metadata = entry.getMetadata(); long expire = metadata.lifespan(); - final long startTimeInMillis = (Long)scheduleCache.get( cacheKey ).get( SCHEDULE_TIME ); + final long startTimeInMillis = (Long)scheduleCache.get( cacheKey ).getDataPayload().get( SCHEDULE_TIME ); return calculateNextExpireTime( expire, startTimeInMillis ); } return null; @@ -708,14 +709,11 @@ public void stop() private void removeCache( final ScheduleKey cacheKey ) { - if ( scheduleCache.containsKey( cacheKey ) ) - { - scheduleCache.remove( cacheKey ); - } + scheduleCache.remove( cacheKey ); } @CacheEntryCreated - public void scheduled( final CacheEntryCreatedEvent e ) + public void scheduled( final CacheEntryCreatedEvent e ) { if ( e == null ) { @@ -726,7 +724,7 @@ public void scheduled( final CacheEntryCreatedEvent e ) if ( !e.isPre() ) { final ScheduleKey expiredKey = e.getKey(); - final Map expiredContent = e.getValue(); + final Map expiredContent = e.getValue().getDataPayload(); if ( expiredKey != null && expiredContent != null ) { logger.debug( "Expiration Created: {}", expiredKey ); @@ -738,7 +736,7 @@ public void scheduled( final CacheEntryCreatedEvent e ) } @CacheEntryExpired - public void expired( CacheEntryExpiredEvent e ) + public void expired( CacheEntryExpiredEvent e ) { if ( e == null ) { @@ -757,7 +755,7 @@ public void expired( CacheEntryExpiredEvent e ) return; } */ - final Map expiredContent = e.getValue(); + final Map expiredContent = e.getValue().getDataPayload(); if ( expiredKey != null && expiredContent != null ) { logger.debug( "EXPIRED: {}", expiredKey ); @@ -790,7 +788,7 @@ public void expired( CacheEntryExpiredEvent e ) } @CacheEntryRemoved - public void cancelled( CacheEntryRemovedEvent e ) + public void cancelled( CacheEntryRemovedEvent e ) { if ( e == null ) { diff --git a/core/src/main/java/org/commonjava/indy/core/expire/ScheduleValue.java b/core/src/main/java/org/commonjava/indy/core/expire/ScheduleValue.java new file mode 100644 index 0000000000..59981cc89c --- /dev/null +++ b/core/src/main/java/org/commonjava/indy/core/expire/ScheduleValue.java @@ -0,0 +1,84 @@ +/** + * Copyright (C) 2011-2020 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.hibernate.search.annotations.Analyze; +import org.hibernate.search.annotations.Field; +import org.hibernate.search.annotations.Index; +import org.hibernate.search.annotations.Indexed; + +import java.io.Externalizable; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; +import java.util.Map; + +@Indexed +public class ScheduleValue + implements Externalizable +{ + @Field( index = Index.YES, analyze = Analyze.NO ) + private ScheduleKey key; + + @Field( index = Index.NO, analyze = Analyze.NO ) + private Map dataPayload; + + public ScheduleValue() + { + } + + public ScheduleValue( ScheduleKey key, Map dataPayload ) + { + this.key = key; + this.dataPayload = dataPayload; + } + + public ScheduleKey getKey() + { + return key; + } + + public void setKey( ScheduleKey key ) + { + this.key = key; + } + + public Map getDataPayload() + { + return dataPayload; + } + + public void setDataPayload( Map dataPayload ) + { + this.dataPayload = dataPayload; + } + + @Override + public void writeExternal( ObjectOutput out ) + throws IOException + { + out.writeObject( key ); + out.writeObject( dataPayload ); + } + + @Override + public void readExternal( ObjectInput in ) + throws IOException, ClassNotFoundException + { + this.key = (ScheduleKey)in.readObject(); + this.dataPayload = (Map)in.readObject(); + } +} diff --git a/core/src/main/java/org/commonjava/indy/core/expire/StoreKeyMatcher.java b/core/src/main/java/org/commonjava/indy/core/expire/StoreKeyMatcher.java index ebeb276d9b..cc67022a8b 100644 --- a/core/src/main/java/org/commonjava/indy/core/expire/StoreKeyMatcher.java +++ b/core/src/main/java/org/commonjava/indy/core/expire/StoreKeyMatcher.java @@ -18,8 +18,12 @@ import org.commonjava.indy.model.core.StoreKey; import org.commonjava.indy.subsys.infinispan.CacheHandle; import org.commonjava.indy.subsys.infinispan.CacheKeyMatcher; -import org.infinispan.commons.api.BasicCache; +import org.infinispan.query.Search; +import org.infinispan.query.dsl.Query; +import org.infinispan.query.dsl.QueryFactory; +import java.util.HashSet; +import java.util.List; import java.util.Set; import java.util.stream.Collectors; @@ -33,22 +37,23 @@ public class StoreKeyMatcher //TODO: will have a thought to replace this type of matcher with a ISPN query API in the future to get better performance. - private final StoreKey storeKey; - - private final String eventType; + private final String groupName; public StoreKeyMatcher( final StoreKey key, final String eventType ) { - this.storeKey = key; - this.eventType = eventType; + this.groupName = ScheduleManager.groupName( key, eventType ); } @Override public Set matches( CacheHandle cacheHandle ) { - return cacheHandle.execute( BasicCache::keySet ) - .stream() - .filter( key -> key != null && key.exists() && key.groupName().equals( ScheduleManager.groupName( storeKey, eventType ) ) ) - .collect( Collectors.toSet() ); + QueryFactory queryFactory = Search.getQueryFactory( cacheHandle.getCache() ); + Query q = queryFactory.from( ScheduleValue.class ).having( "key.groupName" ).eq( groupName ).build(); + List list = q.list(); + return list.stream().map( ScheduleValue::getKey ).collect( Collectors.toSet()); +// return cacheHandle.execute( BasicCache::keySet ) +// .stream() +// .filter( key -> key != null && key.exists() && key.groupName().equals( groupName ) ) +// .collect( Collectors.toSet() ); } } diff --git a/core/src/main/java/org/commonjava/indy/core/expire/cache/ScheduleCacheProducer.java b/core/src/main/java/org/commonjava/indy/core/expire/cache/ScheduleCacheProducer.java index 8c4fa73369..e61b0224b9 100644 --- a/core/src/main/java/org/commonjava/indy/core/expire/cache/ScheduleCacheProducer.java +++ b/core/src/main/java/org/commonjava/indy/core/expire/cache/ScheduleCacheProducer.java @@ -17,6 +17,7 @@ import org.commonjava.indy.cluster.IndyNode; import org.commonjava.indy.core.expire.ScheduleKey; +import org.commonjava.indy.core.expire.ScheduleValue; import org.commonjava.indy.subsys.infinispan.CacheHandle; import org.commonjava.indy.subsys.infinispan.CacheProducer; import org.slf4j.Logger; @@ -48,7 +49,7 @@ public class ScheduleCacheProducer @ScheduleCache @Produces @ApplicationScoped - public CacheHandle scheduleExpireCache() + public CacheHandle scheduleExpireCache() { return cacheProducer.getCache( SCHEDULE_EXPIRE ); } diff --git a/core/src/main/java/org/commonjava/indy/core/inject/CassandraNotFoundCache.java b/core/src/main/java/org/commonjava/indy/core/inject/CassandraNotFoundCache.java index 8292b03876..f8e8bad4c5 100644 --- a/core/src/main/java/org/commonjava/indy/core/inject/CassandraNotFoundCache.java +++ b/core/src/main/java/org/commonjava/indy/core/inject/CassandraNotFoundCache.java @@ -21,7 +21,7 @@ import com.datastax.driver.core.Row; import com.datastax.driver.core.Session; import org.commonjava.indy.conf.IndyConfiguration; -import org.commonjava.indy.measure.annotation.Measure; +import org.commonjava.o11yphant.metrics.annotation.Measure; import org.commonjava.indy.model.core.StoreKey; import org.commonjava.indy.model.galley.KeyedLocation; import org.commonjava.indy.subsys.cassandra.CassandraClient; diff --git a/core/src/main/java/org/commonjava/indy/core/inject/IspnNotFoundCache.java b/core/src/main/java/org/commonjava/indy/core/inject/IspnNotFoundCache.java index fcf3586568..b752743860 100644 --- a/core/src/main/java/org/commonjava/indy/core/inject/IspnNotFoundCache.java +++ b/core/src/main/java/org/commonjava/indy/core/inject/IspnNotFoundCache.java @@ -16,14 +16,12 @@ package org.commonjava.indy.core.inject; import org.commonjava.indy.conf.IndyConfiguration; -import org.commonjava.indy.measure.annotation.Measure; +import org.commonjava.o11yphant.metrics.annotation.Measure; import org.commonjava.indy.model.core.StoreKey; import org.commonjava.indy.model.galley.KeyedLocation; -import org.commonjava.indy.model.galley.RepositoryLocation; import org.commonjava.indy.subsys.infinispan.CacheHandle; import org.commonjava.maven.galley.model.ConcreteResource; import org.commonjava.maven.galley.model.Location; -import org.infinispan.Cache; import org.infinispan.query.Search; import org.infinispan.query.dsl.Expression; import org.infinispan.query.dsl.Query; @@ -34,7 +32,6 @@ import javax.annotation.PostConstruct; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Alternative; -import javax.enterprise.inject.Default; import javax.inject.Inject; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/core/src/main/java/org/commonjava/indy/core/inject/NFCMetricsDecorator.java b/core/src/main/java/org/commonjava/indy/core/inject/NFCMetricsDecorator.java index 7362ba1ef2..5d2d8a16e5 100644 --- a/core/src/main/java/org/commonjava/indy/core/inject/NFCMetricsDecorator.java +++ b/core/src/main/java/org/commonjava/indy/core/inject/NFCMetricsDecorator.java @@ -15,8 +15,7 @@ */ package org.commonjava.indy.core.inject; -import org.commonjava.indy.measure.annotation.Measure; -import org.commonjava.indy.measure.annotation.MetricNamed; +import org.commonjava.o11yphant.metrics.annotation.Measure; import org.commonjava.maven.galley.model.ConcreteResource; import org.commonjava.maven.galley.model.Location; import org.commonjava.maven.galley.spi.nfc.NotFoundCache; diff --git a/core/src/main/resources/default-durable-state.conf b/core/src/main/resources/default-durable-state.conf new file mode 100644 index 0000000000..f9108b87b2 --- /dev/null +++ b/core/src/main/resources/default-durable-state.conf @@ -0,0 +1,4 @@ +[durable-state] +folo.storage=infinispan +store.storage=infinispan +schedule.storage=infinispan \ No newline at end of file diff --git a/core/src/test/java/org/commonjava/indy/core/expire/ScheduleManagerTest.java b/core/src/test/java/org/commonjava/indy/core/expire/ScheduleManagerTest.java index 81ff8f7e3f..520be482b3 100644 --- a/core/src/test/java/org/commonjava/indy/core/expire/ScheduleManagerTest.java +++ b/core/src/test/java/org/commonjava/indy/core/expire/ScheduleManagerTest.java @@ -52,7 +52,7 @@ public void testStoreKeyFrom() { StoreKey k = new StoreKey( "maven", StoreType.remote, "repo1" ); ScheduleKey key = new ScheduleKey(k, ScheduleManager.CONTENT_JOB_TYPE, "/abc"); - final StoreKey sk = ScheduleManager.storeKeyFrom( key.groupName() ); + final StoreKey sk = ScheduleManager.storeKeyFrom( key.getGroupName() ); System.out.println(">>> " + sk); assertNotNull( sk ); assertEquals( sk, k ); diff --git a/core/src/test/java/org/commonjava/indy/fixture/MockGalleyProvider.java b/core/src/test/java/org/commonjava/indy/fixture/MockTestProvider.java similarity index 73% rename from core/src/test/java/org/commonjava/indy/fixture/MockGalleyProvider.java rename to core/src/test/java/org/commonjava/indy/fixture/MockTestProvider.java index e7b290e9fd..074fd42d5c 100644 --- a/core/src/test/java/org/commonjava/indy/fixture/MockGalleyProvider.java +++ b/core/src/test/java/org/commonjava/indy/fixture/MockTestProvider.java @@ -16,22 +16,23 @@ package org.commonjava.indy.fixture; import org.commonjava.atlas.maven.ident.ref.ProjectRef; +import org.commonjava.cdi.util.weft.config.DefaultWeftConfig; +import org.commonjava.cdi.util.weft.config.WeftConfig; import org.commonjava.maven.galley.config.TransportManagerConfig; import org.commonjava.maven.galley.maven.spi.defaults.MavenPluginDefaults; import org.commonjava.maven.galley.maven.spi.defaults.MavenPluginImplications; import org.commonjava.maven.galley.transport.htcli.conf.GlobalHttpConfiguration; +import org.commonjava.o11yphant.honeycomb.config.HoneycombConfiguration; +import org.commonjava.o11yphant.metrics.TrafficClassifier; +import org.commonjava.o11yphant.metrics.sli.GoldenSignalsMetricSet; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Alternative; import javax.enterprise.inject.Produces; -//TODO: This provider is fully duplicated with org.commonjava.indy.test.fixture.core.MockGalleyProvider -// in test/fixture-core for some dependency reasons in addons. Should be refactored in another -// common test module in the future. - @ApplicationScoped @Alternative -public class MockGalleyProvider +public class MockTestProvider { @Produces public TransportManagerConfig getTransportManagerConfig() @@ -76,4 +77,27 @@ public GlobalHttpConfiguration getGlobalHttpConfiguration() return null; } + @Produces + public WeftConfig getWeftConfig() + { + return new DefaultWeftConfig(); + } + + @Produces + public HoneycombConfiguration getHoneycombConfiguration() + { + return null; + } + + @Produces + public GoldenSignalsMetricSet getGoldenSignalsMetricSet() + { + return null; + } + + @Produces + public TrafficClassifier getTrafficClassifier() + { + return null; + } } diff --git a/core/src/test/resources/META-INF/beans.xml b/core/src/test/resources/META-INF/beans.xml index 03820f5090..c291440c00 100644 --- a/core/src/test/resources/META-INF/beans.xml +++ b/core/src/test/resources/META-INF/beans.xml @@ -17,8 +17,7 @@ org.commonjava.indy.mem.data.MemoryStoreDataManager - org.commonjava.indy.fixture.MockWeftProvider - org.commonjava.indy.fixture.MockGalleyProvider + org.commonjava.indy.fixture.MockTestProvider org.commonjava.indy.fixture.MockContentAdvisor diff --git a/db/common/pom.xml b/db/common/pom.xml index 1e509ec0c9..07dd423ce8 100644 --- a/db/common/pom.xml +++ b/db/common/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-db - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-db-common @@ -35,7 +35,7 @@ org.commonjava.indy - indy-subsys-metrics-core + indy-subsys-metrics org.commonjava.indy diff --git a/db/common/src/main/java/org/commonjava/indy/db/common/AbstractStoreDataManager.java b/db/common/src/main/java/org/commonjava/indy/db/common/AbstractStoreDataManager.java index 10ce67c5e4..6195f4db1a 100644 --- a/db/common/src/main/java/org/commonjava/indy/db/common/AbstractStoreDataManager.java +++ b/db/common/src/main/java/org/commonjava/indy/db/common/AbstractStoreDataManager.java @@ -30,7 +30,7 @@ import org.commonjava.indy.data.StoreDataManager; import org.commonjava.indy.data.StoreEventDispatcher; import org.commonjava.indy.data.StoreValidator; -import org.commonjava.indy.measure.annotation.Measure; +import org.commonjava.o11yphant.metrics.annotation.Measure; import org.commonjava.indy.model.core.ArtifactStore; import org.commonjava.indy.model.core.Group; import org.commonjava.indy.model.core.HostedRepository; diff --git a/db/common/src/main/java/org/commonjava/indy/db/common/DefaultArtifactStoreQuery.java b/db/common/src/main/java/org/commonjava/indy/db/common/DefaultArtifactStoreQuery.java index 8542febcb6..8b71027130 100644 --- a/db/common/src/main/java/org/commonjava/indy/db/common/DefaultArtifactStoreQuery.java +++ b/db/common/src/main/java/org/commonjava/indy/db/common/DefaultArtifactStoreQuery.java @@ -19,7 +19,7 @@ import org.commonjava.indy.data.ArtifactStoreQuery; import org.commonjava.indy.data.IndyDataException; import org.commonjava.indy.data.StoreDataManager; -import org.commonjava.indy.measure.annotation.Measure; +import org.commonjava.o11yphant.metrics.annotation.Measure; import org.commonjava.indy.model.core.ArtifactStore; import org.commonjava.indy.model.core.Group; import org.commonjava.indy.model.core.HostedRepository; @@ -40,7 +40,6 @@ import java.util.HashSet; import java.util.LinkedList; import java.util.List; -import java.util.Objects; import java.util.Set; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Predicate; diff --git a/db/flat/pom.xml b/db/flat/pom.xml index 73d26dba14..d76752706c 100644 --- a/db/flat/pom.xml +++ b/db/flat/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-db-flat diff --git a/db/infinispan/pom.xml b/db/infinispan/pom.xml index 8339e5d765..b24857eec1 100644 --- a/db/infinispan/pom.xml +++ b/db/infinispan/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-db - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-db-infinispan @@ -35,7 +35,7 @@ org.commonjava.indy - indy-subsys-metrics-core + indy-subsys-metrics org.commonjava.indy diff --git a/db/infinispan/src/main/java/org/commonjava/indy/infinispan/data/InfinispanStoreDataManager.java b/db/infinispan/src/main/java/org/commonjava/indy/infinispan/data/InfinispanStoreDataManager.java index 5e116c3699..71c95ff435 100644 --- a/db/infinispan/src/main/java/org/commonjava/indy/infinispan/data/InfinispanStoreDataManager.java +++ b/db/infinispan/src/main/java/org/commonjava/indy/infinispan/data/InfinispanStoreDataManager.java @@ -20,7 +20,7 @@ import org.commonjava.indy.data.StoreEventDispatcher; import org.commonjava.indy.db.common.AbstractStoreDataManager; import org.commonjava.indy.db.common.StoreUpdateAction; -import org.commonjava.indy.measure.annotation.Measure; +import org.commonjava.o11yphant.metrics.annotation.Measure; import org.commonjava.indy.model.core.ArtifactStore; import org.commonjava.indy.model.core.Group; import org.commonjava.indy.model.core.StoreKey; diff --git a/db/memory/pom.xml b/db/memory/pom.xml index 67d48fe032..7fc5959830 100644 --- a/db/memory/pom.xml +++ b/db/memory/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-db-memory @@ -34,7 +34,7 @@ org.commonjava.indy - indy-subsys-metrics-core + indy-subsys-metrics org.commonjava.indy diff --git a/db/metrics/pom.xml b/db/metrics/pom.xml index ecdda4cc6f..7fef51480b 100644 --- a/db/metrics/pom.xml +++ b/db/metrics/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-db-metrics @@ -34,11 +34,7 @@ org.commonjava.indy - indy-subsys-metrics-core - - - org.commonjava.indy - indy-subsys-metrics-reporter + indy-subsys-metrics org.commonjava.indy diff --git a/db/metrics/src/main/java/org/commonjava/indy/db/metered/MeasuringArtifactStoreQueryInterceptor.java b/db/metrics/src/main/java/org/commonjava/indy/db/metered/MeasuringArtifactStoreQueryInterceptor.java index 3dc3d45451..0320c3e695 100644 --- a/db/metrics/src/main/java/org/commonjava/indy/db/metered/MeasuringArtifactStoreQueryInterceptor.java +++ b/db/metrics/src/main/java/org/commonjava/indy/db/metered/MeasuringArtifactStoreQueryInterceptor.java @@ -17,7 +17,7 @@ import org.commonjava.indy.data.ArtifactStoreQuery; import org.commonjava.indy.data.StoreDataManager; -import org.commonjava.indy.metrics.IndyMetricsManager; +import org.commonjava.o11yphant.metrics.DefaultMetricsManager; import org.commonjava.indy.model.core.ArtifactStore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,7 +35,7 @@ public abstract class MeasuringArtifactStoreQueryInterceptor private StoreDataManager dataManager; @Inject - private IndyMetricsManager metricsManager; + private DefaultMetricsManager metricsManager; @Override public ArtifactStoreQuery query() diff --git a/db/metrics/src/main/java/org/commonjava/indy/db/metered/MeasuringStoreQuery.java b/db/metrics/src/main/java/org/commonjava/indy/db/metered/MeasuringStoreQuery.java index 21aec1f234..e808b709ae 100644 --- a/db/metrics/src/main/java/org/commonjava/indy/db/metered/MeasuringStoreQuery.java +++ b/db/metrics/src/main/java/org/commonjava/indy/db/metered/MeasuringStoreQuery.java @@ -18,7 +18,7 @@ import org.commonjava.indy.data.ArtifactStoreQuery; import org.commonjava.indy.data.IndyDataException; import org.commonjava.indy.data.StoreDataManager; -import org.commonjava.indy.metrics.IndyMetricsManager; +import org.commonjava.o11yphant.metrics.DefaultMetricsManager; import org.commonjava.indy.model.core.ArtifactStore; import org.commonjava.indy.model.core.Group; import org.commonjava.indy.model.core.HostedRepository; @@ -28,7 +28,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.rmi.Remote; import java.util.Collection; import java.util.List; import java.util.Set; @@ -41,11 +40,11 @@ public class MeasuringStoreQuery { private final ArtifactStoreQuery query; - private final IndyMetricsManager metricsManager; + private final DefaultMetricsManager metricsManager; private final Logger logger = LoggerFactory.getLogger( getClass() ); - public MeasuringStoreQuery( final ArtifactStoreQuery query, final IndyMetricsManager metricsManager ) + public MeasuringStoreQuery( final ArtifactStoreQuery query, final DefaultMetricsManager metricsManager ) { this.query = query; this.metricsManager = metricsManager; diff --git a/db/pom.xml b/db/pom.xml index d277b3fc3e..0e4476ed9b 100644 --- a/db/pom.xml +++ b/db/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-db diff --git a/deployments/cache-migrator/src/main/java/org/commonjava/indy/tools/cache/Main.java b/deployments/cache-migrator/src/main/java/org/commonjava/indy/tools/cache/Main.java index 652bf40fc0..1107519ca6 100644 --- a/deployments/cache-migrator/src/main/java/org/commonjava/indy/tools/cache/Main.java +++ b/deployments/cache-migrator/src/main/java/org/commonjava/indy/tools/cache/Main.java @@ -17,6 +17,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; +import com.google.common.collect.Iterables; import org.apache.commons.io.FileUtils; import org.commonjava.indy.action.IndyLifecycleException; import org.commonjava.indy.folo.model.TrackedContent; @@ -29,19 +30,29 @@ import java.io.BufferedOutputStream; import java.io.BufferedReader; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; +import java.io.InputStream; import java.io.InputStreamReader; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.lang.reflect.InvocationTargetException; +import java.util.HashSet; +import java.util.List; import java.util.Properties; +import java.util.Set; import java.util.concurrent.atomic.AtomicReference; import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; +import static org.apache.commons.io.IOUtils.copy; +import static org.commonjava.indy.folo.ctl.FoloConstants.TRACKING_TYPE.SEALED; import static org.commonjava.propulsor.boot.BootStatus.ERR_INIT; import static org.commonjava.propulsor.boot.BootStatus.ERR_PARSE_ARGS; @@ -139,10 +150,14 @@ private int run( final MigrationOptions options ) { dumpJsonFile( cache, options ); } - else + else if ( DataType.object == options.getDataType() ) { dumpObjectFile( cache, options ); } + else + { + dumpZipFiles( cache, options ); + } } else @@ -370,4 +385,81 @@ private void dumpJsonFile( CacheHandle cache, MigrationOptions throw new BootException( "Failed to write data to file: " + options.getDataFile(), error.get() ); } } + + private void dumpZipFiles( CacheHandle cache, MigrationOptions options ) throws BootException + { + AtomicReference error = new AtomicReference<>(); + cache.executeCache( ( c ) -> { + if ( error.get() == null ) + { + int count = 0; + int batchSize = options.getBatchSize() != null ? options.getBatchSize() : 1000; + Iterable> subLists = Iterables.partition( c.keySet(), batchSize ); + logger.info( "Handle the cache in batch size:{}", batchSize ); + for ( List subList : subLists ) + { + if ( error.get() == null ) + { + Set sealed = new HashSet<>(); + File out = new File( options.getDataFile().getParent() + "/folo-" + count + ".zip" ); + if ( error.get() == null ) + { + for ( Object key : subList ) + { + sealed.add( (TrackedContent) c.get( key ) ); + } + try + { + zipTrackedContent( out, sealed ); + } + catch ( IOException e ) + { + logger.error( "Failed to zip entries : " + subList.toString(), e ); + error.set( e ); + } + } + count++; + } + } + } + return true; + }); + + if ( error.get() != null ) + { + throw new BootException( "Failed to write data to zip.", error.get() ); + } + } + + /** + * Write sealed records to a zip file. + */ + public void zipTrackedContent( File out, Set sealed ) throws IOException + { + logger.info( "Writing sealed zip to: '{}'", out.getAbsolutePath() ); + + try (ZipOutputStream zip = new ZipOutputStream( new FileOutputStream( out ) )) + { + for ( TrackedContent f : sealed ) + { + String name = SEALED.getValue() + "/" + f.getKey().getId(); + + logger.trace( "Adding {} to zip", name ); + zip.putNextEntry( new ZipEntry( name ) ); + copy( toInputStream( f ), zip ); + } + } + } + + public InputStream toInputStream( TrackedContent f ) throws IOException + { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + + ObjectOutputStream oos = new ObjectOutputStream( baos ); + oos.writeObject( f ); + oos.flush(); + oos.close(); + + return new ByteArrayInputStream( baos.toByteArray() ); + } } diff --git a/deployments/cache-migrator/src/main/java/org/commonjava/indy/tools/cache/MigrationOptions.java b/deployments/cache-migrator/src/main/java/org/commonjava/indy/tools/cache/MigrationOptions.java index 740526b2a5..b83eb1abcf 100644 --- a/deployments/cache-migrator/src/main/java/org/commonjava/indy/tools/cache/MigrationOptions.java +++ b/deployments/cache-migrator/src/main/java/org/commonjava/indy/tools/cache/MigrationOptions.java @@ -35,6 +35,9 @@ public class MigrationOptions @Option( name = "-t", aliases = { "--data-type" }, usage = "Data type ('json' or 'object')" ) private DataType dataType; + @Option( name = "-b", aliases = {"--batch-size"}, usage = "Batch size (Default 1000)" ) + private Integer batchSize; + @Argument( index = 0, metaVar = "action", required = false, usage = "Migration command to execute ('dump' or 'load')") private MigrationCommand migrationCommand; @@ -98,6 +101,16 @@ public void setDataFile( final File dataFile ) public void setDataType( final DataType dataType ) { this.dataType = dataType; } + public Integer getBatchSize() + { + return batchSize; + } + + public void setBatchSize( Integer batchSize ) + { + this.batchSize = batchSize; + } + public boolean parseArgs( final String[] args ) throws BootException { diff --git a/deployments/docker/pom.xml b/deployments/docker/pom.xml index 897ec29e59..48d1f3719f 100644 --- a/deployments/docker/pom.xml +++ b/deployments/docker/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-deployments - 2.3.0-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy.docker diff --git a/deployments/launcher/pom.xml b/deployments/launcher/pom.xml index 194ea7aa7c..10031cde3e 100644 --- a/deployments/launcher/pom.xml +++ b/deployments/launcher/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-deployments - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy.launch @@ -113,7 +113,7 @@ org.commonjava.indy - indy-subsys-metrics-reporter + indy-subsys-metrics tar.gz confset diff --git a/deployments/launcher/src/main/resources/META-INF/beans.xml b/deployments/launcher/src/main/resources/META-INF/beans.xml index ebcc6424b1..44fbe864df 100644 --- a/deployments/launcher/src/main/resources/META-INF/beans.xml +++ b/deployments/launcher/src/main/resources/META-INF/beans.xml @@ -22,11 +22,11 @@ org.commonjava.indy.bind.jaxrs.util.RestInterceptor - org.commonjava.indy.metrics.jaxrs.interceptor.MetricsInterceptor - org.commonjava.indy.subsys.honeycomb.interceptor.HoneycombMeasureInterceptor - org.commonjava.indy.subsys.honeycomb.interceptor.HoneycombWrapperInterceptor - org.commonjava.indy.subsys.honeycomb.interceptor.HoneycombWrapperStartInterceptor - org.commonjava.indy.subsys.honeycomb.interceptor.HoneycombWrapperEndInterceptor + org.commonjava.o11yphant.metrics.interceptor.DefaultMetricsInterceptor + org.commonjava.o11yphant.honeycomb.interceptor.flat.FlatHoneycombMeasureInterceptor + org.commonjava.o11yphant.honeycomb.interceptor.flat.FlatHoneycombWrapperInterceptor + org.commonjava.o11yphant.honeycomb.interceptor.flat.FlatHoneycombWrapperStartInterceptor + org.commonjava.o11yphant.honeycomb.interceptor.flat.FlatHoneycombWrapperEndInterceptor diff --git a/deployments/pom.xml b/deployments/pom.xml index 41d7220c8d..6a29e6cfe4 100644 --- a/deployments/pom.xml +++ b/deployments/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-deployments diff --git a/deployments/standalone/launcher/pom.xml b/deployments/standalone/launcher/pom.xml index 96c59fb858..a9b3331d32 100644 --- a/deployments/standalone/launcher/pom.xml +++ b/deployments/standalone/launcher/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-standalone - 2.5.0-SNAPSHOT + 2.5.3-SNAPSHOT indy-standalone-launcher diff --git a/deployments/standalone/launcher/src/main/resources/META-INF/beans.xml b/deployments/standalone/launcher/src/main/resources/META-INF/beans.xml index 01fdda1bdb..b51be215ce 100644 --- a/deployments/standalone/launcher/src/main/resources/META-INF/beans.xml +++ b/deployments/standalone/launcher/src/main/resources/META-INF/beans.xml @@ -30,11 +30,11 @@ org.commonjava.indy.bind.jaxrs.util.RestInterceptor - org.commonjava.indy.metrics.jaxrs.interceptor.MetricsInterceptor - org.commonjava.indy.subsys.honeycomb.interceptor.HoneycombMeasureInterceptor - org.commonjava.indy.subsys.honeycomb.interceptor.HoneycombWrapperInterceptor - org.commonjava.indy.subsys.honeycomb.interceptor.HoneycombWrapperStartInterceptor - org.commonjava.indy.subsys.honeycomb.interceptor.HoneycombWrapperEndInterceptor + org.commonjava.indy.subsys.metrics.jaxrs.interceptor.MetricsInterceptor + org.commonjava.o11yphant.honeycomb.interceptor.HoneycombMeasureInterceptor + org.commonjava.o11yphant.honeycomb.interceptor.HoneycombWrapperInterceptor + org.commonjava.o11yphant.honeycomb.interceptor.HoneycombWrapperStartInterceptor + org.commonjava.o11yphant.honeycomb.interceptor.HoneycombWrapperEndInterceptor diff --git a/deployments/standalone/pom.xml b/deployments/standalone/pom.xml index 2afd7a40cd..288dea34c8 100644 --- a/deployments/standalone/pom.xml +++ b/deployments/standalone/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-deployments - 2.5.0-SNAPSHOT + 2.5.3-SNAPSHOT indy-standalone diff --git a/embedder-tests/pom.xml b/embedder-tests/pom.xml index 4ec570f6dd..665f7d2468 100644 --- a/embedder-tests/pom.xml +++ b/embedder-tests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.3.0-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy.embed.test diff --git a/embedder-tests/sonar-report/pom.xml b/embedder-tests/sonar-report/pom.xml index e387fb32d6..702ded554e 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 - 2.3.0-SNAPSHOT + 2.5.3-SNAPSHOT 4.0.0 @@ -63,11 +63,7 @@ org.commonjava.indy - indy-subsys-metrics-core - - - org.commonjava.indy - indy-subsys-metrics-reporter + indy-subsys-metrics org.commonjava.indy diff --git a/embedder/pom.xml b/embedder/pom.xml index 363792e7f8..047d9d7a8c 100644 --- a/embedder/pom.xml +++ b/embedder/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy.embed @@ -60,15 +60,7 @@ org.commonjava.indy - indy-subsys-metrics-core - - - org.commonjava.indy - indy-subsys-metrics-reporter - - - org.commonjava.indy - indy-subsys-metrics-prometheus + indy-subsys-metrics org.commonjava.indy @@ -231,6 +223,11 @@ indy-repo-proxy-jaxrs + + org.commonjava.util + o11yphant-metrics-core + + org.commonjava.atlas atlas-identities @@ -320,10 +317,6 @@ indy-ftests-pkg-npm test - - org.commonjava.indy - indy-ftests-metrics - org.commonjava.indy @@ -464,7 +457,6 @@ org.commonjava.indy:indy-ftests-promote org.commonjava.indy:indy-ftests-diagnostics org.commonjava.indy:indy-ftests-pkg-maven - org.commonjava.indy:indy-ftests-metrics org.commonjava.indy:indy-ftests-pkg-npm org.commonjava.indy:indy-ftests-hosted-by-archive org.commonjava.indy:indy-ftests-content-browse diff --git a/embedder/src/it/resources/logback.xml b/embedder/src/it/resources/logback.xml index 13762be955..d23658d6a4 100644 --- a/embedder/src/it/resources/logback.xml +++ b/embedder/src/it/resources/logback.xml @@ -36,7 +36,7 @@ - + diff --git a/embedder/src/main/resources/META-INF/beans.xml b/embedder/src/main/resources/META-INF/beans.xml index 70cbad914b..30cc4f18f8 100644 --- a/embedder/src/main/resources/META-INF/beans.xml +++ b/embedder/src/main/resources/META-INF/beans.xml @@ -29,11 +29,11 @@ org.commonjava.indy.bind.jaxrs.util.RestInterceptor - org.commonjava.indy.metrics.jaxrs.interceptor.MetricsInterceptor - org.commonjava.indy.subsys.honeycomb.interceptor.HoneycombMeasureInterceptor - org.commonjava.indy.subsys.honeycomb.interceptor.HoneycombWrapperInterceptor - org.commonjava.indy.subsys.honeycomb.interceptor.HoneycombWrapperStartInterceptor - org.commonjava.indy.subsys.honeycomb.interceptor.HoneycombWrapperEndInterceptor + org.commonjava.o11yphant.metrics.interceptor.DefaultMetricsInterceptor + org.commonjava.o11yphant.honeycomb.interceptor.flat.FlatHoneycombMeasureInterceptor + org.commonjava.o11yphant.honeycomb.interceptor.flat.FlatHoneycombWrapperInterceptor + org.commonjava.o11yphant.honeycomb.interceptor.flat.FlatHoneycombWrapperStartInterceptor + org.commonjava.o11yphant.honeycomb.interceptor.flat.FlatHoneycombWrapperEndInterceptor diff --git a/embedder/src/test/resources/logback-test.xml b/embedder/src/test/resources/logback-test.xml index 885b2ca170..c9fe8e7810 100644 --- a/embedder/src/test/resources/logback-test.xml +++ b/embedder/src/test/resources/logback-test.xml @@ -62,8 +62,8 @@ - - + + diff --git a/filers/default/pom.xml b/filers/default/pom.xml index 2cb329892b..41f50d630a 100644 --- a/filers/default/pom.xml +++ b/filers/default/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-file-managers - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-filer-default @@ -54,7 +54,7 @@ org.commonjava.indy - indy-subsys-metrics-core + indy-subsys-metrics diff --git a/filers/default/src/main/java/org/commonjava/indy/filer/def/DefaultGalleyStorageProvider.java b/filers/default/src/main/java/org/commonjava/indy/filer/def/DefaultGalleyStorageProvider.java index c6a0916e0b..29847c2fcd 100644 --- a/filers/default/src/main/java/org/commonjava/indy/filer/def/DefaultGalleyStorageProvider.java +++ b/filers/default/src/main/java/org/commonjava/indy/filer/def/DefaultGalleyStorageProvider.java @@ -15,8 +15,6 @@ */ package org.commonjava.indy.filer.def; -import com.codahale.metrics.Meter; -import com.codahale.metrics.Timer; import com.datastax.driver.core.Session; import org.commonjava.cdi.util.weft.ExecutorConfig; import org.commonjava.cdi.util.weft.NamedThreadFactory; @@ -25,8 +23,11 @@ import org.commonjava.indy.content.IndyChecksumAdvisor; import org.commonjava.indy.content.SpecialPathSetProducer; import org.commonjava.indy.filer.def.conf.DefaultStorageProviderConfiguration; -import org.commonjava.indy.metrics.IndyMetricsManager; -import org.commonjava.indy.metrics.conf.IndyMetricsConfig; +import org.commonjava.o11yphant.metrics.api.Meter; +import org.commonjava.o11yphant.metrics.api.MetricRegistry; +import org.commonjava.o11yphant.metrics.api.Timer; +import org.commonjava.o11yphant.metrics.DefaultMetricsManager; +import org.commonjava.indy.subsys.metrics.conf.IndyMetricsConfig; import org.commonjava.indy.subsys.cassandra.CassandraClient; import org.commonjava.indy.subsys.cassandra.config.CassandraConfig; import org.commonjava.maven.galley.GalleyInitException; @@ -80,7 +81,7 @@ import java.util.function.Function; import static org.apache.commons.lang3.StringUtils.isBlank; -import static org.commonjava.indy.metrics.IndyMetricsConstants.getSupername; +import static org.commonjava.o11yphant.metrics.util.NameUtils.getSupername; import static org.commonjava.maven.galley.io.checksum.ChecksummingDecoratorAdvisor.ChecksumAdvice.CALCULATE_AND_WRITE; import static org.commonjava.maven.galley.io.checksum.ChecksummingDecoratorAdvisor.ChecksumAdvice.NO_DECORATE; import static org.commonjava.storage.pathmapped.pathdb.datastax.util.CassandraPathDBUtils.*; @@ -123,7 +124,13 @@ public class DefaultGalleyStorageProvider private Instance transferDecorators; @Inject - private IndyMetricsManager metricsManager; + private DefaultMetricsManager metricsManager; + + @Inject + private MetricRegistry metricRegistry; + + @Inject + private IndyMetricsConfig metricsConfig; @Inject private CassandraConfig cassandraConfig; @@ -185,6 +192,8 @@ private void setupCacheProviderFactory() if ( indyConfiguration.isStandalone() ) { + logger.info( "We're in standalone content-storage mode. Cassandra path-mapping database will NOT be used" ); + // Only work for local debug mode. ScheduledExecutorService debugDeleteExecutor = Executors.newScheduledThreadPool( 5, new NamedThreadFactory( "debug-galley-delete-executor", new ThreadGroup( "debug-galley-delete-executor" ), true, 2 ) ); @@ -192,6 +201,8 @@ private void setupCacheProviderFactory() return; } + logger.info( "Initializing Cassandra-based path-mapping database for content storage." ); + PathDB pathDB = null; PathMappedStorageConfig pathMappedStorageConfig = getPathMappedStorageConfig(); if ( cassandraClient != null ) @@ -207,12 +218,11 @@ private void setupCacheProviderFactory() if ( pathDB != null ) { - final IndyMetricsConfig metricsConfig = metricsManager.getConfig(); if ( metricsConfig.isPathDBMetricsEnabled() ) { final String operations = metricsConfig.getPathDBMetricsOperations(); logger.info( "Create measured PathDB, operations: {}" ); - pathDB = new MeasuredPathDB( pathDB, metricsManager.getMetricRegistry(), getSupername( "pathDB" ) ) + pathDB = new MeasuredPathDB( pathDB, metricsManager, getSupername( "pathDB" ) ) { @Override protected boolean isMetricEnabled( String metricName ) @@ -283,12 +293,12 @@ private BiConsumer cumulativeTimer() private Function meterProvider() { - return (name)->metricsManager.getMeter( name ); + return ( name ) -> metricsManager.getMeter( name ); } private Function timerProvider() { - return (name)->metricsManager.startTimer( name ); + return ( name ) -> metricsManager.startTimer( name ); } private ChecksummingTransferDecorator getChecksummingTransferDecorator() diff --git a/filers/default/src/main/java/org/commonjava/indy/filer/def/IOLatencyDecorator.java b/filers/default/src/main/java/org/commonjava/indy/filer/def/IOLatencyDecorator.java index 0587bcbf8a..01c9d71d75 100644 --- a/filers/default/src/main/java/org/commonjava/indy/filer/def/IOLatencyDecorator.java +++ b/filers/default/src/main/java/org/commonjava/indy/filer/def/IOLatencyDecorator.java @@ -15,8 +15,6 @@ */ package org.commonjava.indy.filer.def; -import com.codahale.metrics.Meter; -import com.codahale.metrics.Timer; import org.apache.commons.io.input.CountingInputStream; import org.apache.commons.io.output.CountingOutputStream; import org.commonjava.maven.galley.event.EventMetadata; @@ -24,6 +22,7 @@ import org.commonjava.maven.galley.model.Transfer; import org.commonjava.maven.galley.model.TransferOperation; import org.commonjava.maven.galley.spi.metrics.TimingProvider; +import org.commonjava.o11yphant.metrics.api.Meter; import java.io.IOException; import java.io.InputStream; diff --git a/filers/default/src/main/java/org/commonjava/indy/filer/def/IndyTimingProvider.java b/filers/default/src/main/java/org/commonjava/indy/filer/def/IndyTimingProvider.java index 55c66e33c7..134a3a7d0e 100644 --- a/filers/default/src/main/java/org/commonjava/indy/filer/def/IndyTimingProvider.java +++ b/filers/default/src/main/java/org/commonjava/indy/filer/def/IndyTimingProvider.java @@ -15,7 +15,7 @@ */ package org.commonjava.indy.filer.def; -import org.commonjava.indy.metrics.IndyMetricsManager; +import org.commonjava.o11yphant.metrics.DefaultMetricsManager; import org.commonjava.maven.galley.spi.metrics.TimingProvider; public class IndyTimingProvider @@ -23,9 +23,9 @@ public class IndyTimingProvider { private final String name; - private final IndyMetricsManager metricsManager; + private final DefaultMetricsManager metricsManager; - public IndyTimingProvider( final String name, final IndyMetricsManager metricsManager ) + public IndyTimingProvider( final String name, final DefaultMetricsManager metricsManager ) { this.name = name; this.metricsManager = metricsManager; diff --git a/filers/default/src/main/java/org/commonjava/indy/filer/def/TimingInputStream.java b/filers/default/src/main/java/org/commonjava/indy/filer/def/TimingInputStream.java index 2967127626..d87b153497 100644 --- a/filers/default/src/main/java/org/commonjava/indy/filer/def/TimingInputStream.java +++ b/filers/default/src/main/java/org/commonjava/indy/filer/def/TimingInputStream.java @@ -15,12 +15,11 @@ */ package org.commonjava.indy.filer.def; -import com.codahale.metrics.Meter; -import com.codahale.metrics.Timer; import org.apache.commons.io.input.CountingInputStream; -import org.commonjava.indy.metrics.RequestContextHelper; +import org.commonjava.indy.util.RequestContextHelper; import org.commonjava.maven.galley.spi.metrics.TimingProvider; import org.commonjava.maven.galley.util.IdempotentCloseInputStream; +import org.commonjava.o11yphant.metrics.api.Meter; import java.io.IOException; import java.util.function.BiConsumer; diff --git a/filers/default/src/main/java/org/commonjava/indy/filer/def/TimingOutputStream.java b/filers/default/src/main/java/org/commonjava/indy/filer/def/TimingOutputStream.java index 27bd9bfd60..60feda3bb2 100644 --- a/filers/default/src/main/java/org/commonjava/indy/filer/def/TimingOutputStream.java +++ b/filers/default/src/main/java/org/commonjava/indy/filer/def/TimingOutputStream.java @@ -15,13 +15,11 @@ */ package org.commonjava.indy.filer.def; -import com.codahale.metrics.Meter; -import com.codahale.metrics.Timer; import org.apache.commons.io.output.CountingOutputStream; -import org.commonjava.indy.metrics.IndyMetricsManager; -import org.commonjava.indy.metrics.RequestContextHelper; +import org.commonjava.indy.util.RequestContextHelper; import org.commonjava.maven.galley.spi.metrics.TimingProvider; import org.commonjava.maven.galley.util.IdempotentCloseOutputStream; +import org.commonjava.o11yphant.metrics.api.Meter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 48a0eeac20..932799fd19 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 @@ -16,14 +16,14 @@ package org.commonjava.indy.filer.def.metrics; import org.commonjava.indy.filer.def.conf.DefaultStorageProviderConfiguration; -import org.commonjava.indy.metrics.system.StoragePathProvider; +import org.commonjava.o11yphant.metrics.system.StoragePathProvider; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; import java.io.File; /** - * Used to provide storage path in {@link org.commonjava.indy.metrics.system.SystemGaugesSet} to monitor + * Used to provide storage path in {@link org.commonjava.o11yphant.metrics.system.SystemGaugesSet} to monitor * storage space usage */ @ApplicationScoped diff --git a/filers/pom.xml b/filers/pom.xml index d839d21a35..e079985111 100644 --- a/filers/pom.xml +++ b/filers/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-file-managers diff --git a/ftests/common/pom.xml b/ftests/common/pom.xml index 7f9a5bf843..2edb05c2e1 100644 --- a/ftests/common/pom.xml +++ b/ftests/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-ftests-parent - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-ftests-common diff --git a/ftests/core/pom.xml b/ftests/core/pom.xml index 024638fbb1..88cde499f2 100644 --- a/ftests/core/pom.xml +++ b/ftests/core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-ftests-parent - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-ftests-core diff --git a/ftests/metrics/pom.xml b/ftests/metrics/pom.xml deleted file mode 100644 index 8c9bfb2387..0000000000 --- a/ftests/metrics/pom.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - indy-ftests-parent - org.commonjava.indy - 2.5.1-SNAPSHOT - - 4.0.0 - - indy-ftests-metrics - - - - org.commonjava.indy - indy-client-core-java - - - org.commonjava.indy - indy-ftests-common - - - org.commonjava.indy - indy-test-fixtures-core - compile - - - org.commonjava.util - http-testserver - provided - - - org.commonjava.indy - indy-subsys-jaxrs - - - org.commonjava.indy - indy-bindings-jaxrs - - - org.jboss.weld.se - weld-se-core - compile - - - org.jboss.resteasy - resteasy-jaxrs - - - org.commonjava.indy - indy-subsys-metrics-core - - - \ No newline at end of file diff --git a/ftests/metrics/src/main/java/org/commonjava/indy/ftest/metrics/IndyMetricsTest.java b/ftests/metrics/src/main/java/org/commonjava/indy/ftest/metrics/IndyMetricsTest.java deleted file mode 100644 index d6cccfad99..0000000000 --- a/ftests/metrics/src/main/java/org/commonjava/indy/ftest/metrics/IndyMetricsTest.java +++ /dev/null @@ -1,93 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.ftest.metrics; - -import org.commonjava.indy.client.core.IndyClientModule; -import org.commonjava.indy.ftest.core.AbstractIndyFunctionalTest; -import org.commonjava.indy.ftest.metrics.client.IndyMetricsFtestClientModule; -import org.commonjava.indy.test.fixture.core.CoreServerFixture; -import org.junit.Ignore; -import org.junit.Test; - -import java.io.IOException; -import java.util.Arrays; -import java.util.Collection; - -import static org.junit.Assert.assertEquals; - -/** - * Created by xiabai on 3/22/17. - */ -public class IndyMetricsTest - extends AbstractIndyFunctionalTest -{ - @Test - @Ignore - public void MetricsTest() throws Exception - { - for ( int i = 0; i < 10; i++ ) - { - client.module( IndyMetricsFtestClientModule.class ).getTimerWithOutException(); - } - - for ( int i = 0; i < 10; i++ ) - { - try - { - client.module( IndyMetricsFtestClientModule.class ).getTimerWithException(); - } - catch ( Throwable throwable ) - { - //do nothing - } - } - - for ( int i = 0; i < 10; i++ ) - { - client.module( IndyMetricsFtestClientModule.class ).getMeterWithOutException(); - } - - for ( int i = 0; i < 10; i++ ) - { - try - { - client.module( IndyMetricsFtestClientModule.class ).getMeterWithException(); - } - catch ( Throwable throwable ) - { - //do nothing - } - } - Thread.sleep( 5000 ); - - assertEquals( "20", client.module( IndyMetricsFtestClientModule.class ).getMeterCount() ); - assertEquals( "20", client.module( IndyMetricsFtestClientModule.class ).getTimerCount() ); - assertEquals( "10", client.module( IndyMetricsFtestClientModule.class ).getMeterCountWithException()); - assertEquals( "10", client.module( IndyMetricsFtestClientModule.class ).getTimerCountWithException() ); - } - - @Override - protected Collection getAdditionalClientModules() - { - return Arrays.asList( new IndyMetricsFtestClientModule() ); - } - - @Override - protected void initTestConfig( CoreServerFixture fixture ) throws IOException - { - writeConfigFile( "conf.d/metrics.conf", "\n"+readTestResource( "default-test-metrics.conf" ) ); - } -} diff --git a/ftests/metrics/src/main/java/org/commonjava/indy/ftest/metrics/ZabbixCacheStorageTest.java b/ftests/metrics/src/main/java/org/commonjava/indy/ftest/metrics/ZabbixCacheStorageTest.java deleted file mode 100644 index 32ac8ba9ea..0000000000 --- a/ftests/metrics/src/main/java/org/commonjava/indy/ftest/metrics/ZabbixCacheStorageTest.java +++ /dev/null @@ -1,84 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.ftest.metrics; - -import org.commonjava.indy.client.core.IndyClientModule; -import org.commonjava.indy.ftest.core.AbstractIndyFunctionalTest; -import org.commonjava.indy.ftest.metrics.client.ZabbixCacheStorageTestClientModule; -import org.commonjava.indy.test.fixture.core.CoreServerFixture; -import org.junit.Test; - -import java.io.IOException; -import java.util.Arrays; -import java.util.Collection; - -/** - * Created by xiabai on 5/8/17. - */ -public class ZabbixCacheStorageTest - extends AbstractIndyFunctionalTest -{ -// @Test - public void putCache() - { - try - { - client.module( ZabbixCacheStorageTestClientModule.class ).putCache(); - org.junit.Assert.assertFalse( false ); - } - catch ( Exception e ) - { - org.junit.Assert.assertFalse( true ); - } - } - - @Test - public void getCache() - { - try - { - - client.module( ZabbixCacheStorageTestClientModule.class ).putCache(); - - org.junit.Assert.assertEquals( "456", client.module( ZabbixCacheStorageTestClientModule.class ) - .getHostGroupCache() ); - org.junit.Assert.assertEquals( "123", client.module( ZabbixCacheStorageTestClientModule.class ) - .getHostCache() ); - org.junit.Assert.assertEquals( "789", client.module( ZabbixCacheStorageTestClientModule.class ) - .getItemCache() ); - - } - catch ( Exception e ) - - { - org.junit.Assert.assertFalse( true ); - } - - } - - @Override - protected Collection getAdditionalClientModules() - { - return Arrays.asList( new ZabbixCacheStorageTestClientModule() ); - } - - @Override - protected void initTestConfig( CoreServerFixture fixture ) throws IOException - { - writeConfigFile( "conf.d/metrics.conf", "\n" + readTestResource( "default-test-metrics.conf" ) ); - writeConfigFile( "default-metrics.conf", "\n" + readTestResource( "default-test-metrics.conf" ) ); - } -} diff --git a/ftests/metrics/src/main/java/org/commonjava/indy/ftest/metrics/client/IndyMetricsFtestClientModule.java b/ftests/metrics/src/main/java/org/commonjava/indy/ftest/metrics/client/IndyMetricsFtestClientModule.java deleted file mode 100644 index a555be8e7b..0000000000 --- a/ftests/metrics/src/main/java/org/commonjava/indy/ftest/metrics/client/IndyMetricsFtestClientModule.java +++ /dev/null @@ -1,75 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.ftest.metrics.client; - -import org.commonjava.indy.client.core.IndyClientException; -import org.commonjava.indy.client.core.IndyClientModule; -import org.commonjava.indy.client.core.util.UrlUtils; - -/** - * Created by xiabai on 3/22/17. - */ -public class IndyMetricsFtestClientModule - extends IndyClientModule -{ - private static String TIMTER_PATH = "/ftest/metrics/timer"; - private static String METER_PATH = "/ftest/metrics/meter"; - private static String TIMER_COUNT_PATH = "/ftest/metrics/metricRegistry/timer"; - private static String TIMER_COUNT_EXCEPTION_PATH = "/ftest/metrics/metricRegistry/timer/exception"; - private static String MERTER_COUNT_PATH = "/ftest/metrics/metricRegistry/meter"; - private static String MERTER_COUNTEXCEPTION__PATH = "/ftest/metrics/metricRegistry/meter/exception"; - - public String getTimerWithOutException() throws IndyClientException - { - return http.get( UrlUtils.buildUrl( "", TIMTER_PATH+"/false" ), String.class ); - } - - public String getTimerWithException() throws IndyClientException - { - return http.get( UrlUtils.buildUrl( "", TIMTER_PATH+"/true" ), String.class ); - } - - public String getMeterWithOutException() throws IndyClientException - { - return http.get( UrlUtils.buildUrl( "", METER_PATH+"/false" ), String.class ); - } - - public String getMeterWithException() throws IndyClientException - { - return http.get( UrlUtils.buildUrl( "", METER_PATH+"/true" ), String.class ); - } - - public String getTimerCount()throws IndyClientException - { - return http.get( UrlUtils.buildUrl( "", TIMER_COUNT_PATH), String.class ); - } - - public String getTimerCountWithException() throws IndyClientException - { - return http.get( UrlUtils.buildUrl( "", TIMER_COUNT_EXCEPTION_PATH ), String.class ); - } - - public String getMeterCount() throws IndyClientException - { - return http.get( UrlUtils.buildUrl( "", MERTER_COUNT_PATH ), String.class ); - } - - public String getMeterCountWithException() throws IndyClientException - { - return http.get( UrlUtils.buildUrl( "", MERTER_COUNTEXCEPTION__PATH ), String.class ); - } - -} diff --git a/ftests/metrics/src/main/java/org/commonjava/indy/ftest/metrics/client/ZabbixCacheStorageTestClientModule.java b/ftests/metrics/src/main/java/org/commonjava/indy/ftest/metrics/client/ZabbixCacheStorageTestClientModule.java deleted file mode 100644 index c26348de6c..0000000000 --- a/ftests/metrics/src/main/java/org/commonjava/indy/ftest/metrics/client/ZabbixCacheStorageTestClientModule.java +++ /dev/null @@ -1,52 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.ftest.metrics.client; - -import org.commonjava.indy.client.core.IndyClientException; -import org.commonjava.indy.client.core.IndyClientModule; -import org.commonjava.indy.client.core.util.UrlUtils; - -/** - * Created by xiabai on 5/8/17. - */ -public class ZabbixCacheStorageTestClientModule extends IndyClientModule -{ - private static String PUT_PATH = "/ftest/metrics/storage/put"; - private static String GET_HOSTGROUP_PATH = "/ftest/metrics/storage/putHostGroup"; - private static String GET_HOST_PATH = "/ftest/metrics/storage/putHost"; - private static String GET_ITEM_PATH = "/ftest/metrics/storage/putItem"; - - public String putCache() throws IndyClientException - { - return http.get( UrlUtils.buildUrl( "", PUT_PATH ), String.class ); - } - - public String getHostGroupCache() throws IndyClientException - { - return http.get( UrlUtils.buildUrl( "", GET_HOSTGROUP_PATH ), String.class ); - } - - public String getHostCache() throws IndyClientException - { - return http.get( UrlUtils.buildUrl( "", GET_HOST_PATH ), String.class ); - } - - public String getItemCache() throws IndyClientException - { - return http.get( UrlUtils.buildUrl( "", GET_ITEM_PATH ), String.class ); - } - -} diff --git a/ftests/metrics/src/main/java/org/commonjava/indy/ftest/metrics/jaxrs/MetricsTestResource.java b/ftests/metrics/src/main/java/org/commonjava/indy/ftest/metrics/jaxrs/MetricsTestResource.java deleted file mode 100644 index 550ee3fa11..0000000000 --- a/ftests/metrics/src/main/java/org/commonjava/indy/ftest/metrics/jaxrs/MetricsTestResource.java +++ /dev/null @@ -1,123 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.ftest.metrics.jaxrs; - -import com.codahale.metrics.Meter; -import com.codahale.metrics.MetricRegistry; -import com.codahale.metrics.Timer; -import org.commonjava.indy.bind.jaxrs.IndyResources; -import org.commonjava.indy.bind.jaxrs.util.REST; -import org.commonjava.indy.measure.annotation.Measure; -import org.commonjava.indy.measure.annotation.MetricNamed; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import java.util.Random; - -/** - * Created by xiabai on 3/22/17. - */ -@Path( "/api/ftest/metrics/" ) -@Produces( "application/json" ) -@Consumes( "application/json" ) -public class MetricsTestResource - implements IndyResources -{ - private final Logger logger = LoggerFactory.getLogger( getClass() ); - - @Inject - MetricRegistry metricRegistry; - - @GET - @Path( "/metricRegistry/timer" ) - public Response getTimerCount() - { - Timer timer = metricRegistry.timer( "testTimerRequest.timer" ); - return Response.ok( timer.getCount(), MediaType.APPLICATION_JSON ).build(); - } - - @GET - @Path( "/metricRegistry/timer/exception" ) - public Response getTimerCountWithException() - { - Meter meter = null; - try - { - meter = metricRegistry.meter("testTimerRequestWithException.exception" ); - } - catch ( Throwable t ) - { - t.printStackTrace(); - } - return Response.ok( meter.getCount(), MediaType.APPLICATION_JSON ).build(); - } - - @GET - @Path( "/metricRegistry/meter" ) - public Response getMeterCount() - { - Meter meter = metricRegistry.meter( "testMeterRequest.meter" ); - return Response.ok( meter.getCount(), MediaType.APPLICATION_JSON ).build(); - } - - @GET - @Path( "/metricRegistry/meter/exception" ) - public Response getMeterCountWithException() - { - Meter meter = - metricRegistry.meter( "testMeterRequestException.exception" ); - return Response.ok( meter.getCount(), MediaType.APPLICATION_JSON ).build(); - } - - @GET - @Path( "/timer/{isException :[a-zA-Z]+}" ) - @Measure - public Response getTimer( @PathParam( "isException" ) String isException ) - throws Exception - { - if ( isException.equals( "true" ) ) - { - throw new Exception( "EXPECTED: MetricsTest has a exception" ); - } - logger.info( "call in method : MetricsTest" ); - Random random = new Random(); - Thread.sleep( random.nextInt( 100 ) ); - return Response.ok( " \"Timer: well done\"", MediaType.APPLICATION_JSON ).build(); - } - - @GET - @Path( "/meter/{isException :[a-zA-Z]+}" ) - @Measure - public Response getMeter( @PathParam( "isException" ) String isException ) - throws Exception - { - logger.info( "call in method : getMeter" ); - if ( isException.equals( "true" ) ) - { - throw new Exception( "EXPECTED: getMeter has a exception" ); - } - Thread.sleep( 100 ); - return Response.ok( " " + "\"Meter :well done\"", MediaType.APPLICATION_JSON ).build(); - } -} diff --git a/ftests/metrics/src/main/java/org/commonjava/indy/ftest/metrics/jaxrs/ZabbixCacheStorageResource.java b/ftests/metrics/src/main/java/org/commonjava/indy/ftest/metrics/jaxrs/ZabbixCacheStorageResource.java deleted file mode 100644 index 4a887b1073..0000000000 --- a/ftests/metrics/src/main/java/org/commonjava/indy/ftest/metrics/jaxrs/ZabbixCacheStorageResource.java +++ /dev/null @@ -1,80 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.ftest.metrics.jaxrs; - -import org.commonjava.indy.bind.jaxrs.IndyResources; -import org.commonjava.indy.metrics.zabbix.cache.ZabbixCacheStorage; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import java.io.IOException; - -/** - * Created by xiabai on 5/8/17. - */ -@Path( "/api/ftest/metrics/" ) -@Produces( "application/json" ) -@Consumes( "application/json" ) -public class ZabbixCacheStorageResource - implements IndyResources -{ - private final Logger logger = LoggerFactory.getLogger( getClass() ); - - @Inject - ZabbixCacheStorage zabbixCacheStorage; - - @GET - @Path( "/storage/put" ) - public Response putCache() throws IOException - { - zabbixCacheStorage.putHost( "test-host","123" ); - zabbixCacheStorage.putHostGroup( "test-host-group","456" ); - zabbixCacheStorage.putItem( "test-item","789" ); - return Response.ok("\"well done\"").build(); - } - - @GET - @Path( "/storage/putHostGroup" ) - public Response getHostGroupCache() throws IOException - { - String result = zabbixCacheStorage.getHostGroup( "test-host-group" ); - return Response.ok( result, MediaType.APPLICATION_JSON ).build(); - } - - @GET - @Path( "/storage/putHost" ) - public Response getHostCache() throws IOException - { - String result = zabbixCacheStorage.getHost( "test-host" ); - return Response.ok( result, MediaType.APPLICATION_JSON ).build(); - } - - @GET - @Path( "/storage/putItem" ) - public Response getItemCache() throws IOException - { - String result = zabbixCacheStorage.getItem( "test-item" ); - return Response.ok( result, MediaType.APPLICATION_JSON ).build(); - } - -} diff --git a/ftests/metrics/src/main/resources/META-INF/beans.xml b/ftests/metrics/src/main/resources/META-INF/beans.xml deleted file mode 100644 index cf034ceac5..0000000000 --- a/ftests/metrics/src/main/resources/META-INF/beans.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - org.commonjava.indy.metrics.jaxrs.interceptor.MetricsInterceptor - - \ No newline at end of file diff --git a/ftests/metrics/src/main/resources/default-test-metrics.conf b/ftests/metrics/src/main/resources/default-test-metrics.conf deleted file mode 100644 index f0b01aa0dc..0000000000 --- a/ftests/metrics/src/main/resources/default-test-metrics.conf +++ /dev/null @@ -1,77 +0,0 @@ -[metrics] -enabled = true -reporter.enabled = false - -###################################### -# List of enabled reporters (comma-separated) -# At present, Indy metrics feature just support three reporters -# GraPhiteDB,Zabbix,Console,Elasticsearch -###################################### - -reporter = graphite;zabbix;elasticsearch - -############################################ -# GraphiteDB reporter options -############################################ - -# This is the hostname of GraphiteDB. -graphite.hostname = localhost -# Port of GraphiteDB. -graphite.port = 2003 -# Specific prefix for GraphiteDB Item -graphite.reporter.prefix = local.one -# Indy's metrics item have three type: simple,jvm,healthcheck -# Period of simple item for reporting -graphite.reporter.simple.period = 30 -# Period of jvm item for reporting -graphite.reporter.jvm.period = 300 -# Period of healthcheck item for reporting -graphite.reporter.healthcheck.period = 600 - -############################################ -# Zabbix reporter options -############################################ - -#The Zabbix API is a web based API and is shipped as part of the web frontend -# API URL used to access Zabbix from a web browser -zabbix.api.url = example.com -#Zabbix username for login Zabbix server(Zabbix API) -zabbix.user = test -#Zabbix password for login Zabbix server(Zabbix API) -zabbix.pwd = test -# Zabbix sender is a command line utility that may be used to send performance data to Zabbix server for processing. -# Host of Zabbix server for Zabbix sender -zabbix.sender.host = 192.168.1.1 -# Port of Zabbix server for Zabbix sender -zabbix.sender.port = 10051 -# This is the hostname of the current Indy instance, it also is host name of Zabbix monitoring -zabbix.indy.host = example.com -# Specific prefix for Zabbix Item -zabbix.reporter.prefix = local.one -# Indy's metrics item have three type: simple,jvm,healthcheck -# Those type have different period of reporter -# Period of simple item for reporting -zabbix.reporter.simple.period = 30 -# Period of jvm item for reporting -zabbix.reporter.jvm.period = 300 -# Period of healthcheck item for reporting -zabbix.reporter.healthcheck.period = 600 - -############################################ -# Elasticsearch reporter options -############################################ - -# Specific prefix for Elasticsearch -elk.reporter.prefix = local.one -# Indy's metrics item have three type: simple,jvm,healthcheck. -# Those type have different period of reporter -# Period of simple item for reporting -elk.reporter.simple.period = 30 -# Period of jvm item for reporting -elk.reporter.jvm.period = 300 -# Period of healthcheck item for reporting -elk.reporter.healthcheck.period = 600 -#The index name to index in Elasticsearch -elk.reporter.index = local.one.name -#Configure an array of hosts to send data to. -elk.reporter.hosts = localhost:9200 \ No newline at end of file diff --git a/ftests/pom.xml b/ftests/pom.xml index 349687d916..63ddc4b86e 100644 --- a/ftests/pom.xml +++ b/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-ftests-parent @@ -32,7 +32,6 @@ common core - metrics diff --git a/models/core-java/pom.xml b/models/core-java/pom.xml index 7e48e35080..3c43b700c5 100644 --- a/models/core-java/pom.xml +++ b/models/core-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-models-parent - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-model-core-java @@ -52,6 +52,10 @@ org.commonjava.atlas atlas-relationships-api + + org.apache.commons + commons-lang3 + commons-io commons-io diff --git a/models/pom.xml b/models/pom.xml index 10501befd8..0331d1dd37 100644 --- a/models/pom.xml +++ b/models/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-models-parent diff --git a/pom.xml b/pom.xml index 729291d390..ad0d2b26a3 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.commonjava.indy indy-parent - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT pom @@ -37,7 +37,7 @@ scm:git:https://github.com/CommonJava/indy scm:git:https://github.com/CommonJava/indy http://github.com/Commonjava/indy - HEAD + indy-parent-2.5.2 @@ -75,25 +75,25 @@ 0.1.5 2.4.6.Final 2.10.1 - 4.0.2 4.0.4.Final 4.4.9 4.5.9 1.1.0 3.7.1.0 3.7.2 - 1.7 + 1.8 + 1.3-SNAPSHOT 1.1.1 - 1.4 + 1.5 25 3.2.1 1.16 - 2.12 + 2.13 2.3 1.11 - 1.17 + 1.18 1.4 1.4 0.13.1 @@ -187,7 +187,7 @@ org.commonjava.indy.ui indy-ui-layover - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT runtime @@ -195,22 +195,22 @@ org.commonjava.indy indy-model-core-java - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-api - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-core - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-core - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT tar.gz confset provided @@ -218,32 +218,32 @@ org.commonjava.indy indy-db-flat - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-db-metrics - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-db-common - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-db-infinispan - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-bindings-jaxrs - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy.launch indy-launcher - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT tar.gz skinny provided @@ -251,7 +251,7 @@ org.commonjava.indy.launch indy-launcher - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT tar.gz complete provided @@ -259,7 +259,7 @@ org.commonjava.indy.launch indy-launcher - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT tar.gz data provided @@ -267,7 +267,7 @@ org.commonjava.indy.launch indy-launcher - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT tar.gz etc provided @@ -276,17 +276,17 @@ org.commonjava.indy indy-revisions-jaxrs - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-revisions-common - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-revisions-common - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT tar.gz confset provided @@ -294,7 +294,7 @@ org.commonjava.indy indy-revisions-common - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT tar.gz uiset provided @@ -302,12 +302,12 @@ org.commonjava.indy indy-dot-maven-common - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-dot-maven-common - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT tar.gz dataset provided @@ -315,22 +315,22 @@ org.commonjava.indy indy-dot-maven-jaxrs - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-ftests-dot-maven - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-httprox-common - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-httprox-common - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT tar.gz confset provided @@ -338,17 +338,17 @@ org.commonjava.indy indy-ftests-httprox - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-content-index - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-content-index - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT tar.gz confset provided @@ -356,51 +356,51 @@ org.commonjava.indy indy-db-memory - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-test-db - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT test org.commonjava.indy indy-test-fixtures-core - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT test org.commonjava.indy indy-test-providers-core - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT test org.commonjava.indy indy-test-utils - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT test org.commonjava.indy indy-filer-default - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-subsys-jaxrs - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-subsys-honeycomb - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-subsys-honeycomb - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT tar.gz confset provided @@ -408,17 +408,17 @@ org.commonjava.indy indy-subsys-flatfile - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-subsys-cassandra - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-subsys-cassandra - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT tar.gz confset provided @@ -426,79 +426,79 @@ org.commonjava.indy indy-subsys-infinispan - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-subsys-http - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-subsys-git - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-subsys-groovy - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-subsys-prefetch - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-subsys-cpool - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-client-core-java - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-ftests-common - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-ftests-core - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT test org.commonjava.indy indy-folo-jaxrs - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-ftests-folo - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT test org.commonjava.indy indy-folo-client-java - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-folo-model-java - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-folo-common - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-folo-common - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT tar.gz dataset provided @@ -506,7 +506,7 @@ org.commonjava.indy indy-folo-common - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT tar.gz confset provided @@ -514,33 +514,33 @@ org.commonjava.indy indy-promote-jaxrs - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-ftests-promote - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT test org.commonjava.indy indy-promote-client-java - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-promote-model-java - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-promote-common - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-promote-common - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT tar.gz confset provided @@ -548,7 +548,7 @@ org.commonjava.indy indy-promote-common - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT tar.gz dataset provided @@ -556,19 +556,19 @@ org.commonjava.indy indy-promote-common - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT dataset provided org.commonjava.indy indy-implied-repos-common - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-implied-repos-common - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT tar.gz confset provided @@ -576,37 +576,37 @@ org.commonjava.indy indy-implied-repos-model-java - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-implied-repos-client-java - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-ftests-implied-repos - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy.embed indy-embedder - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy.boot indy-booter-jaxrs - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-subsys-keycloak - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-subsys-keycloak - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT tar.gz confset provided @@ -614,7 +614,7 @@ org.commonjava.indy indy-subsys-infinispan - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT tar.gz confset provided @@ -622,7 +622,7 @@ org.commonjava.indy indy-subsys-prefetch - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT tar.gz confset provided @@ -631,7 +631,7 @@ org.commonjava.indy indy-koji-common - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT tar.gz confset provided @@ -639,103 +639,103 @@ org.commonjava.indy indy-koji-common - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-koji-model-java - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-koji-client-java - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-koji-jaxrs - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-path-mapped-common - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-path-mapped-model-java - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-path-mapped-jaxrs - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-pkg-maven-common - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-pkg-maven-jaxrs - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-pkg-npm-jaxrs - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-ftests-pkg-maven - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT test org.commonjava.indy indy-ftests-pkg-npm - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT test org.commonjava.indy indy-pkg-npm-common - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-pkg-npm-model-java - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-diagnostics-jaxrs - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-diagnostics-client-java - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-diagnostics-common - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-ftests-diagnostics - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT test org.commonjava.indy indy-diagnostics-common - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT confset tar.gz provided @@ -743,81 +743,64 @@ org.commonjava.indy indy-hosted-by-archive-common - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-hosted-by-archive-client-java - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-ftests-hosted-by-archive - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT test org.commonjava.indy indy-hosted-by-archive-jaxrs - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-hosted-by-archive-common - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT confset tar.gz org.commonjava.indy - indy-subsys-metrics-core - 2.5.1-SNAPSHOT + indy-subsys-metrics + 2.5.3-SNAPSHOT org.commonjava.indy - indy-subsys-metrics-reporter - 2.5.1-SNAPSHOT - - - org.commonjava.indy - indy-subsys-metrics-prometheus - 2.5.1-SNAPSHOT - - - org.commonjava.indy - indy-subsys-metrics-reporter - 2.5.1-SNAPSHOT + indy-subsys-metrics + 2.5.3-SNAPSHOT confset tar.gz provided - - org.commonjava.indy - indy-ftests-metrics - 2.5.1-SNAPSHOT - test - - org.commonjava.indy indy-sli - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy.rest indy-rest-api yaml - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT provided org.commonjava.indy.rest indy-rest-api json - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT provided @@ -856,33 +839,33 @@ org.commonjava.indy indy-content-browse-common - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-content-browse-jaxrs - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-ftests-content-browse - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT test org.commonjava.indy indy-content-browse-model-java - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-content-browse-client-java - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-content-browse-common - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT confset tar.gz provided @@ -890,35 +873,35 @@ org.commonjava.indy indy-content-browse-ui - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT reactui tar.gz org.commonjava.indy indy-changelog-common - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-changelog-client-java - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-ftests-changelog - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT test org.commonjava.indy indy-changelog-jaxrs - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-changelog-common - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT confset tar.gz @@ -936,12 +919,12 @@ org.commonjava.indy indy-event-audit-common - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-event-audit-common - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT confset tar.gz provided @@ -956,23 +939,23 @@ org.commonjava.indy indy-repo-proxy-common - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-repo-proxy-jaxrs - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy indy-ftests-repo-proxy - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT test org.commonjava.indy indy-repo-proxy-common - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT confset tar.gz @@ -1076,38 +1059,6 @@ 1.0.0 - - - io.dropwizard.metrics - metrics-core - ${metricsVersion} - - - io.dropwizard.metrics - metrics-jvm - ${metricsVersion} - - - io.dropwizard.metrics - metrics-healthchecks - ${metricsVersion} - - - io.dropwizard.metrics - metrics-graphite - ${metricsVersion} - - - io.dropwizard.metrics - metrics-servlets - ${metricsVersion} - - - io.dropwizard.metrics - metrics-json - ${metricsVersion} - - com.internetitem @@ -1601,6 +1552,28 @@ ${logbackContribVersion} + + + org.commonjava.util + o11yphant-honeycomb-api + ${o11yphantVersion} + + + org.commonjava.util + o11yphant-honeycomb-core + ${o11yphantVersion} + + + org.commonjava.util + o11yphant-metrics-api + ${o11yphantVersion} + + + org.commonjava.util + o11yphant-metrics-core + ${o11yphantVersion} + + org.commonjava.propulsor diff --git a/rest/api/pom.xml b/rest/api/pom.xml index 7788a22ea4..bc8f4433af 100644 --- a/rest/api/pom.xml +++ b/rest/api/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.rest indy-rest-parent - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-rest-api diff --git a/rest/pom.xml b/rest/pom.xml index 74a446ceb4..3b076bd208 100644 --- a/rest/pom.xml +++ b/rest/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy.rest diff --git a/subsys/cassandra/pom.xml b/subsys/cassandra/pom.xml index 134001fc77..a9d6c19826 100644 --- a/subsys/cassandra/pom.xml +++ b/subsys/cassandra/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-subsystems - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-subsys-cassandra diff --git a/subsys/cassandra/src/main/java/org/commonjava/indy/subsys/cassandra/CassandraClient.java b/subsys/cassandra/src/main/java/org/commonjava/indy/subsys/cassandra/CassandraClient.java index 2c32daae7f..3bee2dbeef 100644 --- a/subsys/cassandra/src/main/java/org/commonjava/indy/subsys/cassandra/CassandraClient.java +++ b/subsys/cassandra/src/main/java/org/commonjava/indy/subsys/cassandra/CassandraClient.java @@ -127,4 +127,9 @@ public void close() closed = true; } } + + public Map getSessions() + { + return sessions; + } } diff --git a/subsys/cpool/pom.xml b/subsys/cpool/pom.xml index 72c43d0224..2742ca6441 100644 --- a/subsys/cpool/pom.xml +++ b/subsys/cpool/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-subsys-cpool @@ -33,6 +33,10 @@ org.commonjava.indy indy-api + + org.commonjava.util + o11yphant-metrics-core + io.agroal agroal-api 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 ad6fdcdcd5..445344051b 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 @@ -15,16 +15,15 @@ */ package org.commonjava.indy.subsys.cpool; -import com.codahale.metrics.Gauge; -import com.codahale.metrics.MetricRegistry; -import com.codahale.metrics.health.HealthCheck; -import com.codahale.metrics.health.HealthCheckRegistry; import io.agroal.api.AgroalDataSource; import io.agroal.api.AgroalDataSourceListener; import io.agroal.api.AgroalDataSourceMetrics; import io.agroal.api.configuration.AgroalDataSourceConfiguration; import io.agroal.api.configuration.supplier.AgroalPropertiesReader; import org.commonjava.indy.action.IndyLifecycleException; +import org.commonjava.o11yphant.metrics.api.Gauge; +import org.commonjava.o11yphant.metrics.api.MetricRegistry; +import org.commonjava.o11yphant.metrics.healthcheck.impl.HealthCheckResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,6 +38,7 @@ import java.util.Properties; import static javax.naming.Context.INITIAL_CONTEXT_FACTORY; +import static org.commonjava.o11yphant.metrics.util.NameUtils.name; @ApplicationScoped public class ConnectionPoolProvider @@ -51,9 +51,6 @@ public class ConnectionPoolProvider @Inject private MetricRegistry metricRegistry; - @Inject - private HealthCheckRegistry healthCheckRegistry; - public void init() throws IndyLifecycleException { @@ -110,49 +107,46 @@ public void init() private void registerMetrics(AgroalDataSourceMetrics agroalMetrics, String name) { - metricRegistry.register(MetricRegistry.name(name, "acquireCount"), (Gauge) agroalMetrics::acquireCount); - metricRegistry.register(MetricRegistry.name(name, "creationCount"), (Gauge) agroalMetrics::creationCount); - metricRegistry.register(MetricRegistry.name(name, "leakDetectionCount"), (Gauge) agroalMetrics::leakDetectionCount); - metricRegistry.register(MetricRegistry.name(name, "destroyCount"), (Gauge) agroalMetrics::destroyCount); - metricRegistry.register(MetricRegistry.name(name, "flushCount"), (Gauge) agroalMetrics::flushCount); - metricRegistry.register(MetricRegistry.name(name, "invalidCount"), (Gauge) agroalMetrics::invalidCount); - metricRegistry.register(MetricRegistry.name(name, "reapCount"), (Gauge) agroalMetrics::reapCount); - - metricRegistry.register(MetricRegistry.name(name, "activeCount"), (Gauge) agroalMetrics::activeCount); - metricRegistry.register(MetricRegistry.name(name, "availableCount"), (Gauge) agroalMetrics::availableCount); - metricRegistry.register(MetricRegistry.name(name, "maxUsedCount"), (Gauge) agroalMetrics::maxUsedCount); - metricRegistry.register(MetricRegistry.name(name, "awaitingCount"), (Gauge) agroalMetrics::awaitingCount); - metricRegistry.register(MetricRegistry.name(name, "blockingTimeAverage"), (Gauge) agroalMetrics::blockingTimeAverage); - metricRegistry.register(MetricRegistry.name(name, "blockingTimeMax"), (Gauge) agroalMetrics::blockingTimeMax); - metricRegistry.register(MetricRegistry.name(name, "blockingTimeTotal"), (Gauge) agroalMetrics::blockingTimeTotal); - metricRegistry.register(MetricRegistry.name(name, "creationTimeAverage"), (Gauge) agroalMetrics::creationTimeAverage); - metricRegistry.register(MetricRegistry.name(name, "creationTimeMax"), (Gauge) agroalMetrics::creationTimeMax); - metricRegistry.register(MetricRegistry.name(name, "creationTimeTotal"), (Gauge) agroalMetrics::creationTimeTotal); + metricRegistry.register(name(name, "acquireCount"), (Gauge) agroalMetrics::acquireCount); + metricRegistry.register(name(name, "creationCount"), (Gauge) agroalMetrics::creationCount); + metricRegistry.register(name(name, "leakDetectionCount"), (Gauge) agroalMetrics::leakDetectionCount); + metricRegistry.register(name(name, "destroyCount"), (Gauge) agroalMetrics::destroyCount); + metricRegistry.register(name(name, "flushCount"), (Gauge) agroalMetrics::flushCount); + metricRegistry.register(name(name, "invalidCount"), (Gauge) agroalMetrics::invalidCount); + metricRegistry.register(name(name, "reapCount"), (Gauge) agroalMetrics::reapCount); + + metricRegistry.register(name(name, "activeCount"), (Gauge) agroalMetrics::activeCount); + metricRegistry.register(name(name, "availableCount"), (Gauge) agroalMetrics::availableCount); + metricRegistry.register(name(name, "maxUsedCount"), (Gauge) agroalMetrics::maxUsedCount); + metricRegistry.register(name(name, "awaitingCount"), (Gauge) agroalMetrics::awaitingCount); + metricRegistry.register(name(name, "blockingTimeAverage"), (Gauge) agroalMetrics::blockingTimeAverage); + metricRegistry.register(name(name, "blockingTimeMax"), (Gauge) agroalMetrics::blockingTimeMax); + metricRegistry.register(name(name, "blockingTimeTotal"), (Gauge) agroalMetrics::blockingTimeTotal); + metricRegistry.register(name(name, "creationTimeAverage"), (Gauge) agroalMetrics::creationTimeAverage); + metricRegistry.register(name(name, "creationTimeMax"), (Gauge) agroalMetrics::creationTimeMax); + metricRegistry.register(name(name, "creationTimeTotal"), (Gauge) agroalMetrics::creationTimeTotal); } - private void registerHealthChecks(AgroalDataSource ds, String name) + private void registerHealthChecks( AgroalDataSource ds, String name ) { - healthCheckRegistry.register(name, new HealthCheck() - { - @Override protected Result check() + metricRegistry.registerHealthCheck( name, () -> { + try (Connection con = ds.getConnection()) { - try ( Connection con = ds.getConnection() ) + if ( con.isValid( 5 ) ) { - if ( con.isValid(5) ) - { - return Result.healthy(); - } - else - { - return Result.unhealthy( "validation check failed for DataSource %s", name ); - } + return HealthCheckResult.healthy(); } - catch ( SQLException e ) + else { - return Result.unhealthy( e ); + return HealthCheckResult.unhealthy( + String.format( "validation check failed for DataSource %s", name ) ); } } - }); + catch ( SQLException e ) + { + return HealthCheckResult.unhealthy( e ); + } + } ); } private static class AgroalDataSourceLogger implements AgroalDataSourceListener diff --git a/subsys/flatfile/pom.xml b/subsys/flatfile/pom.xml index bffb78efae..38c7412c5e 100644 --- a/subsys/flatfile/pom.xml +++ b/subsys/flatfile/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-subsys-flatfile diff --git a/subsys/git/pom.xml b/subsys/git/pom.xml index a3265ca102..e6d5f60844 100644 --- a/subsys/git/pom.xml +++ b/subsys/git/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-subsys-git diff --git a/subsys/groovy/pom.xml b/subsys/groovy/pom.xml index 2184d7783f..062246200a 100644 --- a/subsys/groovy/pom.xml +++ b/subsys/groovy/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-subsys-groovy @@ -42,6 +42,10 @@ indy-api provided + + org.commonjava.util + o11yphant-honeycomb-api + org.jboss.weld.se weld-se-core @@ -65,10 +69,5 @@ indy-subsys-http test - - org.commonjava.indy - indy-subsys-metrics-reporter - test - 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 d8dc3d7fb7..98a2547008 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 @@ -15,7 +15,7 @@ */ package org.commonjava.indy.subsys.template.fixture; -import org.commonjava.indy.metrics.system.StoragePathProvider; +import org.commonjava.o11yphant.metrics.system.StoragePathProvider; import javax.enterprise.context.ApplicationScoped; import java.io.File; diff --git a/subsys/groovy/src/test/java/org/commonjava/indy/subsys/template/fixture/TestProvider.java b/subsys/groovy/src/test/java/org/commonjava/indy/subsys/template/fixture/TestProvider.java index 59a832c42f..8cb8945b27 100644 --- a/subsys/groovy/src/test/java/org/commonjava/indy/subsys/template/fixture/TestProvider.java +++ b/subsys/groovy/src/test/java/org/commonjava/indy/subsys/template/fixture/TestProvider.java @@ -34,6 +34,8 @@ import org.commonjava.maven.galley.spi.event.FileEventManager; import org.commonjava.maven.galley.spi.nfc.NotFoundCache; import org.commonjava.maven.galley.transport.htcli.conf.GlobalHttpConfiguration; +import org.commonjava.o11yphant.honeycomb.config.HoneycombConfiguration; +import org.commonjava.o11yphant.metrics.sli.GoldenSignalsMetricSet; import org.junit.rules.TemporaryFolder; import javax.annotation.PostConstruct; @@ -174,4 +176,15 @@ public UserLifecycleManager getUserLifecycleManager() return userLifecycleManager; } + @Produces + public HoneycombConfiguration getHoneycombConfiguration() + { + return null; + } + + @Produces + public GoldenSignalsMetricSet getGoldenSignalsMetricSet() + { + return null; + } } diff --git a/subsys/honeycomb/pom.xml b/subsys/honeycomb/pom.xml index b8cce85bb9..68b0e5de15 100644 --- a/subsys/honeycomb/pom.xml +++ b/subsys/honeycomb/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT 4.0.0 @@ -29,8 +29,8 @@ - io.honeycomb.beeline - beeline-core + org.commonjava.util + o11yphant-honeycomb-api org.commonjava.indy @@ -38,15 +38,11 @@ org.commonjava.indy - indy-subsys-metrics-core - - - org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec + indy-subsys-metrics org.commonjava.indy - indy-subsys-metrics-reporter + indy-subsys-cassandra diff --git a/subsys/honeycomb/src/main/conf/conf.d/honeycomb.conf b/subsys/honeycomb/src/main/conf/conf.d/honeycomb.conf index b495722596..093b8dd5c6 100644 --- a/subsys/honeycomb/src/main/conf/conf.d/honeycomb.conf +++ b/subsys/honeycomb/src/main/conf/conf.d/honeycomb.conf @@ -9,3 +9,6 @@ #spans.include=DefaultArtifactStoreQuery,DefaultContentManager,MavenMetadataMerger,getOrderedConcreteStoresInGroup #spans.exclude=getArtifactStore + +# Inject envar to root span fields +#environment.mappings=envar=honeycomb_var,... diff --git a/subsys/honeycomb/src/main/java/org/commonjava/indy/subsys/honeycomb/HoneycombContextualizer.java b/subsys/honeycomb/src/main/java/org/commonjava/indy/subsys/honeycomb/HoneycombContextualizer.java deleted file mode 100644 index 0fa820ea28..0000000000 --- a/subsys/honeycomb/src/main/java/org/commonjava/indy/subsys/honeycomb/HoneycombContextualizer.java +++ /dev/null @@ -1,105 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.honeycomb; - -import io.honeycomb.beeline.tracing.Beeline; -import io.honeycomb.beeline.tracing.Span; -import org.commonjava.cdi.util.weft.ThreadContextualizer; -import org.commonjava.indy.subsys.honeycomb.config.HoneycombConfiguration; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.inject.Named; - -@ApplicationScoped -@Named -public class HoneycombContextualizer - implements ThreadContextualizer -{ - private static final String THREAD_NAME = "thread.name"; - - private static final String THREAD_GROUP_NAME = "thread.group.name"; - - private final Logger logger = LoggerFactory.getLogger( getClass() ); - - private static ThreadLocal SPAN = new ThreadLocal<>(); - - @Inject - private HoneycombManager honeycombManager; - - @Inject - private HoneycombConfiguration configuration; - - @Inject - private IndyTracingContext tracingContext; - - @Override - public String getId() - { - return "honeycomb.threadpool.spanner"; - } - - @Override - public Object extractCurrentContext() - { - if ( configuration.isEnabled() ) - { - Beeline beeline = honeycombManager.getBeeline(); - SpanContext ctx = new SpanContext( beeline.getActiveSpan() ); - logger.trace( "Extracting parent-thread context: {}", ctx ); - return ctx; - } - return null; - } - - @Override - public void setChildContext( final Object parentContext ) - { - if ( configuration.isEnabled() ) - { - tracingContext.reinitThreadSpans(); - - logger.trace( "Creating thread-level root span using parent-thread context: {}", parentContext ); - SPAN.set( honeycombManager.startRootTracer( "thread." + Thread.currentThread().getThreadGroup().getName(), (SpanContext) parentContext ) ); - } - } - - @Override - public void clearContext() - { - if ( configuration.isEnabled() ) - { - Span span = SPAN.get(); - if ( span != null ) - { - logger.trace( "Closing thread-level root span: {}", span ); - honeycombManager.addFields( span ); - span.addField( THREAD_NAME, Thread.currentThread().getName() ); - span.addField( THREAD_GROUP_NAME, Thread.currentThread().getThreadGroup().getName() ); - - span.close(); - - honeycombManager.endTrace(); - } - - SPAN.remove(); - - tracingContext.clearThreadSpans(); - } - } -} diff --git a/subsys/honeycomb/src/main/java/org/commonjava/indy/subsys/honeycomb/HoneycombFilter.java b/subsys/honeycomb/src/main/java/org/commonjava/indy/subsys/honeycomb/HoneycombFilter.java deleted file mode 100644 index 7ea6dd9beb..0000000000 --- a/subsys/honeycomb/src/main/java/org/commonjava/indy/subsys/honeycomb/HoneycombFilter.java +++ /dev/null @@ -1,116 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.honeycomb; - -import io.honeycomb.beeline.tracing.Span; -import org.commonjava.indy.subsys.honeycomb.config.HoneycombConfiguration; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import java.io.IOException; - -import static org.apache.commons.lang3.StringUtils.isBlank; -import static org.commonjava.indy.metrics.RequestContextHelper.getContext; - -@ApplicationScoped -public class HoneycombFilter - implements Filter -{ - @Inject - private HoneycombManager honeycombManager; - - @Inject - private HoneycombConfiguration config; - - private final Logger logger = LoggerFactory.getLogger( getClass() ); - - @Override - public void init( final FilterConfig filterConfig ) throws ServletException - { - } - - @Override - public void doFilter( final ServletRequest request, final ServletResponse response, final FilterChain chain ) - throws IOException, ServletException - { - logger.trace( "START: {}", getClass().getSimpleName() ); - - HttpServletRequest hsr = (HttpServletRequest) request; - logger.debug( "START: {}", hsr.getPathInfo() ); - - Span rootSpan = null; - try - { - rootSpan = honeycombManager.startRootTracer( getEndpointName( hsr.getMethod(), hsr.getPathInfo() ) ); - if ( rootSpan != null ) - { - rootSpan.addField( "path_info", hsr.getPathInfo() ); - } - - chain.doFilter( request, response ); - } - finally - { - logger.debug( "END: {}", hsr.getPathInfo() ); - if ( rootSpan != null ) - { - honeycombManager.addFields( rootSpan ); - rootSpan.close(); - honeycombManager.endTrace(); - } - - logger.trace( "END: {}", getClass().getSimpleName() ); - } - } - - private String getEndpointName( String method, String pathInfo ) - { - StringBuilder sb = new StringBuilder( method + "_" ); - String[] toks = pathInfo.split( "/" ); - for ( String s : toks ) - { - if ( isBlank( s ) || "api".equals( s ) ) - { - continue; - } - sb.append( s ); - if ( "admin".equals( s ) ) - { - sb.append( "_" ); - } - else - { - break; - } - } - return sb.toString(); - } - - @Override - public void destroy() - { - } - -} diff --git a/subsys/honeycomb/src/main/java/org/commonjava/indy/subsys/honeycomb/HoneycombManager.java b/subsys/honeycomb/src/main/java/org/commonjava/indy/subsys/honeycomb/HoneycombManager.java deleted file mode 100644 index 553b788bc8..0000000000 --- a/subsys/honeycomb/src/main/java/org/commonjava/indy/subsys/honeycomb/HoneycombManager.java +++ /dev/null @@ -1,222 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.honeycomb; - -import io.honeycomb.beeline.tracing.Beeline; -import io.honeycomb.beeline.tracing.Span; -import io.honeycomb.beeline.tracing.SpanBuilderFactory; -import io.honeycomb.beeline.tracing.SpanPostProcessor; -import io.honeycomb.beeline.tracing.Tracer; -import io.honeycomb.beeline.tracing.Tracing; -import io.honeycomb.beeline.tracing.propagation.PropagationContext; -import io.honeycomb.beeline.tracing.sampling.Sampling; -import io.honeycomb.libhoney.HoneyClient; -import io.honeycomb.libhoney.LibHoney; -import io.honeycomb.libhoney.responses.ResponseObservable; -import io.honeycomb.libhoney.transport.impl.ConsoleTransport; -import org.commonjava.cdi.util.weft.ThreadContext; -import org.commonjava.indy.metrics.RequestContextHelper; -import org.commonjava.indy.subsys.honeycomb.config.HoneycombConfiguration; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - -import java.util.Map; - -import static org.commonjava.indy.metrics.RequestContextHelper.CUMULATIVE_COUNTS; -import static org.commonjava.indy.metrics.RequestContextHelper.CUMULATIVE_TIMINGS; -import static org.commonjava.indy.metrics.RequestContextHelper.REQUEST_PARENT_SPAN; -import static org.commonjava.indy.metrics.RequestContextHelper.TRACE_ID; -import static org.commonjava.indy.metrics.RequestContextHelper.getContext; - -@ApplicationScoped -public class HoneycombManager -{ - private final Logger logger = LoggerFactory.getLogger( getClass() ); - - private HoneyClient client; - - private Beeline beeline; - - @Inject - private HoneycombContextualizer honeycombContextualizer; - - @Inject - private HoneycombConfiguration configuration; - - @Inject - private IndyTraceSampler traceSampler; - - @Inject - private IndyTracingContext tracingContext; - - @Inject - private IndyEventPostProcessor eventPostProcessor; - - public HoneycombManager() - { - } - - @PostConstruct - public void init() - { - if ( configuration.isEnabled() ) - { - String writeKey = configuration.getWriteKey(); - String dataset = configuration.getDataset(); - - logger.debug( "Init Honeycomb manager, dataset: {}", dataset ); - client = new HoneyClient( LibHoney.options().setDataset( dataset ).setWriteKey( writeKey ) - .setEventPostProcessor( eventPostProcessor ).build() ); //, new ConsoleTransport( new ResponseObservable() ) ); - LibHoney.setDefault( client ); - - SpanPostProcessor postProcessor = Tracing.createSpanProcessor( client, Sampling.alwaysSampler() ); - SpanBuilderFactory factory = Tracing.createSpanBuilderFactory( postProcessor, traceSampler ); - - Tracer tracer = Tracing.createTracer( factory, tracingContext ); - beeline = Tracing.createBeeline( tracer, factory ); - } - } - - public HoneyClient getClient() - { - return client; - } - - public Beeline getBeeline() - { - return beeline; - } - - public Span startRootTracer( String spanName ) - { - return startRootTracer( spanName, null ); - } - - public Span startRootTracer( String spanName, SpanContext parentContext ) - { - Beeline beeline = getBeeline(); - if ( beeline != null ) - { - Span span = null; - if ( parentContext != null ) - { - PropagationContext propContext = - new PropagationContext( parentContext.getTraceId(), parentContext.getParentSpanId(), null, - null ); - - logger.debug( "Starting root span: {} based on parent context: {}, thread: {}", spanName, propContext, Thread.currentThread().getId() ); - span = beeline.getSpanBuilderFactory() - .createBuilder() - .setParentContext( propContext ) - .setSpanName( spanName ) - .setServiceName( "indy" ) - .build(); - - } - else - { - String traceId = RequestContextHelper.getContext( TRACE_ID ); - String parentId = RequestContextHelper.getContext( REQUEST_PARENT_SPAN ); - - span = beeline.getSpanBuilderFactory().createBuilder() - // .setParentContext( parentContext ) - .setSpanName( spanName ).setServiceName( "indy" ).build(); - } - - span = beeline.getTracer().startTrace( span ); - - logger.debug( "Started root span: {} (ID: {}, trace ID: {} and parent: {}, thread: {})", span, - span.getSpanId(), span.getTraceId(), span.getParentSpanId(), - Thread.currentThread().getId() ); - - span.markStart(); - return span; - } - - return null; - } - - public Span startChildSpan( final String spanName ) - { - Beeline beeline = getBeeline(); - if ( beeline != null ) - { - Span span = null; - if ( tracingContext.isEmpty() ) - { - logger.debug( "Parent span from context: {} is a NO-OP, starting root trace instead in: {}", tracingContext, Thread.currentThread().getId() ); - span = startRootTracer( spanName ); - } - else - { - span = beeline.startChildSpan( spanName ); - } - - logger.debug( "Child span: {} (id: {}, trace: {}, parent: {}, thread: {})", span, - span.getSpanId(), span.getTraceId(), span.getParentSpanId(), - Thread.currentThread().getId() ); - - span.markStart(); - return span; - } - - return null; - } - - public void addFields( Span span ) - { - if ( beeline != null ) - { - ThreadContext ctx = ThreadContext.getContext( false ); - if ( ctx != null ) - { - configuration.getFieldSet().forEach( field -> { - Object value = getContext( field ); - if ( value != null ) - { - span.addField( field, value ); - } - } ); - - Map cumulativeTimings = (Map) ctx.get( CUMULATIVE_TIMINGS ); - if ( cumulativeTimings != null ) - { - cumulativeTimings.forEach( ( k, v ) -> span.addField( CUMULATIVE_TIMINGS + "." + k, v ) ); - } - - Map cumulativeCounts = (Map) ctx.get( CUMULATIVE_COUNTS ); - if ( cumulativeCounts != null ) - { - cumulativeCounts.forEach( ( k, v ) -> span.addField( CUMULATIVE_COUNTS + "." + k, v ) ); - } - } - } - } - - public void endTrace() - { - if ( beeline != null ) - { - logger.debug( "Ending trace: {}", Thread.currentThread().getId() ); - getBeeline().getTracer().endTrace(); - } - } - -} diff --git a/subsys/honeycomb/src/main/java/org/commonjava/indy/subsys/honeycomb/IndyCassandraConnectionRootSpanFields.java b/subsys/honeycomb/src/main/java/org/commonjava/indy/subsys/honeycomb/IndyCassandraConnectionRootSpanFields.java new file mode 100644 index 0000000000..2de6dc9f6b --- /dev/null +++ b/subsys/honeycomb/src/main/java/org/commonjava/indy/subsys/honeycomb/IndyCassandraConnectionRootSpanFields.java @@ -0,0 +1,45 @@ +/** + * Copyright (C) 2011-2020 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.honeycomb; + +import com.datastax.driver.core.Session; +import org.commonjava.indy.subsys.cassandra.CassandraClient; +import org.commonjava.o11yphant.honeycomb.impl.CassandraConnectionRootSpanFields; + +import javax.enterprise.context.ApplicationScoped; +import javax.inject.Inject; +import java.util.Collections; +import java.util.Map; + +@ApplicationScoped +public class IndyCassandraConnectionRootSpanFields + extends CassandraConnectionRootSpanFields +{ + + private final Map sessions; + + @Inject + public IndyCassandraConnectionRootSpanFields( CassandraClient cassandraClient ) + { + this.sessions = Collections.unmodifiableMap( cassandraClient.getSessions() ); + } + + @Override + protected Map getSessions() + { + return sessions; + } +} diff --git a/subsys/honeycomb/src/main/java/org/commonjava/indy/subsys/honeycomb/SpanContext.java b/subsys/honeycomb/src/main/java/org/commonjava/indy/subsys/honeycomb/IndyCustomTraceIdProvider.java similarity index 50% rename from subsys/honeycomb/src/main/java/org/commonjava/indy/subsys/honeycomb/SpanContext.java rename to subsys/honeycomb/src/main/java/org/commonjava/indy/subsys/honeycomb/IndyCustomTraceIdProvider.java index 526296fd74..24a40f6c69 100644 --- a/subsys/honeycomb/src/main/java/org/commonjava/indy/subsys/honeycomb/SpanContext.java +++ b/subsys/honeycomb/src/main/java/org/commonjava/indy/subsys/honeycomb/IndyCustomTraceIdProvider.java @@ -15,39 +15,26 @@ */ package org.commonjava.indy.subsys.honeycomb; -import io.honeycomb.beeline.tracing.Span; +import org.commonjava.o11yphant.honeycomb.CustomTraceIdProvider; +import org.commonjava.o11yphant.metrics.RequestContextHelper; -public class SpanContext -{ - private String traceId; - - private String parentSpanId; - - public SpanContext( final String traceId, final String parentSpanId ) - { - this.traceId = traceId; - this.parentSpanId = parentSpanId; - } - - public SpanContext( final Span span ) - { - this.traceId = span.getTraceId(); - this.parentSpanId = span.getSpanId(); - } +import javax.enterprise.context.ApplicationScoped; - public String getParentSpanId() - { - return parentSpanId; - } - - public String getTraceId() - { - return traceId; - } +import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.commonjava.o11yphant.honeycomb.util.TraceIdUtils.getUUIDTraceId; +import static org.commonjava.o11yphant.metrics.RequestContextConstants.TRACE_ID; +@ApplicationScoped +public class IndyCustomTraceIdProvider implements CustomTraceIdProvider +{ @Override - public String toString() + public String generateId() { - return "SpanContext{" + "traceId='" + traceId + '\'' + ", parentSpanId='" + parentSpanId + '\'' + '}'; + String traceId = RequestContextHelper.getContext( TRACE_ID ); + if ( isNotBlank(traceId )) + { + return traceId; + } + return getUUIDTraceId(); } } diff --git a/subsys/honeycomb/src/main/java/org/commonjava/indy/subsys/honeycomb/IndyEventPostProcessor.java b/subsys/honeycomb/src/main/java/org/commonjava/indy/subsys/honeycomb/IndyEventPostProcessor.java deleted file mode 100644 index 5d1c38222e..0000000000 --- a/subsys/honeycomb/src/main/java/org/commonjava/indy/subsys/honeycomb/IndyEventPostProcessor.java +++ /dev/null @@ -1,58 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.honeycomb; - -import com.codahale.metrics.Meter; -import io.honeycomb.libhoney.EventPostProcessor; -import io.honeycomb.libhoney.eventdata.EventData; -import org.commonjava.indy.metrics.IndyMetricsManager; -import org.commonjava.indy.metrics.conf.IndyMetricsConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - -import static org.commonjava.indy.metrics.IndyMetricsConstants.METER; -import static org.commonjava.indy.metrics.IndyMetricsConstants.getDefaultName; -import static org.commonjava.indy.metrics.IndyMetricsConstants.getName; - -@ApplicationScoped -public class IndyEventPostProcessor implements EventPostProcessor -{ - - private final Logger logger = LoggerFactory.getLogger( getClass() ); - - @Inject - private IndyMetricsManager metricsManager; - - @Inject - private IndyMetricsConfig metricsConfig; - - private final static String TRANSFER_HONEYCOMB_EVENT = "indy.transferred.honeycomb.event"; - - @Override - public void process( EventData eventData ) - { - if ( metricsConfig != null && metricsManager != null ) - { - String name = getName( metricsConfig.getNodePrefix(), TRANSFER_HONEYCOMB_EVENT, - getDefaultName( IndyEventPostProcessor.class, "process" ), METER ); - Meter meter = metricsManager.getMeter( name ); - meter.mark(); - } - } -} diff --git a/subsys/honeycomb/src/main/java/org/commonjava/indy/subsys/honeycomb/IndyTraceSampler.java b/subsys/honeycomb/src/main/java/org/commonjava/indy/subsys/honeycomb/IndyTraceSampler.java deleted file mode 100644 index 158c8fd704..0000000000 --- a/subsys/honeycomb/src/main/java/org/commonjava/indy/subsys/honeycomb/IndyTraceSampler.java +++ /dev/null @@ -1,93 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.honeycomb; - -import io.honeycomb.beeline.tracing.Span; -import io.honeycomb.beeline.tracing.sampling.TraceSampler; -import org.commonjava.cdi.util.weft.ThreadContext; -import org.commonjava.indy.metrics.TrafficClassifier; -import org.commonjava.indy.subsys.honeycomb.config.HoneycombConfiguration; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - -import java.util.List; -import java.util.Optional; -import java.util.Random; - -import static org.commonjava.indy.subsys.honeycomb.interceptor.HoneycombInterceptorUtils.SAMPLE_OVERRIDE; - -@ApplicationScoped -public class IndyTraceSampler - implements TraceSampler -{ - private final Random random = new Random(); - - private final Logger logger = LoggerFactory.getLogger( getClass() ); - - @Inject - private TrafficClassifier classifier; - - @Inject - private HoneycombConfiguration configuration; - - @Override - public int sample( final String input ) - { - ThreadContext ctx = ThreadContext.getContext( false ); - if ( ctx == null ) - { - logger.debug( "No ThreadContext for functional diagnosis; skipping span: {}", input ); - return 0; - } - - if ( ctx.get( SAMPLE_OVERRIDE ) != null ) - { - logger.debug( "Including span via override (span: {})", input ); - return 1; - } - - List functionClassifiers = classifier.getCachedFunctionClassifiers(); - Integer rate = configuration.getBaseSampleRate(); - - rate = configuration.getSampleRate( input ); - - if ( rate == configuration.getBaseSampleRate() && functionClassifiers != null ) - { - Optional mostAggressive = functionClassifiers.stream() - .map( classifier -> configuration.getSampleRate( - classifier ) ) - .filter( theRate -> theRate > 0 ) - .min( ( one, two ) -> two - one ); - - if ( mostAggressive.isPresent() ) - { - rate = mostAggressive.get(); - } - } - - if ( rate == 1 || Math.abs( random.nextInt() ) % rate == 0 ) - { - logger.debug( "Including span due to sampling rate: {} (span: {})", rate, input ); - return 1; - } - - logger.debug( "Skipping span due to sampling rate: {} (span: {})", rate, input ); - return 0; - } -} diff --git a/subsys/honeycomb/src/main/java/org/commonjava/indy/subsys/honeycomb/IndyTracingContext.java b/subsys/honeycomb/src/main/java/org/commonjava/indy/subsys/honeycomb/IndyTracingContext.java deleted file mode 100644 index 66ac05d4a0..0000000000 --- a/subsys/honeycomb/src/main/java/org/commonjava/indy/subsys/honeycomb/IndyTracingContext.java +++ /dev/null @@ -1,121 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.honeycomb; - -import io.honeycomb.beeline.tracing.TracerSpan; -import io.honeycomb.beeline.tracing.context.TracingContext; -import org.commonjava.indy.subsys.honeycomb.config.HoneycombConfiguration; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import java.util.ArrayDeque; -import java.util.Deque; - -@ApplicationScoped -public class IndyTracingContext - implements TracingContext -{ - private static ThreadLocal> SPANS = ThreadLocal.withInitial( ArrayDeque::new ); - - private Logger logger = LoggerFactory.getLogger( getClass() ); - - @Inject - private HoneycombConfiguration config; - - public void reinitThreadSpans() - { - if ( config.isEnabled() ) - { - logger.debug( "Clearing spans in current thread: {}", Thread.currentThread().getId() ); - SPANS.set( new ArrayDeque<>() ); - } - } - - public void clearThreadSpans() - { - if ( config.isEnabled() ) - { - logger.debug( "Clearing context...SPANs in current thread: {} (thread: {})", SPANS.get().size(), - Thread.currentThread().getId() ); - TracerSpan tracerSpan = SPANS.get().peekLast(); - if ( tracerSpan != null ) - { - tracerSpan.close(); - } - - logger.debug( "Clearing spans deque in: {}", Thread.currentThread().getId() ); - SPANS.remove(); - } - } - - @Override - public Deque get() - { - return SPANS.get(); - } - - @Override - public int size() - { - logger.debug( "SPANs in current thread: {} (thread: {})", SPANS.get().size(), Thread.currentThread().getId() ); - return SPANS.get().size(); - } - - @Override - public TracerSpan peekLast() - { - logger.debug( "SPANs in current thread: {} (thread: {})", SPANS.get().size(), Thread.currentThread().getId() ); - return SPANS.get().peekLast(); - } - - @Override - public TracerSpan peekFirst() - { - logger.debug( "SPANs in current thread: {} (thread: {})", SPANS.get().size(), Thread.currentThread().getId() ); - return SPANS.get().peekFirst(); - } - - @Override - public boolean isEmpty() - { - Deque spans = SPANS.get(); - logger.debug( "SPANs in current thread: {} (thread: {})", spans.size(), Thread.currentThread().getId() ); - boolean empty = spans.isEmpty(); - - logger.debug( "SPANs.isEmpty() ? {}", empty ); - return empty; - } - - @Override - public void push( final TracerSpan span ) - { - logger.debug( "SPANs in current thread: {} (thread: {})", SPANS.get().size(), Thread.currentThread().getId() ); - SPANS.get().push( span ); - } - - @Override - public TracerSpan pop() - { - logger.debug( "Pre-POP SPANs in current thread: {} (thread: {})", SPANS.get().size(), Thread.currentThread().getId() ); - - TracerSpan span = SPANS.get().pop(); - - logger.debug( "Post-POP SPANs in current thread: {} (thread: {})", SPANS.get().size(), Thread.currentThread().getId() ); - return span; - } -} diff --git a/subsys/honeycomb/src/main/java/org/commonjava/indy/subsys/honeycomb/config/HoneycombConfiguration.java b/subsys/honeycomb/src/main/java/org/commonjava/indy/subsys/honeycomb/config/HoneycombConfiguration.java deleted file mode 100644 index fcc5dcfbf3..0000000000 --- a/subsys/honeycomb/src/main/java/org/commonjava/indy/subsys/honeycomb/config/HoneycombConfiguration.java +++ /dev/null @@ -1,237 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.honeycomb.config; - -import org.commonjava.indy.conf.IndyConfigInfo; -import org.commonjava.propulsor.config.ConfigurationException; -import org.commonjava.propulsor.config.annotation.SectionName; -import org.commonjava.propulsor.config.section.MapSectionListener; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.enterprise.context.ApplicationScoped; -import java.io.InputStream; -import java.lang.reflect.Method; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - -import static org.commonjava.indy.metrics.RequestContextHelper.CLIENT_ADDR; -import static org.commonjava.indy.metrics.RequestContextHelper.CONTENT_TRACKING_ID; -import static org.commonjava.indy.metrics.RequestContextHelper.HTTP_METHOD; -import static org.commonjava.indy.metrics.RequestContextHelper.HTTP_STATUS; -import static org.commonjava.indy.metrics.RequestContextHelper.PACKAGE_TYPE; -import static org.commonjava.indy.metrics.RequestContextHelper.PATH; -import static org.commonjava.indy.metrics.RequestContextHelper.TRACE_ID; -import static org.commonjava.indy.metrics.RequestContextHelper.REQUEST_LATENCY_MILLIS; -import static org.commonjava.indy.metrics.RequestContextHelper.REST_ENDPOINT_PATH; - -@SectionName( "honeycomb" ) -@ApplicationScoped -public class HoneycombConfiguration - extends MapSectionListener - implements IndyConfigInfo -{ - private static final Set DEFAULT_FIELDS = Collections.unmodifiableSet( new HashSet<>( - Arrays.asList( CONTENT_TRACKING_ID, HTTP_METHOD, HTTP_STATUS, TRACE_ID, CLIENT_ADDR, PATH, PACKAGE_TYPE, - REST_ENDPOINT_PATH, REQUEST_LATENCY_MILLIS ) ) ); - - private static final String ENABLED = "enabled"; - - private static final String WRITE_KEY = "write.key"; - - private static final String DATASET = "dataset"; - - private static final String FIELDS = "fields"; - - private static final String BASE_SAMPLE_RATE = "base.sample.rate"; - - private static final String SAMPLE_PREFIX = "sample."; - - private static final Integer DEFAULT_BASE_SAMPLE_RATE = 100; - - private boolean enabled; - - private String writeKey; - - private String dataset; - - private Integer baseSampleRate; - - private Map spanRates = new HashMap<>(); - - private Set spansIncluded = Collections.emptySet(); - - private Set spansExcluded = Collections.emptySet(); - - private Set fields; - - public HoneycombConfiguration() - { - } - - public boolean isEnabled() - { - return enabled; - } - - @Override - public void sectionStarted( final String name ) - throws ConfigurationException - { - // NOP; just block map init in the underlying implementation. - } - - @Override - public void parameter( final String name, final String value ) - throws ConfigurationException - { - switch(name) - { - case ENABLED: - this.enabled = Boolean.TRUE.equals( Boolean.parseBoolean( value.trim() ) ); - break; - case WRITE_KEY: - this.writeKey = value.trim(); - break; - case DATASET: - this.dataset = value.trim(); - break; - case BASE_SAMPLE_RATE: - this.baseSampleRate = Integer.parseInt( value.trim() ); - break; - case FIELDS: - this.fields = Collections.unmodifiableSet( - new HashSet<>( Arrays.asList( value.trim().split( "\\s*,\\s*" ) ) ) ); - break; - default: - if ( name.startsWith( SAMPLE_PREFIX ) && name.length() > SAMPLE_PREFIX.length() ) - { - spanRates.put( name.substring( SAMPLE_PREFIX.length() ).trim(), Integer.parseInt( value ) ); - } - } - } - - public String getWriteKey() - { - return writeKey; - } - - public String getDataset() - { - return dataset; - } - - @Override - public String getDefaultConfigFileName() - { - return "honeycomb.conf"; - } - - @Override - public InputStream getDefaultConfig() - { - return Thread.currentThread().getContextClassLoader().getResourceAsStream( "default-honeycomb.conf" ); - } - - public Integer getBaseSampleRate() - { - return baseSampleRate == null ? DEFAULT_BASE_SAMPLE_RATE : baseSampleRate; - } - - public int getSampleRate( Method method ) - { - Logger logger = LoggerFactory.getLogger( getClass() ); - if ( !spanRates.isEmpty() ) - { - String[] keys = { - method.getName(), - method.getDeclaringClass().getSimpleName() + "." + method.getName(), - method.getDeclaringClass().getName() + "." + method.getName(), - method.getDeclaringClass().getSimpleName(), - method.getDeclaringClass().getName() - }; - - for( String key: keys ) - { - Integer rate = spanRates.get( key ); - if ( rate != null ) - { - logger.trace( "Found sampling rate for: {} = {}", key, rate ); - return rate; - } - } - } - - logger.trace( "Returning base sampling rate for: {} = {}", method, getBaseSampleRate() ); - return getBaseSampleRate(); - } - - public Set getFieldSet() - { - return fields == null ? DEFAULT_FIELDS : fields; - } - - public Integer getSampleRate( final String classifier ) - { - Logger logger = LoggerFactory.getLogger( getClass() ); - - Integer rate = spanRates.get( classifier ); - if ( rate != null ) - { - logger.trace( "Found sampling rate for: {} = {}", classifier, rate ); - return rate; - } - - String[] parts = classifier.split( "\\." ); - for ( String part : parts ) - { - rate = spanRates.get( part ); - if ( rate != null ) - { - logger.trace( "Found sampling rate for: {} = {}", part, rate ); - return rate; - } - } - - StringBuilder sb = new StringBuilder(); - for ( int i = parts.length; i > 0; i-- ) - { - sb.setLength( 0 ); - for ( int j = 0; j < i; j++ ) - { - if ( sb.length() > 0 ) - { - sb.append( '.' ); - } - sb.append( parts[j] ); - } - - rate = spanRates.get( sb.toString() ); - if ( rate != null ) - { - logger.trace( "Found sampling rate for: {} = {}", sb, rate ); - return rate; - } - } - - logger.trace( "Returning base sampling rate for: {} = {}", classifier, getBaseSampleRate() ); - return getBaseSampleRate(); - } -} diff --git a/subsys/honeycomb/src/main/java/org/commonjava/indy/subsys/honeycomb/config/IndyHoneycombConfiguration.java b/subsys/honeycomb/src/main/java/org/commonjava/indy/subsys/honeycomb/config/IndyHoneycombConfiguration.java new file mode 100644 index 0000000000..05c41de515 --- /dev/null +++ b/subsys/honeycomb/src/main/java/org/commonjava/indy/subsys/honeycomb/config/IndyHoneycombConfiguration.java @@ -0,0 +1,212 @@ +/** + * Copyright (C) 2011-2020 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.honeycomb.config; + +import org.commonjava.indy.conf.IndyConfigInfo; +import org.commonjava.indy.conf.IndyConfiguration; +import org.commonjava.o11yphant.honeycomb.config.HoneycombConfiguration; +import org.commonjava.propulsor.config.ConfigurationException; +import org.commonjava.propulsor.config.annotation.SectionName; +import org.commonjava.propulsor.config.section.MapSectionListener; + +import javax.enterprise.context.ApplicationScoped; +import javax.inject.Inject; +import java.io.InputStream; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +@SectionName( "honeycomb" ) +@ApplicationScoped +public class IndyHoneycombConfiguration + extends MapSectionListener + implements IndyConfigInfo, HoneycombConfiguration +{ + @Inject + private IndyConfiguration indyConfiguration; + + private static final String ENABLED = "enabled"; + + private static final String CONSOLE_TRANSPORT = "console.transport"; + + private static final String WRITE_KEY = "write.key"; + + private static final String DATASET = "dataset"; + + private static final String FIELDS = "fields"; + + private static final String BASE_SAMPLE_RATE = "base.sample.rate"; + + private static final String SAMPLE_PREFIX = "sample."; + + private static final String ENVIRONMENT_MAPPINGS = "environment.mappings"; + + private static final String CP_NAMES = "cp.names"; + + private static final Integer DEFAULT_BASE_SAMPLE_RATE = 100; + + private boolean enabled; + + private boolean consoleTransport; + + private String writeKey; + + private String dataset; + + private Integer baseSampleRate; + + private Map spanRates = new HashMap<>(); + + private Set spansIncluded = Collections.emptySet(); + + private Set spansExcluded = Collections.emptySet(); + + private Set fields; + + private String environmentMappings; + + private String cpNames; + + public IndyHoneycombConfiguration() + { + } + + @Override + public Map getSpanRates() + { + return spanRates; + } + + @Override + public boolean isEnabled() + { + return enabled; + } + + @Override + public boolean isConsoleTransport() + { + return consoleTransport; + } + + @Override + public String getServiceName() + { + return "indy"; + } + + @Override + public void sectionStarted( final String name ) throws ConfigurationException + { + // NOP; just block map init in the underlying implementation. + } + + @Override + public void parameter( final String name, final String value ) throws ConfigurationException + { + switch ( name ) + { + case ENABLED: + this.enabled = Boolean.TRUE.equals( Boolean.parseBoolean( value.trim() ) ); + break; + case WRITE_KEY: + this.writeKey = value.trim(); + break; + case DATASET: + this.dataset = value.trim(); + break; + case BASE_SAMPLE_RATE: + this.baseSampleRate = Integer.parseInt( value.trim() ); + break; + case ENVIRONMENT_MAPPINGS: + this.environmentMappings = value.trim(); + break; + case CP_NAMES: + this.cpNames = value.trim(); + break; + case FIELDS: + this.fields = Collections.unmodifiableSet( + new HashSet<>( Arrays.asList( value.trim().split( "\\s*,\\s*" ) ) ) ); + break; + case CONSOLE_TRANSPORT: + this.consoleTransport = Boolean.parseBoolean( value.trim() ); + break; + default: + if ( name.startsWith( SAMPLE_PREFIX ) && name.length() > SAMPLE_PREFIX.length() ) + { + spanRates.put( name.substring( SAMPLE_PREFIX.length() ).trim(), Integer.parseInt( value ) ); + } + } + } + + @Override + public String getWriteKey() + { + return writeKey; + } + + @Override + public String getDataset() + { + return dataset; + } + + @Override + public String getDefaultConfigFileName() + { + return "honeycomb.conf"; + } + + @Override + public InputStream getDefaultConfig() + { + return Thread.currentThread().getContextClassLoader().getResourceAsStream( "default-honeycomb.conf" ); + } + + @Override + public Integer getBaseSampleRate() + { + return baseSampleRate == null ? DEFAULT_BASE_SAMPLE_RATE : baseSampleRate; + } + + @Override + public Set getFieldSet() + { + return fields == null ? DEFAULT_FIELDS : fields; + } + + @Override + public String getEnvironmentMappings() + { + return environmentMappings; + } + + @Override + public String getCPNames() + { + return cpNames; + } + + @Override + public String getNodeId() + { + return indyConfiguration.getNodeId(); + } + +} diff --git a/subsys/honeycomb/src/main/java/org/commonjava/indy/subsys/honeycomb/interceptor/HoneycombInterceptorUtils.java b/subsys/honeycomb/src/main/java/org/commonjava/indy/subsys/honeycomb/interceptor/HoneycombInterceptorUtils.java deleted file mode 100644 index 7d52795235..0000000000 --- a/subsys/honeycomb/src/main/java/org/commonjava/indy/subsys/honeycomb/interceptor/HoneycombInterceptorUtils.java +++ /dev/null @@ -1,67 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.honeycomb.interceptor; - -import io.honeycomb.beeline.tracing.Span; -import org.commonjava.cdi.util.weft.ThreadContext; -import org.commonjava.indy.measure.annotation.MetricWrapperNamed; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.interceptor.InvocationContext; -import java.lang.reflect.Method; -import java.lang.reflect.Parameter; -import java.util.LinkedList; -import java.util.function.Supplier; - -public class HoneycombInterceptorUtils -{ - - public static final String SAMPLE_OVERRIDE = "honeycomb.sample-override"; - - public static String getMetricNameFromParam( InvocationContext context ) - { - String name = null; - - Method method = context.getMethod(); - Parameter[] parameters = method.getParameters(); - for ( int i=0; i org.commonjava.indy indy-subsystems - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-subsys-http diff --git a/subsys/infinispan/pom.xml b/subsys/infinispan/pom.xml index 68ab1ad583..a0efafc7b4 100644 --- a/subsys/infinispan/pom.xml +++ b/subsys/infinispan/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-subsys-infinispan @@ -39,11 +39,7 @@ org.commonjava.indy - indy-subsys-metrics-core - - - org.commonjava.indy - indy-subsys-metrics-reporter + indy-subsys-metrics org.infinispan diff --git a/subsys/infinispan/src/main/java/org/commonjava/indy/subsys/infinispan/BasicCacheHandle.java b/subsys/infinispan/src/main/java/org/commonjava/indy/subsys/infinispan/BasicCacheHandle.java index 3abfe44395..d91f77bf9c 100644 --- a/subsys/infinispan/src/main/java/org/commonjava/indy/subsys/infinispan/BasicCacheHandle.java +++ b/subsys/infinispan/src/main/java/org/commonjava/indy/subsys/infinispan/BasicCacheHandle.java @@ -15,7 +15,7 @@ */ package org.commonjava.indy.subsys.infinispan; -import org.commonjava.indy.metrics.IndyMetricsManager; +import org.commonjava.o11yphant.metrics.DefaultMetricsManager; import org.infinispan.commons.api.BasicCache; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -24,7 +24,7 @@ import java.util.function.Function; import java.util.function.Supplier; -import static com.codahale.metrics.MetricRegistry.name; +import static org.commonjava.o11yphant.metrics.util.NameUtils.name; public class BasicCacheHandle { @@ -32,7 +32,7 @@ public class BasicCacheHandle protected BasicCache cache; - protected IndyMetricsManager metricsManager; + protected DefaultMetricsManager metricsManager; private String metricPrefix; @@ -52,7 +52,7 @@ protected BasicCacheHandle() { } - protected BasicCacheHandle( String named, BasicCache cache, IndyMetricsManager metricsManager, String metricPrefix ) + protected BasicCacheHandle( String named, BasicCache cache, DefaultMetricsManager metricsManager, String metricPrefix ) { this.name = named; this.cache = cache; diff --git a/subsys/infinispan/src/main/java/org/commonjava/indy/subsys/infinispan/CacheHandle.java b/subsys/infinispan/src/main/java/org/commonjava/indy/subsys/infinispan/CacheHandle.java index 56cb511212..3a4f70e18f 100644 --- a/subsys/infinispan/src/main/java/org/commonjava/indy/subsys/infinispan/CacheHandle.java +++ b/subsys/infinispan/src/main/java/org/commonjava/indy/subsys/infinispan/CacheHandle.java @@ -16,7 +16,7 @@ package org.commonjava.indy.subsys.infinispan; import org.apache.commons.lang3.StringUtils; -import org.commonjava.indy.metrics.IndyMetricsManager; +import org.commonjava.o11yphant.metrics.DefaultMetricsManager; import org.infinispan.Cache; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,7 +37,7 @@ public class CacheHandle extends BasicCacheHandle { protected CacheHandle(){} - public CacheHandle( String named, Cache cache, IndyMetricsManager metricsManager, String metricPrefix ) + public CacheHandle( String named, Cache cache, DefaultMetricsManager metricsManager, String metricPrefix ) { super( named, cache, metricsManager, metricPrefix ); } diff --git a/subsys/infinispan/src/main/java/org/commonjava/indy/subsys/infinispan/CacheProducer.java b/subsys/infinispan/src/main/java/org/commonjava/indy/subsys/infinispan/CacheProducer.java index f04b6f2f41..2098c820a9 100644 --- a/subsys/infinispan/src/main/java/org/commonjava/indy/subsys/infinispan/CacheProducer.java +++ b/subsys/infinispan/src/main/java/org/commonjava/indy/subsys/infinispan/CacheProducer.java @@ -23,8 +23,8 @@ import org.commonjava.indy.action.IndyLifecycleException; import org.commonjava.indy.action.ShutdownAction; import org.commonjava.indy.conf.IndyConfiguration; -import org.commonjava.indy.metrics.IndyMetricsManager; -import org.commonjava.indy.metrics.conf.IndyMetricsConfig; +import org.commonjava.o11yphant.metrics.DefaultMetricsManager; +import org.commonjava.indy.subsys.metrics.conf.IndyMetricsConfig; import org.commonjava.indy.subsys.infinispan.config.ISPNClusterConfiguration; import org.commonjava.indy.subsys.infinispan.config.ISPNRemoteConfiguration; import org.infinispan.Cache; @@ -55,9 +55,8 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import java.util.stream.Collectors; -import static org.commonjava.indy.metrics.IndyMetricsConstants.getSupername; +import static org.commonjava.o11yphant.metrics.util.NameUtils.getSupername; import static org.commonjava.indy.subsys.infinispan.metrics.IspnCheckRegistrySet.INDY_METRIC_ISPN; /** @@ -81,7 +80,7 @@ public class CacheProducer private IndyConfiguration indyConfiguration; @Inject - private IndyMetricsManager metricsManager; + private DefaultMetricsManager metricsManager; @Inject private IndyMetricsConfig metricsConfig; diff --git a/subsys/infinispan/src/main/java/org/commonjava/indy/subsys/infinispan/RemoteCacheHandle.java b/subsys/infinispan/src/main/java/org/commonjava/indy/subsys/infinispan/RemoteCacheHandle.java index aadb9e1683..34d10d4373 100644 --- a/subsys/infinispan/src/main/java/org/commonjava/indy/subsys/infinispan/RemoteCacheHandle.java +++ b/subsys/infinispan/src/main/java/org/commonjava/indy/subsys/infinispan/RemoteCacheHandle.java @@ -15,15 +15,15 @@ */ package org.commonjava.indy.subsys.infinispan; -import org.commonjava.indy.metrics.IndyMetricsManager; +import org.commonjava.o11yphant.metrics.DefaultMetricsManager; import org.infinispan.client.hotrod.RemoteCache; -import static com.codahale.metrics.MetricRegistry.name; +import static org.commonjava.o11yphant.metrics.util.NameUtils.name; public class RemoteCacheHandle extends BasicCacheHandle { - public RemoteCacheHandle( String named, RemoteCache cache, IndyMetricsManager metricsManager, String metricPrefix ) + public RemoteCacheHandle( String named, RemoteCache cache, DefaultMetricsManager metricsManager, String metricPrefix ) { super( named, cache, metricsManager, metricPrefix ); } diff --git a/subsys/infinispan/src/main/java/org/commonjava/indy/subsys/infinispan/metrics/IspnCheckRegistrySet.java b/subsys/infinispan/src/main/java/org/commonjava/indy/subsys/infinispan/metrics/IspnCheckRegistrySet.java index 4dc65d5cca..e0ad647880 100644 --- a/subsys/infinispan/src/main/java/org/commonjava/indy/subsys/infinispan/metrics/IspnCheckRegistrySet.java +++ b/subsys/infinispan/src/main/java/org/commonjava/indy/subsys/infinispan/metrics/IspnCheckRegistrySet.java @@ -15,9 +15,9 @@ */ package org.commonjava.indy.subsys.infinispan.metrics; -import com.codahale.metrics.Gauge; -import com.codahale.metrics.Metric; -import com.codahale.metrics.MetricSet; +import org.commonjava.o11yphant.metrics.api.Gauge; +import org.commonjava.o11yphant.metrics.api.Metric; +import org.commonjava.o11yphant.metrics.api.MetricSet; import org.infinispan.AdvancedCache; import org.infinispan.Cache; import org.infinispan.manager.EmbeddedCacheManager; @@ -30,7 +30,7 @@ import java.util.Set; import java.util.function.Supplier; -import static com.codahale.metrics.MetricRegistry.name; +import static org.commonjava.o11yphant.metrics.util.NameUtils.name; public class IspnCheckRegistrySet implements MetricSet diff --git a/subsys/infinispan/src/main/java/org/commonjava/indy/subsys/infinispan/metrics/IspnRegistrySetProvider.java b/subsys/infinispan/src/main/java/org/commonjava/indy/subsys/infinispan/metrics/IspnRegistrySetProvider.java index eec5f340e4..ce72a91943 100644 --- a/subsys/infinispan/src/main/java/org/commonjava/indy/subsys/infinispan/metrics/IspnRegistrySetProvider.java +++ b/subsys/infinispan/src/main/java/org/commonjava/indy/subsys/infinispan/metrics/IspnRegistrySetProvider.java @@ -15,9 +15,9 @@ */ package org.commonjava.indy.subsys.infinispan.metrics; -import com.codahale.metrics.MetricRegistry; -import org.commonjava.indy.metrics.MetricSetProvider; -import org.commonjava.indy.metrics.conf.IndyMetricsConfig; +import org.commonjava.o11yphant.metrics.api.MetricSet; +import org.commonjava.o11yphant.metrics.MetricSetProvider; +import org.commonjava.indy.subsys.metrics.conf.IndyMetricsConfig; import org.commonjava.indy.subsys.infinispan.CacheProducer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -29,12 +29,12 @@ import java.util.List; import java.util.Set; -import static com.codahale.metrics.MetricRegistry.name; import static org.commonjava.indy.subsys.infinispan.metrics.IspnCheckRegistrySet.INDY_METRIC_ISPN; +import static org.commonjava.o11yphant.metrics.util.NameUtils.name; @ApplicationScoped public class IspnRegistrySetProvider - implements MetricSetProvider + implements MetricSetProvider { @Inject private IndyMetricsConfig metricsConfig; @@ -48,14 +48,9 @@ public class IspnRegistrySetProvider private final Logger logger = LoggerFactory.getLogger( getClass() ); @Override - public void registerMetricSet( final MetricRegistry registry ) + public MetricSet getMetricSet() { - if ( !metricsConfig.isIspnMetricsEnabled() ) - { - return; - } - - logger.info( "Adding ISPN checks to registry: {}", registry ); + logger.info( "Adding ISPN checks" ); String gauges = metricsConfig.getIspnGauges(); List list = null; if ( gauges != null ) @@ -71,8 +66,18 @@ public void registerMetricSet( final MetricRegistry registry ) caches.forEach( ( n ) -> cacheProducer.getCacheManager().getCache( n ) ); } } + return new IspnCheckRegistrySet( cacheProducer.getCacheManager(), list ); + } + + @Override + public String getName() + { + return name( metricsConfig.getNodePrefix(), INDY_METRIC_ISPN ); + } - registry.register( name( metricsConfig.getNodePrefix(), INDY_METRIC_ISPN ), - new IspnCheckRegistrySet( cacheProducer.getCacheManager(), list ) ); + @Override + public boolean isEnabled() + { + return metricsConfig.isIspnMetricsEnabled(); } } diff --git a/subsys/jaxrs/pom.xml b/subsys/jaxrs/pom.xml index 0492810151..eb868d0a23 100644 --- a/subsys/jaxrs/pom.xml +++ b/subsys/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-subsys-jaxrs @@ -115,7 +115,7 @@ org.commonjava.indy - indy-subsys-metrics-reporter + indy-subsys-metrics diff --git a/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/GoldenSignalsFilter.java b/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/GoldenSignalsFilter.java deleted file mode 100644 index 47201b96a2..0000000000 --- a/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/GoldenSignalsFilter.java +++ /dev/null @@ -1,133 +0,0 @@ -/** - * Copyright (C) 2011-2020 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 org.commonjava.indy.metrics.RequestContextHelper; -import org.commonjava.indy.metrics.TrafficClassifier; -import org.commonjava.indy.sli.metrics.GoldenSignalsFunctionMetrics; -import org.commonjava.indy.sli.metrics.GoldenSignalsMetricSet; -import org.commonjava.maven.galley.spi.io.SpecialPathManager; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.util.HashSet; -import java.util.Set; - -import static org.apache.commons.lang3.StringUtils.join; -import static org.commonjava.indy.IndyContentConstants.NANOS_PER_MILLISECOND; -import static org.commonjava.indy.metrics.RequestContextHelper.REQUEST_LATENCY_MILLIS; -import static org.commonjava.indy.metrics.RequestContextHelper.REQUEST_LATENCY_NS; - -@ApplicationScoped -public class GoldenSignalsFilter - implements Filter -{ - @Inject - private GoldenSignalsMetricSet metricSet; - - @Inject - private TrafficClassifier classifier; - - private final Logger logger = LoggerFactory.getLogger( getClass() ); - - // For Unit-testing - GoldenSignalsFilter( final GoldenSignalsMetricSet metricSet, TrafficClassifier classifier ) - { - this.metricSet = metricSet; - this.classifier = classifier; - } - - GoldenSignalsFilter() {} - - @Override - public void init( final FilterConfig filterConfig ) - { - } - - @Override - public void doFilter( final ServletRequest servletRequest, final ServletResponse servletResponse, - final FilterChain filterChain ) - throws IOException, ServletException - { - logger.trace( "START: {}", getClass().getSimpleName() ); - - long start = System.nanoTime(); - - HttpServletRequest req = (HttpServletRequest) servletRequest; - HttpServletResponse resp = (HttpServletResponse) servletResponse; - try - { - Set functions = new HashSet<>( classifier.classifyFunctions( req.getPathInfo(), req.getMethod() ) ); - functions.forEach( function -> metricSet.function( function ).ifPresent( - GoldenSignalsFunctionMetrics::started ) ); - } - catch ( Exception e ) - { - logger.error( "Failed to classify / measure load for: " + req.getPathInfo(), e ); - } - - try - { - filterChain.doFilter( req, resp ); - } - catch ( IOException | ServletException | RuntimeException e ) - { - new HashSet<>( classifier.classifyFunctions( req.getPathInfo(), req.getMethod() ) ).forEach( - function -> metricSet.function( function ).ifPresent( GoldenSignalsFunctionMetrics::error ) ); - throw e; - } - finally - { - // In some cases, we cannot calculate latency without capturing actual data transfer time. When this happens, - // we can capture the actual data transfer time and subtract it from the total execution time to get - // latency. - long end = RequestContextHelper.getRequestEndNanos() - RequestContextHelper.getRawIoWriteNanos(); - - RequestContextHelper.setContext( REQUEST_LATENCY_NS, String.valueOf( end - start ) ); - RequestContextHelper.setContext( REQUEST_LATENCY_MILLIS, (end-start) / NANOS_PER_MILLISECOND ); - - Set functions = new HashSet<>( classifier.classifyFunctions( req.getPathInfo(), req.getMethod() ) ); - boolean error = resp.getStatus() > 499; - - functions.forEach( function -> metricSet.function( function ).ifPresent( ms -> { - ms.latency( end-start ).call(); - if ( error ) - { - ms.error(); - } - } ) ); - - logger.trace( "END: {}", getClass().getSimpleName() ); - } - } - - @Override - public void destroy() - { - } - -} diff --git a/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/IndyDeployment.java b/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/IndyDeployment.java index 7799a5d978..0890883936 100644 --- a/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/IndyDeployment.java +++ b/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/IndyDeployment.java @@ -27,7 +27,8 @@ import org.commonjava.indy.bind.jaxrs.util.RequestScopeListener; import org.commonjava.indy.conf.UIConfiguration; import org.commonjava.indy.stats.IndyVersioning; -import org.commonjava.indy.subsys.honeycomb.HoneycombFilter; +import org.commonjava.o11yphant.honeycomb.HoneycombFilter; +import org.commonjava.o11yphant.metrics.GoldenSignalsFilter; import org.jboss.resteasy.plugins.server.servlet.HttpServlet30Dispatcher; import org.jboss.resteasy.spi.ResteasyDeployment; import org.slf4j.Logger; 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 e0d574b03f..7e473da02d 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 @@ -18,7 +18,7 @@ import org.apache.http.Header; import org.apache.http.HttpRequest; import org.commonjava.indy.conf.IndyConfiguration; -import org.commonjava.indy.metrics.RequestContextHelper; +import org.commonjava.indy.util.RequestContextHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.MDC; @@ -32,17 +32,17 @@ import java.util.UUID; import static org.apache.commons.lang3.StringUtils.isNotBlank; -import static org.commonjava.indy.metrics.RequestContextHelper.CLIENT_ADDR; -import static org.commonjava.indy.metrics.RequestContextHelper.COMPONENT_ID; -import static org.commonjava.indy.metrics.RequestContextHelper.EXTERNAL_TRACE_ID; -import static org.commonjava.indy.metrics.RequestContextHelper.FORCE_METERED; -import static org.commonjava.indy.metrics.RequestContextHelper.HTTP_METHOD; -import static org.commonjava.indy.metrics.RequestContextHelper.HTTP_REQUEST_URI; -import static org.commonjava.indy.metrics.RequestContextHelper.INTERNAL_ID; -import static org.commonjava.indy.metrics.RequestContextHelper.TRACE_ID; -import static org.commonjava.indy.metrics.RequestContextHelper.REQUEST_PARENT_SPAN; -import static org.commonjava.indy.metrics.RequestContextHelper.SPAN_ID_HEADER; -import static org.commonjava.indy.metrics.RequestContextHelper.setContext; +import static org.commonjava.indy.util.RequestContextHelper.CLIENT_ADDR; +import static org.commonjava.indy.util.RequestContextHelper.COMPONENT_ID; +import static org.commonjava.indy.util.RequestContextHelper.EXTERNAL_TRACE_ID; +import static org.commonjava.indy.util.RequestContextHelper.FORCE_METERED; +import static org.commonjava.indy.util.RequestContextHelper.HTTP_METHOD; +import static org.commonjava.indy.util.RequestContextHelper.HTTP_REQUEST_URI; +import static org.commonjava.indy.util.RequestContextHelper.INTERNAL_ID; +import static org.commonjava.indy.util.RequestContextHelper.TRACE_ID; +import static org.commonjava.indy.util.RequestContextHelper.REQUEST_PARENT_SPAN; +import static org.commonjava.indy.util.RequestContextHelper.SPAN_ID_HEADER; +import static org.commonjava.indy.util.RequestContextHelper.setContext; @ApplicationScoped public class MDCManager diff --git a/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/ResourceManagementFilter.java b/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/ResourceManagementFilter.java index 433a3a5a8b..dd9768ab70 100644 --- a/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/ResourceManagementFilter.java +++ b/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/ResourceManagementFilter.java @@ -16,10 +16,10 @@ package org.commonjava.indy.bind.jaxrs; import org.commonjava.cdi.util.weft.ThreadContext; -import org.commonjava.indy.measure.annotation.Measure; -import org.commonjava.indy.metrics.IndyMetricsConstants; -import org.commonjava.indy.metrics.IndyMetricsManager; -import org.commonjava.indy.metrics.RequestContextHelper; +import org.commonjava.o11yphant.metrics.annotation.Measure; +import org.commonjava.o11yphant.metrics.MetricsConstants; +import org.commonjava.o11yphant.metrics.DefaultMetricsManager; +import org.commonjava.indy.util.RequestContextHelper; import org.commonjava.maven.galley.model.SpecialPathInfo; import org.commonjava.maven.galley.spi.cache.CacheProvider; import org.commonjava.maven.galley.spi.io.SpecialPathManager; @@ -41,13 +41,12 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.function.Supplier; -import static org.commonjava.indy.metrics.RequestContextHelper.CLIENT_ADDR; -import static org.commonjava.indy.metrics.RequestContextHelper.CUMULATIVE_COUNTS; -import static org.commonjava.indy.metrics.RequestContextHelper.CUMULATIVE_TIMINGS; -import static org.commonjava.indy.metrics.RequestContextHelper.FORCE_METERED; -import static org.commonjava.indy.metrics.RequestContextHelper.IS_METERED; -import static org.commonjava.indy.metrics.RequestContextHelper.REQUEST_PHASE; -import static org.commonjava.indy.metrics.RequestContextHelper.REQUEST_PHASE_START; +import static org.commonjava.indy.util.RequestContextHelper.CLIENT_ADDR; +import static org.commonjava.indy.util.RequestContextHelper.CUMULATIVE_COUNTS; +import static org.commonjava.indy.util.RequestContextHelper.CUMULATIVE_TIMINGS; +import static org.commonjava.indy.util.RequestContextHelper.IS_METERED; +import static org.commonjava.indy.util.RequestContextHelper.REQUEST_PHASE; +import static org.commonjava.indy.util.RequestContextHelper.REQUEST_PHASE_START; @ApplicationScoped public class ResourceManagementFilter @@ -82,7 +81,7 @@ public class ResourceManagementFilter private SpecialPathManager specialPathManager; @Inject - private IndyMetricsManager metricsManager; + private DefaultMetricsManager metricsManager; private final Logger logger = LoggerFactory.getLogger( getClass() ); @@ -216,7 +215,7 @@ private Supplier pathClassifier( final String pathInfo ) return ()->{ if ( !pathInfo.contains( "content" )) { - return IndyMetricsConstants.SKIP_METRIC; + return MetricsConstants.SKIP_METRIC; } SpecialPathInfo spi = specialPathManager.getSpecialPathInfo( pathInfo ); if ( spi == null ) diff --git a/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/ThreadContextFilter.java b/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/ThreadContextFilter.java index 4cb2769b52..eb950c1b57 100644 --- a/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/ThreadContextFilter.java +++ b/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/ThreadContextFilter.java @@ -16,7 +16,6 @@ package org.commonjava.indy.bind.jaxrs; import org.commonjava.cdi.util.weft.ThreadContext; -import org.commonjava.indy.measure.annotation.Measure; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,7 +30,7 @@ import javax.servlet.http.HttpServletRequest; import java.io.IOException; -import static org.commonjava.indy.metrics.RequestContextHelper.X_FORWARDED_FOR; +import static org.commonjava.indy.util.RequestContextHelper.X_FORWARDED_FOR; @ApplicationScoped public class ThreadContextFilter diff --git a/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/metrics/IndyHealthCheckDeploymentProvider.java b/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/metrics/IndyHealthCheckDeploymentProvider.java index 504aa0eb42..8111644c7c 100644 --- a/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/metrics/IndyHealthCheckDeploymentProvider.java +++ b/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/metrics/IndyHealthCheckDeploymentProvider.java @@ -15,15 +15,9 @@ */ package org.commonjava.indy.bind.jaxrs.metrics; -import com.codahale.metrics.servlets.HealthCheckServlet; -import io.undertow.servlet.Servlets; import io.undertow.servlet.api.DeploymentInfo; -import io.undertow.servlet.api.ServletInfo; import org.commonjava.indy.bind.jaxrs.IndyDeploymentProvider; -import org.commonjava.indy.metrics.IndyMetricsManager; -import org.commonjava.indy.metrics.conf.IndyMetricsConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.commonjava.o11yphant.metrics.jaxrs.HealthCheckDeploymentProvider; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; @@ -33,33 +27,12 @@ public class IndyHealthCheckDeploymentProvider extends IndyDeploymentProvider { - private final Logger logger = LoggerFactory.getLogger( getClass() ); - - @Inject - private IndyMetricsConfig config; - @Inject - private IndyMetricsManager metricsManager; + private HealthCheckDeploymentProvider healthCheckDeploymentProvider; @Override public DeploymentInfo getDeploymentInfo( String contextRoot, Application application ) { - if ( !config.isMetricsEnabled() ) - { - return null; - } - - final ServletInfo servlet = - Servlets.servlet( "healthcheck", HealthCheckServlet.class ).addMapping( "/healthcheck" ).addMapping( "/healthchecks" ); - - final DeploymentInfo di = new DeploymentInfo().addListener( - Servlets.listener( IndyHealthCheckServletContextListener.class ) ) - .setContextPath( contextRoot ) - .addServlet( servlet ) - .setDeploymentName( "HealthCheck Deployment" ) - .setClassLoader( ClassLoader.getSystemClassLoader() ); - - logger.info( "Returning deployment info for health check" ); - return di; + return healthCheckDeploymentProvider.getDeploymentInfo( contextRoot ); } } diff --git a/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/metrics/IndyHealthCheckServletContextListener.java b/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/metrics/IndyHealthCheckServletContextListener.java deleted file mode 100644 index 88efe0bcfe..0000000000 --- a/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/metrics/IndyHealthCheckServletContextListener.java +++ /dev/null @@ -1,30 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.metrics; - -import com.codahale.metrics.health.HealthCheckRegistry; -import com.codahale.metrics.servlets.HealthCheckServlet; - -import javax.enterprise.inject.spi.CDI; - -public class IndyHealthCheckServletContextListener extends HealthCheckServlet.ContextListener -{ - @Override - protected HealthCheckRegistry getHealthCheckRegistry() - { - return CDI.current().select( HealthCheckRegistry.class ).get(); - } -} diff --git a/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/system/SystemGaugesSetProvider.java b/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/metrics/IndyPrometheusDeploymentProvider.java similarity index 55% rename from subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/system/SystemGaugesSetProvider.java rename to subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/metrics/IndyPrometheusDeploymentProvider.java index 711205afbb..156894d8e6 100644 --- a/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/system/SystemGaugesSetProvider.java +++ b/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/metrics/IndyPrometheusDeploymentProvider.java @@ -13,32 +13,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.commonjava.indy.metrics.system; +package org.commonjava.indy.bind.jaxrs.metrics; -import com.codahale.metrics.MetricRegistry; -import org.commonjava.indy.metrics.MetricSetProvider; -import org.commonjava.indy.metrics.conf.IndyMetricsConfig; +import io.undertow.servlet.api.DeploymentInfo; +import org.commonjava.indy.bind.jaxrs.IndyDeploymentProvider; +import org.commonjava.o11yphant.metrics.jaxrs.PrometheusDeploymentProvider; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; - -import static com.codahale.metrics.MetricRegistry.name; +import javax.ws.rs.core.Application; @ApplicationScoped -public class SystemGaugesSetProvider - implements MetricSetProvider +public class IndyPrometheusDeploymentProvider + extends IndyDeploymentProvider { @Inject - private SystemGaugesSet systemGaugesSet; - - @Inject - private IndyMetricsConfig metricsConfig; - - private static final String SYSTEM = "system"; + private PrometheusDeploymentProvider prometheusDeploymentProvider; @Override - public void registerMetricSet( MetricRegistry registry ) + public DeploymentInfo getDeploymentInfo( String contextRoot, Application application ) { - registry.register( name( metricsConfig.getNodePrefix(), SYSTEM ), systemGaugesSet ); + return prometheusDeploymentProvider.getDeploymentInfo( contextRoot ); } } diff --git a/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/util/DTOStreamingOutput.java b/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/util/DTOStreamingOutput.java index f0a292ad7e..792693f81a 100644 --- a/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/util/DTOStreamingOutput.java +++ b/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/util/DTOStreamingOutput.java @@ -15,14 +15,12 @@ */ package org.commonjava.indy.bind.jaxrs.util; -import com.codahale.metrics.Meter; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.commons.io.output.CountingOutputStream; -import org.commonjava.indy.measure.annotation.Measure; -import org.commonjava.indy.measure.annotation.MetricNamed; -import org.commonjava.indy.metrics.IndyMetricsManager; -import org.commonjava.indy.metrics.conf.IndyMetricsConfig; +import org.commonjava.o11yphant.metrics.api.Meter; +import org.commonjava.o11yphant.metrics.DefaultMetricsManager; +import org.commonjava.indy.subsys.metrics.conf.IndyMetricsConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,10 +30,9 @@ import java.io.OutputStream; import java.util.concurrent.atomic.AtomicReference; -import static org.commonjava.indy.measure.annotation.MetricNamed.DEFAULT; -import static org.commonjava.indy.metrics.IndyMetricsConstants.METER; -import static org.commonjava.indy.metrics.IndyMetricsConstants.getDefaultName; -import static org.commonjava.indy.metrics.IndyMetricsConstants.getName; +import static org.commonjava.o11yphant.metrics.MetricsConstants.METER; +import static org.commonjava.o11yphant.metrics.util.NameUtils.getDefaultName; +import static org.commonjava.o11yphant.metrics.util.NameUtils.getName; public class DTOStreamingOutput implements StreamingOutput @@ -48,11 +45,11 @@ public class DTOStreamingOutput private final Object dto; - private final IndyMetricsManager metricsManager; + private final DefaultMetricsManager metricsManager; private final IndyMetricsConfig metricsConfig; - public DTOStreamingOutput( final ObjectMapper mapper, final Object dto, final IndyMetricsManager metricsManager, + public DTOStreamingOutput( final ObjectMapper mapper, final Object dto, final DefaultMetricsManager metricsManager, final IndyMetricsConfig metricsConfig ) { this.mapper = mapper; @@ -98,7 +95,7 @@ public void write( final OutputStream outputStream ) logger.trace( "Wrote: {} bytes", cout.getByteCount() ); String name = getName( metricsConfig.getNodePrefix(), TRANSFER_METRIC_NAME, - getDefaultName( dto.getClass().getSimpleName(), "write" ), METER ); + getDefaultName( dto.getClass(), "write" ), METER ); long end = System.nanoTime(); double elapsed = (end-start)/NANOS_PER_SEC; diff --git a/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/util/ResponseHelper.java b/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/util/ResponseHelper.java index 281009b174..80cc09b940 100644 --- a/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/util/ResponseHelper.java +++ b/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/util/ResponseHelper.java @@ -19,16 +19,14 @@ import org.apache.commons.codec.digest.DigestUtils; import org.commonjava.indy.IndyWorkflowException; import org.commonjava.indy.content.ContentDigester; -import org.commonjava.indy.metrics.IndyMetricsManager; -import org.commonjava.indy.metrics.conf.IndyMetricsConfig; +import org.commonjava.o11yphant.metrics.DefaultMetricsManager; +import org.commonjava.indy.subsys.metrics.conf.IndyMetricsConfig; import org.commonjava.indy.model.core.StoreKey; import org.commonjava.indy.model.util.HttpUtils; import org.commonjava.indy.util.ApplicationContent; import org.commonjava.indy.util.ApplicationHeader; import org.commonjava.indy.util.ApplicationStatus; import org.commonjava.indy.util.LocationUtils; -import org.commonjava.maven.galley.event.EventMetadata; -import org.commonjava.maven.galley.io.checksum.ContentDigest; import org.commonjava.maven.galley.model.Transfer; import org.commonjava.maven.galley.transport.htcli.model.HttpExchangeMetadata; import org.slf4j.Logger; @@ -48,8 +46,8 @@ import java.util.Map; import java.util.function.Consumer; -import static org.commonjava.indy.metrics.RequestContextHelper.HTTP_STATUS; -import static org.commonjava.indy.metrics.RequestContextHelper.setContext; +import static org.commonjava.indy.util.RequestContextHelper.HTTP_STATUS; +import static org.commonjava.indy.util.RequestContextHelper.setContext; @ApplicationScoped public class ResponseHelper @@ -61,7 +59,7 @@ public class ResponseHelper private ObjectMapper mapper; @Inject - private IndyMetricsManager metricsManager; + private DefaultMetricsManager metricsManager; @Inject private IndyMetricsConfig metricsConfig; diff --git a/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/util/RestInterceptor.java b/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/util/RestInterceptor.java index 20049ea887..ceca61d0e7 100644 --- a/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/util/RestInterceptor.java +++ b/subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/util/RestInterceptor.java @@ -23,12 +23,12 @@ import javax.ws.rs.Path; import java.nio.file.Paths; -import static org.commonjava.indy.metrics.RequestContextHelper.REST_CLASS; -import static org.commonjava.indy.metrics.RequestContextHelper.REST_CLASS_PATH; -import static org.commonjava.indy.metrics.RequestContextHelper.REST_ENDPOINT_PATH; -import static org.commonjava.indy.metrics.RequestContextHelper.REST_METHOD_PATH; -import static org.commonjava.indy.metrics.RequestContextHelper.getContext; -import static org.commonjava.indy.metrics.RequestContextHelper.setContext; +import static org.commonjava.indy.util.RequestContextHelper.REST_CLASS; +import static org.commonjava.indy.util.RequestContextHelper.REST_CLASS_PATH; +import static org.commonjava.indy.util.RequestContextHelper.REST_ENDPOINT_PATH; +import static org.commonjava.indy.util.RequestContextHelper.REST_METHOD_PATH; +import static org.commonjava.indy.util.RequestContextHelper.getContext; +import static org.commonjava.indy.util.RequestContextHelper.setContext; @Interceptor @REST diff --git a/subsys/kafka/pom.xml b/subsys/kafka/pom.xml index 6d30864bfd..7f9685cd40 100644 --- a/subsys/kafka/pom.xml +++ b/subsys/kafka/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT 4.0.0 diff --git a/subsys/keycloak/pom.xml b/subsys/keycloak/pom.xml index 84f814b137..18fcab3239 100644 --- a/subsys/keycloak/pom.xml +++ b/subsys/keycloak/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-subsys-keycloak Indy :: Subsystems :: Keycloak diff --git a/subsys/metrics/core/pom.xml b/subsys/metrics/core/pom.xml deleted file mode 100644 index e6cb57b07f..0000000000 --- a/subsys/metrics/core/pom.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - indy-subsys-metrics - org.commonjava.indy - 2.5.1-SNAPSHOT - - 4.0.0 - - indy-subsys-metrics-core - - - - io.dropwizard.metrics - metrics-core - - - io.dropwizard.metrics - metrics-jvm - - - io.dropwizard.metrics - metrics-healthchecks - - - org.apache.commons - commons-lang3 - - - - org.commonjava.indy - indy-api - - - - - - - \ No newline at end of file diff --git a/subsys/metrics/core/src/main/java/org/commonjava/indy/measure/annotation/Measure.java b/subsys/metrics/core/src/main/java/org/commonjava/indy/measure/annotation/Measure.java deleted file mode 100644 index 62524436b6..0000000000 --- a/subsys/metrics/core/src/main/java/org/commonjava/indy/measure/annotation/Measure.java +++ /dev/null @@ -1,32 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.measure.annotation; - -import javax.enterprise.util.Nonbinding; -import javax.interceptor.InterceptorBinding; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -@InterceptorBinding -@Target( { METHOD, TYPE } ) -@Retention( RUNTIME ) -public @interface Measure -{ -} diff --git a/subsys/metrics/core/src/main/java/org/commonjava/indy/measure/annotation/MetricNamed.java b/subsys/metrics/core/src/main/java/org/commonjava/indy/measure/annotation/MetricNamed.java deleted file mode 100644 index 2bbadf86a0..0000000000 --- a/subsys/metrics/core/src/main/java/org/commonjava/indy/measure/annotation/MetricNamed.java +++ /dev/null @@ -1,38 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.measure.annotation; - -import org.commonjava.indy.metrics.IndyMetricsConstants; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -@Target( { METHOD, TYPE } ) -@Retention( RUNTIME ) -public @interface MetricNamed -{ - /** - * Need to migrate to {@link IndyMetricsConstants#DEFAULT}. - * @deprecated - */ - String DEFAULT = IndyMetricsConstants.DEFAULT; - - String value() default DEFAULT; -} \ No newline at end of file diff --git a/subsys/metrics/core/src/main/java/org/commonjava/indy/measure/annotation/MetricWrapperEnd.java b/subsys/metrics/core/src/main/java/org/commonjava/indy/measure/annotation/MetricWrapperEnd.java deleted file mode 100644 index 5b98af60c0..0000000000 --- a/subsys/metrics/core/src/main/java/org/commonjava/indy/measure/annotation/MetricWrapperEnd.java +++ /dev/null @@ -1,31 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.measure.annotation; - -import javax.interceptor.InterceptorBinding; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -@InterceptorBinding -@Target( { METHOD, TYPE } ) -@Retention( RUNTIME ) -public @interface MetricWrapperEnd -{ -} diff --git a/subsys/metrics/core/src/main/java/org/commonjava/indy/measure/annotation/MetricWrapperNamed.java b/subsys/metrics/core/src/main/java/org/commonjava/indy/measure/annotation/MetricWrapperNamed.java deleted file mode 100644 index 7680d38c5b..0000000000 --- a/subsys/metrics/core/src/main/java/org/commonjava/indy/measure/annotation/MetricWrapperNamed.java +++ /dev/null @@ -1,32 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.measure.annotation; - -import javax.enterprise.util.Nonbinding; -import javax.interceptor.InterceptorBinding; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -@InterceptorBinding -@Target( { PARAMETER } ) -@Retention( RUNTIME ) -public @interface MetricWrapperNamed -{ -} diff --git a/subsys/metrics/core/src/main/java/org/commonjava/indy/measure/annotation/MetricWrapperStart.java b/subsys/metrics/core/src/main/java/org/commonjava/indy/measure/annotation/MetricWrapperStart.java deleted file mode 100644 index 1b94fa7470..0000000000 --- a/subsys/metrics/core/src/main/java/org/commonjava/indy/measure/annotation/MetricWrapperStart.java +++ /dev/null @@ -1,31 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.measure.annotation; - -import javax.interceptor.InterceptorBinding; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -@InterceptorBinding -@Target( { METHOD, TYPE } ) -@Retention( RUNTIME ) -public @interface MetricWrapperStart -{ -} diff --git a/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/IndyMetricsConstants.java b/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/IndyMetricsConstants.java deleted file mode 100644 index 395972c70d..0000000000 --- a/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/IndyMetricsConstants.java +++ /dev/null @@ -1,79 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.metrics; - -import org.apache.commons.lang3.ClassUtils; - -import static com.codahale.metrics.MetricRegistry.name; -import static org.apache.commons.lang.StringUtils.isBlank; - -public class IndyMetricsConstants -{ - public static final String DEFAULT = "default"; - - public static final String EXCEPTION = "exception"; - - public static final String METER = "meter"; - - public static final String TIMER = "timer"; - - public static final String SKIP_METRIC = "skip-this-metric"; - - /** - * Get default metric name. Use abbreviated package name, e.g., foo.bar.ClassA.methodB -> f.b.ClassA.methodB - */ - public static String getDefaultName( Class declaringClass, String method ) - { - // minimum len 1 shortens the package name and keeps class name - String cls = ClassUtils.getAbbreviatedName( declaringClass.getName(), 1 ); - return name( cls, method ); - } - - /** - * Get default metric name. Use abbreviated package name, e.g., foo.bar.ClassA.methodB -> f.b.ClassA.methodB - */ - public static String getDefaultName( String declaringClass, String method ) - { - // minimum len 1 shortens the package name and keeps class name - String cls = ClassUtils.getAbbreviatedName( declaringClass, 1 ); - return name( cls, method ); - } - - /** - * Get the metric fullname with no default value. - * @param nameParts user specified name parts - */ - public static String getSupername( String nodePrefix, String... nameParts ) - { - return name( nodePrefix, nameParts ); - } - - /** - * Get the metric fullname. - * @param name user specified name - * @param defaultName 'class name + method name', not null. - */ - public static String getName( String nodePrefix, String name, String defaultName, String... suffix ) - { - if ( isBlank( name ) || name.equals( DEFAULT ) ) - { - name = defaultName; - } - return name( name( nodePrefix, name ), suffix ); - } - - -} diff --git a/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/MetricSetProvider.java b/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/MetricSetProvider.java deleted file mode 100644 index be0055b68e..0000000000 --- a/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/MetricSetProvider.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.metrics; - -import com.codahale.metrics.MetricRegistry; - -public interface MetricSetProvider -{ - void registerMetricSet( MetricRegistry registry ); -} diff --git a/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/exception/IndyMetricsException.java b/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/exception/IndyMetricsException.java deleted file mode 100644 index ea5ab9609c..0000000000 --- a/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/exception/IndyMetricsException.java +++ /dev/null @@ -1,36 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.metrics.exception; - -import org.commonjava.indy.IndyException; - -/** - * Created by xiabai on 5/9/17. - */ -public class IndyMetricsException extends IndyException -{ - public IndyMetricsException( final String message, final Object... params ) - { - super( message, params ); - } - - public IndyMetricsException( final String message, final Throwable cause, final Object... params ) - { - super( message, cause, params ); - } - - private static final long serialVersionUID = 1L; -} diff --git a/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/healthcheck/IndyComponentHC.java b/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/healthcheck/IndyComponentHC.java deleted file mode 100644 index b67490561b..0000000000 --- a/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/healthcheck/IndyComponentHC.java +++ /dev/null @@ -1,20 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.metrics.healthcheck; - -public abstract class IndyComponentHC extends IndyHealthCheck -{ -} diff --git a/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/healthcheck/IndyCompoundHealthCheck.java b/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/healthcheck/IndyCompoundHealthCheck.java deleted file mode 100644 index 56380f7916..0000000000 --- a/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/healthcheck/IndyCompoundHealthCheck.java +++ /dev/null @@ -1,30 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.metrics.healthcheck; - -import com.codahale.metrics.health.HealthCheck; - -import java.util.Map; -import java.util.Set; - -import static org.commonjava.indy.metrics.util.NameUtils.getAbbreviatedName; - -public interface IndyCompoundHealthCheck -{ - - Map getHealthChecks(); - -} diff --git a/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/healthcheck/IndyHealthCheck.java b/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/healthcheck/IndyHealthCheck.java deleted file mode 100644 index de64bf5bb5..0000000000 --- a/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/healthcheck/IndyHealthCheck.java +++ /dev/null @@ -1,34 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.metrics.healthcheck; - -import com.codahale.metrics.health.HealthCheck; - -import static org.commonjava.indy.metrics.util.NameUtils.getAbbreviatedName; - -/** - * Created by xiabai on 3/10/17. - */ -public abstract class IndyHealthCheck - extends HealthCheck -{ - - public String getName() - { - return getAbbreviatedName( this.getClass() ); - } - -} diff --git a/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/healthcheck/IndyHealthCheckRegistrySet.java b/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/healthcheck/IndyHealthCheckRegistrySet.java deleted file mode 100644 index 1677366359..0000000000 --- a/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/healthcheck/IndyHealthCheckRegistrySet.java +++ /dev/null @@ -1,82 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.metrics.healthcheck; - -import com.codahale.metrics.Gauge; -import com.codahale.metrics.Metric; -import com.codahale.metrics.MetricSet; -import com.codahale.metrics.health.HealthCheck; -import com.codahale.metrics.health.HealthCheckRegistry; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.HashMap; -import java.util.Map; -import java.util.SortedMap; - -/** - * Created by xiabai on 3/13/17. - */ -public class IndyHealthCheckRegistrySet - implements MetricSet -{ - private static final Logger logger = LoggerFactory.getLogger( IndyHealthCheckRegistrySet.class ); - - private String name = "healthcheck"; - - private HealthCheckRegistry healthCheckRegistry; - - public IndyHealthCheckRegistrySet() - { - healthCheckRegistry = new HealthCheckRegistry(); - } - - @Override - public Map getMetrics() - { - final Map gauges = new HashMap(); - SortedMap healthResult = healthCheckRegistry.runHealthChecks(); - healthResult.forEach( ( s, result ) -> - { - gauges.put( s, (Gauge) () -> - { - if ( result.isHealthy() ) - { - return 1; - } - return 0; - } ); - } ); - logger.info( "get metrics " + gauges ); - return gauges; - } - - public void register( String name, HealthCheck healthCheck ) - { - healthCheckRegistry.register( name, healthCheck ); - } - - public void setName( String name ) - { - this.name = name; - } - - public String getName() - { - return name; - - } -} diff --git a/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/healthcheck/impl/DeadlockHealthCheck.java b/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/healthcheck/impl/DeadlockHealthCheck.java deleted file mode 100644 index 56fa1896a2..0000000000 --- a/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/healthcheck/impl/DeadlockHealthCheck.java +++ /dev/null @@ -1,36 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.metrics.healthcheck.impl; - -import org.commonjava.indy.metrics.healthcheck.IndyComponentHC; -import org.commonjava.indy.metrics.healthcheck.IndyHealthCheck; - -import javax.inject.Named; - -@Named -public class DeadlockHealthCheck - extends IndyComponentHC -{ - com.codahale.metrics.health.jvm.ThreadDeadlockHealthCheck - deadlock = new com.codahale.metrics.health.jvm.ThreadDeadlockHealthCheck(); - - @Override - protected Result check() throws Exception - { - return deadlock.execute(); - } - -} diff --git a/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/healthcheck/impl/HeapHealthCheck.java b/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/healthcheck/impl/HeapHealthCheck.java deleted file mode 100644 index 4e9ce4f160..0000000000 --- a/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/healthcheck/impl/HeapHealthCheck.java +++ /dev/null @@ -1,71 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.metrics.healthcheck.impl; - -import org.commonjava.indy.metrics.healthcheck.IndyComponentHC; -import org.commonjava.indy.metrics.healthcheck.IndyHealthCheck; - -import javax.inject.Named; - -@Named -public class HeapHealthCheck - extends IndyComponentHC -{ - private static final double GB = Math.pow(1024, 3); - - private static final String FREE_GB = "free-gb"; - - private static final String USED_GB = "used-gb"; - - private static final String TOTAL_GB = "total-gb"; - - private static final String MAX_GB = "max-gb"; - - private static final String CURRENT_LOAD = "current-load-pct"; - - private static final float HEALTHY_LOAD_MAX = 90f; - - @Override - protected Result check() - throws Exception - { - Runtime runtime = Runtime.getRuntime(); - ResultBuilder builder = Result.builder(); - - double free = runtime.freeMemory(); - double total = runtime.totalMemory(); - double used = total-free; - - double max = runtime.maxMemory(); - double load = 100 * (used / max); - - if ( load > HEALTHY_LOAD_MAX ) - { - builder.unhealthy(); - } - else - { - builder.healthy(); - } - - builder.withDetail( FREE_GB, free / GB ) - .withDetail( USED_GB, used / GB ) - .withDetail( MAX_GB, max / GB ) - .withDetail( TOTAL_GB, total / GB ).withDetail( CURRENT_LOAD, load ); - - return builder.build(); - } -} diff --git a/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/healthcheck/impl/SummaryHealthCheck.java b/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/healthcheck/impl/SummaryHealthCheck.java deleted file mode 100644 index 21c7ad4ab1..0000000000 --- a/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/healthcheck/impl/SummaryHealthCheck.java +++ /dev/null @@ -1,83 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.metrics.healthcheck.impl; - -import org.commonjava.indy.metrics.healthcheck.IndyComponentHC; -import org.commonjava.indy.metrics.healthcheck.IndyCompoundHealthCheck; -import org.commonjava.indy.metrics.healthcheck.IndyHealthCheck; - -import javax.enterprise.inject.Instance; -import javax.inject.Inject; -import javax.inject.Named; -import java.util.concurrent.atomic.AtomicInteger; - -@Named -public class SummaryHealthCheck - extends IndyHealthCheck -{ - enum SummaryRating - { - green, yellow, red; - } - - private static final String RATING = "rating"; - - private static final String UNHEALTHY_COUNT = "unhealthy-count"; - - @Inject - private Instance looseComponents; - - @Inject - private Instance looseCompounds; - - @Override - protected Result check() - throws Exception - { - AtomicInteger count = new AtomicInteger( 0 ); - looseComponents.forEach( check->{ - if ( !check.execute().isHealthy() ) - count.incrementAndGet(); - } ); - - looseCompounds.forEach( lc->{ - lc.getHealthChecks().forEach( ( k, check ) -> { - if ( !check.execute().isHealthy() ) - { - count.incrementAndGet(); - } - } ); - } ); - - ResultBuilder rb = Result.builder(); - if ( count.get() > 3 ) - { - rb.unhealthy().withDetail( RATING, SummaryRating.red ); - } - else if ( count.get() > 0 ) - { - rb.unhealthy().withDetail( RATING, SummaryRating.yellow ); - } - else - { - rb.healthy(); - } - - rb.withDetail( UNHEALTHY_COUNT, count.get() ); - - return rb.build(); - } -} diff --git a/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/jvm/IndyJVMInstrumentation.java b/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/jvm/IndyJVMInstrumentation.java deleted file mode 100644 index 358bde5003..0000000000 --- a/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/jvm/IndyJVMInstrumentation.java +++ /dev/null @@ -1,59 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.metrics.jvm; - -import com.codahale.metrics.MetricRegistry; -import com.codahale.metrics.jvm.BufferPoolMetricSet; -import com.codahale.metrics.jvm.CachedThreadStatesGaugeSet; -import com.codahale.metrics.jvm.ClassLoadingGaugeSet; -import com.codahale.metrics.jvm.FileDescriptorRatioGauge; -import com.codahale.metrics.jvm.GarbageCollectorMetricSet; -import com.codahale.metrics.jvm.MemoryUsageGaugeSet; -import com.codahale.metrics.jvm.ThreadStatesGaugeSet; - -import java.lang.management.ManagementFactory; -import java.util.concurrent.TimeUnit; - -import static com.codahale.metrics.MetricRegistry.name; - -/** - * Created by xiabai on 3/10/17. - */ -public class IndyJVMInstrumentation -{ - private static final String JVM_MEMORY = "jvm.memory"; - - private static final String JVM_GARBAGE = "jvm.garbage"; - - private static final String JVM_THREADS = "jvm.threads"; - - private static final String JVM_FILES = "jvm.files"; - - private static final String JVM_BUFFERS = "jvm.buffers"; - - private static final String JVM_CLASSLOADING = "jvm.classloading"; - - public static void registerJvmMetric( String nodePrefix, MetricRegistry registry ) - { - registry.register( name( nodePrefix, JVM_MEMORY ), new MemoryUsageGaugeSet() ); - registry.register( name( nodePrefix, JVM_GARBAGE ), new GarbageCollectorMetricSet() ); - registry.register( name( nodePrefix, JVM_THREADS ), new CachedThreadStatesGaugeSet( 60, TimeUnit.SECONDS )); - registry.register( name( nodePrefix, JVM_FILES ), new FileDescriptorRatioGauge() ); - registry.register( name( nodePrefix, JVM_CLASSLOADING ), new ClassLoadingGaugeSet() ); - registry.register( name( nodePrefix, JVM_BUFFERS ), - new BufferPoolMetricSet( ManagementFactory.getPlatformMBeanServer() ) ); - } -} 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 deleted file mode 100644 index 1c988ebb2d..0000000000 --- a/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/system/StoragePathProvider.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.metrics.system; - -import java.io.File; - -public interface StoragePathProvider -{ - File getStoragePath(); -} 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 deleted file mode 100644 index 9705bbe037..0000000000 --- a/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/system/SystemGaugesSet.java +++ /dev/null @@ -1,123 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.metrics.system; - -import com.codahale.metrics.Gauge; -import com.codahale.metrics.Metric; -import com.codahale.metrics.MetricSet; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.inject.Named; -import java.io.File; -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. - */ -@ApplicationScoped -@Named -public class SystemGaugesSet - implements MetricSet -{ - private final Logger logger = LoggerFactory.getLogger( this.getClass() ); - - @Inject - private StoragePathProvider storagePathProvider; - - 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<>(); - - 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 ); - } - catch ( Throwable e ) - { - logger.warn( "Cannot get system level metrics. Reason: {}", e.getMessage() ); - } - - try - { - final File storePath = getIndyStorageDir(); - if ( storePath.exists() && storePath.isDirectory() ) - { - gauges.put( "store.indy.total", (Gauge) storePath::getTotalSpace ); - gauges.put( "store.indy.usable", (Gauge) storePath::getUsableSpace ); - } - else - { - logger.warn( "Cannot trace indy storage usage because storage path {} not defined.", - storePath.getCanonicalPath() ); - } - } - catch ( Throwable e ) - { - logger.warn( "Cannot trace indy storage usage. Reason: {}", e.getMessage() ); - } - - return Collections.unmodifiableMap( gauges ); - - } - - private File getIndyStorageDir() - { - if ( storagePathProvider != null && storagePathProvider.getStoragePath() != null ) - { - return storagePathProvider.getStoragePath(); - } - - // if indy config for storage path not defined, we use docker defined one. - final String DEFAULT_STORAGE_DIR = "/var/lib/indy/storage"; - return new File( DEFAULT_STORAGE_DIR ); - } - -} diff --git a/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/util/NameUtils.java b/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/util/NameUtils.java deleted file mode 100644 index 15db6ae113..0000000000 --- a/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/util/NameUtils.java +++ /dev/null @@ -1,28 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.metrics.util; - -import org.apache.commons.lang3.ClassUtils; - -public class NameUtils -{ - private static final int DEFAULT_LEN = 40; - - public static String getAbbreviatedName( Class cls ) - { - return ClassUtils.getAbbreviatedName( cls, DEFAULT_LEN ); - } -} diff --git a/subsys/metrics/pom.xml b/subsys/metrics/pom.xml index 9f1af6a15a..46dc04c014 100644 --- a/subsys/metrics/pom.xml +++ b/subsys/metrics/pom.xml @@ -18,21 +18,50 @@ --> - indy-subsystems org.commonjava.indy - 2.5.1-SNAPSHOT + indy-subsystems + 2.5.3-SNAPSHOT 4.0.0 indy-subsys-metrics - Indy :: Subsystems :: Metrics - pom + + + org.commonjava.util + o11yphant-metrics-core + + + org.apache.commons + commons-lang3 + + + org.commonjava.indy + indy-api + + + + + + + maven-assembly-plugin + + + confset + + single + + package + + + confset + + + + + + + - - core - reporter - prometheus - - + \ No newline at end of file diff --git a/subsys/metrics/prometheus/pom.xml b/subsys/metrics/prometheus/pom.xml deleted file mode 100644 index 6541bdc5ff..0000000000 --- a/subsys/metrics/prometheus/pom.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - indy-subsys-metrics - org.commonjava.indy - 2.5.1-SNAPSHOT - - 4.0.0 - - indy-subsys-metrics-prometheus - - - - io.prometheus - simpleclient_dropwizard - - - io.prometheus - simpleclient_servlet - - - org.commonjava.indy - indy-subsys-metrics-core - - - org.commonjava.indy - indy-subsys-jaxrs - - - javax.enterprise - cdi-api - provided - - - org.commonjava.indy - indy-subsys-flatfile - - - org.commonjava.util - http-testserver - - - - \ No newline at end of file diff --git a/subsys/metrics/prometheus/src/main/java/org/commonjava/indy/metrics/prometheus/IndySampleBuilder.java b/subsys/metrics/prometheus/src/main/java/org/commonjava/indy/metrics/prometheus/IndySampleBuilder.java deleted file mode 100644 index 98cd308185..0000000000 --- a/subsys/metrics/prometheus/src/main/java/org/commonjava/indy/metrics/prometheus/IndySampleBuilder.java +++ /dev/null @@ -1,51 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.metrics.prometheus; - -import io.prometheus.client.Collector; -import io.prometheus.client.dropwizard.samplebuilder.DefaultSampleBuilder; - -import java.util.ArrayList; -import java.util.List; - -public class IndySampleBuilder - extends DefaultSampleBuilder -{ - private static final String NODE_NAME_LABEL = "node"; - - private String nodeName; - - public IndySampleBuilder( String nodeName ) - { - super(); - this.nodeName = nodeName; - } - - @Override - public Collector.MetricFamilySamples.Sample createSample( final String dropwizardName, final String nameSuffix, - final List additionalLabelNames, - final List additionalLabelValues, - final double value ) - { - List labelNames = new ArrayList( additionalLabelNames ); - labelNames.add( NODE_NAME_LABEL ); - - List labelValues = new ArrayList( additionalLabelValues ); - labelValues.add( nodeName ); - - return super.createSample( dropwizardName, nameSuffix, labelNames, labelValues, value ); - } -} diff --git a/subsys/metrics/prometheus/src/main/java/org/commonjava/indy/metrics/prometheus/PrometheusDeployment.java b/subsys/metrics/prometheus/src/main/java/org/commonjava/indy/metrics/prometheus/PrometheusDeployment.java deleted file mode 100644 index 61b02133cb..0000000000 --- a/subsys/metrics/prometheus/src/main/java/org/commonjava/indy/metrics/prometheus/PrometheusDeployment.java +++ /dev/null @@ -1,72 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.metrics.prometheus; - -import com.codahale.metrics.MetricRegistry; -import io.prometheus.client.CollectorRegistry; -import io.prometheus.client.dropwizard.DropwizardExports; -import io.prometheus.client.exporter.MetricsServlet; -import io.undertow.servlet.Servlets; -import io.undertow.servlet.api.DeploymentInfo; -import io.undertow.servlet.api.ServletInfo; -import org.commonjava.indy.bind.jaxrs.IndyDeploymentProvider; -import org.commonjava.indy.bind.jaxrs.metrics.IndyHealthCheckServletContextListener; -import org.commonjava.indy.metrics.conf.IndyMetricsConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.ws.rs.core.Application; - -@ApplicationScoped -public class PrometheusDeployment - extends IndyDeploymentProvider -{ - private static final String PROMETHEUS_REPORTER = "prometheus"; - - private final Logger logger = LoggerFactory.getLogger( getClass() ); - - @Inject - private IndyMetricsConfig config; - - @Inject - private MetricRegistry metricRegistry; - - @Override - public DeploymentInfo getDeploymentInfo( String contextRoot, Application application ) - { - if ( !config.isMetricsEnabled() || !config.getReporter().contains( PROMETHEUS_REPORTER ) ) - { - return null; - } - - CollectorRegistry.defaultRegistry.register( new DropwizardExports( metricRegistry, new IndySampleBuilder( config.getNodePrefix() ) ) ); - - final ServletInfo servlet = - Servlets.servlet( "prometheus-metrics", MetricsServlet.class ).addMapping( "/metrics" ); - - final DeploymentInfo di = new DeploymentInfo().addListener( - Servlets.listener( IndyHealthCheckServletContextListener.class ) ) - .setContextPath( contextRoot ) - .addServlet( servlet ) - .setDeploymentName( "Prometheus Metrics Deployment" ) - .setClassLoader( ClassLoader.getSystemClassLoader() ); - - logger.info( "Returning deployment info for Prometheus metrics servlet" ); - return di; - } -} diff --git a/subsys/metrics/reporter/pom.xml b/subsys/metrics/reporter/pom.xml deleted file mode 100644 index ed9e35b81f..0000000000 --- a/subsys/metrics/reporter/pom.xml +++ /dev/null @@ -1,95 +0,0 @@ - - - - - indy-subsys-metrics - org.commonjava.indy - 2.5.1-SNAPSHOT - - 4.0.0 - - indy-subsys-metrics-reporter - - - - org.commonjava.indy - indy-subsys-metrics-core - - - io.dropwizard.metrics - metrics-graphite - - - io.dropwizard.metrics - metrics-servlets - - - javax.enterprise - cdi-api - provided - - - io.github.hengyunabc - zabbix-sender - - - io.github.hengyunabc - zabbix-api - - - org.commonjava.indy - indy-subsys-http - - - org.commonjava.indy - indy-subsys-flatfile - - - org.commonjava.util - http-testserver - - - org.elasticsearch - metrics-elasticsearch-reporter - - - - - - - maven-assembly-plugin - - - confset - - single - - package - - - confset - - - - - - - - - \ No newline at end of file diff --git a/subsys/metrics/reporter/src/main/conf/conf.d/elasticsearch.properties b/subsys/metrics/reporter/src/main/conf/conf.d/elasticsearch.properties deleted file mode 100644 index 0a81578799..0000000000 --- a/subsys/metrics/reporter/src/main/conf/conf.d/elasticsearch.properties +++ /dev/null @@ -1,21 +0,0 @@ -# -# Copyright (C) 2011-2020 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. -# - -elasticsearch.server.url=http://10.66.136.85:9200/_bulk -elasticsearch.index=logs-%date{yyyy-MM-dd} -elasticsearch.type=tester -elasticsearch.loggerName=indy-test -elasticsearch.enable=false diff --git a/subsys/metrics/reporter/src/main/conf/conf.d/metrics.conf b/subsys/metrics/reporter/src/main/conf/conf.d/metrics.conf deleted file mode 100644 index 09c4a87af8..0000000000 --- a/subsys/metrics/reporter/src/main/conf/conf.d/metrics.conf +++ /dev/null @@ -1,119 +0,0 @@ -[metrics] -enabled = false -reporter.enabled = true - -# Specify node prefix (on cluster). This prefix will be prepended to all metric names. Default empty. -# -# node.prefix = - -# Enable kojiji metrics. Default false. -# -koji.enabled = true - -# Enable Infinispan metrics. Default false. -# -ispn.enabled = true - -# Specify ISPN cache gauges. This works only if ispn.enabled is true. Default All. Names are case sensitive. -# -#ispn.gauges = CurrentNumberOfEntries,CurrentNumberOfEntriesInMemory,\ -#TotalNumberOfEntries,Hits,Misses,Retrievals,Evictions - -# Enable pathDB metrics. Default true. -# -#pathdb.enabled = true - -# Specify pathDB operations. Default all. -# -#pathdb.operations = exists,getStorageFile,getFileSystemContaining - -# Enable Galley to measure artifact downloading time. Default false. -# -measure.transport = true - -# Specify a repository list for those to measure artifact downloading time. This works only if -# measure.transport is true. -# -# Format: comma split item of "::" -# The default ":" is "maven:remote" if ignored. You may use wildcard '*' so those would be measured -# as a whole, e.g., koji-* -# -# Example: measure.repos = maven:remote:test,public,koji-* -# -#measure.transport.repos = central - -# List of reporters (comma-separated). At present, Indy supports reporters: -# reporter = graphite,zabbix,elasticsearch,console -# -reporter = console - -############################################ -# Console reporter options -############################################ -console.reporter.period = 30 - -############################################ -# GraphiteDB reporter options -############################################ - -# This is the hostname of GraphiteDB. -graphite.hostname = localhost -# Port of GraphiteDB. -graphite.port = 2003 -# Specific prefix for GraphiteDB Item -graphite.reporter.prefix = local.one -# Indy's metrics item have three type: simple,jvm,healthcheck -# Period of simple item for reporting -graphite.reporter.simple.period = 30 -# Period of jvm item for reporting -graphite.reporter.jvm.period = 300 -# Period of healthcheck item for reporting -graphite.reporter.healthcheck.period = 600 - -############################################ -# Zabbix reporter options -############################################ - -#The Zabbix API is a web based API and is shipped as part of the web frontend -# API URL used to access Zabbix from a web browser -zabbix.api.url = example.com -#Zabbix username for login Zabbix server(Zabbix API) -zabbix.user = test -#Zabbix password for login Zabbix server(Zabbix API) -zabbix.pwd = test -# Zabbix sender is a command line utility that may be used to send performance data to Zabbix server for processing. -# Host of Zabbix server for Zabbix sender -zabbix.sender.host = 192.168.1.1 -# Port of Zabbix server for Zabbix sender -zabbix.sender.port = 10051 -# This is the hostname of the current Indy instance, it also is host name of Zabbix monitoring -zabbix.indy.host = example.com -# Specific prefix for Zabbix Item -zabbix.reporter.prefix = local.one -# Indy's metrics item have three type: simple,jvm,healthcheck. -# Those type have different period of reporter -# Period of simple item for reporting -zabbix.reporter.simple.period = 30 -# Period of jvm item for reporting -zabbix.reporter.jvm.period = 300 -# Period of healthcheck item for reporting -zabbix.reporter.healthcheck.period = 600 - -############################################ -# Elasticsearch reporter options -############################################ - -# Specific prefix for Elasticsearch -elk.reporter.prefix = local.one -# Indy's metrics item have three type: simple,jvm,healthcheck. -# Those type have different period of reporter -# Period of simple item for reporting -elk.reporter.simple.period = 30 -# Period of jvm item for reporting -elk.reporter.jvm.period = 300 -# Period of healthcheck item for reporting -elk.reporter.healthcheck.period = 600 -#The index name to index in Elasticsearch -elk.reporter.index = local.one.name -#Configure an array of hosts to send data to. -elk.reporter.hosts = localhost:9200 \ No newline at end of file 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 deleted file mode 100644 index b36c532075..0000000000 --- a/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/IndyMetricsManager.java +++ /dev/null @@ -1,391 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.metrics; - -import com.codahale.metrics.Gauge; -import com.codahale.metrics.Meter; -import com.codahale.metrics.MetricRegistry; -import com.codahale.metrics.Timer; -import com.codahale.metrics.health.HealthCheck; -import com.codahale.metrics.health.HealthCheckRegistry; -import org.commonjava.cdi.util.weft.ThreadContext; -import org.commonjava.indy.measure.annotation.MetricWrapper; -import org.commonjava.indy.measure.annotation.MetricWrapperEnd; -import org.commonjava.indy.measure.annotation.MetricWrapperNamed; -import org.commonjava.indy.measure.annotation.MetricWrapperStart; -import org.commonjava.indy.metrics.conf.IndyMetricsConfig; -import org.commonjava.indy.metrics.healthcheck.IndyCompoundHealthCheck; -import org.commonjava.indy.metrics.healthcheck.IndyHealthCheck; -import org.commonjava.indy.metrics.reporter.ReporterIntializer; -import org.commonjava.maven.galley.config.TransportMetricConfig; -import org.commonjava.maven.galley.model.Location; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Random; -import java.util.concurrent.ConcurrentHashMap; -import java.util.function.Supplier; - -import static com.codahale.metrics.MetricRegistry.name; -import static org.apache.commons.lang.StringUtils.isNotBlank; -import static org.commonjava.indy.IndyContentConstants.NANOS_PER_MILLISECOND; -import static org.commonjava.indy.metrics.IndyMetricsConstants.DEFAULT; -import static org.commonjava.indy.metrics.IndyMetricsConstants.EXCEPTION; -import static org.commonjava.indy.metrics.IndyMetricsConstants.SKIP_METRIC; -import static org.commonjava.indy.metrics.IndyMetricsConstants.TIMER; -import static org.commonjava.indy.metrics.IndyMetricsConstants.getDefaultName; -import static org.commonjava.indy.metrics.RequestContextHelper.CUMULATIVE_COUNTS; -import static org.commonjava.indy.metrics.RequestContextHelper.CUMULATIVE_TIMINGS; -import static org.commonjava.indy.metrics.RequestContextHelper.IS_METERED; -import static org.commonjava.indy.metrics.jvm.IndyJVMInstrumentation.registerJvmMetric; -import static org.commonjava.indy.model.core.StoreType.remote; -import static org.commonjava.indy.pkg.maven.model.MavenPackageTypeDescriptor.MAVEN_PKG_KEY; - -/** - * Created by xiabai on 2/27/17. - */ -@ApplicationScoped -public class IndyMetricsManager -{ - - public static final String METRIC_LOGGER_NAME = "org.commonjava.indy.metrics"; - - private static final Logger logger = LoggerFactory.getLogger( IndyMetricsManager.class ); - - @Inject - private MetricRegistry metricRegistry; - - @Inject - private HealthCheckRegistry healthCheckRegistry; - - @Inject - private Instance indyHealthChecks; - - @Inject - private Instance indyCompoundHealthChecks; - - @Inject - ReporterIntializer reporter; - - @Inject - private Instance metricSetProviderInstances; - - @Inject - private IndyMetricsConfig config; - - private TransportMetricConfig transportMetricConfig; - - private Random random = new Random(); - - @Produces - public TransportMetricConfig getTransportMetricConfig() - { - return transportMetricConfig; - } - - @PostConstruct - public void init() - { - if ( !config.isMetricsEnabled() ) - { - logger.info( "Indy metrics subsystem not enabled" ); - return; - } - - logger.info( "Init metrics subsystem..." ); - - registerJvmMetric( config.getNodePrefix(), metricRegistry ); - - // Health checks - indyHealthChecks.forEach( hc -> { - logger.info( "Registering health check: {}", hc.getName() ); - healthCheckRegistry.register( hc.getName(), hc ); - } ); - - indyCompoundHealthChecks.forEach( cc-> { - Map healthChecks = cc.getHealthChecks(); - logger.info( "Registering {} health checks from set: {}", healthChecks.size(), cc.getClass().getSimpleName() ); - healthChecks.forEach( (name,check)->{ - logger.info( "Registering health check: {}", name ); - healthCheckRegistry.register( name, check ); - } ); - } ); - - metricSetProviderInstances.forEach( ( provider ) -> provider.registerMetricSet( metricRegistry ) ); - - if ( config.isMeasureTransport() ) - { - setUpTransportMetricConfig(); - } - } - - public void startReporter() throws Exception - { - if ( !config.isMetricsEnabled() ) - { - return; - } - logger.info( "Start metrics reporters" ); - reporter.initReporter( metricRegistry ); - } - - private void setUpTransportMetricConfig() - { - logger.info( "Adding transport metrics to registry: {}", metricRegistry ); - final String measureRepos = config.getMeasureTransportRepos(); - final List list = new ArrayList<>(); - if ( isNotBlank( measureRepos ) ) - { - String[] toks = measureRepos.split( "," ); - for ( String s : toks ) - { - s = s.trim(); - if ( isNotBlank( s ) ) - { - if ( s.indexOf( ":" ) < 0 ) - { - s = MAVEN_PKG_KEY + ":" + remote.singularEndpointName() + ":" + s; // use default - } - list.add( s ); - } - } - } - transportMetricConfig = new TransportMetricConfig() - { - @Override - public boolean isEnabled() - { - return true; - } - - @Override - public String getNodePrefix() - { - return config.getNodePrefix(); - } - - @Override - public String getMetricUniqueName( Location location ) - { - String locationName = location.getName(); - for ( String s : list ) - { - if ( s.equals( locationName ) ) - { - return normalizeName( s ); - } - - if ( s.endsWith( "*" ) ) // handle wildcard - { - String prefix = s.substring( 0, s.length() - 1 ); - if ( locationName.startsWith( prefix ) ) - { - return normalizeName( prefix ); - } - } - } - return null; - } - }; - } - - private String normalizeName( String name ) - { - return name.replaceAll( ":", "." ); - } - - public boolean isMetered( Supplier meteringOverride ) - { - int meterRatio = config.getMeterRatio(); - if ( meterRatio <= 1 || random.nextInt() % meterRatio == 0 ) - { - return true; - } - else if ( meteringOverride != null && Boolean.TRUE.equals( meteringOverride.get() ) ) - { - return true; - } - - return false; - } - - @MetricWrapperStart - public Timer.Context startTimer( @MetricWrapperNamed String name ) - { - Timer.Context tctx = this.metricRegistry.timer( name ).time(); - ThreadContext ctx = ThreadContext.getContext( true ); - ctx.put( TIMER + name, tctx ); - - return tctx; - } - - @MetricWrapperEnd - public long stopTimer( @MetricWrapperNamed String name ) - { - ThreadContext ctx = ThreadContext.getContext( false ); - if ( ctx == null ) - { - return 0; - } - - Timer.Context tctx = (Timer.Context) ctx.get( TIMER + name ); - if ( tctx != null ) - { - return tctx.stop(); - } - - return 0; - } - - public Meter getMeter( String name ) - { - return metricRegistry.meter( name ); - } - - public void accumulate( String name, final double elapsed ) - { - ThreadContext ctx = ThreadContext.getContext( true ); - if ( ctx != null ) - { - if ( !checkMetered( ctx ) ) - { - return; - } - - ctx.putIfAbsent( CUMULATIVE_TIMINGS, new ConcurrentHashMap<>() ); - Map timingMap = (Map) ctx.get( CUMULATIVE_TIMINGS ); - - timingMap.merge( name, elapsed, ( existingVal, newVal ) -> existingVal + newVal ); - - ctx.putIfAbsent( CUMULATIVE_COUNTS, new ConcurrentHashMap<>() ); - Map countMap = - (Map) ctx.get( CUMULATIVE_COUNTS ); - - countMap.merge( name, 1, ( existingVal, newVal ) -> existingVal + 1 ); - } - } - - @MetricWrapper - public T wrapWithStandardMetrics( final Supplier method, @MetricWrapperNamed final Supplier classifier ) - { -// if ( logger.isDebugEnabled() ) -// { -// Throwable t = new Throwable(); -// logger.info( "Wrapping with standard metrics at the following location:", t ); -// } - - String name = classifier.get(); - if ( !checkMetered() || SKIP_METRIC.equals( name ) ) - { - return method.get(); - } - - String nodePrefix = config.getNodePrefix(); - - String metricName = name( nodePrefix, name ); - String startName = name( metricName, "starts" ); - - String timerName = name( metricName, TIMER ); - String errorName = name( name, EXCEPTION ); - String eClassName = null; - - Timer.Context timer = startTimer( timerName ); - logger.trace( "START: {} ({})", metricName, timer ); - - long start = System.nanoTime(); - try - { - mark( Arrays.asList( startName ) ); - - return method.get(); - } - catch ( Throwable e ) - { - eClassName = name( name, EXCEPTION, e.getClass().getSimpleName() ); - mark( Arrays.asList( errorName, eClassName ) ); - - throw e; - } - finally - { - stopTimers( Collections.singletonMap( timerName, timer ) ); - mark( Arrays.asList( metricName ) ); - - double elapsed = (System.nanoTime() - start) / NANOS_PER_MILLISECOND; - accumulate( metricName, elapsed ); - } - } - - public boolean checkMetered() - { - return checkMetered( null ); - } - - public boolean checkMetered( ThreadContext ctx ) - { - if ( ctx == null ) - { - ctx = ThreadContext.getContext( false ); - } - - return ( ctx == null || ((Boolean) ctx.getOrDefault( IS_METERED, Boolean.TRUE ) ) ); - } - - public void stopTimers( final Map timers ) - { - if ( timers != null ) - { - timers.forEach( ( name, timer ) -> stopTimer( name ) ); - } - } - - public void mark( final Collection metricNames ) - { - metricNames.forEach( metricName -> { - getMeter( metricName ).mark(); - } ); - } - - public void addGauges( Class className, String method, Map> gauges ) - { - String defaultName = getDefaultName( className, method ); - gauges.forEach( ( k, v ) -> { - String name = IndyMetricsConstants.getName( config.getNodePrefix(), DEFAULT, defaultName, k ); - metricRegistry.gauge( name, () -> v ); - } ); - } - - public MetricRegistry getMetricRegistry() - { - return metricRegistry; - } - - public IndyMetricsConfig getConfig() - { - return config; - } -} diff --git a/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/MetricsConstants.java b/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/MetricsConstants.java deleted file mode 100644 index 7721783a6c..0000000000 --- a/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/MetricsConstants.java +++ /dev/null @@ -1,26 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.metrics; - -public class MetricsConstants -{ - public static final String METRICS_PHASE = "metrics-phase"; - - public static final String PRELIMINARY_METRICS = "preliminary"; - - public static final String FINAL_METRICS = "final"; - -} diff --git a/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/conf/IndyMetricsConfig.java b/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/conf/IndyMetricsConfig.java deleted file mode 100644 index 7342dbba79..0000000000 --- a/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/conf/IndyMetricsConfig.java +++ /dev/null @@ -1,575 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.metrics.conf; - -import org.commonjava.indy.conf.IndyConfigInfo; -import org.commonjava.propulsor.config.annotation.ConfigName; -import org.commonjava.propulsor.config.annotation.SectionName; - -import javax.enterprise.context.ApplicationScoped; -import java.io.InputStream; - -import static org.commonjava.indy.metrics.conf.IndyMetricsConfig.SECTION; - -/** - * Created by xiabai on 3/17/17. - */ -@SectionName( SECTION ) -@ApplicationScoped -public class IndyMetricsConfig - implements IndyConfigInfo -{ - public static final String SECTION = "metrics"; - - public final static String INDY_METRICS_NODE_PREFIX = "node.prefix"; - - private final static String INDY_METRICS_REPORTER = "reporter"; - - private final static String INDY_METRICS_REPORTER_CONSOLE_PERIOD = "console.reporter.period"; - - private final static String INDY_METRICS_REPORTER_GRPHITEREPORTER_HOSTNAME = "graphite.hostname"; - - private final static String INDY_METRICS_REPORTER_GRPHITEREPORTER_PORT = "graphite.port"; - - private final static String INDY_METRICS_REPORTER_GRPHITEREPORTER_PREFIX = "graphite.reporter.prefix"; - - private final static String INDY_METRICS_REPORTER_GRPHITEREPORTER_SIMPLE_PERIOD = "graphite.reporter.simple.period"; - - private final static String INDY_METRICS_REPORTER_GRPHITEREPORTER_JVM_PERIOD = "graphite.reporter.jvm.period"; - - private final static String INDY_METRICS_REPORTER_GRPHITEREPORTER_HEALTHCHECK_PERIOD = - "graphite.reporter.healthcheck.period"; - - private final static String INDY_METRICS_ISENABLED = "enabled"; - - private static final String INDY_METRICS_METER_RATIO = "meter.ratio"; - - private final static String INDY_METRICS_ISPN_ENABLED = "ispn.enabled"; - - private final static String INDY_METRICS_ISPN_GAUGES = "ispn.gauges"; - - private final static String INDY_METRICS_REPORTER_ISENABLED = "reporter.enabled"; - - private final static String INDY_METRICS_REPORTER_ZABBIXREPORTER_API_HOST_URL = "zabbix.api.url"; - - private final static String INDY_METRICS_REPORTER_ZABBIXREPORTER_HOST_PORT = "zabbix.sender.port"; - - private final static String INDY_METRICS_REPORTER_ZABBIXREPORTER_HOST = "zabbix.sender.host"; - - private final static String INDY_METRICS_REPORTER_ZABBIXREPORTER_USER = "zabbix.user"; - - private final static String INDY_METRICS_REPORTER_ZABBIXREPORTER_PWD = "zabbix.pwd"; - - private final static String INDY_METRICS_REPORTER_ZABBIXREPORTER_LOCAL_HOSTNAME = "zabbix.indy.host"; - - private final static String INDY_METRICS_REPORTER_ZABBIXREPORTER_PREFIX = "zabbix.reporter.prefix"; - - private final static String INDY_METRICS_REPORTER_ZABBIXREPORTER_SIMPLE_PERIOD = "zabbix.reporter.simple.period"; - - private final static String INDY_METRICS_REPORTER_ZABBIXREPORTER_JVM_PERIOD = "zabbix.reporter.jvm.period"; - - private final static String INDY_METRICS_REPORTER_ZABBIXREPORTER_HEALTHCHECK_PERIOD = - "zabbix.reporter.healthcheck.period"; - - private final static String INDY_METRICS_REPORTER_ELKREPORTER_PREFIX = "elk.reporter.prefix"; - - private final static String INDY_METRICS_REPORTER_ELKREPORTER_SIMPLE_PERIOD = "elk.reporter.simple.period"; - - private final static String INDY_METRICS_REPORTER_ELKREPORTER_JVM_PERIOD = "elk.reporter.jvm.period"; - - private final static String INDY_METRICS_REPORTER_ELKREPORTER_HEALTHCHECK_PERIOD = "elk.reporter.healthcheck.period"; - - private final static String INDY_METRICS_REPORTER_ELKREPORTER_INDEX = "elk.reporter.index"; - - private final static String INDY_METRICS_REPORTER_ELKREPORTER_HOSTS = "elk.reporter.hosts"; - - private static final String INDY_METRICS_MEASURE_TRANSPORT = "measure.transport"; - - private static final String INDY_METRICS_MEASURE_TRANSPORT_REPOS = "measure.transport.repos"; - - private final static String INDY_METRICS_KOJI_ENABLED = "koji.enabled"; - - private final static String INDY_METRICS_PATH_DB_ENABLED = "pathdb.enabled"; - - private final static String INDY_METRICS_PATH_DB_OPERATIONS = "pathdb.operations"; - - private static final int DEFAULT_METER_RATIO = 1; - - private boolean ispnMetricsEnabled; - - private boolean pathDBMetricsEnabled = true; // default - - private String pathDBMetricsOperations; - - private String ispnGauges; - - private boolean measureTransport; - - private String measureTransportRepos; - - private int consolePeriod = 30; // default - - private String elkPrefix; - - private int elkSimplePriod; - - private int elkJVMPriod; - - private int elkHealthCheckPriod; - - private String elkHosts; - - private String elkIndex; - - private String zabbixPrefix; - - private int zabbixSimplePriod; - - private int zabbixJVMPriod; - - private int zabbixHealthcheckPeriod; - - private String zabbixApiHostUrl; - - private String zabbixHost; - - private int zabbixPort; - - private String zabbixUser; - - private String zabbixPwd; - - private String zabbixLocalHostName; - - private String reporter; - - private String grphiterHostName; - - private int grphiterPort; - - private String grphiterPrefix; - - private int grphiterSimplePriod; - - private int grphiterJVMPriod; - - private int grphiterHealthcheckPeriod; - - private boolean metricsEnabled; - - private boolean reporterEnabled; - - private boolean kojiMetricEnabled; - - private String nodePrefix; - - private Integer meterRatio; - - public boolean isMeasureTransport() - { - return measureTransport; - } - - @ConfigName( INDY_METRICS_NODE_PREFIX ) - public void setNodePrefix( String nodePrefix ) - { - this.nodePrefix = nodePrefix; - } - - public String getNodePrefix() - { - return nodePrefix; - } - - @ConfigName( INDY_METRICS_MEASURE_TRANSPORT ) - public void setMeasureTransport( boolean measureTransport ) - { - this.measureTransport = measureTransport; - } - - public String getMeasureTransportRepos() - { - return measureTransportRepos; - } - - @ConfigName( INDY_METRICS_MEASURE_TRANSPORT_REPOS ) - public void setMeasureTransportRepos( String measureTransportRepos ) - { - this.measureTransportRepos = measureTransportRepos; - } - - public int getConsolePeriod() - { - return consolePeriod; - } - - @ConfigName( INDY_METRICS_REPORTER_CONSOLE_PERIOD ) - public void setConsolePeriod( int consolePeriod ) - { - this.consolePeriod = consolePeriod; - } - - public String getElkPrefix() - { - return elkPrefix; - } - - @ConfigName( INDY_METRICS_REPORTER_ELKREPORTER_PREFIX ) - public void setElkPrefix( String elkPrefix ) - { - this.elkPrefix = elkPrefix; - } - - public int getElkSimplePriod() - { - return elkSimplePriod; - } - - @ConfigName( INDY_METRICS_REPORTER_ELKREPORTER_SIMPLE_PERIOD ) - public void setElkSimplePriod( int elkSimplePriod ) - { - this.elkSimplePriod = elkSimplePriod; - } - - public int getElkJVMPriod() - { - return elkJVMPriod; - } - - @ConfigName( INDY_METRICS_REPORTER_ELKREPORTER_JVM_PERIOD ) - public void setElkJVMPriod( int elkJVMPriod ) - { - this.elkJVMPriod = elkJVMPriod; - } - - public int getElkHealthCheckPriod() - { - return elkHealthCheckPriod; - } - - @ConfigName( INDY_METRICS_REPORTER_ELKREPORTER_HEALTHCHECK_PERIOD ) - public void setElkHealthCheckPriod( int elkHealthCheckPriod ) - { - this.elkHealthCheckPriod = elkHealthCheckPriod; - } - - public String getElkHosts() - { - return elkHosts; - } - - @ConfigName( INDY_METRICS_REPORTER_ELKREPORTER_HOSTS ) - public void setElkHosts( String elkHosts ) - { - this.elkHosts = elkHosts; - } - - public String getElkIndex() - { - return elkIndex; - } - - @ConfigName( INDY_METRICS_REPORTER_ELKREPORTER_INDEX ) - public void setElkIndex( String elkIndex ) - { - this.elkIndex = elkIndex; - } - - public String getZabbixPrefix() - { - return zabbixPrefix; - } - @ConfigName( INDY_METRICS_REPORTER_ZABBIXREPORTER_PREFIX ) - public void setZabbixPrefix( String zabbixPrefix ) - { - this.zabbixPrefix = zabbixPrefix; - } - - public int getZabbixSimplePriod() - { - return zabbixSimplePriod; - } - - @ConfigName( INDY_METRICS_REPORTER_ZABBIXREPORTER_SIMPLE_PERIOD ) - public void setZabbixSimplePriod( int zabbixSimplePriod ) - { - this.zabbixSimplePriod = zabbixSimplePriod; - } - - public int getZabbixJVMPriod() - { - return zabbixJVMPriod; - } - - @ConfigName( INDY_METRICS_REPORTER_ZABBIXREPORTER_JVM_PERIOD ) - public void setZabbixJVMPriod( int zabbixJVMPriod ) - { - this.zabbixJVMPriod = zabbixJVMPriod; - } - - public int getZabbixHealthcheckPeriod() - { - return zabbixHealthcheckPeriod; - } - - @ConfigName( INDY_METRICS_REPORTER_ZABBIXREPORTER_HEALTHCHECK_PERIOD ) - public void setZabbixHealthcheckPeriod( int zabbixHealthcheckPeriod ) - { - this.zabbixHealthcheckPeriod = zabbixHealthcheckPeriod; - } - - public String getZabbixApiHostUrl() - { - return zabbixApiHostUrl; - } - - @ConfigName( INDY_METRICS_REPORTER_ZABBIXREPORTER_API_HOST_URL ) - public void setZabbixApiHostUrl( String zabbixApiHostUrl ) - { - this.zabbixApiHostUrl = zabbixApiHostUrl; - } - - public String getZabbixHost() - { - return zabbixHost; - } - - @ConfigName( INDY_METRICS_REPORTER_ZABBIXREPORTER_HOST ) - public void setZabbixHost( String zabbixHost ) - { - this.zabbixHost = zabbixHost; - } - - public int getZabbixPort() - { - return zabbixPort; - } - - @ConfigName( INDY_METRICS_REPORTER_ZABBIXREPORTER_HOST_PORT ) - public void setZabbixPort( int zabbixPort ) - { - this.zabbixPort = zabbixPort; - } - - public String getZabbixUser() - { - return zabbixUser; - } - - @ConfigName( INDY_METRICS_REPORTER_ZABBIXREPORTER_USER ) - public void setZabbixUser( String zabbixUser ) - { - this.zabbixUser = zabbixUser; - } - - public String getZabbixPwd() - { - return zabbixPwd; - } - - @ConfigName( INDY_METRICS_REPORTER_ZABBIXREPORTER_PWD ) - public void setZabbixPwd( String zabbixPwd ) - { - this.zabbixPwd = zabbixPwd; - } - - public String getZabbixLocalHostName() - { - return zabbixLocalHostName; - } - - @ConfigName( INDY_METRICS_REPORTER_ZABBIXREPORTER_LOCAL_HOSTNAME ) - public void setZabbixLocalHostName( String zabbixLocalHostName ) - { - this.zabbixLocalHostName = zabbixLocalHostName; - } - - public boolean isReporterEnabled() - { - return reporterEnabled; - } - - @ConfigName( INDY_METRICS_REPORTER_ISENABLED ) - public void setReporterEnabled( boolean reporterEnabled ) - { - this.reporterEnabled = reporterEnabled; - } - - public boolean isMetricsEnabled() - { - return metricsEnabled; - } - - @ConfigName( INDY_METRICS_ISENABLED ) - public void setMetricsEnabled( boolean metricsEnabled ) - { - this.metricsEnabled = metricsEnabled; - } - - @ConfigName( INDY_METRICS_METER_RATIO ) - public void setMeterRatio( int meterRatio ) - { - this.meterRatio = meterRatio; - } - - public int getMeterRatio() - { - return meterRatio == null ? DEFAULT_METER_RATIO : meterRatio; - } - - public String getReporter() - { - return reporter; - } - - @ConfigName( INDY_METRICS_REPORTER ) - public void setReporter( String reporter ) - { - this.reporter = reporter; - } - - public String getGrphiterHostName() - { - return grphiterHostName; - } - - @ConfigName( INDY_METRICS_REPORTER_GRPHITEREPORTER_HOSTNAME ) - public void setGrphiterHostName( String grphiterHostName ) - { - this.grphiterHostName = grphiterHostName; - } - - public int getGrphiterPort() - { - return grphiterPort; - } - - @ConfigName( INDY_METRICS_REPORTER_GRPHITEREPORTER_PORT ) - public void setGrphiterPort( int grphiterPort ) - { - this.grphiterPort = grphiterPort; - } - - public String getGrphiterPrefix() - { - return grphiterPrefix; - } - - @ConfigName( INDY_METRICS_REPORTER_GRPHITEREPORTER_PREFIX ) - public void setGrphiterPrefix( String grphiterPrefix ) - { - this.grphiterPrefix = grphiterPrefix; - } - - public int getGrphiterSimplePriod() - { - return grphiterSimplePriod; - } - - @ConfigName( INDY_METRICS_REPORTER_GRPHITEREPORTER_SIMPLE_PERIOD ) - public void setGrphiterSimplePriod( int grphiterSimplePriod ) - { - this.grphiterSimplePriod = grphiterSimplePriod; - } - - public int getGrphiterJVMPriod() - { - return grphiterJVMPriod; - } - - @ConfigName( INDY_METRICS_REPORTER_GRPHITEREPORTER_JVM_PERIOD ) - public void setGrphiterJVMPriod( int grphiterJVMPriod ) - { - this.grphiterJVMPriod = grphiterJVMPriod; - } - - public int getGrphiterHealthcheckPeriod() - { - return grphiterHealthcheckPeriod; - } - - @ConfigName( INDY_METRICS_REPORTER_GRPHITEREPORTER_HEALTHCHECK_PERIOD ) - public void setGrphiterHealthcheckPeriod( int grphiterHealthcheckPeriod ) - { - this.grphiterHealthcheckPeriod = grphiterHealthcheckPeriod; - } - - @ConfigName( INDY_METRICS_KOJI_ENABLED ) - public void setKojiMetricEnabled( boolean kojiMetricEnabled ) - { - this.kojiMetricEnabled = kojiMetricEnabled; - } - - public boolean isKojiMetricEnabled() - { - return kojiMetricEnabled; - } - - public boolean isPathDBMetricsEnabled() - { - return pathDBMetricsEnabled; - } - - @ConfigName( INDY_METRICS_PATH_DB_ENABLED ) - public void setPathDBMetricsEnabled( boolean pathDBMetricsEnabled ) - { - this.pathDBMetricsEnabled = pathDBMetricsEnabled; - } - - public String getPathDBMetricsOperations() - { - return pathDBMetricsOperations; - } - - @ConfigName( INDY_METRICS_PATH_DB_OPERATIONS ) - public void setPathDBMetricsOperations( String pathDBMetricsOperations ) - { - this.pathDBMetricsOperations = pathDBMetricsOperations; - } - - @ConfigName( INDY_METRICS_ISPN_ENABLED ) - public void setIspnMetricsEnabled( boolean ispnMetricsEnabled ) - { - this.ispnMetricsEnabled = ispnMetricsEnabled; - } - - public boolean isIspnMetricsEnabled() - { - return ispnMetricsEnabled; - } - - @ConfigName( INDY_METRICS_ISPN_GAUGES ) - public void setIspnGauges( String ispnGauges ) - { - this.ispnGauges = ispnGauges; - } - - public String getIspnGauges() - { - return ispnGauges; - } - - public String getDefaultConfigFileName() - { - return "conf.d/metrics.conf"; - } - - public InputStream getDefaultConfig() - { - return Thread.currentThread().getContextClassLoader().getResourceAsStream( "default-metrics.conf" ); - } - -} 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 deleted file mode 100644 index fda47a27f4..0000000000 --- a/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/jaxrs/interceptor/MetricsInterceptor.java +++ /dev/null @@ -1,143 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.metrics.jaxrs.interceptor; - -import com.codahale.metrics.Timer; -import org.commonjava.indy.measure.annotation.Measure; -import org.commonjava.indy.measure.annotation.MetricNamed; -import org.commonjava.indy.metrics.IndyMetricsManager; -import org.commonjava.indy.metrics.conf.IndyMetricsConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.inject.Inject; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import static com.codahale.metrics.MetricRegistry.name; -import static org.commonjava.indy.IndyContentConstants.NANOS_PER_MILLISECOND; -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.TIMER; -import static org.commonjava.indy.metrics.IndyMetricsConstants.getDefaultName; -import static org.commonjava.indy.metrics.IndyMetricsConstants.getName; - -@Interceptor -@Measure -public class MetricsInterceptor -{ - private final Logger logger = LoggerFactory.getLogger( getClass() ); - - @Inject - private IndyMetricsManager metricsManager; - - @Inject - private IndyMetricsConfig config; - - @AroundInvoke - public Object operation( InvocationContext context ) throws Exception - { - if ( !config.isMetricsEnabled() || !metricsManager.checkMetered() ) - { - return context.proceed(); - } - - Method method = context.getMethod(); - Measure measure = method.getAnnotation( Measure.class ); - if ( measure == null ) - { - 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() ); - - Map timers = initTimers( measure, defaultName ); - List exceptionMeters = initMeters( measure, EXCEPTION, defaultName ); - List meters = initMeters( measure, METER, defaultName ); - - List startMeters = meters.stream().map( name -> name( name, "starts" ) ).collect( Collectors.toList() ); - - long start = System.nanoTime(); - - try - { - metricsManager.mark( startMeters ); - - return context.proceed(); - } - catch ( Exception e ) - { - metricsManager.mark( exceptionMeters ); - - List eClassMeters = exceptionMeters.stream() - .map( name -> name( name, e.getClass().getSimpleName() ) ) - .filter( name -> !exceptionMeters.contains( name ) ) - .collect( Collectors.toList() ); - - metricsManager.mark( eClassMeters ); - - throw e; - } - finally - { - metricsManager.stopTimers( timers ); - metricsManager.mark( meters ); - - double elapsed = (System.nanoTime() - start) / NANOS_PER_MILLISECOND; - - metricsManager.accumulate( defaultName, elapsed ); - } - } - - private List initMeters( final Measure measure, String classifier, - final String defaultName ) - { - List meters = new ArrayList<>(); - - meters.add( getName( config.getNodePrefix(), DEFAULT, defaultName, classifier ) ); - - logger.trace( "Got meter for {} with classifier: {}: {}", defaultName, classifier, meters ); - - return meters; - } - - private Map initTimers( final Measure measure, String defaultName ) - { - Map timers = new HashMap<>(); - - String name = getName( config.getNodePrefix(), DEFAULT, defaultName, TIMER ); - timers.put(name, - metricsManager.startTimer( name ) ); - - return timers; - } - -} diff --git a/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/reporter/ReporterIntializer.java b/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/reporter/ReporterIntializer.java deleted file mode 100644 index 3732f7c56a..0000000000 --- a/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/reporter/ReporterIntializer.java +++ /dev/null @@ -1,214 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.metrics.reporter; - -import com.codahale.metrics.ConsoleReporter; -import com.codahale.metrics.MetricRegistry; -import com.codahale.metrics.graphite.Graphite; -import com.codahale.metrics.graphite.GraphiteReporter; -import org.commonjava.indy.metrics.conf.IndyMetricsConfig; -import org.commonjava.indy.metrics.zabbix.cache.ZabbixCacheStorage; -import org.commonjava.indy.metrics.zabbix.reporter.IndyZabbixReporter; -import org.commonjava.indy.metrics.zabbix.sender.IndyZabbixSender; -import org.commonjava.indy.subsys.http.IndyHttpProvider; -import org.elasticsearch.metrics.ElasticsearchReporter; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import java.io.IOException; -import java.net.InetSocketAddress; -import java.util.concurrent.TimeUnit; - -/** - * Created by xiabai on 3/3/17. - */ -@ApplicationScoped -public class ReporterIntializer -{ - private final static String FILTER_JVM = "jvm"; - - public final static String INDY_METRICS_REPORTER_GRPHITEREPORTER = "graphite"; - - public final static String INDY_METRICS_REPORTER_CONSOLEREPORTER = "console"; - - public final static String INDY_METRICS_REPORTER_ZABBIXREPORTER = "zabbix"; - - public final static String INDY_METRICS_REPORTER_ELKEPORTER = "elasticsearch"; - - @Inject - private IndyHttpProvider indyHttpProvider; - - @Inject - private ZabbixCacheStorage cache; - - @Inject - private IndyMetricsConfig config; - - public void initReporter( MetricRegistry metrics ) throws Exception - { - - if ( !config.isReporterEnabled() ) - { - initConsoleReporter( metrics, config ); - return; - } - if ( this.isExistReporter( INDY_METRICS_REPORTER_GRPHITEREPORTER ) ) - { - initGraphiteReporterForSimpleMetric( metrics, config ); - initGraphiteReporterForJVMMetric( metrics, config ); - } - - if ( this.isExistReporter( INDY_METRICS_REPORTER_ZABBIXREPORTER ) ) - { - this.initZabbixReporterForJVMMetric( metrics, config ); - this.initZabbixReporterForSimpleMetric( metrics, config ); - } - - if ( this.isExistReporter( INDY_METRICS_REPORTER_CONSOLEREPORTER ) ) - { - initConsoleReporter( metrics, config ); - } - - if ( this.isExistReporter( INDY_METRICS_REPORTER_ELKEPORTER ) ) - { - initELKReporterForSimpleMetric( metrics, config ); - initELKReporterForJVMMetric( metrics, config ); - } - } - - private boolean isJvmMetric( String name ) - { - return name.contains( FILTER_JVM ); - } - - private boolean isApplicationMetric( String name ) - { - return !isJvmMetric( name ); - } - - private void initELKReporterForSimpleMetric( MetricRegistry metrics, IndyMetricsConfig config ) throws IOException - { - Logger logger = LoggerFactory.getLogger( getClass() ); - logger.info( "Setting up Elasticsearch reporter for Indy metrics" ); - ElasticsearchReporter reporter = ElasticsearchReporter.forRegistry( metrics ) - .hosts( config.getElkHosts().split( ";" ) ) - .index( config.getElkIndex() ) - .indexDateFormat( "YYYY-MM-dd" ) - .filter( ( name, metric ) -> isApplicationMetric( name ) ) - .build(); - - reporter.start( config.getElkSimplePriod(), TimeUnit.SECONDS ); - } - - private void initELKReporterForJVMMetric( MetricRegistry metrics, IndyMetricsConfig config ) throws IOException - { - Logger logger = LoggerFactory.getLogger( getClass() ); - logger.info( "Setting up Elasticsearch reporter for JVM metrics" ); - ElasticsearchReporter reporter = ElasticsearchReporter.forRegistry( metrics ) - .hosts( config.getElkHosts().split( ";" ) ) - .index( config.getElkIndex() ) - .indexDateFormat( "YYYY-MM-dd" ) - .filter( ( name, metric ) -> isJvmMetric( name ) ) - .build(); - - reporter.start( config.getElkJVMPriod(), TimeUnit.SECONDS ); - } - - private void initConsoleReporter( MetricRegistry metrics, IndyMetricsConfig config ) - { - ConsoleReporter.forRegistry( metrics ) - .build() - .start( config.getConsolePeriod(), - TimeUnit.SECONDS ); - } - - private void initGraphiteReporterForSimpleMetric( MetricRegistry metrics, IndyMetricsConfig config ) - { - final Graphite graphite = - new Graphite( new InetSocketAddress( config.getGrphiterHostName(), config.getGrphiterPort() ) ); - final GraphiteReporter reporter = GraphiteReporter.forRegistry( metrics ) - .prefixedWith( config.getGrphiterPrefix() ) - .convertRatesTo( TimeUnit.SECONDS ) - .convertDurationsTo( TimeUnit.MILLISECONDS ) - .filter( ( name, metric ) -> isApplicationMetric( name ) ) - .build( graphite ); - reporter.start( config.getGrphiterSimplePriod(), TimeUnit.SECONDS ); - } - - private void initGraphiteReporterForJVMMetric( MetricRegistry metrics, IndyMetricsConfig config ) - { - final Graphite graphite = - new Graphite( new InetSocketAddress( config.getGrphiterHostName(), config.getGrphiterPort() ) ); - final GraphiteReporter reporter = GraphiteReporter.forRegistry( metrics ) - .prefixedWith( config.getGrphiterPrefix() ) - .convertRatesTo( TimeUnit.SECONDS ) - .convertDurationsTo( TimeUnit.MILLISECONDS ) - .filter( ( name, metric ) -> isJvmMetric( name ) ) - .build( graphite ); - reporter.start( config.getGrphiterJVMPriod(), TimeUnit.SECONDS ); - } - - private boolean isExistReporter( String reporter ) - { - return config.getReporter().contains( reporter ); - - } - - private void initZabbixReporterForSimpleMetric( MetricRegistry metrics, IndyMetricsConfig config ) - { - IndyZabbixReporter reporter = initZabbixReporter( metrics, config ) - .filter( ( name, metric ) -> isApplicationMetric( name ) ) - .build( initZabbixSender() ); - - reporter.start( config.getZabbixSimplePriod(), TimeUnit.SECONDS ); - } - - private void initZabbixReporterForJVMMetric( MetricRegistry metrics, IndyMetricsConfig config ) - { - IndyZabbixReporter reporter = initZabbixReporter( metrics, config ) - .filter( ( name, metric ) -> isJvmMetric( name ) ) - .build( initZabbixSender() ); - - reporter.start( config.getZabbixJVMPriod(), TimeUnit.SECONDS ); - } - - private IndyZabbixReporter.Builder initZabbixReporter( MetricRegistry metrics, IndyMetricsConfig config ) - { - return IndyZabbixReporter.forRegistry( metrics ) - .prefix( config.getZabbixPrefix() ) - .convertRatesTo( TimeUnit.SECONDS ) - .convertDurationsTo( TimeUnit.MILLISECONDS ) - .hostName( config.getZabbixLocalHostName() ); - } - - private IndyZabbixSender initZabbixSender() - { - final IndyZabbixSender zabbixSender = IndyZabbixSender.create() - .zabbixHost( config.getZabbixHost() ) - .zabbixPort( config.getZabbixPort() ) - .zabbixHostUrl( config.getZabbixApiHostUrl() ) - .zabbixUserName( config.getZabbixUser() ) - .zabbixUserPwd( config.getZabbixPwd() ) - .hostName( config.getZabbixLocalHostName() ) - .bCreateNotExistZabbixSender( true ) - .indyHttpProvider( indyHttpProvider ) - .metricsZabbixCache( cache ) - .build(); - return zabbixSender; - } -} diff --git a/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/zabbix/api/IndyZabbixApi.java b/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/zabbix/api/IndyZabbixApi.java deleted file mode 100644 index e39d17e197..0000000000 --- a/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/zabbix/api/IndyZabbixApi.java +++ /dev/null @@ -1,285 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.metrics.zabbix.api; - -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.node.ArrayNode; -import com.fasterxml.jackson.databind.node.ObjectNode; -import org.apache.commons.io.IOUtils; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.entity.ContentType; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClients; -import org.apache.http.util.EntityUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.IOException; -import java.net.URI; -import java.net.URISyntaxException; - -/** - * Created by xiabai on 3/31/17. - */ -public class IndyZabbixApi - implements ZabbixApi -{ - private static final Logger logger = LoggerFactory.getLogger( IndyZabbixApi.class ); - - private CloseableHttpClient httpClient; - - private URI uri; - - private volatile String auth; - - public IndyZabbixApi( String url ) - { - try - { - uri = new URI( url.trim() ); - } - catch ( URISyntaxException e ) - { - logger.error( "url invalid", e ); - } - } - - public IndyZabbixApi( URI uri ) - { - this.uri = uri; - } - - public IndyZabbixApi( String url, CloseableHttpClient httpClient ) - { - this( url ); - this.httpClient = httpClient; - } - - public IndyZabbixApi( URI uri, CloseableHttpClient httpClient ) - { - this( uri ); - this.httpClient = httpClient; - } - - @Override - public void init() - { - if ( httpClient == null ) - { - httpClient = HttpClients.custom().build(); - } - } - - @Override - public void destroy() - { - IOUtils.closeQuietly( httpClient ); - } - - @Override - public boolean login( String user, String password ) throws IOException - { - this.auth = null; - Request request = RequestBuilder.newBuilder() - .paramEntry( "user", user ) - .paramEntry( "password", password ) - .method( "user.login" ) - .build(); - JsonNode response = call( request ); - String auth = response.get( "result" ).asText(); - if ( auth != null && !auth.isEmpty() ) - { - this.auth = auth; - return true; - } - return false; - } - - @Override - public String apiVersion() throws IOException - { - Request request = RequestBuilder.newBuilder().method( "apiinfo.version" ).build(); - JsonNode response = call( request ); - return response.get( "result" ).asText(); - } - - /** - * - * @param name - * @return hostid - */ - public String getHost( String name ) throws IOException - { - ObjectMapper mapper = new ObjectMapper(); - ObjectNode jsonNode = mapper.createObjectNode(); - ArrayNode arrayNode = mapper.createArrayNode(); - arrayNode.add( name ); - jsonNode.put( "host", arrayNode ); - Request request = RequestBuilder.newBuilder().method( "host.get" ).paramEntry( "filter", jsonNode ).build(); - JsonNode response = call( request ); - if ( response.get( "result" ).isNull() || response.get( "result" ).get( 0 ) == null ) - { - return null; - } - return response.get( "result" ).get( 0 ).get( "hostid" ).asText(); - } - - /** - * - * @param host - * @param groupId - * @param ip - * @return hostid - */ - public String hostCreate( String host, String groupId, String ip ) throws IOException - { - // host not exists, create it. - ObjectMapper mapper = new ObjectMapper(); - ArrayNode groups = mapper.createArrayNode(); - ObjectNode group = mapper.createObjectNode(); - group.put( "groupid", groupId ); - groups.add( group ); - - // "interfaces": [ - // { - // "type": 1, - // "main": 1, - // "useip": 1, - // "ip": "192.168.3.1", - // "dns": "", - // "port": "10050" - // } - // ], - - ObjectNode interface1 = mapper.createObjectNode(); - // JSONObject interface1 = new JSONObject(); - interface1.put( "type", 1 ); - interface1.put( "main", 1 ); - interface1.put( "useip", 1 ); - interface1.put( "ip", ip ); - interface1.put( "dns", "" ); - interface1.put( "port", "10050" ); - - Request request = RequestBuilder.newBuilder() - .method( "host.create" ) - .paramEntry( "host", host ) - .paramEntry( "groups", groups ) - .paramEntry( "interfaces", new Object[] { interface1 } ) - .build(); - JsonNode response = call( request ); - return response.get( "result" ).get( "hostids" ).get( 0 ).asText(); - } - - /** - * - * @param name - * @return groupId - */ - public String getHostgroup( String name ) throws IOException - { - ObjectMapper mapper = new ObjectMapper(); - ObjectNode jsonNode = mapper.createObjectNode(); - ArrayNode arrayNode = mapper.createArrayNode(); - arrayNode.add( name ); - jsonNode.put( "name", arrayNode ); - Request request = - RequestBuilder.newBuilder().method( "hostgroup.get" ).paramEntry( "filter", jsonNode ).build(); - JsonNode response = call( request ); - if ( response.get( "result" ).isNull() || response.get( "result" ).get( 0 ) == null ) - { - return null; - } - return response.get( "result" ).get( 0 ).get( "groupid" ).asText(); - } - - /** - * - * @param name - * @return groupId - */ - public String hostgroupCreate( String name ) throws IOException - { - Request request = RequestBuilder.newBuilder().method( "hostgroup.create" ).paramEntry( "name", name ).build(); - JsonNode response = call( request ); - return response.get( "result" ).get( "groupids" ).get( 0 ).toString(); - } - - @Override - public JsonNode call( Request request ) throws IOException - { - if ( request.getAuth() == null ) - { - request.setAuth( this.auth ); - } - ObjectMapper mapper = new ObjectMapper(); - HttpUriRequest httpRequest = org.apache.http.client.methods.RequestBuilder.post() - .setUri( uri ) - .addHeader( "Content-Type", - "application/json" ) - .setEntity( new StringEntity( - mapper.writeValueAsString( - request ), - ContentType.APPLICATION_JSON ) ) - .build(); - CloseableHttpResponse response = httpClient.execute( httpRequest ); - String result = EntityUtils.toString( response.getEntity() ); - logger.info( result ); - return mapper.readTree( result ); - } - - public String createItem( String host, String item, String hostid, int valueType ) throws IOException - { - // create item - int type = 2; // trapper - int value_type = valueType; // float - int delay = 30; - Request request = RequestBuilder.newBuilder() - .method( "item.create" ) - .paramEntry( "name", item ) - .paramEntry( "key_", item ) - .paramEntry( "hostid", hostid ) - .paramEntry( "type", type ) - .paramEntry( "value_type", value_type ) - .paramEntry( "delay", delay ) - .build(); - - JsonNode response = call( request ); - return response.get( "result" ).findValues( "itemids" ).get( 0 ).asText(); - } - - public String getItem( String host, String item, String hostid ) throws IOException - { - ObjectMapper mapper = new ObjectMapper(); - - ArrayNode groups = mapper.createArrayNode(); - ObjectNode search = mapper.createObjectNode(); - search.put( "key_", item ); - Request getRequest = RequestBuilder.newBuilder() - .method( "item.get" ) - .paramEntry( "hostids", hostid ) - .paramEntry( "search", search ) - .build(); - JsonNode response = call( getRequest ); - if ( response.get( "result" ).isNull() || response.get( "result" ).get( 0 ) == null ) - { - return null; - } - return response.get( "result" ).get( 0 ).get( "itemid" ).asText(); - } -} diff --git a/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/zabbix/api/Request.java b/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/zabbix/api/Request.java deleted file mode 100644 index 568b55358a..0000000000 --- a/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/zabbix/api/Request.java +++ /dev/null @@ -1,98 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.metrics.zabbix.api; - - -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; - -import java.util.HashMap; -import java.util.Map; - -public class Request { - private String jsonrpc = "2.0"; - - private Map params = new HashMap<>(); - - private String method; - - private String auth; - - private Integer id; - - public void putParam(String key, Object value) { - params.put(key, value); - } - - public Object removeParam(String key) { - return params.remove(key); - } - - public String getJsonrpc() { - return jsonrpc; - } - - public void setJsonrpc(String jsonrpc) { - this.jsonrpc = jsonrpc; - } - - public Map getParams() { - return params; - } - - public void setParams(Map params) { - this.params = params; - } - - public String getMethod() { - return method; - } - - public void setMethod(String method) { - this.method = method; - } - - public String getAuth() { - return auth; - } - - public void setAuth(String auth) { - this.auth = auth; - } - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - @Override - public String toString() { - ObjectMapper mapper = new ObjectMapper(); - - try - { - return mapper.writeValueAsString( this ); - } - catch ( JsonProcessingException e ) - { - e.printStackTrace(); - throw new RuntimeException( e ); - } - } -} diff --git a/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/zabbix/api/RequestBuilder.java b/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/zabbix/api/RequestBuilder.java deleted file mode 100644 index af39c5448c..0000000000 --- a/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/zabbix/api/RequestBuilder.java +++ /dev/null @@ -1,74 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.metrics.zabbix.api; - -import java.util.concurrent.atomic.AtomicInteger; - -public class RequestBuilder { - private static final AtomicInteger nextId = new AtomicInteger(1); - - private Request request = new Request(); - - private RequestBuilder(){ - - } - - static public RequestBuilder newBuilder(){ - return new RequestBuilder(); - } - - public Request build(){ - if(request.getId() == null){ - request.setId(nextId.getAndIncrement()); - } - return request; - } - - public RequestBuilder version( String version){ - request.setJsonrpc(version); - return this; - } - - public RequestBuilder paramEntry( String key, Object value){ - request.putParam(key, value); - return this; - } - - /** - * Do not necessary to call this method.If don not set id, ZabbixApi will auto set request auth.. - * @param auth - * @return - */ - public RequestBuilder auth( String auth){ - request.setAuth(auth); - return this; - } - - public RequestBuilder method( String method){ - request.setMethod(method); - return this; - } - - /** - * Do not necessary to call this method.If don not set id, RequestBuilder will auto generate. - * @param id - * @return - */ - public RequestBuilder id( Integer id){ - request.setId(id); - return this; - } -} diff --git a/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/zabbix/api/ZabbixApi.java b/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/zabbix/api/ZabbixApi.java deleted file mode 100644 index 8bf6eccacf..0000000000 --- a/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/zabbix/api/ZabbixApi.java +++ /dev/null @@ -1,46 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.metrics.zabbix.api; - -import com.fasterxml.jackson.databind.JsonNode; - -import java.io.IOException; - -public interface ZabbixApi -{ - - void init(); - - void destroy(); - - String apiVersion() throws IOException; - - JsonNode call( Request request ) throws IOException; - - boolean login( String user, String password ) throws IOException; - - String hostCreate( String host, String groupId, String ip ) throws IOException; - - String hostgroupCreate( String name ) throws IOException; - - String createItem( String host, String item, String hostid, int valueType ) throws IOException; - - String getItem( String host, String item, String hostCache ) throws IOException; - - String getHost( String name ) throws IOException; - - String getHostgroup( String name ) throws IOException; -} diff --git a/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/zabbix/cache/ZabbixCacheStorage.java b/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/zabbix/cache/ZabbixCacheStorage.java deleted file mode 100644 index fa761b97df..0000000000 --- a/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/zabbix/cache/ZabbixCacheStorage.java +++ /dev/null @@ -1,186 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.metrics.zabbix.cache; - -import com.fasterxml.jackson.databind.ObjectMapper; -import org.commonjava.indy.action.IndyLifecycleException; -import org.commonjava.indy.action.StartupAction; -import org.commonjava.indy.subsys.datafile.DataFile; -import org.commonjava.indy.subsys.datafile.DataFileManager; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import java.io.IOException; -import java.util.HashMap; -import java.util.concurrent.ConcurrentHashMap; - -/** - * Created by xiabai on 5/8/17. - */ - -@ApplicationScoped -public class ZabbixCacheStorage - implements StartupAction -{ - private static final Logger logger = LoggerFactory.getLogger( ZabbixCacheStorage.class ); - - private final static String ZABBIX_ID = "zabbix"; - - private final static String ZABBIX_HOSTGROUP = "hostGroupCache.json"; - - private final static String ZABBIX_HOST = "hostCache.json"; - - private final static String ZABBIX_ITEM = "itemCache.json"; - - private DataFile hostGroupCacheDataFile = null; - - private DataFile hostCacheDataFile = null; - - private DataFile itemCacheDataFile = null; - - // name, hostGroupId - private ConcurrentHashMap hostGroupCache = new ConcurrentHashMap(); - - // name, hostId - private ConcurrentHashMap hostCache = new ConcurrentHashMap(); - - // name, itemId - private ConcurrentHashMap itemCache = new ConcurrentHashMap(); - - @Inject - private DataFileManager dataFileManager; - - @Override - public int getStartupPriority() - { - return 30; - } - - @Override - public String getId() - { - return ZABBIX_ID; - } - - @Override - public void start() throws IndyLifecycleException - { - this.reLoadHostGroup(); - this.reLoadHost(); - this.reLoadItem(); - } - - private void reLoadHostGroup() - { - hostGroupCacheDataFile = dataFileManager.getDataFile( ZABBIX_ID + "/" + ZABBIX_HOSTGROUP ); - - ObjectMapper mapper = new ObjectMapper(); - if ( hostGroupCacheDataFile.exists() ) - { - try - { - HashMap m = new HashMap( ); - m.put( "test","123" ); - mapper.writeValueAsString( m ); - String hostGroups = hostGroupCacheDataFile.readString(); - hostGroupCache = mapper.readValue( hostGroups, ConcurrentHashMap.class ); - } - catch ( IOException e ) - { - e.printStackTrace(); - logger.error( "read hostGroup cache from data file have a error:" + e ); - } - } - } - - private void reLoadHost() - { - hostCacheDataFile = dataFileManager.getDataFile( ZABBIX_ID + "/" + ZABBIX_HOST ); - - ObjectMapper mapper = new ObjectMapper(); - if ( hostCacheDataFile.exists() ) - { - try - { - String hosts = hostCacheDataFile.readString(); - hostCache = mapper.readValue( hosts, ConcurrentHashMap.class ); - } - catch ( IOException e ) - { - e.printStackTrace(); - logger.error( "read hosts cache from data file have a error:" + e ); - } - } - } - - private void reLoadItem() - { - itemCacheDataFile = dataFileManager.getDataFile( ZABBIX_ID + "/" + ZABBIX_ITEM ); - ObjectMapper mapper = new ObjectMapper(); - - if ( itemCacheDataFile.exists() ) - { - try - { - String items = itemCacheDataFile.readString(); - itemCache = mapper.readValue( items, ConcurrentHashMap.class ); - } - catch ( IOException e ) - { - e.printStackTrace(); - logger.error( "read items cache from data file have a error:" + e ); - } - } - } - - public void putHostGroup( String name, String id ) throws IOException - { - ObjectMapper mapper = new ObjectMapper(); - hostGroupCache.put( name, id ); - hostGroupCacheDataFile.writeString( mapper.writeValueAsString( hostGroupCache ), "UTF-8", null ); - } - - public String getHostGroup( String name ) - { - return hostGroupCache.get( name ); - } - - public void putHost( String name, String id ) throws IOException - { - ObjectMapper mapper = new ObjectMapper(); - hostCache.put( name, id ); - hostCacheDataFile.writeString( mapper.writeValueAsString( hostCache ), "UTF-8", null ); - } - - public String getHost( String name ) - { - return hostCache.get( name ); - } - - public void putItem( String name, String id ) throws IOException - { - ObjectMapper mapper = new ObjectMapper(); - itemCache.put( name, id ); - itemCacheDataFile.writeString( mapper.writeValueAsString( itemCache ), "UTF-8", null ); - } - - public String getItem( String name ) - { - return itemCache.get( name ); - } -} diff --git a/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/zabbix/reporter/HostUtil.java b/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/zabbix/reporter/HostUtil.java deleted file mode 100644 index 424b0e0c33..0000000000 --- a/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/zabbix/reporter/HostUtil.java +++ /dev/null @@ -1,93 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.metrics.zabbix.reporter; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.net.InetAddress; -import java.net.NetworkInterface; -import java.net.SocketException; -import java.net.UnknownHostException; -import java.util.Enumeration; - -/** - * http://stackoverflow.com/questions/7348711/recommended-way-to-get-hostname-in - * -java - * - */ -public class HostUtil -{ - private static final Logger logger = LoggerFactory.getLogger( HostUtil.class); - - public static void main(String[] args) { - System.err.println(getHostName()); - System.err.println(getHostAddress()); - System.err.println(getNotLoopbackAddress()); - } - - public static String getHostName() { - try { - String hostName = InetAddress.getLocalHost().getHostName(); - if (hostName != null && !hostName.isEmpty()) { - return hostName; - } - } catch (UnknownHostException e) { - logger.error("get hostName error!", e); - } - - String host = System.getenv("COMPUTERNAME"); - if (host != null) - return host; - host = System.getenv("HOSTNAME"); - if (host != null) - return host; - - return null; - } - - public static String getNotLoopbackAddress() { - String hostName = null; - Enumeration interfaces; - try { - interfaces = NetworkInterface.getNetworkInterfaces(); - while (interfaces.hasMoreElements()) { - NetworkInterface nic = interfaces.nextElement(); - Enumeration addresses = nic.getInetAddresses(); - while (hostName == null && addresses.hasMoreElements()) { - InetAddress address = addresses.nextElement(); - if (!address.isLoopbackAddress()) { - hostName = address.getHostName(); - } - } - } - } catch (SocketException e) { - logger.error("getNotLoopbackAddress error!", e); - } - return hostName; - } - - public static String getHostAddress() { - try { - return InetAddress.getLocalHost().getHostAddress(); - } catch (UnknownHostException e) { - logger.error("get hostAddress error!", e); - } - - return null; - } - -} diff --git a/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/zabbix/reporter/IndyZabbixReporter.java b/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/zabbix/reporter/IndyZabbixReporter.java deleted file mode 100644 index 4c1e5ddf58..0000000000 --- a/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/zabbix/reporter/IndyZabbixReporter.java +++ /dev/null @@ -1,339 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.metrics.zabbix.reporter; - -import com.codahale.metrics.Counter; -import com.codahale.metrics.Gauge; -import com.codahale.metrics.Histogram; -import com.codahale.metrics.Meter; -import com.codahale.metrics.Metered; -import com.codahale.metrics.MetricFilter; -import com.codahale.metrics.MetricRegistry; -import com.codahale.metrics.ScheduledReporter; -import com.codahale.metrics.Snapshot; -import com.codahale.metrics.Timer; -import org.commonjava.indy.metrics.exception.IndyMetricsException; -import org.commonjava.indy.metrics.zabbix.sender.DataObject; -import org.commonjava.indy.metrics.zabbix.sender.IndyZabbixSender; -import org.commonjava.indy.metrics.zabbix.sender.SenderResult; -import org.commonjava.indy.subsys.http.IndyHttpException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.IOException; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.SortedMap; -import java.util.concurrent.TimeUnit; - -/** - * Created by xiabai on 3/29/17. - */ -public class IndyZabbixReporter - extends ScheduledReporter -{ - private static final Logger logger = LoggerFactory.getLogger( IndyZabbixReporter.class ); - - private final IndyZabbixSender indyZabbixSender; - - private final String hostName; - - private final String prefix; - - private final String suffix; - - public static Builder forRegistry( MetricRegistry registry ) - { - return new Builder( registry ); - } - - public static class Builder - { - - private final MetricRegistry registry; - - private String name = "zabbix-reporter"; - - private TimeUnit rateUnit; - - private TimeUnit durationUnit; - - private MetricFilter filter; - - private String hostName; - - private String prefix = ""; - - private String suffix = ""; - - private String zabbixHostName; - - private IndyZabbixSender indyZabbixSender; - - public Builder( MetricRegistry registry ) - { - this.registry = registry; - - this.rateUnit = TimeUnit.SECONDS; - this.durationUnit = TimeUnit.MILLISECONDS; - this.filter = MetricFilter.ALL; - - } - - /** - * Convert rates to the given time unit. - * - * @param rateUnit - * a unit of time - * @return {@code this} - */ - public Builder convertRatesTo( TimeUnit rateUnit ) - { - this.rateUnit = rateUnit; - return this; - } - - /** - * Convert durations to the given time unit. - * - * @param durationUnit - * a unit of time - * @return {@code this} - */ - public Builder convertDurationsTo( TimeUnit durationUnit ) - { - this.durationUnit = durationUnit; - return this; - } - - /** - * Only report metrics which match the given filter. - * - * @param filter - * a {@link MetricFilter} - * @return {@code this} - */ - public Builder filter( MetricFilter filter ) - { - this.filter = filter; - return this; - } - - /** - * default register name is "zabbix-reporter". - * - * @param name - * @return - */ - public Builder name( String name ) - { - this.name = name; - return this; - } - - public Builder hostName( String hostName ) - { - this.hostName = hostName; - return this; - } - - public Builder prefix( String prefix ) - { - this.prefix = prefix + "."; - return this; - } - - public Builder suffix( String suffix ) - { - this.suffix = suffix; - return this; - } - - public Builder zabbixHostName( String zabbixHostName ) - { - this.zabbixHostName = zabbixHostName; - return this; - } - - public Builder zabbixSender( IndyZabbixSender indyZabbixSender ) - { - this.indyZabbixSender = indyZabbixSender; - return this; - } - - /** - * Builds a {@link IndyZabbixReporter} with the given properties. - * - * @return a {@link IndyZabbixReporter} - */ - public IndyZabbixReporter build( IndyZabbixSender zabbixSender ) - { - if ( hostName == null ) - { - hostName = HostUtil.getHostName(); - logger.info( name + " detect hostName: " + hostName ); - } - return new IndyZabbixReporter( registry, name, rateUnit, durationUnit, filter, zabbixSender, hostName, - prefix, suffix ); - } - } - - private IndyZabbixReporter( MetricRegistry registry, String name, TimeUnit rateUnit, TimeUnit durationUnit, - MetricFilter filter, IndyZabbixSender indyZabbixSender, String hostName, String prefix, - String suffix ) - { - super( registry, name, filter, rateUnit, durationUnit ); - this.indyZabbixSender = indyZabbixSender; - this.hostName = hostName; - this.prefix = prefix; - this.suffix = suffix; - } - - private DataObject toDataObject( String key, String keySuffix, Object value, long clock ) - { - return DataObject.builder() - .host( hostName ) - .key( prefix + key + keySuffix + suffix ) - .clock( clock ) - .value( String.valueOf( value ) ) - .build(); - } - - /** - * for histograms. - * - * @param key - * @param snapshot - * @param dataObjectList - */ - private void addSnapshotDataObject( String key, Snapshot snapshot, long clock, List dataObjectList ) - { - dataObjectList.add( toDataObject( key, ".min", snapshot.getMin(), clock ) ); - dataObjectList.add( toDataObject( key, ".max", snapshot.getMax(), clock ) ); - dataObjectList.add( toDataObject( key, ".mean", snapshot.getMean(), clock ) ); - dataObjectList.add( toDataObject( key, ".stddev", snapshot.getStdDev(), clock ) ); - dataObjectList.add( toDataObject( key, ".median", snapshot.getMedian(), clock ) ); - dataObjectList.add( toDataObject( key, ".75th", snapshot.get75thPercentile(), clock ) ); - dataObjectList.add( toDataObject( key, ".95th", snapshot.get95thPercentile(), clock ) ); - dataObjectList.add( toDataObject( key, ".98th", snapshot.get98thPercentile(), clock ) ); - dataObjectList.add( toDataObject( key, ".99th", snapshot.get99thPercentile(), clock ) ); - dataObjectList.add( toDataObject( key, ".99.9th", snapshot.get999thPercentile(), clock ) ); - } - - /** - * for timer. - * - * @param key - * @param snapshot - * @param dataObjectList - */ - private void addSnapshotDataObjectWithConvertDuration( String key, Snapshot snapshot, long clock, - List dataObjectList ) - { - dataObjectList.add( toDataObject( key, ".min", convertDuration( snapshot.getMin() ), clock ) ); - dataObjectList.add( toDataObject( key, ".max", convertDuration( snapshot.getMax() ), clock ) ); - dataObjectList.add( toDataObject( key, ".mean", convertDuration( snapshot.getMean() ), clock ) ); - dataObjectList.add( toDataObject( key, ".stddev", convertDuration( snapshot.getStdDev() ), clock ) ); - dataObjectList.add( toDataObject( key, ".median", convertDuration( snapshot.getMedian() ), clock ) ); - dataObjectList.add( toDataObject( key, ".75th", convertDuration( snapshot.get75thPercentile() ), clock ) ); - dataObjectList.add( toDataObject( key, ".95th", convertDuration( snapshot.get95thPercentile() ), clock ) ); - dataObjectList.add( toDataObject( key, ".98th", convertDuration( snapshot.get98thPercentile() ), clock ) ); - dataObjectList.add( toDataObject( key, ".99th", convertDuration( snapshot.get99thPercentile() ), clock ) ); - dataObjectList.add( toDataObject( key, ".99.9th", convertDuration( snapshot.get999thPercentile() ), clock ) ); - } - - private void addMeterDataObject( String key, Metered meter, long clock, List dataObjectList ) - { - dataObjectList.add( toDataObject( key, ".count", meter.getCount(), clock ) ); - dataObjectList.add( toDataObject( key, ".meanRate", convertRate( meter.getMeanRate() ), clock ) ); - dataObjectList.add( toDataObject( key, ".1-minuteRate", convertRate( meter.getOneMinuteRate() ), clock ) ); - dataObjectList.add( toDataObject( key, ".5-minuteRate", convertRate( meter.getFiveMinuteRate() ), clock ) ); - dataObjectList.add( toDataObject( key, ".15-minuteRate", convertRate( meter.getFifteenMinuteRate() ), clock ) ); - } - - @SuppressWarnings( "rawtypes" ) - @Override - public void report( SortedMap gauges, SortedMap counters, - SortedMap histograms, SortedMap meters, - SortedMap timers ) - { - final long clock = System.currentTimeMillis() / 1000; - List dataObjectList = new LinkedList(); - for ( Map.Entry entry : gauges.entrySet() ) - { - DataObject dataObject = - toDataObject( entry.getKey(), "", String.valueOf( entry.getValue().getValue() ), clock ); - dataObjectList.add( dataObject ); - } - - for ( Map.Entry entry : counters.entrySet() ) - { - DataObject dataObject = - toDataObject( entry.getKey(), "", String.valueOf( entry.getValue().getCount() ), clock ); - dataObjectList.add( dataObject ); - } - - for ( Map.Entry entry : histograms.entrySet() ) - { - Histogram histogram = entry.getValue(); - Snapshot snapshot = histogram.getSnapshot(); - addSnapshotDataObject( entry.getKey(), snapshot, clock, dataObjectList ); - } - - for ( Map.Entry entry : meters.entrySet() ) - { - Meter meter = entry.getValue(); - addMeterDataObject( entry.getKey(), meter, clock, dataObjectList ); - } - - for ( Map.Entry entry : timers.entrySet() ) - { - Timer timer = entry.getValue(); - addMeterDataObject( entry.getKey(), timer, clock, dataObjectList ); - addSnapshotDataObjectWithConvertDuration( entry.getKey(), timer.getSnapshot(), clock, dataObjectList ); - } - - try - { - SenderResult senderResult = indyZabbixSender.send( dataObjectList, clock ); - if ( !senderResult.success() ) - { - logger.warn( "report metrics to zabbix not success!" + senderResult ); - } - else if ( logger.isDebugEnabled() ) - { - logger.info( "report metrics to zabbix success. " + senderResult ); - } - } - catch ( IOException e ) - { - logger.error( "report metrics to zabbix error! " + e ); - e.printStackTrace(); - } - catch ( IndyMetricsException e ) - { - logger.error( "Indy metrics config error " + e ); - e.printStackTrace(); - } - catch ( IndyHttpException e ) - { - logger.error( "Indy http client error " + e ); - e.printStackTrace(); - } - } - -} diff --git a/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/zabbix/sender/DataObject.java b/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/zabbix/sender/DataObject.java deleted file mode 100644 index 91bf6418a8..0000000000 --- a/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/zabbix/sender/DataObject.java +++ /dev/null @@ -1,135 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.metrics.zabbix.sender; - -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; - -public class DataObject { - long clock; - String host; - String key; - String value; - - public DataObject() { - - } - - public DataObject(long clock, String host, String key, String value) { - this.clock = clock; - this.host = host; - this.key = key; - this.value = value; - } - - static public Builder builder() { - return new Builder(); - } - - public static class Builder { - Long clock; - String host; - String key; - String value; - - Builder() { - - } - - public Builder clock(long clock) { - this.clock = clock; - return this; - } - - public Builder host(String host) { - this.host = host; - return this; - } - - public Builder key(String key) { - this.key = key; - return this; - } - - public Builder value(String value) { - this.value = value; - return this; - } - - public DataObject build() { - if (clock == null) { - clock = System.currentTimeMillis() / 1000; - } - return new DataObject( clock, host, key, value); - } - } - - public long getClock() { - return clock; - } - - public void setClock(long clock) { - this.clock = clock; - } - - public String getHost() { - return host; - } - - public void setHost(String host) { - this.host = host; - } - - public String getKey() { - return key; - } - - public void setKey(String key) { - this.key = key; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - - @Override - public String toString() { - ObjectMapper mapper = new ObjectMapper(); - - try - { - return mapper.writeValueAsString( this ); - } - catch ( JsonProcessingException e ) - { - e.printStackTrace(); - throw new RuntimeException( e ); - } - } - public static void main(String[] args) - { - DataObject d = new DataObject(); - d.setClock( 10 ); - d.setHost( "a" ); - d.setKey( "b" ); - d.setValue("100" ); - System.out.println( d.toString() ); - } -} diff --git a/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/zabbix/sender/IndyZabbixSender.java b/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/zabbix/sender/IndyZabbixSender.java deleted file mode 100644 index 92a3c3f9b3..0000000000 --- a/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/zabbix/sender/IndyZabbixSender.java +++ /dev/null @@ -1,601 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.metrics.zabbix.sender; - -import org.commonjava.indy.IndyException; -import org.commonjava.indy.metrics.exception.IndyMetricsException; -import org.commonjava.indy.metrics.zabbix.api.IndyZabbixApi; -import org.commonjava.indy.metrics.zabbix.api.ZabbixApi; -import org.commonjava.indy.metrics.zabbix.cache.ZabbixCacheStorage; -import org.commonjava.indy.subsys.http.IndyHttpException; -import org.commonjava.indy.subsys.http.IndyHttpProvider; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.IOException; -import java.net.URL; -import java.util.Collections; -import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -/** - * Created by xiabai on 4/1/17. - */ -public class IndyZabbixSender -{ - private static final Logger logger = LoggerFactory.getLogger( IndyZabbixSender.class ); - - private ZabbixSender sender; - - private boolean bCreateNotExistHostGroup = true; - - private boolean bCreateNotExistHost = true; - - private boolean bCreateNotExistItem = true; - - private boolean bCreateNotExistZabbixApi = true; - - private ZabbixApi zabbixApi; - - private String zabbixHostUrl; - - private String hostGroup = "NOS";//// default host group - - private String group = "NOS"; - - private long clock = 0l; - - private String hostName; - - private String ip; - - private String zabbixUserName; - - private String zabbixUserPwd; - - private ZabbixCacheStorage zabbixCacheStorage; - - private IndyHttpProvider indyHttpProvider; - - private static final String regEx = "^-?[0-9]+$"; - - private static final Pattern pat = Pattern.compile( regEx ); - - public static Builder create() - { - return new Builder(); - } - - public static class Builder - { - boolean bCreateNotExistHostGroup = true; - - boolean bCreateNotExistHost = true; - - boolean bCreateNotExistItem = true; - - boolean bCreateNotExistZabbixSender = true; - - ZabbixApi zabbixApi; - - String zabbixHostUrl; - - String hostGroup = "NOS";//// default host group - - String group = "NOS"; - - long clock = 0l; - - String hostName; - - String ip; - - String zabbixUserName; - - String zabbixUserPwd; - - String zabbixHost; - - int zabbixPort; - - ZabbixCacheStorage zabbixCacheStorage; - - IndyHttpProvider indyHttpProvider; - - public Builder metricsZabbixCache( ZabbixCacheStorage zabbixCacheStorage ) - { - this.zabbixCacheStorage = zabbixCacheStorage; - return this; - } - - public Builder indyHttpProvider( IndyHttpProvider indyHttpProvider ) - { - this.indyHttpProvider = indyHttpProvider; - return this; - } - - public Builder zabbixHost( String zabbixHost ) - { - this.zabbixHost = zabbixHost; - return this; - } - - public Builder hostName( String hostName ) - { - this.hostName = hostName; - return this; - } - - public Builder zabbixPort( int zabbixPort ) - { - this.zabbixPort = zabbixPort; - return this; - } - - public Builder bCreateNotExistHostGroup( boolean bCreateNotExistHostGroup ) - { - this.bCreateNotExistHostGroup = bCreateNotExistHostGroup; - return this; - } - - public Builder bCreateNotExistHost( boolean bCreateNotExistHost ) - { - this.bCreateNotExistHost = bCreateNotExistHost; - return this; - } - - public Builder bCreateNotExistItem( boolean bCreateNotExistItem ) - { - this.bCreateNotExistItem = bCreateNotExistItem; - return this; - } - - public Builder bCreateNotExistZabbixSender( boolean bCreateNotExistZabbixSender ) - { - this.bCreateNotExistZabbixSender = bCreateNotExistZabbixSender; - return this; - } - - public Builder zabbixApi( ZabbixApi zabbixApi ) - { - this.zabbixApi = zabbixApi; - return this; - } - - public Builder zabbixHostUrl( String zabbixHostUrl ) - { - this.zabbixHostUrl = zabbixHostUrl; - return this; - } - - public Builder hostGroup( String hostGroup ) - { - this.hostGroup = hostGroup; - return this; - } - - public Builder group( String group ) - { - this.group = group; - return this; - } - - public Builder ip( String ip ) - { - this.ip = ip; - return this; - } - - public Builder zabbixUserName( String zabbixUserName ) - { - this.zabbixUserName = zabbixUserName; - return this; - } - - public Builder clock( long clock ) - { - this.clock = clock; - return this; - } - - public Builder zabbixUserPwd( String zabbixUserPwd ) - { - this.zabbixUserPwd = zabbixUserPwd; - return this; - } - - public IndyZabbixSender build() - { - return new IndyZabbixSender( this.bCreateNotExistHostGroup, this.bCreateNotExistHost, - this.bCreateNotExistItem, this.bCreateNotExistZabbixSender, this.zabbixApi, - this.zabbixHostUrl, this.hostGroup, this.group, this.clock, this.hostName, - this.ip, this.zabbixUserName, this.zabbixUserPwd, this.zabbixHost, - this.zabbixPort, this.indyHttpProvider, this.zabbixCacheStorage ); - } - - } - - public IndyZabbixSender( boolean bCreateNotExistHostGroup, boolean bCreateNotExistHost, boolean bCreateNotExistItem, - boolean bCreateNotExistZabbixApi, ZabbixApi zabbixApi, String zabbixHostUrl, - String hostGroup, String group, long clock, String hostName, String ip, - String zabbixUserName, String zabbixUserPwd, String zabbixHost, int zabbixPort, - IndyHttpProvider indyHttpProvider, ZabbixCacheStorage zabbixCacheStorage ) - { - - this.bCreateNotExistHostGroup = bCreateNotExistHostGroup; - this.bCreateNotExistHost = bCreateNotExistHost; - this.bCreateNotExistItem = bCreateNotExistItem; - this.bCreateNotExistZabbixApi = bCreateNotExistZabbixApi; - this.zabbixApi = zabbixApi; - this.zabbixHostUrl = zabbixHostUrl; - this.hostGroup = hostGroup; - this.group = group; - this.clock = clock; - this.hostName = hostName; - this.ip = ip; - this.zabbixUserName = zabbixUserName; - this.zabbixUserPwd = zabbixUserPwd; - this.indyHttpProvider = indyHttpProvider; - this.zabbixCacheStorage = zabbixCacheStorage; - this.sender = new ZabbixSender( zabbixHost, zabbixPort ); - } - - String checkHostGroup( String hostGroup ) throws IOException, IndyHttpException, IndyMetricsException - { - if ( zabbixCacheStorage.getHostGroup( hostGroup ) == null ) - { - try - { - this.zabbixApiInit(); - String groupid = zabbixApi.getHostgroup( hostGroup ); - if ( groupid == null ) - { - groupid = zabbixApi.hostgroupCreate( hostGroup ); - zabbixCacheStorage.putHostGroup( hostGroup, groupid ); - } - zabbixCacheStorage.putHostGroup( hostGroup, groupid ); - return groupid; - } - finally - { - this.destroy(); - } - } - return null; - } - - String checkHost( String host, String ip ) throws IOException, IndyHttpException, IndyMetricsException - { - try - { - if ( zabbixCacheStorage.getHost( host ) == null ) - { - this.zabbixApiInit(); - String hostid = zabbixApi.getHost( host ); - if ( hostid != null ) - { - zabbixCacheStorage.putHost( host, hostid ); - - } - else - {// host not exists, create it. - - hostid = zabbixApi.hostCreate( host, zabbixCacheStorage.getHostGroup( hostGroup ), ip ); - zabbixCacheStorage.putHost( host, hostid ); - } - return hostid; - } - } - finally - { - this.destroy(); - } - return null; - } - - private String itemCacheKey( String host, String item ) - { - return host + ":" + item; - } - - String checkItem( String host, String item, int valueType ) throws IOException, IndyHttpException, IndyMetricsException - { - - try - { - if ( zabbixCacheStorage.getItem( itemCacheKey( host, item ) ) == null ) - { - this.zabbixApiInit(); - - String itemid = zabbixApi.getItem( host, item, zabbixCacheStorage.getHost( host ) ); - if ( itemid == null ) - { - itemid = zabbixApi.createItem( host, item, zabbixCacheStorage.getHost( host ), valueType ); - zabbixCacheStorage.putItem( itemCacheKey( host, item ), itemid ); - } - else - { - // put into metricsZabbixCache - zabbixCacheStorage.putItem( itemCacheKey( host, item ), itemid ); - } - return itemid; - } - } - finally - { - this.destroy(); - } - - return null; - } - - public SenderResult send( DataObject dataObject ) throws IOException, IndyException - { - return this.send( dataObject, System.currentTimeMillis() / 1000L ); - } - - public SenderResult send( DataObject dataObject, long clock ) throws IOException, IndyException - { - return this.send( Collections.singletonList( dataObject ), clock ); - } - - public SenderResult send( List dataObjectList ) throws IOException, IndyException - { - return this.send( dataObjectList, System.currentTimeMillis() / 1000L ); - } - - /** - * - * @param dataObjectList - * @param clock - * TimeUnit is SECONDS. - * @return - * @throws IOException - */ - public SenderResult send( List dataObjectList, long clock ) - throws IOException, IndyHttpException, IndyMetricsException - { - if ( bCreateNotExistHostGroup ) - { - try - { - checkHostGroup( hostGroup ); - } - catch ( IndyHttpException e ) - { - logger.error( "Check HostGroup of Zabbix is error:" + e.getMessage() ); - throw e; - } - } - if ( bCreateNotExistHost ) - { - try - { - checkHost( hostName, ip ); - } - catch ( IndyHttpException e ) - { - logger.error( "Check Host of Zabbix is error:" + e.getMessage() ); - throw e; - } - } - - if ( bCreateNotExistItem ) - { - for ( DataObject object : dataObjectList ) - { - String key = object.getKey(); - int vauleType = 0; - Matcher mat = pat.matcher( object.getValue() ); - if ( !mat.find() ) - { - vauleType = 4; - } - try - { - checkItem( hostName, key, vauleType ); - } - catch ( IndyHttpException e ) - { - logger.error( "Check Item of Zabbix is error:" + e.getMessage() ); - throw e; - } - } - } - - try - { - SenderResult senderResult = sender.send( dataObjectList, clock ); - if ( !senderResult.success() ) - { - logger.error( "send data to zabbix server error! senderResult:" + senderResult ); - } - return senderResult; - } - catch ( IOException e ) - { - logger.error( "send data to zabbix server error!", e ); - throw e; - } - } - - public void destroy() - { - if ( bCreateNotExistZabbixApi ) - { - return; - } - if ( zabbixApi != null ) - zabbixApi.destroy(); - } - - private void zabbixApiInit() throws IndyMetricsException, IOException, IndyHttpException - { - if ( !bCreateNotExistZabbixApi ) - { - return; - } - if ( this.zabbixHostUrl == null || "".equals( this.zabbixHostUrl ) ) - { - throw new IndyMetricsException( "can not find Zabbix's Host" ); - } - - zabbixApi = new IndyZabbixApi( this.zabbixHostUrl, indyHttpProvider.createClient( new URL( zabbixHostUrl ).getHost() ) ); - - zabbixApi.init(); - - if ( this.zabbixUserName == null || "".equals( this.zabbixUserName ) || this.zabbixUserPwd == null || "".equals( - this.zabbixUserPwd ) ) - { - throw new IndyMetricsException( "can not find Zabbix's username or password" ); - } - boolean login = zabbixApi.login( this.zabbixUserName, this.zabbixUserPwd ); - - logger.info( "User:" + this.zabbixUserName + " login is " + login ); - } - - public ZabbixApi getZabbixApi() - { - return zabbixApi; - } - - public void setZabbixApi( ZabbixApi zabbixApi ) - { - this.zabbixApi = zabbixApi; - } - - public boolean isbCreateNotExistHost() - { - return bCreateNotExistHost; - } - - public void setbCreateNotExistHost( boolean bCreateNotExistHost ) - { - this.bCreateNotExistHost = bCreateNotExistHost; - } - - public String getHostGroup() - { - return hostGroup; - } - - public void setHostGroup( String hostGroup ) - { - this.hostGroup = hostGroup; - } - - public boolean isbCreateNotExistItem() - { - return bCreateNotExistItem; - } - - public void setbCreateNotExistItem( boolean bCreateNotExistItem ) - { - this.bCreateNotExistItem = bCreateNotExistItem; - } - - public String getGroup() - { - return group; - } - - public void setGroup( String group ) - { - this.group = group; - } - - public long getClock() - { - return clock; - } - - public void setClock( long clock ) - { - this.clock = clock; - } - - public String getHostName() - { - return hostName; - } - - public void setHostName( String hostName ) - { - this.hostName = hostName; - } - - public String getIp() - { - return ip; - } - - public void setIp( String ip ) - { - this.ip = ip; - } - - public boolean isbCreateNotExistHostGroup() - { - return bCreateNotExistHostGroup; - } - - public void setbCreateNotExistHostGroup( boolean bCreateNotExistHostGroup ) - { - this.bCreateNotExistHostGroup = bCreateNotExistHostGroup; - } - - public String getZabbixHostUrl() - { - return zabbixHostUrl; - } - - public void setZabbixHostUrl( String zabbixHostUrl ) - { - this.zabbixHostUrl = zabbixHostUrl; - } - - public String getZabbixUserName() - { - return zabbixUserName; - } - - public void setZabbixUserName( String zabbixUserName ) - { - this.zabbixUserName = zabbixUserName; - } - - public String getZabbixUserPwd() - { - return zabbixUserPwd; - } - - public void setZabbixUserPwd( String zabbixUserPwd ) - { - this.zabbixUserPwd = zabbixUserPwd; - } - - public boolean isbCreateNotExistZabbixApi() - { - return bCreateNotExistZabbixApi; - } - - public void setbCreateNotExistZabbixApi( boolean bCreateNotExistZabbixApi ) - { - this.bCreateNotExistZabbixApi = bCreateNotExistZabbixApi; - } - -} diff --git a/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/zabbix/sender/SenderRequest.java b/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/zabbix/sender/SenderRequest.java deleted file mode 100644 index 05fe738519..0000000000 --- a/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/zabbix/sender/SenderRequest.java +++ /dev/null @@ -1,120 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.metrics.zabbix.sender; - -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.List; - -/** - * - */ -public class SenderRequest -{ - static final byte header[] = { 'Z', 'B', 'X', 'D', '\1' }; - - private static final Logger logger = LoggerFactory.getLogger( SenderRequest.class ); - - /** - * TimeUnit is SECONDS. - */ - long clock; - - List data; - - String request = "sender data"; - - public byte[] toBytes() throws JsonProcessingException - { - // https://www.zabbix.org/wiki/Docs/protocols/zabbix_sender/2.0 - // https://www.zabbix.org/wiki/Docs/protocols/zabbix_sender/1.8/java_example - - ObjectMapper mapper = new ObjectMapper(); - byte[] jsonBytes = mapper.writeValueAsBytes( this ); - - byte[] result = new byte[header.length + 4 + 4 + jsonBytes.length]; - - System.arraycopy( header, 0, result, 0, header.length ); - - result[header.length] = (byte) ( jsonBytes.length & 0xFF ); - result[header.length + 1] = (byte) ( ( jsonBytes.length >> 8 ) & 0x00FF ); - result[header.length + 2] = (byte) ( ( jsonBytes.length >> 16 ) & 0x0000FF ); - result[header.length + 3] = (byte) ( ( jsonBytes.length >> 24 ) & 0x000000FF ); - - System.arraycopy( jsonBytes, 0, result, header.length + 4 + 4, jsonBytes.length ); - return result; - } - - public String getRequest() - { - return request; - } - - public void setRequest( String request ) - { - this.request = request; - } - - /** - * TimeUnit is SECONDS. - * - * @return - */ - public long getClock() - { - return clock; - } - - /** - * TimeUnit is SECONDS. - * - * @param clock - */ - public void setClock( long clock ) - { - this.clock = clock; - } - - public List getData() - { - return data; - } - - public void setData( List data ) - { - this.data = data; - } - - @Override - public String toString() - { - try - { - ObjectMapper mapper = new ObjectMapper(); - return mapper.writeValueAsString( this ); - - } - catch ( JsonProcessingException e ) - { - logger.error( e.getMessage() ); - } - return super.toString(); - } -} - diff --git a/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/zabbix/sender/SenderResult.java b/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/zabbix/sender/SenderResult.java deleted file mode 100644 index 2648aeaa50..0000000000 --- a/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/zabbix/sender/SenderResult.java +++ /dev/null @@ -1,95 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.metrics.zabbix.sender; - -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; - -/** - * - */ -public class SenderResult { - int processed; - int failed; - int total; - - float spentSeconds; - - /** - * sometimes zabbix server will return "[]". - */ - boolean bReturnEmptyArray = false; - - /** - * if all sended data are processed, will return true, else return false. - * - * @return - */ - public boolean success() { - return !bReturnEmptyArray && processed == total; - } - - public int getProcessed() { - return processed; - } - - public void setProcessed(int processed) { - this.processed = processed; - } - - public int getFailed() { - return failed; - } - - public void setFailed(int failed) { - this.failed = failed; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public float getSpentSeconds() { - return spentSeconds; - } - - public void setSpentSeconds(float spentSeconds) { - this.spentSeconds = spentSeconds; - } - - public void setbReturnEmptyArray(boolean bReturnEmptyArray) { - this.bReturnEmptyArray = bReturnEmptyArray; - } - - @Override - public String toString() { - ObjectMapper mapper = new ObjectMapper(); - - try - { - return mapper.writeValueAsString( this ); - } - catch ( JsonProcessingException e ) - { - e.printStackTrace(); - throw new RuntimeException( e ); - } - } -} diff --git a/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/zabbix/sender/ZabbixSender.java b/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/zabbix/sender/ZabbixSender.java deleted file mode 100644 index e404e203b5..0000000000 --- a/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/zabbix/sender/ZabbixSender.java +++ /dev/null @@ -1,193 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.metrics.zabbix.sender; - -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.net.InetSocketAddress; -import java.net.Socket; -import java.nio.charset.Charset; -import java.util.Collections; -import java.util.List; -import java.util.regex.Pattern; - -/** - * Created by xiabai on 4/7/17. - * Copy from - */ -public class ZabbixSender -{ - private static final Pattern PATTERN = Pattern.compile( "[^0-9\\.]+"); - private static final Logger logger = LoggerFactory.getLogger( ZabbixSender.class ); - String host; - int port; - int connectTimeout = 3 * 1000; - int socketTimeout = 3 * 1000; - - public ZabbixSender(String host, int port) { - this.host = host; - this.port = port; - } - - public ZabbixSender(String host, int port, int connectTimeout, int socketTimeout) { - this(host, port); - this.connectTimeout = connectTimeout; - this.socketTimeout = socketTimeout; - } - - public SenderResult send(DataObject dataObject) throws IOException - { - return send(dataObject, System.currentTimeMillis() / 1000); - } - - /** - * - * @param dataObject - * @param clock - * TimeUnit is SECONDS. - * @return - * @throws IOException - */ - public SenderResult send(DataObject dataObject, long clock) throws IOException { - return send( Collections.singletonList( dataObject), clock); - } - - public SenderResult send(List dataObjectList) throws IOException { - return send(dataObjectList, System.currentTimeMillis() / 1000); - } - - /** - * - * @param dataObjectList - * @param clock - * TimeUnit is SECONDS. - * @return - * @throws IOException - */ - public SenderResult send(List dataObjectList, long clock) throws IOException { - //TODO Need refacing the method using XNIO - SenderResult senderResult = new SenderResult(); - - Socket socket = null; - InputStream inputStream = null; - OutputStream outputStream = null; - try { - socket = new Socket(); - - socket.setSoTimeout(socketTimeout); - socket.connect( new InetSocketAddress( host, port), connectTimeout); - - inputStream = socket.getInputStream(); - outputStream = socket.getOutputStream(); - - SenderRequest senderRequest = new SenderRequest(); - senderRequest.setData(dataObjectList); - senderRequest.setClock(clock); - - outputStream.write(senderRequest.toBytes()); - - outputStream.flush(); - - // normal responseData.length < 100 - byte[] responseData = new byte[512]; - - int readCount = 0; - - while (true) { - int read = inputStream.read(responseData, readCount, responseData.length - readCount); - if (read <= 0) { - break; - } - readCount += read; - } - - if (readCount < 13) { - // seems zabbix server return "[]"? - senderResult.setbReturnEmptyArray(true); - } - - // header('ZBXD\1') + len + 0 - // 5 + 4 + 4 - String jsonString = new String( responseData, 13, readCount - 13, Charset.forName( "UTF-8")); - logger.info( "jsonString : " +jsonString ); - ObjectMapper mapper = new ObjectMapper(); - JsonNode json = mapper.readTree( jsonString ); - -// JSONObject json = JSON.parseObject(jsonString); - String info = json.get("info").asText(); - // example info: processed: 1; failed: 0; total: 1; seconds spent: - // 0.000053 - // after split: [, 1, 0, 1, 0.000053] - String[] split = PATTERN.split(info); - senderResult.setProcessed(Integer.parseInt(split[1])); - senderResult.setFailed(Integer.parseInt(split[2])); - senderResult.setTotal(Integer.parseInt(split[3])); - senderResult.setSpentSeconds(Float.parseFloat(split[4])); - - } finally { - if (socket != null) { - socket.close(); - } - if (inputStream != null) { - inputStream.close(); - } - if (outputStream != null) { - outputStream.close(); - } - } - - return senderResult; - } - - public String getHost() { - return host; - } - - public void setHost(String host) { - this.host = host; - } - - public int getPort() { - return port; - } - - public void setPort(int port) { - this.port = port; - } - - public int getConnectTimeout() { - return connectTimeout; - } - - public void setConnectTimeout(int connectTimeout) { - this.connectTimeout = connectTimeout; - } - - public int getSocketTimeout() { - return socketTimeout; - } - - public void setSocketTimeout(int socketTimeout) { - this.socketTimeout = socketTimeout; - } - -} diff --git a/subsys/metrics/reporter/src/main/resources/META-INF/beans.xml b/subsys/metrics/reporter/src/main/resources/META-INF/beans.xml deleted file mode 100644 index 25aab64176..0000000000 --- a/subsys/metrics/reporter/src/main/resources/META-INF/beans.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - \ No newline at end of file diff --git a/subsys/metrics/reporter/src/test/java/org/commonjava/indy/metrics/socket/Capitalizer.java b/subsys/metrics/reporter/src/test/java/org/commonjava/indy/metrics/socket/Capitalizer.java deleted file mode 100644 index fe59356b0c..0000000000 --- a/subsys/metrics/reporter/src/test/java/org/commonjava/indy/metrics/socket/Capitalizer.java +++ /dev/null @@ -1,123 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.metrics.socket; - -import com.fasterxml.jackson.databind.ObjectMapper; -import org.commonjava.indy.metrics.zabbix.sender.SenderRequest; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.BufferedInputStream; -import java.io.BufferedOutputStream; -import java.io.IOException; -import java.net.Socket; -import java.util.Arrays; -import java.util.concurrent.ConcurrentHashMap; - -/** - * Created by xiabai on 5/9/17. - */ -public class Capitalizer - implements Runnable -{ - private final Logger logger = LoggerFactory.getLogger( getClass() ); - - private Socket socket; - - private int clientNumber; - - private Expectation expect; - - private ConcurrentHashMap expections; - - public Capitalizer( Socket socket, int clientNumber, ConcurrentHashMap expections ) - { - this.socket = socket; - this.clientNumber = clientNumber; - this.expections = expections; - logger.info( "New connection with client# " + clientNumber + " at " + socket ); - } - - /** - */ - public void run() - { - BufferedInputStream in = null; - BufferedOutputStream out = null; - try - { - - in = new BufferedInputStream( socket.getInputStream() ); - ObjectMapper mapper = new ObjectMapper(); - byte[] responseData = new byte[1024]; - int readCount = 0; - int read = in.read( responseData, readCount, responseData.length - readCount ); - // } - byte[] responseDataTmp = Arrays.copyOfRange( responseData, 13, responseData.length ); - SenderRequest senderRequest = mapper.readValue( responseDataTmp, SenderRequest.class ); - out = new BufferedOutputStream( socket.getOutputStream() ); - ZabbixResult zr = new ZabbixResult( expections.get( senderRequest.getRequest() ).getSenderResult() ); - out.write( getResult( mapper.writeValueAsBytes( zr ) ) ); - out.flush(); - logger.info( senderRequest.toString() ); - - } - catch ( IOException e ) - { - logger.info( "Error handling client# " + clientNumber + ": " + e ); - } - finally - { - try - { - if ( in != null ) - { - in.close(); - } - if ( out != null ) - { - out.close(); - } - if ( socket != null ) - { - socket.close(); - } - } - catch ( IOException e ) - { - logger.info( "Couldn't close a socket, what's going on?" ); - } - logger.info( "Connection with client# " + clientNumber + " closed" ); - } - } - - private byte[] getResult( byte[] responseData ) - { - byte header[] = { 'Z', 'B', 'X', 'D', '\1' }; - - byte[] info = new byte[header.length + 4 + 4 + responseData.length]; - - System.arraycopy( header, 0, info, 0, header.length ); - - info[header.length] = (byte) ( responseData.length & 0xFF ); - info[header.length + 1] = (byte) ( ( responseData.length >> 8 ) & 0x00FF ); - info[header.length + 2] = (byte) ( ( responseData.length >> 16 ) & 0x0000FF ); - info[header.length + 3] = (byte) ( ( responseData.length >> 24 ) & 0x000000FF ); - - System.arraycopy( responseData, 0, info, header.length + 4 + 4, responseData.length ); - return info; - } -} diff --git a/subsys/metrics/reporter/src/test/java/org/commonjava/indy/metrics/socket/Expectation.java b/subsys/metrics/reporter/src/test/java/org/commonjava/indy/metrics/socket/Expectation.java deleted file mode 100644 index 96a20ce908..0000000000 --- a/subsys/metrics/reporter/src/test/java/org/commonjava/indy/metrics/socket/Expectation.java +++ /dev/null @@ -1,52 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.metrics.socket; - -import org.commonjava.indy.metrics.zabbix.sender.SenderResult; - -/** - * Created by xiabai on 5/9/17. - */ -public class Expectation -{ - private final String method; - - private final byte[] requestBody; - - private final SenderResult senderResult; - - public Expectation( String method, byte[] requestBody, SenderResult senderResult ) - { - this.method = method; - this.requestBody = requestBody; - this.senderResult = senderResult; - } - - public String getMethod() - { - return method; - } - - public byte[] getRequestBody() - { - return requestBody; - } - - public SenderResult getSenderResult() - { - return senderResult; - } -} diff --git a/subsys/metrics/reporter/src/test/java/org/commonjava/indy/metrics/socket/ZabbixResult.java b/subsys/metrics/reporter/src/test/java/org/commonjava/indy/metrics/socket/ZabbixResult.java deleted file mode 100644 index 0d9c79cfae..0000000000 --- a/subsys/metrics/reporter/src/test/java/org/commonjava/indy/metrics/socket/ZabbixResult.java +++ /dev/null @@ -1,50 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.metrics.socket; - -import org.commonjava.indy.metrics.zabbix.sender.SenderResult; - -/** - * Created by xiabai on 5/12/17. - */ -public class ZabbixResult -{ - private String info; - - private SenderResult result; - - public ZabbixResult( SenderResult senderResult ) - { - this.result = senderResult; - } - - public String getInfo() - { - return toString(); - } - - public void setInfo( String info ) - { - this.info = info; - } - - @Override - public String toString() - { - return "," + result.getProcessed() + "," + result.getFailed() + "," + result.getTotal() + "," - + result.getSpentSeconds(); - } -} diff --git a/subsys/metrics/reporter/src/test/java/org/commonjava/indy/metrics/socket/ZabbixSocketServer.java b/subsys/metrics/reporter/src/test/java/org/commonjava/indy/metrics/socket/ZabbixSocketServer.java deleted file mode 100644 index 5f1b821499..0000000000 --- a/subsys/metrics/reporter/src/test/java/org/commonjava/indy/metrics/socket/ZabbixSocketServer.java +++ /dev/null @@ -1,99 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.metrics.socket; - -import java.io.IOException; -import java.net.ServerSocket; -import java.util.concurrent.ConcurrentHashMap; - -import static org.commonjava.test.http.util.PortFinder.findPortFor; - -/** - * Created by xiabai on 5/9/17. - */ -public class ZabbixSocketServer - implements Runnable -{ - private ConcurrentHashMap expections = new ConcurrentHashMap(); - - private int port; - - public boolean isStartFlag() - { - return startFlag; - } - - public void setStartFlag( boolean startFlag ) - { - this.startFlag = startFlag; - } - - private boolean startFlag = true; - - public Expectation getExpection( String method ) - { - return expections.get( method ); - } - - public void setExpection( String method, Expectation expectation ) - { - expections.put( method, expectation ); - } - - public int getPort() - { - return port; - } - - public void run() - { - ServerSocket listener = null; - try - { - int clientNumber = 0; - listener = new ServerSocket( findPortFor( 16, p -> p ) ); - - this.port = listener.getLocalPort(); - - synchronized ( this ) - { - notifyAll(); - } - - while ( startFlag ) - { - - new Thread( new Capitalizer( listener.accept(), clientNumber++, expections ) ).start(); - } - } - catch ( IOException e ) - { - throw new RuntimeException( e ); - } - finally - { - try - { - listener.close(); - } - catch ( IOException e ) - { - e.printStackTrace(); - } - } - } - -} \ No newline at end of file diff --git a/subsys/metrics/reporter/src/test/java/org/commonjava/indy/metrics/zabbix/api/ZabbixAPITest.java b/subsys/metrics/reporter/src/test/java/org/commonjava/indy/metrics/zabbix/api/ZabbixAPITest.java deleted file mode 100644 index 81baf31205..0000000000 --- a/subsys/metrics/reporter/src/test/java/org/commonjava/indy/metrics/zabbix/api/ZabbixAPITest.java +++ /dev/null @@ -1,68 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.metrics.zabbix.api; - -import org.commonjava.test.http.expect.ExpectationServer; -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; - -import java.io.IOException; - -/** - * Created by xiabai on 5/12/17. - */ -public class ZabbixAPITest -{ - private final static String PATHPARTS = "/api_jsonrpc.php"; - - @Rule - public ExpectationServer server = new ExpectationServer(); - - String url = ""; - - @Before - public void start() throws Exception - { - server.expect( "POST", server.formatUrl( PATHPARTS ), new ZabbxiAPIHandler() ); - server.start(); - } - - @After - public void down() throws Exception - { -// server.stop(); - } - - @Test - public void gethostid() throws IOException - { - IndyZabbixApi api = new IndyZabbixApi( server.formatUrl( PATHPARTS ) ); - api.init(); - org.junit.Assert.assertEquals( "123", api.getHost( "test" ) ); - api.destroy(); - } - - @Test - public void getitemid() throws IOException - { - IndyZabbixApi api = new IndyZabbixApi( server.formatUrl( PATHPARTS ) ); - api.init(); - org.junit.Assert.assertEquals( "456", api.getItem( "test","test-item","123" ) ); - api.destroy(); - } -} diff --git a/subsys/metrics/reporter/src/test/java/org/commonjava/indy/metrics/zabbix/api/ZabbxiAPIHandler.java b/subsys/metrics/reporter/src/test/java/org/commonjava/indy/metrics/zabbix/api/ZabbxiAPIHandler.java deleted file mode 100644 index 077afa0740..0000000000 --- a/subsys/metrics/reporter/src/test/java/org/commonjava/indy/metrics/zabbix/api/ZabbxiAPIHandler.java +++ /dev/null @@ -1,86 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.metrics.zabbix.api; - -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.commons.io.IOUtils; -import org.commonjava.test.http.expect.ExpectationHandler; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.OutputStream; -import java.util.HashMap; -import java.util.Map; - -/** - * Created by xiabai on 5/12/17. - */ -public class ZabbxiAPIHandler - implements ExpectationHandler -{ - @Override - public void handle( HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse ) - throws ServletException, IOException - { - String json = IOUtils.toString( httpServletRequest.getInputStream() ); - ObjectMapper mapper = new ObjectMapper(); - Request request = mapper.readValue( json, Request.class ); - String result = ""; - if ( request.getMethod().equals( "host.get" ) ) - { - result = getHostids(); - } - if ( request.getMethod().equals( "item.get" ) ) - { - result = getItem(); - } - httpServletResponse.setCharacterEncoding( "UTF-8" ); - httpServletResponse.setContentType( "application/json; charset=utf-8" ); - httpServletResponse.setStatus( 200 ); - OutputStream out = httpServletResponse.getOutputStream(); - IOUtils.write( result, out ); - - } - - private String getHostids() throws JsonProcessingException - { - Map map = new HashMap(); - map.put( "jsonrpc", "2.0" ); - Map[] result = new HashMap[1]; - Map host = new HashMap(); - host.put( "hostid", "123" ); - result[0] = host; - map.put( "result", result ); - ObjectMapper mapper = new ObjectMapper(); - return mapper.writeValueAsString( map ); - } - - private String getItem() throws JsonProcessingException - { - Map map = new HashMap(); - map.put( "jsonrpc", "2.0" ); - Map[] result = new HashMap[1]; - Map host = new HashMap(); - host.put( "itemid", "456" ); - result[0] = host; - map.put( "result", result ); - ObjectMapper mapper = new ObjectMapper(); - return mapper.writeValueAsString( map ); - } -} diff --git a/subsys/metrics/reporter/src/test/java/org/commonjava/indy/metrics/zabbix/sender/ZabbixSenderTest.java b/subsys/metrics/reporter/src/test/java/org/commonjava/indy/metrics/zabbix/sender/ZabbixSenderTest.java deleted file mode 100644 index 4c1f7bf0bd..0000000000 --- a/subsys/metrics/reporter/src/test/java/org/commonjava/indy/metrics/zabbix/sender/ZabbixSenderTest.java +++ /dev/null @@ -1,91 +0,0 @@ -/** - * Copyright (C) 2011-2020 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.metrics.zabbix.sender; - -import org.commonjava.indy.metrics.socket.Expectation; -import org.commonjava.indy.metrics.socket.ZabbixSocketServer; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; - -import static org.junit.Assert.fail; - -/** - * Created by xiabai on 5/9/17. - */ -public class ZabbixSenderTest -{ - private ZabbixSocketServer socketServer; - - private DataObject dataObject; - - @Before - public void socketStart() throws Exception - { - socketServer = new ZabbixSocketServer(); - dataObject = new DataObject(); - dataObject.setClock( 1000 ); - dataObject.setHost( "test" ); - dataObject.setKey( "test-item" ); - dataObject.setValue( "123" ); - SenderRequest sr = new SenderRequest(); - sr.setRequest( "dataSend" ); - sr.setData( new ArrayList<>( Collections.singletonList( dataObject ) ) ); - SenderResult senderResult = new SenderResult(); - senderResult.setFailed( 0 ); - senderResult.setProcessed( 1 ); - senderResult.setTotal( 1 ); - senderResult.setSpentSeconds( 1l ); - System.out.print( sr.toString() ); - Expectation expectation = new Expectation( "sender data", sr.toBytes(), senderResult ); - socketServer.setExpection( "sender data", expectation ); - Thread t = new Thread( socketServer ); - t.start(); - - synchronized ( socketServer ) - { - socketServer.wait(); - } - } - - @After - public void shutDown() throws Exception - { - socketServer.setStartFlag( false ); - } - - @Test - public void dataSend() throws Exception - { - - ZabbixSender sender = new ZabbixSender( "localhost", socketServer.getPort() ); - try - { - - SenderResult result = sender.send( dataObject ); - org.junit.Assert.assertEquals( result.getProcessed(), result.getTotal() ); - } - catch ( IOException e ) - { - e.printStackTrace(); - fail( "Error trying to send/receive data" ); - } - } -} diff --git a/subsys/metrics/core/src/main/conf/conf.d/elasticsearch.properties b/subsys/metrics/src/main/conf/conf.d/elasticsearch.properties similarity index 100% rename from subsys/metrics/core/src/main/conf/conf.d/elasticsearch.properties rename to subsys/metrics/src/main/conf/conf.d/elasticsearch.properties diff --git a/subsys/metrics/core/src/main/conf/conf.d/metrics.conf b/subsys/metrics/src/main/conf/conf.d/metrics.conf similarity index 68% rename from subsys/metrics/core/src/main/conf/conf.d/metrics.conf rename to subsys/metrics/src/main/conf/conf.d/metrics.conf index 09c4a87af8..befce628d3 100644 --- a/subsys/metrics/core/src/main/conf/conf.d/metrics.conf +++ b/subsys/metrics/src/main/conf/conf.d/metrics.conf @@ -1,6 +1,5 @@ [metrics] enabled = false -reporter.enabled = true # Specify node prefix (on cluster). This prefix will be prepended to all metric names. Default empty. # @@ -43,7 +42,7 @@ measure.transport = true #measure.transport.repos = central # List of reporters (comma-separated). At present, Indy supports reporters: -# reporter = graphite,zabbix,elasticsearch,console +# reporter = graphite,elasticsearch,console # reporter = console @@ -70,35 +69,6 @@ graphite.reporter.jvm.period = 300 # Period of healthcheck item for reporting graphite.reporter.healthcheck.period = 600 -############################################ -# Zabbix reporter options -############################################ - -#The Zabbix API is a web based API and is shipped as part of the web frontend -# API URL used to access Zabbix from a web browser -zabbix.api.url = example.com -#Zabbix username for login Zabbix server(Zabbix API) -zabbix.user = test -#Zabbix password for login Zabbix server(Zabbix API) -zabbix.pwd = test -# Zabbix sender is a command line utility that may be used to send performance data to Zabbix server for processing. -# Host of Zabbix server for Zabbix sender -zabbix.sender.host = 192.168.1.1 -# Port of Zabbix server for Zabbix sender -zabbix.sender.port = 10051 -# This is the hostname of the current Indy instance, it also is host name of Zabbix monitoring -zabbix.indy.host = example.com -# Specific prefix for Zabbix Item -zabbix.reporter.prefix = local.one -# Indy's metrics item have three type: simple,jvm,healthcheck. -# Those type have different period of reporter -# Period of simple item for reporting -zabbix.reporter.simple.period = 30 -# Period of jvm item for reporting -zabbix.reporter.jvm.period = 300 -# Period of healthcheck item for reporting -zabbix.reporter.healthcheck.period = 600 - ############################################ # Elasticsearch reporter options ############################################ diff --git a/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/jaxrs/producer/IndyMetricProducer.java b/subsys/metrics/src/main/java/org/commonjava/indy/subsys/metrics/IndyMetricsStartupAction.java similarity index 55% rename from subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/jaxrs/producer/IndyMetricProducer.java rename to subsys/metrics/src/main/java/org/commonjava/indy/subsys/metrics/IndyMetricsStartupAction.java index f1a016ecb2..23582845f4 100644 --- a/subsys/metrics/reporter/src/main/java/org/commonjava/indy/metrics/jaxrs/producer/IndyMetricProducer.java +++ b/subsys/metrics/src/main/java/org/commonjava/indy/subsys/metrics/IndyMetricsStartupAction.java @@ -13,58 +13,31 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.commonjava.indy.metrics.jaxrs.producer; +package org.commonjava.indy.subsys.metrics; -import com.codahale.metrics.MetricRegistry; -import com.codahale.metrics.health.HealthCheckRegistry; import org.commonjava.indy.action.IndyLifecycleException; import org.commonjava.indy.action.StartupAction; -import org.commonjava.indy.metrics.IndyMetricsManager; +import org.commonjava.o11yphant.metrics.reporter.ReporterInitializer; import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; import javax.inject.Inject; -/** - * Created by xiabai on 2/27/17. - */ -public class IndyMetricProducer implements StartupAction +@ApplicationScoped +public class IndyMetricsStartupAction implements StartupAction { - - private static final String METRIC_ID = "metric"; - - @ApplicationScoped - @Produces - public MetricRegistry getMetricRegistry() - { - return new MetricRegistry(); - } - - @ApplicationScoped - @Produces - public HealthCheckRegistry getHealthCheckRegistry() { - return new HealthCheckRegistry(); - } - - @Override - public String getId() - { - return METRIC_ID; - } - @Inject - private IndyMetricsManager indyMetricsManager; + private ReporterInitializer reporterInitializer; @Override public void start() throws IndyLifecycleException { try { - indyMetricsManager.startReporter(); + reporterInitializer.init(); } catch ( Exception e ) { - throw new IndyLifecycleException( "Failed while attempting to start Metric reporters.", e ); + throw new IndyLifecycleException( "Failed to setup metrics!", e ); } } @@ -73,4 +46,10 @@ public int getStartupPriority() { return 10; } + + @Override + public String getId() + { + return "Indy metrics initialization"; + } } diff --git a/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/TrafficClassifier.java b/subsys/metrics/src/main/java/org/commonjava/indy/subsys/metrics/IndyTrafficClassifier.java similarity index 75% rename from subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/TrafficClassifier.java rename to subsys/metrics/src/main/java/org/commonjava/indy/subsys/metrics/IndyTrafficClassifier.java index 30682f09f1..b381d85e48 100644 --- a/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/TrafficClassifier.java +++ b/subsys/metrics/src/main/java/org/commonjava/indy/subsys/metrics/IndyTrafficClassifier.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.commonjava.indy.metrics; +package org.commonjava.indy.subsys.metrics; -import org.commonjava.cdi.util.weft.ThreadContext; import org.commonjava.indy.IndyRequestConstants; +import org.commonjava.o11yphant.metrics.TrafficClassifier; import org.commonjava.indy.model.core.HostedRepository; import org.commonjava.indy.model.core.RemoteRepository; import org.commonjava.indy.model.core.StoreType; @@ -33,65 +33,51 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.List; +import java.util.Optional; import java.util.Set; import static java.util.Arrays.asList; -import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; import static org.apache.commons.lang3.StringUtils.join; -import static org.commonjava.indy.metrics.TrafficClassifierConstants.FN_CONTENT; -import static org.commonjava.indy.metrics.TrafficClassifierConstants.FN_CONTENT_LISTING; -import static org.commonjava.indy.metrics.TrafficClassifierConstants.FN_CONTENT_MAVEN; -import static org.commonjava.indy.metrics.TrafficClassifierConstants.FN_CONTENT_NPM; -import static org.commonjava.indy.metrics.TrafficClassifierConstants.FN_MAVEN_DOWNLOAD; -import static org.commonjava.indy.metrics.TrafficClassifierConstants.FN_MAVEN_UPLOAD; -import static org.commonjava.indy.metrics.TrafficClassifierConstants.FN_METADATA; -import static org.commonjava.indy.metrics.TrafficClassifierConstants.FN_METADATA_MAVEN; -import static org.commonjava.indy.metrics.TrafficClassifierConstants.FN_METADATA_NPM; -import static org.commonjava.indy.metrics.TrafficClassifierConstants.FN_NPM_DOWNLOAD; -import static org.commonjava.indy.metrics.TrafficClassifierConstants.FN_NPM_UPLOAD; -import static org.commonjava.indy.metrics.TrafficClassifierConstants.FN_PROMOTION; -import static org.commonjava.indy.metrics.TrafficClassifierConstants.FN_REPO_MGMT; -import static org.commonjava.indy.metrics.TrafficClassifierConstants.FN_TRACKING_RECORD; +import static org.commonjava.indy.subsys.metrics.IndyTrafficClassifierConstants.FN_CONTENT; +import static org.commonjava.indy.subsys.metrics.IndyTrafficClassifierConstants.FN_CONTENT_LISTING; +import static org.commonjava.indy.subsys.metrics.IndyTrafficClassifierConstants.FN_CONTENT_MAVEN; +import static org.commonjava.indy.subsys.metrics.IndyTrafficClassifierConstants.FN_CONTENT_NPM; +import static org.commonjava.indy.subsys.metrics.IndyTrafficClassifierConstants.FN_MAVEN_DOWNLOAD; +import static org.commonjava.indy.subsys.metrics.IndyTrafficClassifierConstants.FN_MAVEN_UPLOAD; +import static org.commonjava.indy.subsys.metrics.IndyTrafficClassifierConstants.FN_METADATA; +import static org.commonjava.indy.subsys.metrics.IndyTrafficClassifierConstants.FN_METADATA_MAVEN; +import static org.commonjava.indy.subsys.metrics.IndyTrafficClassifierConstants.FN_METADATA_NPM; +import static org.commonjava.indy.subsys.metrics.IndyTrafficClassifierConstants.FN_NPM_DOWNLOAD; +import static org.commonjava.indy.subsys.metrics.IndyTrafficClassifierConstants.FN_NPM_UPLOAD; +import static org.commonjava.indy.subsys.metrics.IndyTrafficClassifierConstants.FN_PROMOTION; +import static org.commonjava.indy.subsys.metrics.IndyTrafficClassifierConstants.FN_REPO_MGMT; +import static org.commonjava.indy.subsys.metrics.IndyTrafficClassifierConstants.FN_TRACKING_RECORD; import static org.commonjava.indy.pkg.PackageTypeConstants.PKG_TYPE_MAVEN; import static org.commonjava.indy.pkg.PackageTypeConstants.PKG_TYPE_NPM; @ApplicationScoped -public class TrafficClassifier +public class IndyTrafficClassifier + extends TrafficClassifier { - private static final String CACHED_FUNCTIONS = "cached-functions"; - - private static final Set MODIFY_METHODS = new HashSet<>( asList( "POST", "PUT", "DELETE" ) ); - private static final Set FOLO_RECORD_ENDPOINTS = new HashSet<>( asList( "record", "report" ) ); private static final Set DEPRECATED_CONTENT_ENDPOINTS = - new HashSet<>( asList( "group", "hosted", "remote" ) ); - + new HashSet<>( asList( "group", "hosted", "remote" ) ); private SpecialPathManager specialPathManager; @Inject - public TrafficClassifier( SpecialPathManager specialPathManager ) + public IndyTrafficClassifier( SpecialPathManager specialPathManager ) { this.specialPathManager = specialPathManager; } - public List classifyFunctions( String restPath, String method ) + protected List calculateCachedFunctionClassifiers( String restPath, String method ) { - ThreadContext ctx = ThreadContext.getContext( false ); - if ( ctx != null ) - { - List cached = (List) ctx.get( CACHED_FUNCTIONS ); - if ( cached != null ) - { - return cached; - } - } - List result = new ArrayList<>(); - String[] pathParts = restPath.split("/" ); + String[] pathParts = restPath.split( "/" ); if ( pathParts.length >= 2 ) { String[] classifierParts = new String[pathParts.length - 1]; @@ -105,7 +91,7 @@ public List classifyFunctions( String restPath, String method ) result = singletonList( FN_PROMOTION ); } else if ( "admin".equals( classifierParts[0] ) && "stores".equals( classifierParts[1] ) - && classifierParts.length > 2 ) + && classifierParts.length > 2 ) { if ( MODIFY_METHODS.contains( method ) ) { @@ -118,14 +104,15 @@ else if ( "browse".equals( classifierParts[0] ) ) // this is a browse / list request result = singletonList( FN_CONTENT_LISTING ); } - else if ( ( "content".equals( classifierParts[0] ) && classifierParts.length >= 4 && ( restPath.endsWith( "/" ) - || restPath.endsWith( IndyRequestConstants.LISTING_HTML_FILE ) ) ) ) + else if ( ( "content".equals( classifierParts[0] ) && classifierParts.length >= 4 && ( + restPath.endsWith( "/" ) || restPath.endsWith( + IndyRequestConstants.LISTING_HTML_FILE ) ) ) ) { // this is an old version of the browse / list request result = singletonList( FN_CONTENT_LISTING ); } else if ( ( DEPRECATED_CONTENT_ENDPOINTS.contains( classifierParts[0] ) && ( restPath.endsWith( "/" ) - || restPath.endsWith( IndyRequestConstants.LISTING_HTML_FILE ) ) ) ) + || restPath.endsWith( IndyRequestConstants.LISTING_HTML_FILE ) ) ) ) { // this is an old, OLD version of the browse / list request result = singletonList( FN_CONTENT_LISTING ); @@ -178,8 +165,6 @@ else if ( DEPRECATED_CONTENT_ENDPOINTS.contains( classifierParts[0] ) && classif } } } - - ctx.put( CACHED_FUNCTIONS, result ); return result; } @@ -232,7 +217,8 @@ private boolean isValidContent( final String packageType, final String storeType return PackageTypeConstants.isValidPackageType( packageType ) && StoreType.get( storeType ) != null; } - private boolean isMetadata( final String packageType, final String storeType, final String storeName, final String[] pathParts, final int realPathStartIdx ) + private boolean isMetadata( final String packageType, final String storeType, final String storeName, + final String[] pathParts, final int realPathStartIdx ) { Location location = getLightweightLocation( packageType, storeType, storeName ); @@ -252,7 +238,8 @@ private Location getLightweightLocation( final String packageType, final String switch ( st ) { case remote: - return new RepositoryLocation( new RemoteRepository( packageType, storeName, "http://used.to.classify.requests.only/" ) ); + return new RepositoryLocation( new RemoteRepository( packageType, storeName, + "http://used.to.classify.requests.only/" ) ); case hosted: return new CacheOnlyLocation( new HostedRepository( packageType, storeName ) ); default: @@ -260,14 +247,4 @@ private Location getLightweightLocation( final String packageType, final String } } - public List getCachedFunctionClassifiers() - { - ThreadContext ctx = ThreadContext.getContext( false ); - if ( ctx != null ) - { - return (List) ctx.get( CACHED_FUNCTIONS ); - } - - return null; - } } diff --git a/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/TrafficClassifierConstants.java b/subsys/metrics/src/main/java/org/commonjava/indy/subsys/metrics/IndyTrafficClassifierConstants.java similarity index 75% rename from subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/TrafficClassifierConstants.java rename to subsys/metrics/src/main/java/org/commonjava/indy/subsys/metrics/IndyTrafficClassifierConstants.java index f91cb65a54..5b7cc00635 100644 --- a/subsys/metrics/core/src/main/java/org/commonjava/indy/metrics/TrafficClassifierConstants.java +++ b/subsys/metrics/src/main/java/org/commonjava/indy/subsys/metrics/IndyTrafficClassifierConstants.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.commonjava.indy.metrics; +package org.commonjava.indy.subsys.metrics; -public final class TrafficClassifierConstants +public final class IndyTrafficClassifierConstants { public static final String FN_CONTENT = "content"; @@ -47,12 +47,12 @@ public final class TrafficClassifierConstants public static final String FN_NPM_DOWNLOAD = "npm.download"; - public static final String[] FUNCTIONS = { - FN_CONTENT, FN_CONTENT_MAVEN, FN_CONTENT_NPM, FN_CONTENT_GENERIC, - FN_METADATA, FN_METADATA_MAVEN, FN_METADATA_NPM, - FN_PROMOTION, FN_TRACKING_RECORD, FN_CONTENT_LISTING, FN_REPO_MGMT, - FN_MAVEN_UPLOAD, FN_MAVEN_DOWNLOAD, FN_NPM_UPLOAD, FN_NPM_DOWNLOAD - }; + public static final String[] FUNCTIONS = + { FN_CONTENT, FN_CONTENT_MAVEN, FN_CONTENT_NPM, FN_CONTENT_GENERIC, FN_METADATA, FN_METADATA_MAVEN, + FN_METADATA_NPM, FN_PROMOTION, FN_TRACKING_RECORD, FN_CONTENT_LISTING, FN_REPO_MGMT, + FN_MAVEN_UPLOAD, FN_MAVEN_DOWNLOAD, FN_NPM_UPLOAD, FN_NPM_DOWNLOAD }; - private TrafficClassifierConstants(){} + private IndyTrafficClassifierConstants() + { + } } diff --git a/subsys/metrics/src/main/java/org/commonjava/indy/subsys/metrics/IndyTransportMetricConfigProducer.java b/subsys/metrics/src/main/java/org/commonjava/indy/subsys/metrics/IndyTransportMetricConfigProducer.java new file mode 100644 index 0000000000..330a29a1f2 --- /dev/null +++ b/subsys/metrics/src/main/java/org/commonjava/indy/subsys/metrics/IndyTransportMetricConfigProducer.java @@ -0,0 +1,120 @@ +/** + * Copyright (C) 2011-2020 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.metrics; + +import org.commonjava.indy.subsys.metrics.conf.IndyMetricsConfig; +import org.commonjava.maven.galley.config.TransportMetricConfig; +import org.commonjava.maven.galley.model.Location; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Produces; +import javax.inject.Inject; +import java.util.ArrayList; +import java.util.List; + +import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.commonjava.indy.model.core.StoreType.remote; +import static org.commonjava.indy.pkg.maven.model.MavenPackageTypeDescriptor.MAVEN_PKG_KEY; + +@ApplicationScoped +public class IndyTransportMetricConfigProducer +{ + private final Logger logger = LoggerFactory.getLogger( getClass() ); + + @Inject + private IndyMetricsConfig config; + + private TransportMetricConfig transportMetricConfig; + + @Produces + public TransportMetricConfig getTransportMetricConfig() + { + if ( config.isMeasureTransport() ) + { + setUpTransportMetricConfig(); + } + + return transportMetricConfig; + } + + private void setUpTransportMetricConfig() + { + logger.info( "Adding transport metrics to registry" ); + final String measureRepos = config.getMeasureTransportRepos(); + final List list = new ArrayList<>(); + if ( isNotBlank( measureRepos ) ) + { + String[] toks = measureRepos.split( "," ); + for ( String s : toks ) + { + s = s.trim(); + if ( isNotBlank( s ) ) + { + if ( s.indexOf( ":" ) < 0 ) + { + s = MAVEN_PKG_KEY + ":" + remote.singularEndpointName() + ":" + s; // use default + } + list.add( s ); + } + } + } + transportMetricConfig = new TransportMetricConfig() + { + @Override + public boolean isEnabled() + { + return true; + } + + @Override + public String getNodePrefix() + { + return config.getNodePrefix(); + } + + @Override + public String getMetricUniqueName( Location location ) + { + String locationName = location.getName(); + for ( String s : list ) + { + if ( s.equals( locationName ) ) + { + return normalizeName( s ); + } + + if ( s.endsWith( "*" ) ) // handle wildcard + { + String prefix = s.substring( 0, s.length() - 1 ); + if ( locationName.startsWith( prefix ) ) + { + return normalizeName( prefix ); + } + } + } + return null; + } + }; + } + + private String normalizeName( String name ) + { + return name.replaceAll( ":", "." ); + } + +} diff --git a/subsys/metrics/src/main/java/org/commonjava/indy/subsys/metrics/conf/IndyMetricsConfig.java b/subsys/metrics/src/main/java/org/commonjava/indy/subsys/metrics/conf/IndyMetricsConfig.java new file mode 100644 index 0000000000..72eab3d48e --- /dev/null +++ b/subsys/metrics/src/main/java/org/commonjava/indy/subsys/metrics/conf/IndyMetricsConfig.java @@ -0,0 +1,424 @@ +/** + * Copyright (C) 2011-2020 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.metrics.conf; + +import org.commonjava.indy.conf.IndyConfigInfo; +import org.commonjava.o11yphant.metrics.conf.ConsoleConfig; +import org.commonjava.o11yphant.metrics.conf.ELKConfig; +import org.commonjava.o11yphant.metrics.conf.GraphiteConfig; +import org.commonjava.o11yphant.metrics.conf.MetricsConfig; +import org.commonjava.o11yphant.metrics.conf.PrometheusConfig; +import org.commonjava.propulsor.config.annotation.ConfigName; +import org.commonjava.propulsor.config.annotation.SectionName; + +import javax.enterprise.context.ApplicationScoped; +import java.io.InputStream; +import java.util.Arrays; + +import static org.commonjava.indy.subsys.metrics.conf.IndyMetricsConfig.SECTION; + +@SectionName( SECTION ) +@ApplicationScoped +public class IndyMetricsConfig + implements IndyConfigInfo, MetricsConfig +{ + public static final String SECTION = "metrics"; + + public final static String NODE_PREFIX = "node.prefix"; + + private final static String REPORTER = "reporter"; + + private final static String REPORTER_CONSOLE_PERIOD = "console.reporter.period"; + + private final static String GRAPHITE_HOSTNAME = "graphite.hostname"; + + private final static String GRAPHITE_PORT = "graphite.port"; + + private final static String GRAPHITE_REPORTER_PREFIX = "graphite.reporter.prefix"; + + private final static String GRAPHITE_REPORTER_SIMPLE_PERIOD = "graphite.reporter.simple.period"; + + private final static String GRAPHITE_REPORTER_JVM_PERIOD = "graphite.reporter.jvm.period"; + + private final static String GRAPHITE_REPORTER_HEALTHCHECK_PERIOD = "graphite.reporter.healthcheck.period"; + + private final static String ENABLED = "enabled"; + + private static final String METER_RATIO = "meter.ratio"; + + private final static String ISPN_ENABLED = "ispn.enabled"; + + private final static String ISPN_GAUGES = "ispn.gauges"; + + private final static String ELK_REPORTER_PREFIX = "elk.reporter.prefix"; + + private final static String ELK_REPORTER_SIMPLE_PERIOD = "elk.reporter.simple.period"; + + private final static String ELK_REPORTER_JVM_PERIOD = "elk.reporter.jvm.period"; + + private final static String ELK_REPORTER_HEALTHCHECK_PERIOD = "elk.reporter.healthcheck.period"; + + private final static String ELK_REPORTER_INDEX = "elk.reporter.index"; + + private final static String ELK_REPORTER_HOSTS = "elk.reporter.hosts"; + + private static final String MEASURE_TRANSPORT = "measure.transport"; + + private static final String MEASURE_TRANSPORT_REPOS = "measure.transport.repos"; + + private final static String KOJI_ENABLED = "koji.enabled"; + + private final static String PATH_DB_ENABLED = "pathdb.enabled"; + + private final static String PATH_DB_OPERATIONS = "pathdb.operations"; + + private final static String PROMETHEUS_EXPRESSED_METRICS = "prometheus.expressed.metrics"; + + private static final String PROMETHEUS_NODE_LABEL = "prometheus.node.label"; + + private static final int DEFAULT_METER_RATIO = 1; + + private boolean ispnMetricsEnabled; + + private boolean pathDBMetricsEnabled = true; // default + + private String pathDBMetricsOperations; + + private String ispnGauges; + + private boolean measureTransport; + + private String measureTransportRepos; + + private int consolePeriod = 30; // default + + private String elkPrefix; + + private int elkSimplePeriod; + + private int elkJVMPeriod; + + private int elkHealthCheckPeriod; + + private String elkHosts; + + private String elkIndex; + + private String reporter; + + private String graphiteHostName; + + private int graphitePort; + + private String graphitePrefix; + + private int graphiteSimplePeriod; + + private int graphiteJVMPeriod; + + private int graphiteHealthcheckPeriod; + + private boolean metricsEnabled; + + private boolean kojiMetricEnabled; + + private String nodePrefix; + + private Integer meterRatio; + + private String prometheusExpressedMetrics; + + private String prometheusNodeLabel; + + public boolean isMeasureTransport() + { + return measureTransport; + } + + @ConfigName( NODE_PREFIX ) + public void setNodePrefix( String nodePrefix ) + { + this.nodePrefix = nodePrefix; + } + + public String getNodePrefix() + { + return nodePrefix; + } + + @ConfigName( MEASURE_TRANSPORT ) + public void setMeasureTransport( boolean measureTransport ) + { + this.measureTransport = measureTransport; + } + + public String getMeasureTransportRepos() + { + return measureTransportRepos; + } + + @ConfigName( MEASURE_TRANSPORT_REPOS ) + public void setMeasureTransportRepos( String measureTransportRepos ) + { + this.measureTransportRepos = measureTransportRepos; + } + + @ConfigName( REPORTER_CONSOLE_PERIOD ) + public void setConsolePeriod( int consolePeriod ) + { + this.consolePeriod = consolePeriod; + } + + @ConfigName( ELK_REPORTER_PREFIX ) + public void setElkPrefix( String elkPrefix ) + { + this.elkPrefix = elkPrefix; + } + + @ConfigName( ELK_REPORTER_SIMPLE_PERIOD ) + public void setElkSimplePeriod( int elkSimplePeriod ) + { + this.elkSimplePeriod = elkSimplePeriod; + } + + @ConfigName( ELK_REPORTER_JVM_PERIOD ) + public void setElkJVMPeriod( int elkJVMPeriod ) + { + this.elkJVMPeriod = elkJVMPeriod; + } + + @ConfigName( ELK_REPORTER_HEALTHCHECK_PERIOD ) + public void setElkHealthCheckPeriod( int elkHealthCheckPeriod ) + { + this.elkHealthCheckPeriod = elkHealthCheckPeriod; + } + + @ConfigName( ELK_REPORTER_HOSTS ) + public void setElkHosts( String elkHosts ) + { + this.elkHosts = elkHosts; + } + + @ConfigName( ELK_REPORTER_INDEX ) + public void setElkIndex( String elkIndex ) + { + this.elkIndex = elkIndex; + } + + public boolean isEnabled() + { + return metricsEnabled; + } + + @ConfigName( ENABLED ) + public void setEnabled( boolean metricsEnabled ) + { + this.metricsEnabled = metricsEnabled; + } + + @ConfigName( METER_RATIO ) + public void setMeterRatio( int meterRatio ) + { + this.meterRatio = meterRatio; + } + + @Override + public int getMeterRatio() + { + return meterRatio == null ? DEFAULT_METER_RATIO : meterRatio; + } + + @Override + public String getReporter() + { + return reporter; + } + + @ConfigName( REPORTER ) + public void setReporter( String reporter ) + { + this.reporter = reporter; + } + + @ConfigName( GRAPHITE_HOSTNAME ) + public void setGraphiteHostName( String graphiteHostName ) + { + this.graphiteHostName = graphiteHostName; + } + + @ConfigName( GRAPHITE_PORT ) + public void setGraphitePort( int graphitePort ) + { + this.graphitePort = graphitePort; + } + + @ConfigName( GRAPHITE_REPORTER_PREFIX ) + public void setGraphitePrefix( String graphitePrefix ) + { + this.graphitePrefix = graphitePrefix; + } + + @ConfigName( GRAPHITE_REPORTER_SIMPLE_PERIOD ) + public void setGraphiteSimplePeriod( int graphiteSimplePeriod ) + { + this.graphiteSimplePeriod = graphiteSimplePeriod; + } + + @ConfigName( GRAPHITE_REPORTER_JVM_PERIOD ) + public void setGraphiteJVMPeriod( int graphiteJVMPeriod ) + { + this.graphiteJVMPeriod = graphiteJVMPeriod; + } + + @ConfigName( GRAPHITE_REPORTER_HEALTHCHECK_PERIOD ) + public void setGraphiteHealthcheckPeriod( int graphiteHealthcheckPeriod ) + { + this.graphiteHealthcheckPeriod = graphiteHealthcheckPeriod; + } + + @ConfigName( KOJI_ENABLED ) + public void setKojiMetricEnabled( boolean kojiMetricEnabled ) + { + this.kojiMetricEnabled = kojiMetricEnabled; + } + + public boolean isKojiMetricEnabled() + { + return kojiMetricEnabled; + } + + public boolean isPathDBMetricsEnabled() + { + return pathDBMetricsEnabled; + } + + @ConfigName( PATH_DB_ENABLED ) + public void setPathDBMetricsEnabled( boolean pathDBMetricsEnabled ) + { + this.pathDBMetricsEnabled = pathDBMetricsEnabled; + } + + public String getPathDBMetricsOperations() + { + return pathDBMetricsOperations; + } + + @ConfigName( PATH_DB_OPERATIONS ) + public void setPathDBMetricsOperations( String pathDBMetricsOperations ) + { + this.pathDBMetricsOperations = pathDBMetricsOperations; + } + + @ConfigName( ISPN_ENABLED ) + public void setIspnMetricsEnabled( boolean ispnMetricsEnabled ) + { + this.ispnMetricsEnabled = ispnMetricsEnabled; + } + + public boolean isIspnMetricsEnabled() + { + return ispnMetricsEnabled; + } + + @ConfigName( ISPN_GAUGES ) + public void setIspnGauges( String ispnGauges ) + { + this.ispnGauges = ispnGauges; + } + + public String getIspnGauges() + { + return ispnGauges; + } + + @Override + public ConsoleConfig getConsoleConfig() + { + ConsoleConfig ret = new ConsoleConfig(); + ret.setConsolePeriodInSeconds( consolePeriod ); + return ret; + } + + @Override + public GraphiteConfig getGraphiteConfig() + { + GraphiteConfig ret = new GraphiteConfig(); + ret.setGraphiteHostName( graphiteHostName ); + ret.setGraphitePort( graphitePort ); + ret.setGraphitePeriodInSeconds( graphiteSimplePeriod ); + ret.setGraphitePrefix( graphitePrefix ); + ret.setGraphiteJVMPeriodInSeconds( graphiteJVMPeriod ); + ret.setGraphiteHealthcheckPeriodInSeconds( graphiteHealthcheckPeriod ); + return ret; + } + + @Override + public ELKConfig getELKConfig() + { + ELKConfig ret = new ELKConfig(); + ret.setElkHosts( elkHosts ); + ret.setElkIndex( elkIndex ); + ret.setElkPeriodInSeconds( elkSimplePeriod ); + ret.setElkJVMPeriodInSeconds( elkJVMPeriod ); + ret.setElkPrefix( elkPrefix ); + ret.setElkHealthCheckPeriodInSeconds( elkHealthCheckPeriod ); + return ret; + } + + public PrometheusConfig getPrometheusConfig() + { + PrometheusConfig ret = new PrometheusConfig(); + ret.setNodeLabel( prometheusNodeLabel ); + if ( prometheusExpressedMetrics != null ) + { + ret.setExpressedMetrics( Arrays.asList( prometheusExpressedMetrics.split( "\\s*,\\s*" ) ) ); + } + + return ret; + } + + public String getDefaultConfigFileName() + { + return "conf.d/metrics.conf"; + } + + public InputStream getDefaultConfig() + { + return Thread.currentThread().getContextClassLoader().getResourceAsStream( "default-metrics.conf" ); + } + + public String getPrometheusExpressedMetrics() + { + return prometheusExpressedMetrics; + } + + @ConfigName( PROMETHEUS_EXPRESSED_METRICS ) + public void setPrometheusExpressedMetrics( String prometheusExpressedMetrics ) + { + this.prometheusExpressedMetrics = prometheusExpressedMetrics; + } + + public String getPrometheusNodeLabel() + { + return prometheusNodeLabel; + } + + @ConfigName( PROMETHEUS_NODE_LABEL ) + public void setPrometheusNodeLabel( String prometheusNodeLabel ) + { + this.prometheusNodeLabel = prometheusNodeLabel; + } +} diff --git a/subsys/metrics/core/src/main/resources/META-INF/beans.xml b/subsys/metrics/src/main/resources/META-INF/beans.xml similarity index 76% rename from subsys/metrics/core/src/main/resources/META-INF/beans.xml rename to subsys/metrics/src/main/resources/META-INF/beans.xml index 0d565f116b..4c97b74b34 100644 --- a/subsys/metrics/core/src/main/resources/META-INF/beans.xml +++ b/subsys/metrics/src/main/resources/META-INF/beans.xml @@ -2,6 +2,6 @@ - org.commonjava.indy.metrics.jaxrs.interceptor.MetricsInterceptor + org.commonjava.o11yphant.metrics.interceptor.DefaultMetricsInterceptor \ No newline at end of file diff --git a/subsys/metrics/reporter/src/main/resources/default-metrics.conf b/subsys/metrics/src/main/resources/default-metrics.conf similarity index 68% rename from subsys/metrics/reporter/src/main/resources/default-metrics.conf rename to subsys/metrics/src/main/resources/default-metrics.conf index 57c12f43fa..befce628d3 100644 --- a/subsys/metrics/reporter/src/main/resources/default-metrics.conf +++ b/subsys/metrics/src/main/resources/default-metrics.conf @@ -1,6 +1,5 @@ [metrics] enabled = false -reporter.enabled = true # Specify node prefix (on cluster). This prefix will be prepended to all metric names. Default empty. # @@ -43,7 +42,7 @@ measure.transport = true #measure.transport.repos = central # List of reporters (comma-separated). At present, Indy supports reporters: -# reporter = graphite,zabbix,elasticsearch,console +# reporter = graphite,elasticsearch,console # reporter = console @@ -70,35 +69,6 @@ graphite.reporter.jvm.period = 300 # Period of healthcheck item for reporting graphite.reporter.healthcheck.period = 600 -############################################ -# Zabbix reporter options -############################################ - -#The Zabbix API is a web based API and is shipped as part of the web frontend -# API URL used to access Zabbix from a web browser -zabbix.api.url = example.com -#Zabbix username for login Zabbix server(Zabbix API) -zabbix.user = test -#Zabbix password for login Zabbix server(Zabbix API) -zabbix.pwd = test -# Zabbix sender is a command line utility that may be used to send performance data to Zabbix server for processing. -# Host of Zabbix server for Zabbix sender -zabbix.sender.host = 192.168.1.1 -# Port of Zabbix server for Zabbix sender -zabbix.sender.port = 10051 -# This is the hostname of the current Indy instance, it also is host name of Zabbix monitoring -zabbix.indy.host = example.com -# Specific prefix for Zabbix Item -zabbix.reporter.prefix = local.one -# Indy's metrics item have three type: simple,jvm,healthcheck -# Those type have different period of reporter -# Period of simple item for reporting -zabbix.reporter.simple.period = 30 -# Period of jvm item for reporting -zabbix.reporter.jvm.period = 300 -# Period of healthcheck item for reporting -zabbix.reporter.healthcheck.period = 600 - ############################################ # Elasticsearch reporter options ############################################ diff --git a/subsys/pom.xml b/subsys/pom.xml index 7dc07eaa85..76346ac546 100644 --- a/subsys/pom.xml +++ b/subsys/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-subsystems diff --git a/subsys/prefetch/pom.xml b/subsys/prefetch/pom.xml index baf36af786..2af8647771 100644 --- a/subsys/prefetch/pom.xml +++ b/subsys/prefetch/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT 4.0.0 diff --git a/test/db/pom.xml b/test/db/pom.xml index f766a232e7..1eae34909f 100644 --- a/test/db/pom.xml +++ b/test/db/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-test-db diff --git a/test/docker/gogs-test-appliance/pom.xml b/test/docker/gogs-test-appliance/pom.xml index 4f053d1763..d5d1f7e532 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 - 2.3.0-SNAPSHOT + 2.5.3-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 3f7aadd45a..67b3a974a5 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 - 2.3.0-SNAPSHOT + 2.5.3-SNAPSHOT indy-docker-keycloak-test-appliance diff --git a/test/docker/pom.xml b/test/docker/pom.xml index 0d0b3ead92..cba87f0d93 100644 --- a/test/docker/pom.xml +++ b/test/docker/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.3.0-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy.docker diff --git a/test/fixtures-core/pom.xml b/test/fixtures-core/pom.xml index cae70f8fc7..82f41ac1a2 100644 --- a/test/fixtures-core/pom.xml +++ b/test/fixtures-core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-test-fixtures-core diff --git a/test/pom.xml b/test/pom.xml index 609428a0de..3152c710a3 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-test diff --git a/test/providers-core/pom.xml b/test/providers-core/pom.xml index 7bd0bd67d5..4752ddc244 100644 --- a/test/providers-core/pom.xml +++ b/test/providers-core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-test-providers-core diff --git a/test/utils/pom.xml b/test/utils/pom.xml index becff4c07e..36035e3d1c 100644 --- a/test/utils/pom.xml +++ b/test/utils/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-test-utils diff --git a/tools/assemblies/pom.xml b/tools/assemblies/pom.xml index b7cca6fdca..17b673e661 100644 --- a/tools/assemblies/pom.xml +++ b/tools/assemblies/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.tools indy-tools - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-assemblies diff --git a/tools/pom.xml b/tools/pom.xml index b24ab6d924..e7bf2e1ad9 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy.tools diff --git a/uis/layover/app/favicon.ico b/uis/layover/app/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..4aae4b13999a8b2e81a285428bba0cdb24b0da25 GIT binary patch literal 1150 zcmeHH%}X0W6d$2CFIrT@(kg1qe(##i8VxxJ^=d&yTeKhnTSTEJ3ko70;?0BqfFOcb zkwOL0UPP}VVuPr}k8{;iARChWd^0kOidyKov%EL+K7McB{2nZ0W%N~4FwzZd^c7<@ zj4_3TT;#d))5aLZUYFmAuu0+ndcZ)TP=J(Tv4~Qs^dSD6!SkNW<@I>2zb!wX$M()H zmRDA=y0(Vj=`?&lAHaBhUhDon@|^R1jEs$=F{~h@X=qkeSZ)-3A3tG!VF7#l`vS|0 zag6MT*W>HQ&vn$keTPU}3}(cIO;|3P%nY|2)yI9!HIhC+B;y7uSrp1dmh#|Hi8=BK org.commonjava.indy.ui indy-uis - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT indy-ui-layover diff --git a/uis/pom.xml b/uis/pom.xml index deafb12a35..5a828b3c4f 100644 --- a/uis/pom.xml +++ b/uis/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.1-SNAPSHOT + 2.5.3-SNAPSHOT org.commonjava.indy.ui From 1ef06f8bb14e11b6c1fc1891d5f132de31ec9548 Mon Sep 17 00:00:00 2001 From: Gang Li Date: Mon, 9 Nov 2020 10:59:32 +0800 Subject: [PATCH 31/50] Add schedule expiration cache migrator * Add new data migrator to address expiration value type change. * Fix some NPE problem in ScheduleManager for new expiration value type change. --- ...spanScheduleExpirationMigrationAction.java | 98 +++++++++++++++++++ .../indy/core/expire/ScheduleManager.java | 18 ++-- .../expire/cache/ScheduleCacheProducer.java | 2 +- .../src/main/resources/infinispan-jdbc.xml | 14 +++ .../src/main/resources/infinispan.xml | 7 ++ 5 files changed, 131 insertions(+), 8 deletions(-) create mode 100644 core/src/main/java/org/commonjava/indy/core/expire/InfinispanScheduleExpirationMigrationAction.java diff --git a/core/src/main/java/org/commonjava/indy/core/expire/InfinispanScheduleExpirationMigrationAction.java b/core/src/main/java/org/commonjava/indy/core/expire/InfinispanScheduleExpirationMigrationAction.java new file mode 100644 index 0000000000..525e459a3c --- /dev/null +++ b/core/src/main/java/org/commonjava/indy/core/expire/InfinispanScheduleExpirationMigrationAction.java @@ -0,0 +1,98 @@ +/** + * Copyright (C) 2020 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.core.expire; + +import org.commonjava.indy.action.MigrationAction; +import org.commonjava.indy.audit.ChangeSummary; +import org.commonjava.indy.model.core.io.IndyObjectMapper; +import org.commonjava.indy.subsys.datafile.DataFileManager; +import org.commonjava.indy.subsys.infinispan.CacheHandle; +import org.commonjava.indy.subsys.infinispan.CacheProducer; +import org.infinispan.manager.EmbeddedCacheManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.inject.Inject; +import javax.inject.Named; +import java.util.Collections; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +@Named( "infinispan-schedule-expiration-migration" ) +public class InfinispanScheduleExpirationMigrationAction + implements MigrationAction +{ + private final Logger logger = LoggerFactory.getLogger( getClass() ); + + private static final String SCHEDULE_CACHE_V1 = "schedule-expire-cache"; + + @Inject + private DataFileManager dataFileManager; + + @Inject + private CacheProducer cacheProducer; + + @Inject + private CacheHandle scheduleCacheV2; + + @Inject + private IndyObjectMapper objectMapper; + + protected InfinispanScheduleExpirationMigrationAction() + { + } + + @Override + public boolean migrate() + { + final Set result = Collections.synchronizedSet( new HashSet<>() ); + if ( cacheProducer != null ) + { + EmbeddedCacheManager cacheManager = cacheProducer.getCacheManager(); + if ( cacheManager.cacheExists( SCHEDULE_CACHE_V1 ) ) + { + logger.info( "Migrating from legacy schedule expiration cache: {}", SCHEDULE_CACHE_V1 ); + cacheProducer.getCache( SCHEDULE_CACHE_V1 ).executeCache( c -> { + c.forEach( ( key, value ) -> { + if ( key instanceof ScheduleKey && value instanceof Map ) + { + logger.info( "Migrating from legacy cache: {}", key ); + scheduleCacheV2.put( (ScheduleKey) key, + new ScheduleValue( (ScheduleKey) key, (Map) value ) ); + result.add( (ScheduleKey) key ); + } + } ); + c.clearAsync(); + return null; + } ); + } + } + return !result.isEmpty(); + } + + @Override + public int getMigrationPriority() + { + return 99; + } + + @Override + public String getId() + { + return "Legacy ISPN schedule-expiration cache data migrator"; + } +} diff --git a/core/src/main/java/org/commonjava/indy/core/expire/ScheduleManager.java b/core/src/main/java/org/commonjava/indy/core/expire/ScheduleManager.java index 571a08a714..61433398c9 100644 --- a/core/src/main/java/org/commonjava/indy/core/expire/ScheduleManager.java +++ b/core/src/main/java/org/commonjava/indy/core/expire/ScheduleManager.java @@ -724,7 +724,13 @@ public void scheduled( final CacheEntryCreatedEvent if ( !e.isPre() ) { final ScheduleKey expiredKey = e.getKey(); - final Map expiredContent = e.getValue().getDataPayload(); + final ScheduleValue value = e.getValue(); + if ( value == null ) + { + logger.warn( "The cache value for ISPN creation event of schedule expiration is null, key is {} .", expiredKey ); + return; + } + final Map expiredContent = value.getDataPayload(); if ( expiredKey != null && expiredContent != null ) { logger.debug( "Expiration Created: {}", expiredKey ); @@ -747,15 +753,13 @@ public void expired( CacheEntryExpiredEvent e ) if ( !e.isPre() ) { final ScheduleKey expiredKey = e.getKey(); -/* - if ( scheduleEventLockCache.containsKey( expiredKey ) ) + final ScheduleValue value = e.getValue(); + if ( value == null ) { - logger.info( "Another instance {} is still handling expiration event for {}", expiredKey, - scheduleEventLockCache.containsKey( expiredKey ) ); + logger.warn( "The cache value for ISPN expired event of schedule expiration is null, key is {} .", expiredKey ); return; } -*/ - final Map expiredContent = e.getValue().getDataPayload(); + final Map expiredContent = value.getDataPayload(); if ( expiredKey != null && expiredContent != null ) { logger.debug( "EXPIRED: {}", expiredKey ); diff --git a/core/src/main/java/org/commonjava/indy/core/expire/cache/ScheduleCacheProducer.java b/core/src/main/java/org/commonjava/indy/core/expire/cache/ScheduleCacheProducer.java index e61b0224b9..a984078409 100644 --- a/core/src/main/java/org/commonjava/indy/core/expire/cache/ScheduleCacheProducer.java +++ b/core/src/main/java/org/commonjava/indy/core/expire/cache/ScheduleCacheProducer.java @@ -42,7 +42,7 @@ public class ScheduleCacheProducer @Inject private CacheProducer cacheProducer; - private static final String SCHEDULE_EXPIRE = "schedule-expire-cache"; + private static final String SCHEDULE_EXPIRE = "schedule-expire-cache-v2"; private static final String SCHEDULE_EVENT_LOCK = "schedule-event-lock-cache"; diff --git a/subsys/infinispan/src/main/resources/infinispan-jdbc.xml b/subsys/infinispan/src/main/resources/infinispan-jdbc.xml index 62a7ed313f..59540b4c17 100644 --- a/subsys/infinispan/src/main/resources/infinispan-jdbc.xml +++ b/subsys/infinispan/src/main/resources/infinispan-jdbc.xml @@ -140,6 +140,20 @@ + + + + + + + + + + + + + + 1.1.1 From 5476fc71a2f267ed5322370245c54e791a53e4e2 Mon Sep 17 00:00:00 2001 From: Gang Li Date: Tue, 2 Feb 2021 11:09:02 +0800 Subject: [PATCH 33/50] Update licnese header --- .../expire/InfinispanScheduleExpirationMigrationAction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/org/commonjava/indy/core/expire/InfinispanScheduleExpirationMigrationAction.java b/core/src/main/java/org/commonjava/indy/core/expire/InfinispanScheduleExpirationMigrationAction.java index 525e459a3c..a9b2b323d1 100644 --- a/core/src/main/java/org/commonjava/indy/core/expire/InfinispanScheduleExpirationMigrationAction.java +++ b/core/src/main/java/org/commonjava/indy/core/expire/InfinispanScheduleExpirationMigrationAction.java @@ -1,5 +1,5 @@ /** - * Copyright (C) 2020 Red Hat, Inc. + * Copyright (C) 2011-2020 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 e0ab5a7c9c87e3bb8ddfa73d762f8054f26fecfd Mon Sep 17 00:00:00 2001 From: Jeremy Whiting Date: Wed, 16 Dec 2020 17:55:59 +0000 Subject: [PATCH 34/50] Add Maven toolchains support to the environment. --- Jenkinsfile | 4 +++- toolchains.xml | 23 +++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 toolchains.xml diff --git a/Jenkinsfile b/Jenkinsfile index 631f5eb987..b2ff3becbc 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,9 @@ pipeline { } stage('Build') { steps { - sh 'mvn -B -V clean verify -DskipNpmConfig=false' + withEnv(['JAVA_HOME=/usr/lib/jvm/java-11-openjdk', 'JAVA_11_HOME=/usr/lib/jvm/java-11-openjdk']){ + sh 'mvn -B -V clean verify -DskipNpmConfig=false --global-toolchains toolchains.xml' + } } } stage('Function Test') { diff --git a/toolchains.xml b/toolchains.xml new file mode 100644 index 0000000000..23b39bfc97 --- /dev/null +++ b/toolchains.xml @@ -0,0 +1,23 @@ + + + + jdk + + 1.8 + OpenJDK + + + /usr/lib/jvm/java-1.8.0-openjdk + + + + jdk + + 11 + OpenJDK + + + /usr/lib/jvm/java-11-openjdk + + + From 82414ff03a8c69573835a685fca52f3e50f94f0c Mon Sep 17 00:00:00 2001 From: Jeremy Whiting Date: Mon, 21 Dec 2020 11:18:52 +0000 Subject: [PATCH 35/50] Set env variable for verify phase and set toolchains on command line. --- Jenkinsfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index b2ff3becbc..019aca5d43 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { } stage('Build') { steps { - withEnv(['JAVA_HOME=/usr/lib/jvm/java-11-openjdk', 'JAVA_11_HOME=/usr/lib/jvm/java-11-openjdk']){ + withEnv(['JAVA_HOME=/usr/lib/jvm/java-11-openjdk']){ sh 'mvn -B -V clean verify -DskipNpmConfig=false --global-toolchains toolchains.xml' } } @@ -27,7 +27,9 @@ pipeline { expression { env.CHANGE_ID != null } // Pull request } steps { - sh 'mvn -B -V verify -Prun-its -Pci -DskipNpmConfig=false' + withEnv(['JAVA_HOME=/usr/lib/jvm/java-11-openjdk', 'JAVA_11_HOME=/usr/lib/jvm/java-11-openjdk']){ + sh 'mvn -B -V verify -Prun-its -Pci -DskipNpmConfig=false --global-toolchains toolchains.xml' + } } } stage('Load OCP Mappings') { From a1c2d74adb4053888bb6cb4c76807ab95e6a61c2 Mon Sep 17 00:00:00 2001 From: Gang Li Date: Tue, 2 Feb 2021 11:34:44 +0800 Subject: [PATCH 36/50] Update license header --- toolchains.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/toolchains.xml b/toolchains.xml index 23b39bfc97..95d201ca9b 100644 --- a/toolchains.xml +++ b/toolchains.xml @@ -1,4 +1,21 @@ + jdk From a8d1ada7bf53717a51cc4e154e6038ae10ed424a Mon Sep 17 00:00:00 2001 From: Gang Li Date: Tue, 2 Feb 2021 04:17:37 +0000 Subject: [PATCH 37/50] [maven-release-plugin] prepare release indy-parent-2.5.3 --- addons/changelog/client-java/pom.xml | 2 +- addons/changelog/common/pom.xml | 2 +- addons/changelog/ftests/pom.xml | 2 +- addons/changelog/jaxrs/pom.xml | 2 +- addons/changelog/pom.xml | 2 +- addons/content-browse/client-java/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/event-audit/common/pom.xml | 2 +- addons/event-audit/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/path-mapped/common/pom.xml | 2 +- addons/path-mapped/jaxrs/pom.xml | 2 +- addons/path-mapped/model-java/pom.xml | 2 +- addons/path-mapped/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/repo-proxy/common/pom.xml | 2 +- addons/repo-proxy/ftests/pom.xml | 2 +- addons/repo-proxy/jaxrs/pom.xml | 2 +- addons/repo-proxy/pom.xml | 2 +- addons/revisions/common/pom.xml | 2 +- addons/revisions/jaxrs/pom.xml | 2 +- addons/revisions/pom.xml | 2 +- addons/sli/pom.xml | 2 +- api/pom.xml | 2 +- bindings/jaxrs/pom.xml | 2 +- bindings/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/common/pom.xml | 2 +- db/flat/pom.xml | 2 +- db/infinispan/pom.xml | 2 +- db/memory/pom.xml | 2 +- db/metrics/pom.xml | 2 +- db/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/pom.xml | 2 +- models/core-java/pom.xml | 2 +- models/pom.xml | 2 +- pom.xml | 248 +++++++++---------- rest/api/pom.xml | 2 +- rest/pom.xml | 2 +- subsys/cassandra/pom.xml | 2 +- subsys/cpool/pom.xml | 2 +- subsys/flatfile/pom.xml | 2 +- subsys/git/pom.xml | 2 +- subsys/groovy/pom.xml | 2 +- subsys/honeycomb/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/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 +- 127 files changed, 250 insertions(+), 250 deletions(-) diff --git a/addons/changelog/client-java/pom.xml b/addons/changelog/client-java/pom.xml index fccfa6ecea..03005e7230 100644 --- a/addons/changelog/client-java/pom.xml +++ b/addons/changelog/client-java/pom.xml @@ -20,7 +20,7 @@ indy-changelog org.commonjava.indy - 2.5.3-SNAPSHOT + 2.5.3 4.0.0 diff --git a/addons/changelog/common/pom.xml b/addons/changelog/common/pom.xml index 57d5b3b209..8b4bac2cb6 100644 --- a/addons/changelog/common/pom.xml +++ b/addons/changelog/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.5.3-SNAPSHOT + 2.5.3 indy-changelog-common Indy :: Add-Ons :: ChangeLog :: Common diff --git a/addons/changelog/ftests/pom.xml b/addons/changelog/ftests/pom.xml index 96c7f39d3b..d9be279ce5 100644 --- a/addons/changelog/ftests/pom.xml +++ b/addons/changelog/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.5.3-SNAPSHOT + 2.5.3 indy-ftests-changelog diff --git a/addons/changelog/jaxrs/pom.xml b/addons/changelog/jaxrs/pom.xml index 6c79eb16ab..bc3482d799 100644 --- a/addons/changelog/jaxrs/pom.xml +++ b/addons/changelog/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.5.3-SNAPSHOT + 2.5.3 indy-changelog-jaxrs diff --git a/addons/changelog/pom.xml b/addons/changelog/pom.xml index 8ae602d314..2ed64a94ab 100644 --- a/addons/changelog/pom.xml +++ b/addons/changelog/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.3-SNAPSHOT + 2.5.3 indy-changelog Indy :: Add-Ons :: ChangeLog :: Parent diff --git a/addons/content-browse/client-java/pom.xml b/addons/content-browse/client-java/pom.xml index f266cc9edb..cfaf5a6d19 100644 --- a/addons/content-browse/client-java/pom.xml +++ b/addons/content-browse/client-java/pom.xml @@ -20,7 +20,7 @@ indy-content-browse org.commonjava.indy - 2.5.3-SNAPSHOT + 2.5.3 4.0.0 diff --git a/addons/content-browse/common/pom.xml b/addons/content-browse/common/pom.xml index ce4e3f236c..3665a50f95 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 - 2.5.3-SNAPSHOT + 2.5.3 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 012f84fc22..ad9a89ceea 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 - 2.5.3-SNAPSHOT + 2.5.3 indy-ftests-content-browse diff --git a/addons/content-browse/jaxrs/pom.xml b/addons/content-browse/jaxrs/pom.xml index ae423857d5..20e7b830c8 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 - 2.5.3-SNAPSHOT + 2.5.3 indy-content-browse-jaxrs diff --git a/addons/content-browse/model-java/pom.xml b/addons/content-browse/model-java/pom.xml index a7af392084..084b9c879b 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 - 2.5.3-SNAPSHOT + 2.5.3 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 5ff13e35fe..884ede92bc 100644 --- a/addons/content-browse/pom.xml +++ b/addons/content-browse/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.3-SNAPSHOT + 2.5.3 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 66daedc465..4add71d449 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 - 2.5.3-SNAPSHOT + 2.5.3 4.0.0 diff --git a/addons/content-index/pom.xml b/addons/content-index/pom.xml index c2322d7b31..a743160323 100644 --- a/addons/content-index/pom.xml +++ b/addons/content-index/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.3-SNAPSHOT + 2.5.3 indy-content-index diff --git a/addons/diagnostics/client-java/pom.xml b/addons/diagnostics/client-java/pom.xml index c5ede55489..cda5ce410e 100644 --- a/addons/diagnostics/client-java/pom.xml +++ b/addons/diagnostics/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.5.3-SNAPSHOT + 2.5.3 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 aebef84fff..9be8541619 100644 --- a/addons/diagnostics/common/pom.xml +++ b/addons/diagnostics/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.5.3-SNAPSHOT + 2.5.3 indy-diagnostics-common Indy :: Add-Ons :: Diagnostic Tools :: Common diff --git a/addons/diagnostics/ftests/pom.xml b/addons/diagnostics/ftests/pom.xml index f3ebf54396..c01d901a92 100644 --- a/addons/diagnostics/ftests/pom.xml +++ b/addons/diagnostics/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.5.3-SNAPSHOT + 2.5.3 indy-ftests-diagnostics diff --git a/addons/diagnostics/jaxrs/pom.xml b/addons/diagnostics/jaxrs/pom.xml index 9337e870c6..880560c445 100644 --- a/addons/diagnostics/jaxrs/pom.xml +++ b/addons/diagnostics/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.5.3-SNAPSHOT + 2.5.3 indy-diagnostics-jaxrs diff --git a/addons/diagnostics/pom.xml b/addons/diagnostics/pom.xml index 9110ded1cd..d7d942990f 100644 --- a/addons/diagnostics/pom.xml +++ b/addons/diagnostics/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.3-SNAPSHOT + 2.5.3 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 8045a14493..f5dd645dbe 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 - 2.5.3-SNAPSHOT + 2.5.3 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 ce858ac4af..8c3f6c004d 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 - 2.5.3-SNAPSHOT + 2.5.3 indy-ftests-dot-maven diff --git a/addons/dot-maven/jaxrs/pom.xml b/addons/dot-maven/jaxrs/pom.xml index e83c3af8d1..0decfe5d6e 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 - 2.5.3-SNAPSHOT + 2.5.3 indy-dot-maven-jaxrs diff --git a/addons/dot-maven/pom.xml b/addons/dot-maven/pom.xml index d032b641d9..aa2243ab99 100644 --- a/addons/dot-maven/pom.xml +++ b/addons/dot-maven/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.3-SNAPSHOT + 2.5.3 indy-dot-maven diff --git a/addons/event-audit/common/pom.xml b/addons/event-audit/common/pom.xml index 03dc6ea910..630f656b47 100644 --- a/addons/event-audit/common/pom.xml +++ b/addons/event-audit/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-event-audit - 2.5.3-SNAPSHOT + 2.5.3 indy-event-audit-common diff --git a/addons/event-audit/pom.xml b/addons/event-audit/pom.xml index b3575aa795..71876b73a6 100644 --- a/addons/event-audit/pom.xml +++ b/addons/event-audit/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.3-SNAPSHOT + 2.5.3 indy-event-audit diff --git a/addons/folo/client-java/pom.xml b/addons/folo/client-java/pom.xml index 44424706cb..bb51f7ddbf 100644 --- a/addons/folo/client-java/pom.xml +++ b/addons/folo/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.5.3-SNAPSHOT + 2.5.3 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 07a797e179..a30d6ce1cc 100644 --- a/addons/folo/common/pom.xml +++ b/addons/folo/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.5.3-SNAPSHOT + 2.5.3 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 3fc7b8391b..1219c010f0 100644 --- a/addons/folo/ftests/pom.xml +++ b/addons/folo/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.5.3-SNAPSHOT + 2.5.3 indy-ftests-folo diff --git a/addons/folo/jaxrs/pom.xml b/addons/folo/jaxrs/pom.xml index e9eee682f4..e489aece7b 100644 --- a/addons/folo/jaxrs/pom.xml +++ b/addons/folo/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.5.3-SNAPSHOT + 2.5.3 indy-folo-jaxrs diff --git a/addons/folo/model-java/pom.xml b/addons/folo/model-java/pom.xml index 9302df6fc9..00525c7548 100644 --- a/addons/folo/model-java/pom.xml +++ b/addons/folo/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.5.3-SNAPSHOT + 2.5.3 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 65a989cf91..3088174ecc 100644 --- a/addons/folo/pom.xml +++ b/addons/folo/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.3-SNAPSHOT + 2.5.3 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 f393f99240..2439df876c 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 - 2.5.3-SNAPSHOT + 2.5.3 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 5fc39b61c8..1278991e62 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 - 2.5.3-SNAPSHOT + 2.5.3 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 52573d66cf..59142c4478 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 - 2.5.3-SNAPSHOT + 2.5.3 indy-ftests-hosted-by-archive diff --git a/addons/hosted-by-archive/jaxrs/pom.xml b/addons/hosted-by-archive/jaxrs/pom.xml index a05f372309..6e10917f2f 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 - 2.5.3-SNAPSHOT + 2.5.3 indy-hosted-by-archive-jaxrs diff --git a/addons/hosted-by-archive/pom.xml b/addons/hosted-by-archive/pom.xml index 1e941e0413..c98bff8ff0 100644 --- a/addons/hosted-by-archive/pom.xml +++ b/addons/hosted-by-archive/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.3-SNAPSHOT + 2.5.3 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 2c1406629e..da7c4ec3ac 100644 --- a/addons/httprox/common/pom.xml +++ b/addons/httprox/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.5.3-SNAPSHOT + 2.5.3 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 16ec5c4230..eb454e4c68 100644 --- a/addons/httprox/ftests/pom.xml +++ b/addons/httprox/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.5.3-SNAPSHOT + 2.5.3 indy-ftests-httprox diff --git a/addons/httprox/jaxrs/pom.xml b/addons/httprox/jaxrs/pom.xml index c813ea8749..e7fd4b663e 100644 --- a/addons/httprox/jaxrs/pom.xml +++ b/addons/httprox/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.5.3-SNAPSHOT + 2.5.3 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 c0d53e9dbd..bb1260071e 100644 --- a/addons/httprox/pom.xml +++ b/addons/httprox/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.3-SNAPSHOT + 2.5.3 indy-httprox diff --git a/addons/implied-repos/client-java/pom.xml b/addons/implied-repos/client-java/pom.xml index b817ad2682..4fb58b6489 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 - 2.5.3-SNAPSHOT + 2.5.3 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 2f5cac73db..d9f01d0d38 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 - 2.5.3-SNAPSHOT + 2.5.3 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 5e0444dc41..475d4c1a06 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 - 2.5.3-SNAPSHOT + 2.5.3 indy-ftests-implied-repos diff --git a/addons/implied-repos/model-java/pom.xml b/addons/implied-repos/model-java/pom.xml index baea66f227..db810e0b9b 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 - 2.5.3-SNAPSHOT + 2.5.3 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 b7269f3537..952291e364 100644 --- a/addons/implied-repos/pom.xml +++ b/addons/implied-repos/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.3-SNAPSHOT + 2.5.3 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 db6cae9c6b..9317b266b0 100644 --- a/addons/koji/client-java/pom.xml +++ b/addons/koji/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.5.3-SNAPSHOT + 2.5.3 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 36ab28333d..420cb155f9 100644 --- a/addons/koji/common/pom.xml +++ b/addons/koji/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.5.3-SNAPSHOT + 2.5.3 indy-koji-common Indy :: Add-Ons :: Koji Integration :: Common diff --git a/addons/koji/jaxrs/pom.xml b/addons/koji/jaxrs/pom.xml index 537cc4d342..ea2ec86813 100644 --- a/addons/koji/jaxrs/pom.xml +++ b/addons/koji/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.5.3-SNAPSHOT + 2.5.3 indy-koji-jaxrs diff --git a/addons/koji/model-java/pom.xml b/addons/koji/model-java/pom.xml index d1cc4b2440..fa6f50b5f6 100644 --- a/addons/koji/model-java/pom.xml +++ b/addons/koji/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.5.3-SNAPSHOT + 2.5.3 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 d1e14b69a9..c1547476b4 100644 --- a/addons/koji/pom.xml +++ b/addons/koji/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.3-SNAPSHOT + 2.5.3 indy-koji Indy :: Add-Ons :: Koji Integration :: Parent diff --git a/addons/path-mapped/common/pom.xml b/addons/path-mapped/common/pom.xml index d53a7ce146..1419cc3178 100644 --- a/addons/path-mapped/common/pom.xml +++ b/addons/path-mapped/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.5.3-SNAPSHOT + 2.5.3 indy-path-mapped-common diff --git a/addons/path-mapped/jaxrs/pom.xml b/addons/path-mapped/jaxrs/pom.xml index d78848c213..dd68f9b6fa 100644 --- a/addons/path-mapped/jaxrs/pom.xml +++ b/addons/path-mapped/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.5.3-SNAPSHOT + 2.5.3 indy-path-mapped-jaxrs diff --git a/addons/path-mapped/model-java/pom.xml b/addons/path-mapped/model-java/pom.xml index b924330151..d8b8a640db 100644 --- a/addons/path-mapped/model-java/pom.xml +++ b/addons/path-mapped/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.5.3-SNAPSHOT + 2.5.3 indy-path-mapped-model-java diff --git a/addons/path-mapped/pom.xml b/addons/path-mapped/pom.xml index aad7b46715..6c48444d78 100644 --- a/addons/path-mapped/pom.xml +++ b/addons/path-mapped/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.3-SNAPSHOT + 2.5.3 indy-path-mapped Indy :: Add-Ons :: Path Mapped :: Parent diff --git a/addons/pkg-maven/common/pom.xml b/addons/pkg-maven/common/pom.xml index 068b5cef9a..05814aee56 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 - 2.5.3-SNAPSHOT + 2.5.3 4.0.0 diff --git a/addons/pkg-maven/ftests/pom.xml b/addons/pkg-maven/ftests/pom.xml index 49fc2c2c86..3c2b531002 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 - 2.5.3-SNAPSHOT + 2.5.3 4.0.0 diff --git a/addons/pkg-maven/jaxrs/pom.xml b/addons/pkg-maven/jaxrs/pom.xml index b0242ebb50..388fa6adde 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 - 2.5.3-SNAPSHOT + 2.5.3 4.0.0 diff --git a/addons/pkg-maven/pom.xml b/addons/pkg-maven/pom.xml index c031f32be5..398957e2b2 100644 --- a/addons/pkg-maven/pom.xml +++ b/addons/pkg-maven/pom.xml @@ -20,7 +20,7 @@ indy-addons org.commonjava.indy - 2.5.3-SNAPSHOT + 2.5.3 4.0.0 diff --git a/addons/pkg-npm/common/pom.xml b/addons/pkg-npm/common/pom.xml index 65074d1ca8..80791bc464 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 - 2.5.3-SNAPSHOT + 2.5.3 4.0.0 diff --git a/addons/pkg-npm/ftests/pom.xml b/addons/pkg-npm/ftests/pom.xml index 6703bbcb9f..4b739f8a47 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 - 2.5.3-SNAPSHOT + 2.5.3 4.0.0 diff --git a/addons/pkg-npm/jaxrs/pom.xml b/addons/pkg-npm/jaxrs/pom.xml index 402e154d58..6d81016dd1 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 - 2.5.3-SNAPSHOT + 2.5.3 4.0.0 diff --git a/addons/pkg-npm/model-java/pom.xml b/addons/pkg-npm/model-java/pom.xml index 824b82cf32..cab46913cb 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 - 2.5.3-SNAPSHOT + 2.5.3 4.0.0 diff --git a/addons/pkg-npm/pom.xml b/addons/pkg-npm/pom.xml index 2e2fd5cd71..ab2aec5655 100644 --- a/addons/pkg-npm/pom.xml +++ b/addons/pkg-npm/pom.xml @@ -20,7 +20,7 @@ indy-addons org.commonjava.indy - 2.5.3-SNAPSHOT + 2.5.3 4.0.0 diff --git a/addons/pom.xml b/addons/pom.xml index f15cd80708..ffdae16496 100644 --- a/addons/pom.xml +++ b/addons/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-parent - 2.5.3-SNAPSHOT + 2.5.3 indy-addons diff --git a/addons/promote/client-java/pom.xml b/addons/promote/client-java/pom.xml index bfc5587d6f..ffa5dd8625 100644 --- a/addons/promote/client-java/pom.xml +++ b/addons/promote/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.5.3-SNAPSHOT + 2.5.3 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 3d9e859a46..84bb186ee2 100644 --- a/addons/promote/common/pom.xml +++ b/addons/promote/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.5.3-SNAPSHOT + 2.5.3 indy-promote-common Indy :: Add-Ons :: Artifact Promotion :: Common diff --git a/addons/promote/ftests/pom.xml b/addons/promote/ftests/pom.xml index bc0832acbe..9e6308e77e 100644 --- a/addons/promote/ftests/pom.xml +++ b/addons/promote/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.5.3-SNAPSHOT + 2.5.3 indy-ftests-promote diff --git a/addons/promote/jaxrs/pom.xml b/addons/promote/jaxrs/pom.xml index dfba29ca0a..1b90f4dd18 100644 --- a/addons/promote/jaxrs/pom.xml +++ b/addons/promote/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.5.3-SNAPSHOT + 2.5.3 indy-promote-jaxrs diff --git a/addons/promote/model-java/pom.xml b/addons/promote/model-java/pom.xml index 97c033c405..eefefcf896 100644 --- a/addons/promote/model-java/pom.xml +++ b/addons/promote/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.5.3-SNAPSHOT + 2.5.3 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 30901b960b..206758f70e 100644 --- a/addons/promote/pom.xml +++ b/addons/promote/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.3-SNAPSHOT + 2.5.3 indy-promote Indy :: Add-Ons :: Artifact Promotion :: Parent diff --git a/addons/repo-proxy/common/pom.xml b/addons/repo-proxy/common/pom.xml index 6d21dfe1bc..b02456b971 100644 --- a/addons/repo-proxy/common/pom.xml +++ b/addons/repo-proxy/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-repo-proxy - 2.5.3-SNAPSHOT + 2.5.3 indy-repo-proxy-common Indy :: Add-Ons :: Repository-Proxy :: Common diff --git a/addons/repo-proxy/ftests/pom.xml b/addons/repo-proxy/ftests/pom.xml index f8d3cb8442..86b7327468 100644 --- a/addons/repo-proxy/ftests/pom.xml +++ b/addons/repo-proxy/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-repo-proxy - 2.5.3-SNAPSHOT + 2.5.3 indy-ftests-repo-proxy diff --git a/addons/repo-proxy/jaxrs/pom.xml b/addons/repo-proxy/jaxrs/pom.xml index d44145e304..9fcf516c46 100644 --- a/addons/repo-proxy/jaxrs/pom.xml +++ b/addons/repo-proxy/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-repo-proxy - 2.5.3-SNAPSHOT + 2.5.3 indy-repo-proxy-jaxrs diff --git a/addons/repo-proxy/pom.xml b/addons/repo-proxy/pom.xml index b8baa6c481..c297a45f25 100644 --- a/addons/repo-proxy/pom.xml +++ b/addons/repo-proxy/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.3-SNAPSHOT + 2.5.3 indy-repo-proxy Indy :: Add-Ons :: Repository-Proxy :: Parent diff --git a/addons/revisions/common/pom.xml b/addons/revisions/common/pom.xml index 43f2f79b57..2ca1001dd1 100644 --- a/addons/revisions/common/pom.xml +++ b/addons/revisions/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-revisions - 2.5.3-SNAPSHOT + 2.5.3 indy-revisions-common Indy :: Add-Ons :: Revisions :: Common diff --git a/addons/revisions/jaxrs/pom.xml b/addons/revisions/jaxrs/pom.xml index ca45c6db06..4886d886cf 100644 --- a/addons/revisions/jaxrs/pom.xml +++ b/addons/revisions/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-revisions - 2.5.3-SNAPSHOT + 2.5.3 indy-revisions-jaxrs diff --git a/addons/revisions/pom.xml b/addons/revisions/pom.xml index fe1178d04c..4f488eb2d2 100644 --- a/addons/revisions/pom.xml +++ b/addons/revisions/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.3-SNAPSHOT + 2.5.3 indy-revisions Indy :: Add-Ons :: Revisions :: Parent diff --git a/addons/sli/pom.xml b/addons/sli/pom.xml index e0c6d912a5..198e6373e7 100644 --- a/addons/sli/pom.xml +++ b/addons/sli/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.3-SNAPSHOT + 2.5.3 indy-sli Indy :: Add-Ons :: Service Level Indicators Reporting :: JAX-RS diff --git a/api/pom.xml b/api/pom.xml index 39212affa7..93cfb400e9 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.3-SNAPSHOT + 2.5.3 indy-api diff --git a/bindings/jaxrs/pom.xml b/bindings/jaxrs/pom.xml index 9c12411f4a..8347baf4a2 100644 --- a/bindings/jaxrs/pom.xml +++ b/bindings/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-bindings - 2.5.3-SNAPSHOT + 2.5.3 indy-bindings-jaxrs diff --git a/bindings/pom.xml b/bindings/pom.xml index 97e8301eef..a1eb34e6e4 100644 --- a/bindings/pom.xml +++ b/bindings/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-parent - 2.5.3-SNAPSHOT + 2.5.3 indy-bindings diff --git a/boot/jaxrs/pom.xml b/boot/jaxrs/pom.xml index e3a571cc17..aa2b105bea 100644 --- a/boot/jaxrs/pom.xml +++ b/boot/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.boot indy-booters - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy.boot diff --git a/boot/pom.xml b/boot/pom.xml index 223a0fc7f2..7f6948aec4 100644 --- a/boot/pom.xml +++ b/boot/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy.boot diff --git a/clients/core-java/pom.xml b/clients/core-java/pom.xml index 7ca907077d..85f483d27b 100644 --- a/clients/core-java/pom.xml +++ b/clients/core-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-clients-parent - 2.5.3-SNAPSHOT + 2.5.3 indy-client-core-java diff --git a/clients/pom.xml b/clients/pom.xml index a44df42b95..73bf7376ea 100644 --- a/clients/pom.xml +++ b/clients/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.3-SNAPSHOT + 2.5.3 indy-clients-parent diff --git a/core/pom.xml b/core/pom.xml index 1f38ce065f..675ad4f186 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.3-SNAPSHOT + 2.5.3 indy-core diff --git a/db/common/pom.xml b/db/common/pom.xml index 07dd423ce8..b020d33c2b 100644 --- a/db/common/pom.xml +++ b/db/common/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-db - 2.5.3-SNAPSHOT + 2.5.3 indy-db-common diff --git a/db/flat/pom.xml b/db/flat/pom.xml index d76752706c..2adc99cac6 100644 --- a/db/flat/pom.xml +++ b/db/flat/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.5.3-SNAPSHOT + 2.5.3 indy-db-flat diff --git a/db/infinispan/pom.xml b/db/infinispan/pom.xml index b24857eec1..e5e495fc1c 100644 --- a/db/infinispan/pom.xml +++ b/db/infinispan/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-db - 2.5.3-SNAPSHOT + 2.5.3 indy-db-infinispan diff --git a/db/memory/pom.xml b/db/memory/pom.xml index 7fc5959830..3076822d86 100644 --- a/db/memory/pom.xml +++ b/db/memory/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.5.3-SNAPSHOT + 2.5.3 indy-db-memory diff --git a/db/metrics/pom.xml b/db/metrics/pom.xml index 7fef51480b..30c3801370 100644 --- a/db/metrics/pom.xml +++ b/db/metrics/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.5.3-SNAPSHOT + 2.5.3 indy-db-metrics diff --git a/db/pom.xml b/db/pom.xml index 0e4476ed9b..10706a8649 100644 --- a/db/pom.xml +++ b/db/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.3-SNAPSHOT + 2.5.3 indy-db diff --git a/deployments/launcher/pom.xml b/deployments/launcher/pom.xml index 10031cde3e..3f7d7330c1 100644 --- a/deployments/launcher/pom.xml +++ b/deployments/launcher/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-deployments - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy.launch diff --git a/deployments/pom.xml b/deployments/pom.xml index 6a29e6cfe4..9fd9a6b656 100644 --- a/deployments/pom.xml +++ b/deployments/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.3-SNAPSHOT + 2.5.3 indy-deployments diff --git a/embedder/pom.xml b/embedder/pom.xml index 047d9d7a8c..fa54b3f8e2 100644 --- a/embedder/pom.xml +++ b/embedder/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy.embed diff --git a/filers/default/pom.xml b/filers/default/pom.xml index 41f50d630a..3553f143de 100644 --- a/filers/default/pom.xml +++ b/filers/default/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-file-managers - 2.5.3-SNAPSHOT + 2.5.3 indy-filer-default diff --git a/filers/pom.xml b/filers/pom.xml index e079985111..24b9381e02 100644 --- a/filers/pom.xml +++ b/filers/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.3-SNAPSHOT + 2.5.3 indy-file-managers diff --git a/ftests/common/pom.xml b/ftests/common/pom.xml index 2edb05c2e1..334e026b06 100644 --- a/ftests/common/pom.xml +++ b/ftests/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-ftests-parent - 2.5.3-SNAPSHOT + 2.5.3 indy-ftests-common diff --git a/ftests/core/pom.xml b/ftests/core/pom.xml index 88cde499f2..9b349dae34 100644 --- a/ftests/core/pom.xml +++ b/ftests/core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-ftests-parent - 2.5.3-SNAPSHOT + 2.5.3 indy-ftests-core diff --git a/ftests/pom.xml b/ftests/pom.xml index 63ddc4b86e..3c4d3fb256 100644 --- a/ftests/pom.xml +++ b/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.3-SNAPSHOT + 2.5.3 indy-ftests-parent diff --git a/models/core-java/pom.xml b/models/core-java/pom.xml index 3c43b700c5..b8e436fe32 100644 --- a/models/core-java/pom.xml +++ b/models/core-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-models-parent - 2.5.3-SNAPSHOT + 2.5.3 indy-model-core-java diff --git a/models/pom.xml b/models/pom.xml index 0331d1dd37..aabfe0121f 100644 --- a/models/pom.xml +++ b/models/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.3-SNAPSHOT + 2.5.3 indy-models-parent diff --git a/pom.xml b/pom.xml index 741a18bfa7..50d395b48c 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.commonjava.indy indy-parent - 2.5.3-SNAPSHOT + 2.5.3 pom @@ -37,7 +37,7 @@ scm:git:https://github.com/CommonJava/indy scm:git:https://github.com/CommonJava/indy http://github.com/Commonjava/indy - indy-parent-2.5.2 + indy-parent-2.5.3 @@ -187,7 +187,7 @@ org.commonjava.indy.ui indy-ui-layover - 2.5.3-SNAPSHOT + 2.5.3 runtime @@ -195,22 +195,22 @@ org.commonjava.indy indy-model-core-java - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-api - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-core - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-core - 2.5.3-SNAPSHOT + 2.5.3 tar.gz confset provided @@ -218,32 +218,32 @@ org.commonjava.indy indy-db-flat - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-db-metrics - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-db-common - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-db-infinispan - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-bindings-jaxrs - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy.launch indy-launcher - 2.5.3-SNAPSHOT + 2.5.3 tar.gz skinny provided @@ -251,7 +251,7 @@ org.commonjava.indy.launch indy-launcher - 2.5.3-SNAPSHOT + 2.5.3 tar.gz complete provided @@ -259,7 +259,7 @@ org.commonjava.indy.launch indy-launcher - 2.5.3-SNAPSHOT + 2.5.3 tar.gz data provided @@ -267,7 +267,7 @@ org.commonjava.indy.launch indy-launcher - 2.5.3-SNAPSHOT + 2.5.3 tar.gz etc provided @@ -276,17 +276,17 @@ org.commonjava.indy indy-revisions-jaxrs - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-revisions-common - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-revisions-common - 2.5.3-SNAPSHOT + 2.5.3 tar.gz confset provided @@ -294,7 +294,7 @@ org.commonjava.indy indy-revisions-common - 2.5.3-SNAPSHOT + 2.5.3 tar.gz uiset provided @@ -302,12 +302,12 @@ org.commonjava.indy indy-dot-maven-common - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-dot-maven-common - 2.5.3-SNAPSHOT + 2.5.3 tar.gz dataset provided @@ -315,22 +315,22 @@ org.commonjava.indy indy-dot-maven-jaxrs - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-ftests-dot-maven - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-httprox-common - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-httprox-common - 2.5.3-SNAPSHOT + 2.5.3 tar.gz confset provided @@ -338,17 +338,17 @@ org.commonjava.indy indy-ftests-httprox - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-content-index - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-content-index - 2.5.3-SNAPSHOT + 2.5.3 tar.gz confset provided @@ -356,51 +356,51 @@ org.commonjava.indy indy-db-memory - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-test-db - 2.5.3-SNAPSHOT + 2.5.3 test org.commonjava.indy indy-test-fixtures-core - 2.5.3-SNAPSHOT + 2.5.3 test org.commonjava.indy indy-test-providers-core - 2.5.3-SNAPSHOT + 2.5.3 test org.commonjava.indy indy-test-utils - 2.5.3-SNAPSHOT + 2.5.3 test org.commonjava.indy indy-filer-default - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-subsys-jaxrs - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-subsys-honeycomb - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-subsys-honeycomb - 2.5.3-SNAPSHOT + 2.5.3 tar.gz confset provided @@ -408,17 +408,17 @@ org.commonjava.indy indy-subsys-flatfile - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-subsys-cassandra - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-subsys-cassandra - 2.5.3-SNAPSHOT + 2.5.3 tar.gz confset provided @@ -426,79 +426,79 @@ org.commonjava.indy indy-subsys-infinispan - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-subsys-http - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-subsys-git - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-subsys-groovy - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-subsys-prefetch - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-subsys-cpool - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-client-core-java - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-ftests-common - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-ftests-core - 2.5.3-SNAPSHOT + 2.5.3 test org.commonjava.indy indy-folo-jaxrs - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-ftests-folo - 2.5.3-SNAPSHOT + 2.5.3 test org.commonjava.indy indy-folo-client-java - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-folo-model-java - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-folo-common - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-folo-common - 2.5.3-SNAPSHOT + 2.5.3 tar.gz dataset provided @@ -506,7 +506,7 @@ org.commonjava.indy indy-folo-common - 2.5.3-SNAPSHOT + 2.5.3 tar.gz confset provided @@ -514,33 +514,33 @@ org.commonjava.indy indy-promote-jaxrs - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-ftests-promote - 2.5.3-SNAPSHOT + 2.5.3 test org.commonjava.indy indy-promote-client-java - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-promote-model-java - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-promote-common - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-promote-common - 2.5.3-SNAPSHOT + 2.5.3 tar.gz confset provided @@ -548,7 +548,7 @@ org.commonjava.indy indy-promote-common - 2.5.3-SNAPSHOT + 2.5.3 tar.gz dataset provided @@ -556,19 +556,19 @@ org.commonjava.indy indy-promote-common - 2.5.3-SNAPSHOT + 2.5.3 dataset provided org.commonjava.indy indy-implied-repos-common - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-implied-repos-common - 2.5.3-SNAPSHOT + 2.5.3 tar.gz confset provided @@ -576,37 +576,37 @@ org.commonjava.indy indy-implied-repos-model-java - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-implied-repos-client-java - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-ftests-implied-repos - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy.embed indy-embedder - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy.boot indy-booter-jaxrs - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-subsys-keycloak - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-subsys-keycloak - 2.5.3-SNAPSHOT + 2.5.3 tar.gz confset provided @@ -614,7 +614,7 @@ org.commonjava.indy indy-subsys-infinispan - 2.5.3-SNAPSHOT + 2.5.3 tar.gz confset provided @@ -622,7 +622,7 @@ org.commonjava.indy indy-subsys-prefetch - 2.5.3-SNAPSHOT + 2.5.3 tar.gz confset provided @@ -631,7 +631,7 @@ org.commonjava.indy indy-koji-common - 2.5.3-SNAPSHOT + 2.5.3 tar.gz confset provided @@ -639,103 +639,103 @@ org.commonjava.indy indy-koji-common - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-koji-model-java - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-koji-client-java - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-koji-jaxrs - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-path-mapped-common - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-path-mapped-model-java - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-path-mapped-jaxrs - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-pkg-maven-common - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-pkg-maven-jaxrs - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-pkg-npm-jaxrs - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-ftests-pkg-maven - 2.5.3-SNAPSHOT + 2.5.3 test org.commonjava.indy indy-ftests-pkg-npm - 2.5.3-SNAPSHOT + 2.5.3 test org.commonjava.indy indy-pkg-npm-common - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-pkg-npm-model-java - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-diagnostics-jaxrs - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-diagnostics-client-java - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-diagnostics-common - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-ftests-diagnostics - 2.5.3-SNAPSHOT + 2.5.3 test org.commonjava.indy indy-diagnostics-common - 2.5.3-SNAPSHOT + 2.5.3 confset tar.gz provided @@ -743,28 +743,28 @@ org.commonjava.indy indy-hosted-by-archive-common - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-hosted-by-archive-client-java - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-ftests-hosted-by-archive - 2.5.3-SNAPSHOT + 2.5.3 test org.commonjava.indy indy-hosted-by-archive-jaxrs - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-hosted-by-archive-common - 2.5.3-SNAPSHOT + 2.5.3 confset tar.gz @@ -772,12 +772,12 @@ org.commonjava.indy indy-subsys-metrics - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-subsys-metrics - 2.5.3-SNAPSHOT + 2.5.3 confset tar.gz provided @@ -786,21 +786,21 @@ org.commonjava.indy indy-sli - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy.rest indy-rest-api yaml - 2.5.3-SNAPSHOT + 2.5.3 provided org.commonjava.indy.rest indy-rest-api json - 2.5.3-SNAPSHOT + 2.5.3 provided @@ -839,33 +839,33 @@ org.commonjava.indy indy-content-browse-common - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-content-browse-jaxrs - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-ftests-content-browse - 2.5.3-SNAPSHOT + 2.5.3 test org.commonjava.indy indy-content-browse-model-java - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-content-browse-client-java - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-content-browse-common - 2.5.3-SNAPSHOT + 2.5.3 confset tar.gz provided @@ -873,35 +873,35 @@ org.commonjava.indy indy-content-browse-ui - 2.5.3-SNAPSHOT + 2.5.3 reactui tar.gz org.commonjava.indy indy-changelog-common - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-changelog-client-java - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-ftests-changelog - 2.5.3-SNAPSHOT + 2.5.3 test org.commonjava.indy indy-changelog-jaxrs - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-changelog-common - 2.5.3-SNAPSHOT + 2.5.3 confset tar.gz @@ -919,12 +919,12 @@ org.commonjava.indy indy-event-audit-common - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-event-audit-common - 2.5.3-SNAPSHOT + 2.5.3 confset tar.gz provided @@ -939,23 +939,23 @@ org.commonjava.indy indy-repo-proxy-common - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-repo-proxy-jaxrs - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy indy-ftests-repo-proxy - 2.5.3-SNAPSHOT + 2.5.3 test org.commonjava.indy indy-repo-proxy-common - 2.5.3-SNAPSHOT + 2.5.3 confset tar.gz diff --git a/rest/api/pom.xml b/rest/api/pom.xml index bc8f4433af..5fa6fef516 100644 --- a/rest/api/pom.xml +++ b/rest/api/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.rest indy-rest-parent - 2.5.3-SNAPSHOT + 2.5.3 indy-rest-api diff --git a/rest/pom.xml b/rest/pom.xml index 3b076bd208..0ddcd739d2 100644 --- a/rest/pom.xml +++ b/rest/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy.rest diff --git a/subsys/cassandra/pom.xml b/subsys/cassandra/pom.xml index a9d6c19826..4009a96f2a 100644 --- a/subsys/cassandra/pom.xml +++ b/subsys/cassandra/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-subsystems - 2.5.3-SNAPSHOT + 2.5.3 indy-subsys-cassandra diff --git a/subsys/cpool/pom.xml b/subsys/cpool/pom.xml index 2742ca6441..55d779cec7 100644 --- a/subsys/cpool/pom.xml +++ b/subsys/cpool/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.3-SNAPSHOT + 2.5.3 indy-subsys-cpool diff --git a/subsys/flatfile/pom.xml b/subsys/flatfile/pom.xml index 38c7412c5e..c2a3a4dfcd 100644 --- a/subsys/flatfile/pom.xml +++ b/subsys/flatfile/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.3-SNAPSHOT + 2.5.3 indy-subsys-flatfile diff --git a/subsys/git/pom.xml b/subsys/git/pom.xml index e6d5f60844..8c33b49ff1 100644 --- a/subsys/git/pom.xml +++ b/subsys/git/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.3-SNAPSHOT + 2.5.3 indy-subsys-git diff --git a/subsys/groovy/pom.xml b/subsys/groovy/pom.xml index 062246200a..5248779c70 100644 --- a/subsys/groovy/pom.xml +++ b/subsys/groovy/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.3-SNAPSHOT + 2.5.3 indy-subsys-groovy diff --git a/subsys/honeycomb/pom.xml b/subsys/honeycomb/pom.xml index 68b0e5de15..446a858d4b 100644 --- a/subsys/honeycomb/pom.xml +++ b/subsys/honeycomb/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.5.3-SNAPSHOT + 2.5.3 4.0.0 diff --git a/subsys/http/pom.xml b/subsys/http/pom.xml index 2fff73ec2d..eebbec52f2 100644 --- a/subsys/http/pom.xml +++ b/subsys/http/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.3-SNAPSHOT + 2.5.3 indy-subsys-http diff --git a/subsys/infinispan/pom.xml b/subsys/infinispan/pom.xml index a0efafc7b4..9115f8855d 100644 --- a/subsys/infinispan/pom.xml +++ b/subsys/infinispan/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.3-SNAPSHOT + 2.5.3 indy-subsys-infinispan diff --git a/subsys/jaxrs/pom.xml b/subsys/jaxrs/pom.xml index eb868d0a23..310a4c9632 100644 --- a/subsys/jaxrs/pom.xml +++ b/subsys/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.3-SNAPSHOT + 2.5.3 indy-subsys-jaxrs diff --git a/subsys/kafka/pom.xml b/subsys/kafka/pom.xml index 7f9685cd40..c1f2e13b89 100644 --- a/subsys/kafka/pom.xml +++ b/subsys/kafka/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.5.3-SNAPSHOT + 2.5.3 4.0.0 diff --git a/subsys/keycloak/pom.xml b/subsys/keycloak/pom.xml index 18fcab3239..b0c38d2622 100644 --- a/subsys/keycloak/pom.xml +++ b/subsys/keycloak/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.3-SNAPSHOT + 2.5.3 indy-subsys-keycloak Indy :: Subsystems :: Keycloak diff --git a/subsys/metrics/pom.xml b/subsys/metrics/pom.xml index 46dc04c014..23388e213b 100644 --- a/subsys/metrics/pom.xml +++ b/subsys/metrics/pom.xml @@ -20,7 +20,7 @@ org.commonjava.indy indy-subsystems - 2.5.3-SNAPSHOT + 2.5.3 4.0.0 diff --git a/subsys/pom.xml b/subsys/pom.xml index 76346ac546..d2b4291a7f 100644 --- a/subsys/pom.xml +++ b/subsys/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.3-SNAPSHOT + 2.5.3 indy-subsystems diff --git a/subsys/prefetch/pom.xml b/subsys/prefetch/pom.xml index 2af8647771..00786df295 100644 --- a/subsys/prefetch/pom.xml +++ b/subsys/prefetch/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.5.3-SNAPSHOT + 2.5.3 4.0.0 diff --git a/test/db/pom.xml b/test/db/pom.xml index 1eae34909f..deb2295d2b 100644 --- a/test/db/pom.xml +++ b/test/db/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.5.3-SNAPSHOT + 2.5.3 indy-test-db diff --git a/test/fixtures-core/pom.xml b/test/fixtures-core/pom.xml index 82f41ac1a2..6ce4badb5b 100644 --- a/test/fixtures-core/pom.xml +++ b/test/fixtures-core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.5.3-SNAPSHOT + 2.5.3 indy-test-fixtures-core diff --git a/test/pom.xml b/test/pom.xml index 3152c710a3..76ec9f3aec 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.3-SNAPSHOT + 2.5.3 indy-test diff --git a/test/providers-core/pom.xml b/test/providers-core/pom.xml index 4752ddc244..b099c58bea 100644 --- a/test/providers-core/pom.xml +++ b/test/providers-core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.5.3-SNAPSHOT + 2.5.3 indy-test-providers-core diff --git a/test/utils/pom.xml b/test/utils/pom.xml index 36035e3d1c..3df560c5f4 100644 --- a/test/utils/pom.xml +++ b/test/utils/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.5.3-SNAPSHOT + 2.5.3 indy-test-utils diff --git a/tools/assemblies/pom.xml b/tools/assemblies/pom.xml index 17b673e661..f787d80c35 100644 --- a/tools/assemblies/pom.xml +++ b/tools/assemblies/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.tools indy-tools - 2.5.3-SNAPSHOT + 2.5.3 indy-assemblies diff --git a/tools/pom.xml b/tools/pom.xml index e7bf2e1ad9..69be82615d 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy.tools diff --git a/uis/layover/pom.xml b/uis/layover/pom.xml index 4f7e20796e..704824d1db 100644 --- a/uis/layover/pom.xml +++ b/uis/layover/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.ui indy-uis - 2.5.3-SNAPSHOT + 2.5.3 indy-ui-layover diff --git a/uis/pom.xml b/uis/pom.xml index 5a828b3c4f..33548df2c8 100644 --- a/uis/pom.xml +++ b/uis/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.3-SNAPSHOT + 2.5.3 org.commonjava.indy.ui From 02c4183e0c8f7e8baad29e0ca977ede956297269 Mon Sep 17 00:00:00 2001 From: Gang Li Date: Tue, 2 Feb 2021 04:18:14 +0000 Subject: [PATCH 38/50] [maven-release-plugin] prepare for next development iteration --- addons/changelog/client-java/pom.xml | 2 +- addons/changelog/common/pom.xml | 2 +- addons/changelog/ftests/pom.xml | 2 +- addons/changelog/jaxrs/pom.xml | 2 +- addons/changelog/pom.xml | 2 +- addons/content-browse/client-java/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/event-audit/common/pom.xml | 2 +- addons/event-audit/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/path-mapped/common/pom.xml | 2 +- addons/path-mapped/jaxrs/pom.xml | 2 +- addons/path-mapped/model-java/pom.xml | 2 +- addons/path-mapped/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/repo-proxy/common/pom.xml | 2 +- addons/repo-proxy/ftests/pom.xml | 2 +- addons/repo-proxy/jaxrs/pom.xml | 2 +- addons/repo-proxy/pom.xml | 2 +- addons/revisions/common/pom.xml | 2 +- addons/revisions/jaxrs/pom.xml | 2 +- addons/revisions/pom.xml | 2 +- addons/sli/pom.xml | 2 +- api/pom.xml | 2 +- bindings/jaxrs/pom.xml | 2 +- bindings/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/common/pom.xml | 2 +- db/flat/pom.xml | 2 +- db/infinispan/pom.xml | 2 +- db/memory/pom.xml | 2 +- db/metrics/pom.xml | 2 +- db/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/pom.xml | 2 +- models/core-java/pom.xml | 2 +- models/pom.xml | 2 +- pom.xml | 248 +++++++++---------- rest/api/pom.xml | 2 +- rest/pom.xml | 2 +- subsys/cassandra/pom.xml | 2 +- subsys/cpool/pom.xml | 2 +- subsys/flatfile/pom.xml | 2 +- subsys/git/pom.xml | 2 +- subsys/groovy/pom.xml | 2 +- subsys/honeycomb/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/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 +- 127 files changed, 250 insertions(+), 250 deletions(-) diff --git a/addons/changelog/client-java/pom.xml b/addons/changelog/client-java/pom.xml index 03005e7230..153609268a 100644 --- a/addons/changelog/client-java/pom.xml +++ b/addons/changelog/client-java/pom.xml @@ -20,7 +20,7 @@ indy-changelog org.commonjava.indy - 2.5.3 + 2.5.4-SNAPSHOT 4.0.0 diff --git a/addons/changelog/common/pom.xml b/addons/changelog/common/pom.xml index 8b4bac2cb6..6ae117f8da 100644 --- a/addons/changelog/common/pom.xml +++ b/addons/changelog/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.5.3 + 2.5.4-SNAPSHOT indy-changelog-common Indy :: Add-Ons :: ChangeLog :: Common diff --git a/addons/changelog/ftests/pom.xml b/addons/changelog/ftests/pom.xml index d9be279ce5..252f07440f 100644 --- a/addons/changelog/ftests/pom.xml +++ b/addons/changelog/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.5.3 + 2.5.4-SNAPSHOT indy-ftests-changelog diff --git a/addons/changelog/jaxrs/pom.xml b/addons/changelog/jaxrs/pom.xml index bc3482d799..c8c6748d8b 100644 --- a/addons/changelog/jaxrs/pom.xml +++ b/addons/changelog/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.5.3 + 2.5.4-SNAPSHOT indy-changelog-jaxrs diff --git a/addons/changelog/pom.xml b/addons/changelog/pom.xml index 2ed64a94ab..eda443767a 100644 --- a/addons/changelog/pom.xml +++ b/addons/changelog/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.3 + 2.5.4-SNAPSHOT indy-changelog Indy :: Add-Ons :: ChangeLog :: Parent diff --git a/addons/content-browse/client-java/pom.xml b/addons/content-browse/client-java/pom.xml index cfaf5a6d19..1c8fcd7a8b 100644 --- a/addons/content-browse/client-java/pom.xml +++ b/addons/content-browse/client-java/pom.xml @@ -20,7 +20,7 @@ indy-content-browse org.commonjava.indy - 2.5.3 + 2.5.4-SNAPSHOT 4.0.0 diff --git a/addons/content-browse/common/pom.xml b/addons/content-browse/common/pom.xml index 3665a50f95..c2ef8419ac 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 - 2.5.3 + 2.5.4-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 ad9a89ceea..a1ed21fee4 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 - 2.5.3 + 2.5.4-SNAPSHOT indy-ftests-content-browse diff --git a/addons/content-browse/jaxrs/pom.xml b/addons/content-browse/jaxrs/pom.xml index 20e7b830c8..dd4f45c8cb 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 - 2.5.3 + 2.5.4-SNAPSHOT indy-content-browse-jaxrs diff --git a/addons/content-browse/model-java/pom.xml b/addons/content-browse/model-java/pom.xml index 084b9c879b..ae6641745c 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 - 2.5.3 + 2.5.4-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 884ede92bc..88b3b13b29 100644 --- a/addons/content-browse/pom.xml +++ b/addons/content-browse/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.3 + 2.5.4-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 4add71d449..36c81fb1da 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 - 2.5.3 + 2.5.4-SNAPSHOT 4.0.0 diff --git a/addons/content-index/pom.xml b/addons/content-index/pom.xml index a743160323..312b4ec4bc 100644 --- a/addons/content-index/pom.xml +++ b/addons/content-index/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.3 + 2.5.4-SNAPSHOT indy-content-index diff --git a/addons/diagnostics/client-java/pom.xml b/addons/diagnostics/client-java/pom.xml index cda5ce410e..d090490d01 100644 --- a/addons/diagnostics/client-java/pom.xml +++ b/addons/diagnostics/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.5.3 + 2.5.4-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 9be8541619..435fa77f2e 100644 --- a/addons/diagnostics/common/pom.xml +++ b/addons/diagnostics/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.5.3 + 2.5.4-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 c01d901a92..48092e8ff5 100644 --- a/addons/diagnostics/ftests/pom.xml +++ b/addons/diagnostics/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.5.3 + 2.5.4-SNAPSHOT indy-ftests-diagnostics diff --git a/addons/diagnostics/jaxrs/pom.xml b/addons/diagnostics/jaxrs/pom.xml index 880560c445..169eb45828 100644 --- a/addons/diagnostics/jaxrs/pom.xml +++ b/addons/diagnostics/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.5.3 + 2.5.4-SNAPSHOT indy-diagnostics-jaxrs diff --git a/addons/diagnostics/pom.xml b/addons/diagnostics/pom.xml index d7d942990f..aad1320207 100644 --- a/addons/diagnostics/pom.xml +++ b/addons/diagnostics/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.3 + 2.5.4-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 f5dd645dbe..26b50c5b19 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 - 2.5.3 + 2.5.4-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 8c3f6c004d..3da8c87c63 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 - 2.5.3 + 2.5.4-SNAPSHOT indy-ftests-dot-maven diff --git a/addons/dot-maven/jaxrs/pom.xml b/addons/dot-maven/jaxrs/pom.xml index 0decfe5d6e..8d97336509 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 - 2.5.3 + 2.5.4-SNAPSHOT indy-dot-maven-jaxrs diff --git a/addons/dot-maven/pom.xml b/addons/dot-maven/pom.xml index aa2243ab99..e11e45c160 100644 --- a/addons/dot-maven/pom.xml +++ b/addons/dot-maven/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.3 + 2.5.4-SNAPSHOT indy-dot-maven diff --git a/addons/event-audit/common/pom.xml b/addons/event-audit/common/pom.xml index 630f656b47..2a7222b0bb 100644 --- a/addons/event-audit/common/pom.xml +++ b/addons/event-audit/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-event-audit - 2.5.3 + 2.5.4-SNAPSHOT indy-event-audit-common diff --git a/addons/event-audit/pom.xml b/addons/event-audit/pom.xml index 71876b73a6..281ee1cc5d 100644 --- a/addons/event-audit/pom.xml +++ b/addons/event-audit/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.3 + 2.5.4-SNAPSHOT indy-event-audit diff --git a/addons/folo/client-java/pom.xml b/addons/folo/client-java/pom.xml index bb51f7ddbf..2ddf2f9fee 100644 --- a/addons/folo/client-java/pom.xml +++ b/addons/folo/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.5.3 + 2.5.4-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 a30d6ce1cc..31081a4588 100644 --- a/addons/folo/common/pom.xml +++ b/addons/folo/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.5.3 + 2.5.4-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 1219c010f0..a72438f659 100644 --- a/addons/folo/ftests/pom.xml +++ b/addons/folo/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.5.3 + 2.5.4-SNAPSHOT indy-ftests-folo diff --git a/addons/folo/jaxrs/pom.xml b/addons/folo/jaxrs/pom.xml index e489aece7b..59b4dc6f45 100644 --- a/addons/folo/jaxrs/pom.xml +++ b/addons/folo/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.5.3 + 2.5.4-SNAPSHOT indy-folo-jaxrs diff --git a/addons/folo/model-java/pom.xml b/addons/folo/model-java/pom.xml index 00525c7548..3d3975ff46 100644 --- a/addons/folo/model-java/pom.xml +++ b/addons/folo/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.5.3 + 2.5.4-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 3088174ecc..041af7cdc1 100644 --- a/addons/folo/pom.xml +++ b/addons/folo/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.3 + 2.5.4-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 2439df876c..140aa7e6d8 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 - 2.5.3 + 2.5.4-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 1278991e62..c537f2105c 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 - 2.5.3 + 2.5.4-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 59142c4478..92d55ba646 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 - 2.5.3 + 2.5.4-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 6e10917f2f..70ff5c3285 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 - 2.5.3 + 2.5.4-SNAPSHOT indy-hosted-by-archive-jaxrs diff --git a/addons/hosted-by-archive/pom.xml b/addons/hosted-by-archive/pom.xml index c98bff8ff0..4fc8df74c7 100644 --- a/addons/hosted-by-archive/pom.xml +++ b/addons/hosted-by-archive/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.3 + 2.5.4-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 da7c4ec3ac..0d03e2d63d 100644 --- a/addons/httprox/common/pom.xml +++ b/addons/httprox/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.5.3 + 2.5.4-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 eb454e4c68..3304593ae5 100644 --- a/addons/httprox/ftests/pom.xml +++ b/addons/httprox/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.5.3 + 2.5.4-SNAPSHOT indy-ftests-httprox diff --git a/addons/httprox/jaxrs/pom.xml b/addons/httprox/jaxrs/pom.xml index e7fd4b663e..b81140e6af 100644 --- a/addons/httprox/jaxrs/pom.xml +++ b/addons/httprox/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.5.3 + 2.5.4-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 bb1260071e..71f3d68643 100644 --- a/addons/httprox/pom.xml +++ b/addons/httprox/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.3 + 2.5.4-SNAPSHOT indy-httprox diff --git a/addons/implied-repos/client-java/pom.xml b/addons/implied-repos/client-java/pom.xml index 4fb58b6489..746a1ef1c0 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 - 2.5.3 + 2.5.4-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 d9f01d0d38..335a5d026e 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 - 2.5.3 + 2.5.4-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 475d4c1a06..326a8ba70c 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 - 2.5.3 + 2.5.4-SNAPSHOT indy-ftests-implied-repos diff --git a/addons/implied-repos/model-java/pom.xml b/addons/implied-repos/model-java/pom.xml index db810e0b9b..1c11a58a08 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 - 2.5.3 + 2.5.4-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 952291e364..0f709bf67f 100644 --- a/addons/implied-repos/pom.xml +++ b/addons/implied-repos/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.3 + 2.5.4-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 9317b266b0..08a0d380e2 100644 --- a/addons/koji/client-java/pom.xml +++ b/addons/koji/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.5.3 + 2.5.4-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 420cb155f9..8c38997946 100644 --- a/addons/koji/common/pom.xml +++ b/addons/koji/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.5.3 + 2.5.4-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 ea2ec86813..7fba769c42 100644 --- a/addons/koji/jaxrs/pom.xml +++ b/addons/koji/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.5.3 + 2.5.4-SNAPSHOT indy-koji-jaxrs diff --git a/addons/koji/model-java/pom.xml b/addons/koji/model-java/pom.xml index fa6f50b5f6..a8c37259b7 100644 --- a/addons/koji/model-java/pom.xml +++ b/addons/koji/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.5.3 + 2.5.4-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 c1547476b4..352cbfb5ad 100644 --- a/addons/koji/pom.xml +++ b/addons/koji/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.3 + 2.5.4-SNAPSHOT indy-koji Indy :: Add-Ons :: Koji Integration :: Parent diff --git a/addons/path-mapped/common/pom.xml b/addons/path-mapped/common/pom.xml index 1419cc3178..4aca425015 100644 --- a/addons/path-mapped/common/pom.xml +++ b/addons/path-mapped/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.5.3 + 2.5.4-SNAPSHOT indy-path-mapped-common diff --git a/addons/path-mapped/jaxrs/pom.xml b/addons/path-mapped/jaxrs/pom.xml index dd68f9b6fa..7447186f99 100644 --- a/addons/path-mapped/jaxrs/pom.xml +++ b/addons/path-mapped/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.5.3 + 2.5.4-SNAPSHOT indy-path-mapped-jaxrs diff --git a/addons/path-mapped/model-java/pom.xml b/addons/path-mapped/model-java/pom.xml index d8b8a640db..abda311076 100644 --- a/addons/path-mapped/model-java/pom.xml +++ b/addons/path-mapped/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.5.3 + 2.5.4-SNAPSHOT indy-path-mapped-model-java diff --git a/addons/path-mapped/pom.xml b/addons/path-mapped/pom.xml index 6c48444d78..ce78c37a49 100644 --- a/addons/path-mapped/pom.xml +++ b/addons/path-mapped/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.3 + 2.5.4-SNAPSHOT indy-path-mapped Indy :: Add-Ons :: Path Mapped :: Parent diff --git a/addons/pkg-maven/common/pom.xml b/addons/pkg-maven/common/pom.xml index 05814aee56..0d6cf0ef0f 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 - 2.5.3 + 2.5.4-SNAPSHOT 4.0.0 diff --git a/addons/pkg-maven/ftests/pom.xml b/addons/pkg-maven/ftests/pom.xml index 3c2b531002..35019706f0 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 - 2.5.3 + 2.5.4-SNAPSHOT 4.0.0 diff --git a/addons/pkg-maven/jaxrs/pom.xml b/addons/pkg-maven/jaxrs/pom.xml index 388fa6adde..6ca754424d 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 - 2.5.3 + 2.5.4-SNAPSHOT 4.0.0 diff --git a/addons/pkg-maven/pom.xml b/addons/pkg-maven/pom.xml index 398957e2b2..e1fbae7d09 100644 --- a/addons/pkg-maven/pom.xml +++ b/addons/pkg-maven/pom.xml @@ -20,7 +20,7 @@ indy-addons org.commonjava.indy - 2.5.3 + 2.5.4-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/common/pom.xml b/addons/pkg-npm/common/pom.xml index 80791bc464..631cf9f843 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 - 2.5.3 + 2.5.4-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/ftests/pom.xml b/addons/pkg-npm/ftests/pom.xml index 4b739f8a47..b53bf27286 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 - 2.5.3 + 2.5.4-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/jaxrs/pom.xml b/addons/pkg-npm/jaxrs/pom.xml index 6d81016dd1..e7a513206b 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 - 2.5.3 + 2.5.4-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/model-java/pom.xml b/addons/pkg-npm/model-java/pom.xml index cab46913cb..2911f3353e 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 - 2.5.3 + 2.5.4-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/pom.xml b/addons/pkg-npm/pom.xml index ab2aec5655..b79bc25ac5 100644 --- a/addons/pkg-npm/pom.xml +++ b/addons/pkg-npm/pom.xml @@ -20,7 +20,7 @@ indy-addons org.commonjava.indy - 2.5.3 + 2.5.4-SNAPSHOT 4.0.0 diff --git a/addons/pom.xml b/addons/pom.xml index ffdae16496..7f4cd653aa 100644 --- a/addons/pom.xml +++ b/addons/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-parent - 2.5.3 + 2.5.4-SNAPSHOT indy-addons diff --git a/addons/promote/client-java/pom.xml b/addons/promote/client-java/pom.xml index ffa5dd8625..1f2d8434d9 100644 --- a/addons/promote/client-java/pom.xml +++ b/addons/promote/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.5.3 + 2.5.4-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 84bb186ee2..89352ab386 100644 --- a/addons/promote/common/pom.xml +++ b/addons/promote/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.5.3 + 2.5.4-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 9e6308e77e..7f4c44a558 100644 --- a/addons/promote/ftests/pom.xml +++ b/addons/promote/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.5.3 + 2.5.4-SNAPSHOT indy-ftests-promote diff --git a/addons/promote/jaxrs/pom.xml b/addons/promote/jaxrs/pom.xml index 1b90f4dd18..05dac2549e 100644 --- a/addons/promote/jaxrs/pom.xml +++ b/addons/promote/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.5.3 + 2.5.4-SNAPSHOT indy-promote-jaxrs diff --git a/addons/promote/model-java/pom.xml b/addons/promote/model-java/pom.xml index eefefcf896..42b7e3a330 100644 --- a/addons/promote/model-java/pom.xml +++ b/addons/promote/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.5.3 + 2.5.4-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 206758f70e..981a6e43da 100644 --- a/addons/promote/pom.xml +++ b/addons/promote/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.3 + 2.5.4-SNAPSHOT indy-promote Indy :: Add-Ons :: Artifact Promotion :: Parent diff --git a/addons/repo-proxy/common/pom.xml b/addons/repo-proxy/common/pom.xml index b02456b971..a351a616d0 100644 --- a/addons/repo-proxy/common/pom.xml +++ b/addons/repo-proxy/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-repo-proxy - 2.5.3 + 2.5.4-SNAPSHOT indy-repo-proxy-common Indy :: Add-Ons :: Repository-Proxy :: Common diff --git a/addons/repo-proxy/ftests/pom.xml b/addons/repo-proxy/ftests/pom.xml index 86b7327468..308965e0ce 100644 --- a/addons/repo-proxy/ftests/pom.xml +++ b/addons/repo-proxy/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-repo-proxy - 2.5.3 + 2.5.4-SNAPSHOT indy-ftests-repo-proxy diff --git a/addons/repo-proxy/jaxrs/pom.xml b/addons/repo-proxy/jaxrs/pom.xml index 9fcf516c46..c5127f6e08 100644 --- a/addons/repo-proxy/jaxrs/pom.xml +++ b/addons/repo-proxy/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-repo-proxy - 2.5.3 + 2.5.4-SNAPSHOT indy-repo-proxy-jaxrs diff --git a/addons/repo-proxy/pom.xml b/addons/repo-proxy/pom.xml index c297a45f25..d050c47606 100644 --- a/addons/repo-proxy/pom.xml +++ b/addons/repo-proxy/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.3 + 2.5.4-SNAPSHOT indy-repo-proxy Indy :: Add-Ons :: Repository-Proxy :: Parent diff --git a/addons/revisions/common/pom.xml b/addons/revisions/common/pom.xml index 2ca1001dd1..5d8befd899 100644 --- a/addons/revisions/common/pom.xml +++ b/addons/revisions/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-revisions - 2.5.3 + 2.5.4-SNAPSHOT indy-revisions-common Indy :: Add-Ons :: Revisions :: Common diff --git a/addons/revisions/jaxrs/pom.xml b/addons/revisions/jaxrs/pom.xml index 4886d886cf..906b3d14b4 100644 --- a/addons/revisions/jaxrs/pom.xml +++ b/addons/revisions/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-revisions - 2.5.3 + 2.5.4-SNAPSHOT indy-revisions-jaxrs diff --git a/addons/revisions/pom.xml b/addons/revisions/pom.xml index 4f488eb2d2..1f34c0ae8e 100644 --- a/addons/revisions/pom.xml +++ b/addons/revisions/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.3 + 2.5.4-SNAPSHOT indy-revisions Indy :: Add-Ons :: Revisions :: Parent diff --git a/addons/sli/pom.xml b/addons/sli/pom.xml index 198e6373e7..103a649936 100644 --- a/addons/sli/pom.xml +++ b/addons/sli/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.3 + 2.5.4-SNAPSHOT indy-sli Indy :: Add-Ons :: Service Level Indicators Reporting :: JAX-RS diff --git a/api/pom.xml b/api/pom.xml index 93cfb400e9..fa63cc906a 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.3 + 2.5.4-SNAPSHOT indy-api diff --git a/bindings/jaxrs/pom.xml b/bindings/jaxrs/pom.xml index 8347baf4a2..2804239bde 100644 --- a/bindings/jaxrs/pom.xml +++ b/bindings/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-bindings - 2.5.3 + 2.5.4-SNAPSHOT indy-bindings-jaxrs diff --git a/bindings/pom.xml b/bindings/pom.xml index a1eb34e6e4..4faec030b2 100644 --- a/bindings/pom.xml +++ b/bindings/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-parent - 2.5.3 + 2.5.4-SNAPSHOT indy-bindings diff --git a/boot/jaxrs/pom.xml b/boot/jaxrs/pom.xml index aa2b105bea..19fa1b5483 100644 --- a/boot/jaxrs/pom.xml +++ b/boot/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.boot indy-booters - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy.boot diff --git a/boot/pom.xml b/boot/pom.xml index 7f6948aec4..2e26c19fec 100644 --- a/boot/pom.xml +++ b/boot/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy.boot diff --git a/clients/core-java/pom.xml b/clients/core-java/pom.xml index 85f483d27b..fc8bc4c87d 100644 --- a/clients/core-java/pom.xml +++ b/clients/core-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-clients-parent - 2.5.3 + 2.5.4-SNAPSHOT indy-client-core-java diff --git a/clients/pom.xml b/clients/pom.xml index 73bf7376ea..2bfa8fa400 100644 --- a/clients/pom.xml +++ b/clients/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.3 + 2.5.4-SNAPSHOT indy-clients-parent diff --git a/core/pom.xml b/core/pom.xml index 675ad4f186..4d4ebf4bb9 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.3 + 2.5.4-SNAPSHOT indy-core diff --git a/db/common/pom.xml b/db/common/pom.xml index b020d33c2b..dff3d74962 100644 --- a/db/common/pom.xml +++ b/db/common/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-db - 2.5.3 + 2.5.4-SNAPSHOT indy-db-common diff --git a/db/flat/pom.xml b/db/flat/pom.xml index 2adc99cac6..389466b0eb 100644 --- a/db/flat/pom.xml +++ b/db/flat/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.5.3 + 2.5.4-SNAPSHOT indy-db-flat diff --git a/db/infinispan/pom.xml b/db/infinispan/pom.xml index e5e495fc1c..336fc65a13 100644 --- a/db/infinispan/pom.xml +++ b/db/infinispan/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-db - 2.5.3 + 2.5.4-SNAPSHOT indy-db-infinispan diff --git a/db/memory/pom.xml b/db/memory/pom.xml index 3076822d86..3413f490b3 100644 --- a/db/memory/pom.xml +++ b/db/memory/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.5.3 + 2.5.4-SNAPSHOT indy-db-memory diff --git a/db/metrics/pom.xml b/db/metrics/pom.xml index 30c3801370..d13ca123e6 100644 --- a/db/metrics/pom.xml +++ b/db/metrics/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.5.3 + 2.5.4-SNAPSHOT indy-db-metrics diff --git a/db/pom.xml b/db/pom.xml index 10706a8649..dcd10ac8e2 100644 --- a/db/pom.xml +++ b/db/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.3 + 2.5.4-SNAPSHOT indy-db diff --git a/deployments/launcher/pom.xml b/deployments/launcher/pom.xml index 3f7d7330c1..2e31785d30 100644 --- a/deployments/launcher/pom.xml +++ b/deployments/launcher/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-deployments - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy.launch diff --git a/deployments/pom.xml b/deployments/pom.xml index 9fd9a6b656..8bea5b1fd2 100644 --- a/deployments/pom.xml +++ b/deployments/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.3 + 2.5.4-SNAPSHOT indy-deployments diff --git a/embedder/pom.xml b/embedder/pom.xml index fa54b3f8e2..1ed0c6f0c0 100644 --- a/embedder/pom.xml +++ b/embedder/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy.embed diff --git a/filers/default/pom.xml b/filers/default/pom.xml index 3553f143de..b14a815036 100644 --- a/filers/default/pom.xml +++ b/filers/default/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-file-managers - 2.5.3 + 2.5.4-SNAPSHOT indy-filer-default diff --git a/filers/pom.xml b/filers/pom.xml index 24b9381e02..624732d85b 100644 --- a/filers/pom.xml +++ b/filers/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.3 + 2.5.4-SNAPSHOT indy-file-managers diff --git a/ftests/common/pom.xml b/ftests/common/pom.xml index 334e026b06..97233205c8 100644 --- a/ftests/common/pom.xml +++ b/ftests/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-ftests-parent - 2.5.3 + 2.5.4-SNAPSHOT indy-ftests-common diff --git a/ftests/core/pom.xml b/ftests/core/pom.xml index 9b349dae34..5a4de29e3d 100644 --- a/ftests/core/pom.xml +++ b/ftests/core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-ftests-parent - 2.5.3 + 2.5.4-SNAPSHOT indy-ftests-core diff --git a/ftests/pom.xml b/ftests/pom.xml index 3c4d3fb256..e588b7819b 100644 --- a/ftests/pom.xml +++ b/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.3 + 2.5.4-SNAPSHOT indy-ftests-parent diff --git a/models/core-java/pom.xml b/models/core-java/pom.xml index b8e436fe32..50f0df2d50 100644 --- a/models/core-java/pom.xml +++ b/models/core-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-models-parent - 2.5.3 + 2.5.4-SNAPSHOT indy-model-core-java diff --git a/models/pom.xml b/models/pom.xml index aabfe0121f..087f4b521b 100644 --- a/models/pom.xml +++ b/models/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.3 + 2.5.4-SNAPSHOT indy-models-parent diff --git a/pom.xml b/pom.xml index 50d395b48c..23505abaf9 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.commonjava.indy indy-parent - 2.5.3 + 2.5.4-SNAPSHOT pom @@ -37,7 +37,7 @@ scm:git:https://github.com/CommonJava/indy scm:git:https://github.com/CommonJava/indy http://github.com/Commonjava/indy - indy-parent-2.5.3 + indy-parent-2.5.2 @@ -187,7 +187,7 @@ org.commonjava.indy.ui indy-ui-layover - 2.5.3 + 2.5.4-SNAPSHOT runtime @@ -195,22 +195,22 @@ org.commonjava.indy indy-model-core-java - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-api - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-core - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-core - 2.5.3 + 2.5.4-SNAPSHOT tar.gz confset provided @@ -218,32 +218,32 @@ org.commonjava.indy indy-db-flat - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-db-metrics - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-db-common - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-db-infinispan - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-bindings-jaxrs - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy.launch indy-launcher - 2.5.3 + 2.5.4-SNAPSHOT tar.gz skinny provided @@ -251,7 +251,7 @@ org.commonjava.indy.launch indy-launcher - 2.5.3 + 2.5.4-SNAPSHOT tar.gz complete provided @@ -259,7 +259,7 @@ org.commonjava.indy.launch indy-launcher - 2.5.3 + 2.5.4-SNAPSHOT tar.gz data provided @@ -267,7 +267,7 @@ org.commonjava.indy.launch indy-launcher - 2.5.3 + 2.5.4-SNAPSHOT tar.gz etc provided @@ -276,17 +276,17 @@ org.commonjava.indy indy-revisions-jaxrs - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-revisions-common - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-revisions-common - 2.5.3 + 2.5.4-SNAPSHOT tar.gz confset provided @@ -294,7 +294,7 @@ org.commonjava.indy indy-revisions-common - 2.5.3 + 2.5.4-SNAPSHOT tar.gz uiset provided @@ -302,12 +302,12 @@ org.commonjava.indy indy-dot-maven-common - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-dot-maven-common - 2.5.3 + 2.5.4-SNAPSHOT tar.gz dataset provided @@ -315,22 +315,22 @@ org.commonjava.indy indy-dot-maven-jaxrs - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-ftests-dot-maven - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-httprox-common - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-httprox-common - 2.5.3 + 2.5.4-SNAPSHOT tar.gz confset provided @@ -338,17 +338,17 @@ org.commonjava.indy indy-ftests-httprox - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-content-index - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-content-index - 2.5.3 + 2.5.4-SNAPSHOT tar.gz confset provided @@ -356,51 +356,51 @@ org.commonjava.indy indy-db-memory - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-test-db - 2.5.3 + 2.5.4-SNAPSHOT test org.commonjava.indy indy-test-fixtures-core - 2.5.3 + 2.5.4-SNAPSHOT test org.commonjava.indy indy-test-providers-core - 2.5.3 + 2.5.4-SNAPSHOT test org.commonjava.indy indy-test-utils - 2.5.3 + 2.5.4-SNAPSHOT test org.commonjava.indy indy-filer-default - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-subsys-jaxrs - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-subsys-honeycomb - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-subsys-honeycomb - 2.5.3 + 2.5.4-SNAPSHOT tar.gz confset provided @@ -408,17 +408,17 @@ org.commonjava.indy indy-subsys-flatfile - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-subsys-cassandra - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-subsys-cassandra - 2.5.3 + 2.5.4-SNAPSHOT tar.gz confset provided @@ -426,79 +426,79 @@ org.commonjava.indy indy-subsys-infinispan - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-subsys-http - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-subsys-git - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-subsys-groovy - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-subsys-prefetch - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-subsys-cpool - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-client-core-java - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-ftests-common - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-ftests-core - 2.5.3 + 2.5.4-SNAPSHOT test org.commonjava.indy indy-folo-jaxrs - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-ftests-folo - 2.5.3 + 2.5.4-SNAPSHOT test org.commonjava.indy indy-folo-client-java - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-folo-model-java - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-folo-common - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-folo-common - 2.5.3 + 2.5.4-SNAPSHOT tar.gz dataset provided @@ -506,7 +506,7 @@ org.commonjava.indy indy-folo-common - 2.5.3 + 2.5.4-SNAPSHOT tar.gz confset provided @@ -514,33 +514,33 @@ org.commonjava.indy indy-promote-jaxrs - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-ftests-promote - 2.5.3 + 2.5.4-SNAPSHOT test org.commonjava.indy indy-promote-client-java - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-promote-model-java - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-promote-common - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-promote-common - 2.5.3 + 2.5.4-SNAPSHOT tar.gz confset provided @@ -548,7 +548,7 @@ org.commonjava.indy indy-promote-common - 2.5.3 + 2.5.4-SNAPSHOT tar.gz dataset provided @@ -556,19 +556,19 @@ org.commonjava.indy indy-promote-common - 2.5.3 + 2.5.4-SNAPSHOT dataset provided org.commonjava.indy indy-implied-repos-common - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-implied-repos-common - 2.5.3 + 2.5.4-SNAPSHOT tar.gz confset provided @@ -576,37 +576,37 @@ org.commonjava.indy indy-implied-repos-model-java - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-implied-repos-client-java - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-ftests-implied-repos - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy.embed indy-embedder - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy.boot indy-booter-jaxrs - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-subsys-keycloak - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-subsys-keycloak - 2.5.3 + 2.5.4-SNAPSHOT tar.gz confset provided @@ -614,7 +614,7 @@ org.commonjava.indy indy-subsys-infinispan - 2.5.3 + 2.5.4-SNAPSHOT tar.gz confset provided @@ -622,7 +622,7 @@ org.commonjava.indy indy-subsys-prefetch - 2.5.3 + 2.5.4-SNAPSHOT tar.gz confset provided @@ -631,7 +631,7 @@ org.commonjava.indy indy-koji-common - 2.5.3 + 2.5.4-SNAPSHOT tar.gz confset provided @@ -639,103 +639,103 @@ org.commonjava.indy indy-koji-common - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-koji-model-java - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-koji-client-java - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-koji-jaxrs - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-path-mapped-common - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-path-mapped-model-java - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-path-mapped-jaxrs - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-pkg-maven-common - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-pkg-maven-jaxrs - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-pkg-npm-jaxrs - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-ftests-pkg-maven - 2.5.3 + 2.5.4-SNAPSHOT test org.commonjava.indy indy-ftests-pkg-npm - 2.5.3 + 2.5.4-SNAPSHOT test org.commonjava.indy indy-pkg-npm-common - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-pkg-npm-model-java - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-diagnostics-jaxrs - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-diagnostics-client-java - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-diagnostics-common - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-ftests-diagnostics - 2.5.3 + 2.5.4-SNAPSHOT test org.commonjava.indy indy-diagnostics-common - 2.5.3 + 2.5.4-SNAPSHOT confset tar.gz provided @@ -743,28 +743,28 @@ org.commonjava.indy indy-hosted-by-archive-common - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-hosted-by-archive-client-java - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-ftests-hosted-by-archive - 2.5.3 + 2.5.4-SNAPSHOT test org.commonjava.indy indy-hosted-by-archive-jaxrs - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-hosted-by-archive-common - 2.5.3 + 2.5.4-SNAPSHOT confset tar.gz @@ -772,12 +772,12 @@ org.commonjava.indy indy-subsys-metrics - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-subsys-metrics - 2.5.3 + 2.5.4-SNAPSHOT confset tar.gz provided @@ -786,21 +786,21 @@ org.commonjava.indy indy-sli - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy.rest indy-rest-api yaml - 2.5.3 + 2.5.4-SNAPSHOT provided org.commonjava.indy.rest indy-rest-api json - 2.5.3 + 2.5.4-SNAPSHOT provided @@ -839,33 +839,33 @@ org.commonjava.indy indy-content-browse-common - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-content-browse-jaxrs - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-ftests-content-browse - 2.5.3 + 2.5.4-SNAPSHOT test org.commonjava.indy indy-content-browse-model-java - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-content-browse-client-java - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-content-browse-common - 2.5.3 + 2.5.4-SNAPSHOT confset tar.gz provided @@ -873,35 +873,35 @@ org.commonjava.indy indy-content-browse-ui - 2.5.3 + 2.5.4-SNAPSHOT reactui tar.gz org.commonjava.indy indy-changelog-common - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-changelog-client-java - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-ftests-changelog - 2.5.3 + 2.5.4-SNAPSHOT test org.commonjava.indy indy-changelog-jaxrs - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-changelog-common - 2.5.3 + 2.5.4-SNAPSHOT confset tar.gz @@ -919,12 +919,12 @@ org.commonjava.indy indy-event-audit-common - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-event-audit-common - 2.5.3 + 2.5.4-SNAPSHOT confset tar.gz provided @@ -939,23 +939,23 @@ org.commonjava.indy indy-repo-proxy-common - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-repo-proxy-jaxrs - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy indy-ftests-repo-proxy - 2.5.3 + 2.5.4-SNAPSHOT test org.commonjava.indy indy-repo-proxy-common - 2.5.3 + 2.5.4-SNAPSHOT confset tar.gz diff --git a/rest/api/pom.xml b/rest/api/pom.xml index 5fa6fef516..79f6ff21e8 100644 --- a/rest/api/pom.xml +++ b/rest/api/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.rest indy-rest-parent - 2.5.3 + 2.5.4-SNAPSHOT indy-rest-api diff --git a/rest/pom.xml b/rest/pom.xml index 0ddcd739d2..eb5740891b 100644 --- a/rest/pom.xml +++ b/rest/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy.rest diff --git a/subsys/cassandra/pom.xml b/subsys/cassandra/pom.xml index 4009a96f2a..c9d45b4fe5 100644 --- a/subsys/cassandra/pom.xml +++ b/subsys/cassandra/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-subsystems - 2.5.3 + 2.5.4-SNAPSHOT indy-subsys-cassandra diff --git a/subsys/cpool/pom.xml b/subsys/cpool/pom.xml index 55d779cec7..1a0df46332 100644 --- a/subsys/cpool/pom.xml +++ b/subsys/cpool/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.3 + 2.5.4-SNAPSHOT indy-subsys-cpool diff --git a/subsys/flatfile/pom.xml b/subsys/flatfile/pom.xml index c2a3a4dfcd..b3dcf09164 100644 --- a/subsys/flatfile/pom.xml +++ b/subsys/flatfile/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.3 + 2.5.4-SNAPSHOT indy-subsys-flatfile diff --git a/subsys/git/pom.xml b/subsys/git/pom.xml index 8c33b49ff1..7fa1ed2833 100644 --- a/subsys/git/pom.xml +++ b/subsys/git/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.3 + 2.5.4-SNAPSHOT indy-subsys-git diff --git a/subsys/groovy/pom.xml b/subsys/groovy/pom.xml index 5248779c70..fe3b52bf01 100644 --- a/subsys/groovy/pom.xml +++ b/subsys/groovy/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.3 + 2.5.4-SNAPSHOT indy-subsys-groovy diff --git a/subsys/honeycomb/pom.xml b/subsys/honeycomb/pom.xml index 446a858d4b..122bf6ddbe 100644 --- a/subsys/honeycomb/pom.xml +++ b/subsys/honeycomb/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.5.3 + 2.5.4-SNAPSHOT 4.0.0 diff --git a/subsys/http/pom.xml b/subsys/http/pom.xml index eebbec52f2..b8fab98e5e 100644 --- a/subsys/http/pom.xml +++ b/subsys/http/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.3 + 2.5.4-SNAPSHOT indy-subsys-http diff --git a/subsys/infinispan/pom.xml b/subsys/infinispan/pom.xml index 9115f8855d..b58b1a7403 100644 --- a/subsys/infinispan/pom.xml +++ b/subsys/infinispan/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.3 + 2.5.4-SNAPSHOT indy-subsys-infinispan diff --git a/subsys/jaxrs/pom.xml b/subsys/jaxrs/pom.xml index 310a4c9632..9c906fb150 100644 --- a/subsys/jaxrs/pom.xml +++ b/subsys/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.3 + 2.5.4-SNAPSHOT indy-subsys-jaxrs diff --git a/subsys/kafka/pom.xml b/subsys/kafka/pom.xml index c1f2e13b89..feb563d07b 100644 --- a/subsys/kafka/pom.xml +++ b/subsys/kafka/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.5.3 + 2.5.4-SNAPSHOT 4.0.0 diff --git a/subsys/keycloak/pom.xml b/subsys/keycloak/pom.xml index b0c38d2622..54869b2a33 100644 --- a/subsys/keycloak/pom.xml +++ b/subsys/keycloak/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.3 + 2.5.4-SNAPSHOT indy-subsys-keycloak Indy :: Subsystems :: Keycloak diff --git a/subsys/metrics/pom.xml b/subsys/metrics/pom.xml index 23388e213b..576250f7ab 100644 --- a/subsys/metrics/pom.xml +++ b/subsys/metrics/pom.xml @@ -20,7 +20,7 @@ org.commonjava.indy indy-subsystems - 2.5.3 + 2.5.4-SNAPSHOT 4.0.0 diff --git a/subsys/pom.xml b/subsys/pom.xml index d2b4291a7f..ed072777f6 100644 --- a/subsys/pom.xml +++ b/subsys/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.3 + 2.5.4-SNAPSHOT indy-subsystems diff --git a/subsys/prefetch/pom.xml b/subsys/prefetch/pom.xml index 00786df295..ba20b88d0a 100644 --- a/subsys/prefetch/pom.xml +++ b/subsys/prefetch/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.5.3 + 2.5.4-SNAPSHOT 4.0.0 diff --git a/test/db/pom.xml b/test/db/pom.xml index deb2295d2b..d8d2a901e5 100644 --- a/test/db/pom.xml +++ b/test/db/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.5.3 + 2.5.4-SNAPSHOT indy-test-db diff --git a/test/fixtures-core/pom.xml b/test/fixtures-core/pom.xml index 6ce4badb5b..19d9cd6257 100644 --- a/test/fixtures-core/pom.xml +++ b/test/fixtures-core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.5.3 + 2.5.4-SNAPSHOT indy-test-fixtures-core diff --git a/test/pom.xml b/test/pom.xml index 76ec9f3aec..dbc53f2af5 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.3 + 2.5.4-SNAPSHOT indy-test diff --git a/test/providers-core/pom.xml b/test/providers-core/pom.xml index b099c58bea..843585e449 100644 --- a/test/providers-core/pom.xml +++ b/test/providers-core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.5.3 + 2.5.4-SNAPSHOT indy-test-providers-core diff --git a/test/utils/pom.xml b/test/utils/pom.xml index 3df560c5f4..01675cfc11 100644 --- a/test/utils/pom.xml +++ b/test/utils/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.5.3 + 2.5.4-SNAPSHOT indy-test-utils diff --git a/tools/assemblies/pom.xml b/tools/assemblies/pom.xml index f787d80c35..2aeb73d8fb 100644 --- a/tools/assemblies/pom.xml +++ b/tools/assemblies/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.tools indy-tools - 2.5.3 + 2.5.4-SNAPSHOT indy-assemblies diff --git a/tools/pom.xml b/tools/pom.xml index 69be82615d..92dc3cf8f8 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy.tools diff --git a/uis/layover/pom.xml b/uis/layover/pom.xml index 704824d1db..29304cf709 100644 --- a/uis/layover/pom.xml +++ b/uis/layover/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.ui indy-uis - 2.5.3 + 2.5.4-SNAPSHOT indy-ui-layover diff --git a/uis/pom.xml b/uis/pom.xml index 33548df2c8..826e232d9d 100644 --- a/uis/pom.xml +++ b/uis/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.3 + 2.5.4-SNAPSHOT org.commonjava.indy.ui From 4875d9ff388aa3751684b90812b68538a2ce66ef Mon Sep 17 00:00:00 2001 From: Gang Li Date: Tue, 2 Feb 2021 15:33:41 +0800 Subject: [PATCH 39/50] Revert "Add Maven toolchains support to the environment." This reverts commit e0ab5a7c9c87e3bb8ddfa73d762f8054f26fecfd. --- Jenkinsfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 019aca5d43..23afab107e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,9 +17,7 @@ pipeline { } stage('Build') { steps { - withEnv(['JAVA_HOME=/usr/lib/jvm/java-11-openjdk']){ - sh 'mvn -B -V clean verify -DskipNpmConfig=false --global-toolchains toolchains.xml' - } + sh 'mvn -B -V clean verify -DskipNpmConfig=false' } } stage('Function Test') { From 4ca6cb48dda4e43cef5fbaab69c2afe4f73cca08 Mon Sep 17 00:00:00 2001 From: Gang Li Date: Tue, 2 Feb 2021 15:34:10 +0800 Subject: [PATCH 40/50] Revert "Set env variable for verify phase and set toolchains on command line." This reverts commit 82414ff03a8c69573835a685fca52f3e50f94f0c. --- Jenkinsfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 23afab107e..631f5eb987 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -25,9 +25,7 @@ pipeline { expression { env.CHANGE_ID != null } // Pull request } steps { - withEnv(['JAVA_HOME=/usr/lib/jvm/java-11-openjdk', 'JAVA_11_HOME=/usr/lib/jvm/java-11-openjdk']){ - sh 'mvn -B -V verify -Prun-its -Pci -DskipNpmConfig=false --global-toolchains toolchains.xml' - } + sh 'mvn -B -V verify -Prun-its -Pci -DskipNpmConfig=false' } } stage('Load OCP Mappings') { From 63604aa1dc67df4df2c09ecbbfac1a74fd37e061 Mon Sep 17 00:00:00 2001 From: John Casey Date: Mon, 15 Feb 2021 08:26:59 -0600 Subject: [PATCH 41/50] Workaround NPE when downloading a checksum via httprox (#1848) When downloading an md5 or a sha1, the metadata object is null for some reason, but the code does not expect it in a single specific place, while it does in others. Also setting the contentType to null seems safe, because it is checked for null further down in the code. Not sure if it is correct state that metadata is null, but this should help unblock other features development in PNC. Co-authored-by: Petr Kocandrle --- .../org/commonjava/indy/httprox/util/HttpConduitWrapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/httprox/common/src/main/java/org/commonjava/indy/httprox/util/HttpConduitWrapper.java b/addons/httprox/common/src/main/java/org/commonjava/indy/httprox/util/HttpConduitWrapper.java index 709dc1c4ca..c4beaf9f24 100644 --- a/addons/httprox/common/src/main/java/org/commonjava/indy/httprox/util/HttpConduitWrapper.java +++ b/addons/httprox/common/src/main/java/org/commonjava/indy/httprox/util/HttpConduitWrapper.java @@ -203,7 +203,7 @@ public void writeExistingTransfer( Transfer txfr, boolean writeBody, String path writeHeader( ApplicationHeader.last_modified, lastMod ); } - String contentType = metadata.getContentType(); + String contentType = metadata != null ? metadata.getContentType() : null; writeHeader( ApplicationHeader.content_type, contentType != null ? contentType : contentController.getContentType( path ) ); From dedb395d27dc9fc27f11af2f227d13efd2bfc57d Mon Sep 17 00:00:00 2001 From: Gang Li Date: Tue, 23 Feb 2021 01:57:58 +0000 Subject: [PATCH 42/50] [maven-release-plugin] prepare release indy-parent-2.5.4 --- addons/changelog/client-java/pom.xml | 2 +- addons/changelog/common/pom.xml | 2 +- addons/changelog/ftests/pom.xml | 2 +- addons/changelog/jaxrs/pom.xml | 2 +- addons/changelog/pom.xml | 2 +- addons/content-browse/client-java/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/event-audit/common/pom.xml | 2 +- addons/event-audit/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/path-mapped/common/pom.xml | 2 +- addons/path-mapped/jaxrs/pom.xml | 2 +- addons/path-mapped/model-java/pom.xml | 2 +- addons/path-mapped/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/repo-proxy/common/pom.xml | 2 +- addons/repo-proxy/ftests/pom.xml | 2 +- addons/repo-proxy/jaxrs/pom.xml | 2 +- addons/repo-proxy/pom.xml | 2 +- addons/revisions/common/pom.xml | 2 +- addons/revisions/jaxrs/pom.xml | 2 +- addons/revisions/pom.xml | 2 +- addons/sli/pom.xml | 2 +- api/pom.xml | 2 +- bindings/jaxrs/pom.xml | 2 +- bindings/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/common/pom.xml | 2 +- db/flat/pom.xml | 2 +- db/infinispan/pom.xml | 2 +- db/memory/pom.xml | 2 +- db/metrics/pom.xml | 2 +- db/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/pom.xml | 2 +- models/core-java/pom.xml | 2 +- models/pom.xml | 2 +- pom.xml | 248 +++++++++---------- rest/api/pom.xml | 2 +- rest/pom.xml | 2 +- subsys/cassandra/pom.xml | 2 +- subsys/cpool/pom.xml | 2 +- subsys/flatfile/pom.xml | 2 +- subsys/git/pom.xml | 2 +- subsys/groovy/pom.xml | 2 +- subsys/honeycomb/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/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 +- 127 files changed, 250 insertions(+), 250 deletions(-) diff --git a/addons/changelog/client-java/pom.xml b/addons/changelog/client-java/pom.xml index 153609268a..ddd85e7ca9 100644 --- a/addons/changelog/client-java/pom.xml +++ b/addons/changelog/client-java/pom.xml @@ -20,7 +20,7 @@ indy-changelog org.commonjava.indy - 2.5.4-SNAPSHOT + 2.5.4 4.0.0 diff --git a/addons/changelog/common/pom.xml b/addons/changelog/common/pom.xml index 6ae117f8da..cf6136d98c 100644 --- a/addons/changelog/common/pom.xml +++ b/addons/changelog/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.5.4-SNAPSHOT + 2.5.4 indy-changelog-common Indy :: Add-Ons :: ChangeLog :: Common diff --git a/addons/changelog/ftests/pom.xml b/addons/changelog/ftests/pom.xml index 252f07440f..91003d266b 100644 --- a/addons/changelog/ftests/pom.xml +++ b/addons/changelog/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.5.4-SNAPSHOT + 2.5.4 indy-ftests-changelog diff --git a/addons/changelog/jaxrs/pom.xml b/addons/changelog/jaxrs/pom.xml index c8c6748d8b..3ef7afa457 100644 --- a/addons/changelog/jaxrs/pom.xml +++ b/addons/changelog/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.5.4-SNAPSHOT + 2.5.4 indy-changelog-jaxrs diff --git a/addons/changelog/pom.xml b/addons/changelog/pom.xml index eda443767a..c8ee82dc83 100644 --- a/addons/changelog/pom.xml +++ b/addons/changelog/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4-SNAPSHOT + 2.5.4 indy-changelog Indy :: Add-Ons :: ChangeLog :: Parent diff --git a/addons/content-browse/client-java/pom.xml b/addons/content-browse/client-java/pom.xml index 1c8fcd7a8b..25e11a3a71 100644 --- a/addons/content-browse/client-java/pom.xml +++ b/addons/content-browse/client-java/pom.xml @@ -20,7 +20,7 @@ indy-content-browse org.commonjava.indy - 2.5.4-SNAPSHOT + 2.5.4 4.0.0 diff --git a/addons/content-browse/common/pom.xml b/addons/content-browse/common/pom.xml index c2ef8419ac..491f6e4b3f 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 - 2.5.4-SNAPSHOT + 2.5.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 a1ed21fee4..fb24925d5d 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 - 2.5.4-SNAPSHOT + 2.5.4 indy-ftests-content-browse diff --git a/addons/content-browse/jaxrs/pom.xml b/addons/content-browse/jaxrs/pom.xml index dd4f45c8cb..76dc69f728 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 - 2.5.4-SNAPSHOT + 2.5.4 indy-content-browse-jaxrs diff --git a/addons/content-browse/model-java/pom.xml b/addons/content-browse/model-java/pom.xml index ae6641745c..23119463be 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 - 2.5.4-SNAPSHOT + 2.5.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 88b3b13b29..48bfda86e6 100644 --- a/addons/content-browse/pom.xml +++ b/addons/content-browse/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4-SNAPSHOT + 2.5.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 36c81fb1da..5e2bf94ac3 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 - 2.5.4-SNAPSHOT + 2.5.4 4.0.0 diff --git a/addons/content-index/pom.xml b/addons/content-index/pom.xml index 312b4ec4bc..088d8d9576 100644 --- a/addons/content-index/pom.xml +++ b/addons/content-index/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4-SNAPSHOT + 2.5.4 indy-content-index diff --git a/addons/diagnostics/client-java/pom.xml b/addons/diagnostics/client-java/pom.xml index d090490d01..983906678a 100644 --- a/addons/diagnostics/client-java/pom.xml +++ b/addons/diagnostics/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.5.4-SNAPSHOT + 2.5.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 435fa77f2e..d9c10f95fa 100644 --- a/addons/diagnostics/common/pom.xml +++ b/addons/diagnostics/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.5.4-SNAPSHOT + 2.5.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 48092e8ff5..60848979cc 100644 --- a/addons/diagnostics/ftests/pom.xml +++ b/addons/diagnostics/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.5.4-SNAPSHOT + 2.5.4 indy-ftests-diagnostics diff --git a/addons/diagnostics/jaxrs/pom.xml b/addons/diagnostics/jaxrs/pom.xml index 169eb45828..114a7dcb65 100644 --- a/addons/diagnostics/jaxrs/pom.xml +++ b/addons/diagnostics/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.5.4-SNAPSHOT + 2.5.4 indy-diagnostics-jaxrs diff --git a/addons/diagnostics/pom.xml b/addons/diagnostics/pom.xml index aad1320207..9b5d1f0034 100644 --- a/addons/diagnostics/pom.xml +++ b/addons/diagnostics/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4-SNAPSHOT + 2.5.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 26b50c5b19..3fd2b8300c 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 - 2.5.4-SNAPSHOT + 2.5.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 3da8c87c63..b0fa515d71 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 - 2.5.4-SNAPSHOT + 2.5.4 indy-ftests-dot-maven diff --git a/addons/dot-maven/jaxrs/pom.xml b/addons/dot-maven/jaxrs/pom.xml index 8d97336509..713cef0194 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 - 2.5.4-SNAPSHOT + 2.5.4 indy-dot-maven-jaxrs diff --git a/addons/dot-maven/pom.xml b/addons/dot-maven/pom.xml index e11e45c160..73028ad879 100644 --- a/addons/dot-maven/pom.xml +++ b/addons/dot-maven/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4-SNAPSHOT + 2.5.4 indy-dot-maven diff --git a/addons/event-audit/common/pom.xml b/addons/event-audit/common/pom.xml index 2a7222b0bb..9e60ba548d 100644 --- a/addons/event-audit/common/pom.xml +++ b/addons/event-audit/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-event-audit - 2.5.4-SNAPSHOT + 2.5.4 indy-event-audit-common diff --git a/addons/event-audit/pom.xml b/addons/event-audit/pom.xml index 281ee1cc5d..7a33851538 100644 --- a/addons/event-audit/pom.xml +++ b/addons/event-audit/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4-SNAPSHOT + 2.5.4 indy-event-audit diff --git a/addons/folo/client-java/pom.xml b/addons/folo/client-java/pom.xml index 2ddf2f9fee..40114a42d4 100644 --- a/addons/folo/client-java/pom.xml +++ b/addons/folo/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.5.4-SNAPSHOT + 2.5.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 31081a4588..3932d2faf2 100644 --- a/addons/folo/common/pom.xml +++ b/addons/folo/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.5.4-SNAPSHOT + 2.5.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 a72438f659..aed34280c5 100644 --- a/addons/folo/ftests/pom.xml +++ b/addons/folo/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.5.4-SNAPSHOT + 2.5.4 indy-ftests-folo diff --git a/addons/folo/jaxrs/pom.xml b/addons/folo/jaxrs/pom.xml index 59b4dc6f45..2a03d11572 100644 --- a/addons/folo/jaxrs/pom.xml +++ b/addons/folo/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.5.4-SNAPSHOT + 2.5.4 indy-folo-jaxrs diff --git a/addons/folo/model-java/pom.xml b/addons/folo/model-java/pom.xml index 3d3975ff46..51cd3f40b6 100644 --- a/addons/folo/model-java/pom.xml +++ b/addons/folo/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.5.4-SNAPSHOT + 2.5.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 041af7cdc1..3221ceee57 100644 --- a/addons/folo/pom.xml +++ b/addons/folo/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4-SNAPSHOT + 2.5.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 140aa7e6d8..bd6018d4fc 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 - 2.5.4-SNAPSHOT + 2.5.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 c537f2105c..07e5cdaaf8 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 - 2.5.4-SNAPSHOT + 2.5.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 92d55ba646..9bb32395a6 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 - 2.5.4-SNAPSHOT + 2.5.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 70ff5c3285..524f72e5eb 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 - 2.5.4-SNAPSHOT + 2.5.4 indy-hosted-by-archive-jaxrs diff --git a/addons/hosted-by-archive/pom.xml b/addons/hosted-by-archive/pom.xml index 4fc8df74c7..b58da24b1f 100644 --- a/addons/hosted-by-archive/pom.xml +++ b/addons/hosted-by-archive/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4-SNAPSHOT + 2.5.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 0d03e2d63d..41376a6a67 100644 --- a/addons/httprox/common/pom.xml +++ b/addons/httprox/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.5.4-SNAPSHOT + 2.5.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 3304593ae5..65a8ef983f 100644 --- a/addons/httprox/ftests/pom.xml +++ b/addons/httprox/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.5.4-SNAPSHOT + 2.5.4 indy-ftests-httprox diff --git a/addons/httprox/jaxrs/pom.xml b/addons/httprox/jaxrs/pom.xml index b81140e6af..2d5b55cf64 100644 --- a/addons/httprox/jaxrs/pom.xml +++ b/addons/httprox/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.5.4-SNAPSHOT + 2.5.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 71f3d68643..6ca0485b76 100644 --- a/addons/httprox/pom.xml +++ b/addons/httprox/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4-SNAPSHOT + 2.5.4 indy-httprox diff --git a/addons/implied-repos/client-java/pom.xml b/addons/implied-repos/client-java/pom.xml index 746a1ef1c0..947fdcd38a 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 - 2.5.4-SNAPSHOT + 2.5.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 335a5d026e..53da87c148 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 - 2.5.4-SNAPSHOT + 2.5.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 326a8ba70c..256bb91cb8 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 - 2.5.4-SNAPSHOT + 2.5.4 indy-ftests-implied-repos diff --git a/addons/implied-repos/model-java/pom.xml b/addons/implied-repos/model-java/pom.xml index 1c11a58a08..12cf3593d4 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 - 2.5.4-SNAPSHOT + 2.5.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 0f709bf67f..699a0c4223 100644 --- a/addons/implied-repos/pom.xml +++ b/addons/implied-repos/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4-SNAPSHOT + 2.5.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 08a0d380e2..03b3267c1b 100644 --- a/addons/koji/client-java/pom.xml +++ b/addons/koji/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.5.4-SNAPSHOT + 2.5.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 8c38997946..bd818edbae 100644 --- a/addons/koji/common/pom.xml +++ b/addons/koji/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.5.4-SNAPSHOT + 2.5.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 7fba769c42..fb86e69e24 100644 --- a/addons/koji/jaxrs/pom.xml +++ b/addons/koji/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.5.4-SNAPSHOT + 2.5.4 indy-koji-jaxrs diff --git a/addons/koji/model-java/pom.xml b/addons/koji/model-java/pom.xml index a8c37259b7..fc2614b96f 100644 --- a/addons/koji/model-java/pom.xml +++ b/addons/koji/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.5.4-SNAPSHOT + 2.5.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 352cbfb5ad..b69a2db8a8 100644 --- a/addons/koji/pom.xml +++ b/addons/koji/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4-SNAPSHOT + 2.5.4 indy-koji Indy :: Add-Ons :: Koji Integration :: Parent diff --git a/addons/path-mapped/common/pom.xml b/addons/path-mapped/common/pom.xml index 4aca425015..3a7e9a222a 100644 --- a/addons/path-mapped/common/pom.xml +++ b/addons/path-mapped/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.5.4-SNAPSHOT + 2.5.4 indy-path-mapped-common diff --git a/addons/path-mapped/jaxrs/pom.xml b/addons/path-mapped/jaxrs/pom.xml index 7447186f99..24beda393b 100644 --- a/addons/path-mapped/jaxrs/pom.xml +++ b/addons/path-mapped/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.5.4-SNAPSHOT + 2.5.4 indy-path-mapped-jaxrs diff --git a/addons/path-mapped/model-java/pom.xml b/addons/path-mapped/model-java/pom.xml index abda311076..eddc382228 100644 --- a/addons/path-mapped/model-java/pom.xml +++ b/addons/path-mapped/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.5.4-SNAPSHOT + 2.5.4 indy-path-mapped-model-java diff --git a/addons/path-mapped/pom.xml b/addons/path-mapped/pom.xml index ce78c37a49..bd8acd6946 100644 --- a/addons/path-mapped/pom.xml +++ b/addons/path-mapped/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4-SNAPSHOT + 2.5.4 indy-path-mapped Indy :: Add-Ons :: Path Mapped :: Parent diff --git a/addons/pkg-maven/common/pom.xml b/addons/pkg-maven/common/pom.xml index 0d6cf0ef0f..e36acd51a1 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 - 2.5.4-SNAPSHOT + 2.5.4 4.0.0 diff --git a/addons/pkg-maven/ftests/pom.xml b/addons/pkg-maven/ftests/pom.xml index 35019706f0..a228e2e7ae 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 - 2.5.4-SNAPSHOT + 2.5.4 4.0.0 diff --git a/addons/pkg-maven/jaxrs/pom.xml b/addons/pkg-maven/jaxrs/pom.xml index 6ca754424d..47bef5d3a0 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 - 2.5.4-SNAPSHOT + 2.5.4 4.0.0 diff --git a/addons/pkg-maven/pom.xml b/addons/pkg-maven/pom.xml index e1fbae7d09..84a06c19cb 100644 --- a/addons/pkg-maven/pom.xml +++ b/addons/pkg-maven/pom.xml @@ -20,7 +20,7 @@ indy-addons org.commonjava.indy - 2.5.4-SNAPSHOT + 2.5.4 4.0.0 diff --git a/addons/pkg-npm/common/pom.xml b/addons/pkg-npm/common/pom.xml index 631cf9f843..2bcefcc374 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 - 2.5.4-SNAPSHOT + 2.5.4 4.0.0 diff --git a/addons/pkg-npm/ftests/pom.xml b/addons/pkg-npm/ftests/pom.xml index b53bf27286..343d92ee93 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 - 2.5.4-SNAPSHOT + 2.5.4 4.0.0 diff --git a/addons/pkg-npm/jaxrs/pom.xml b/addons/pkg-npm/jaxrs/pom.xml index e7a513206b..bd49623c92 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 - 2.5.4-SNAPSHOT + 2.5.4 4.0.0 diff --git a/addons/pkg-npm/model-java/pom.xml b/addons/pkg-npm/model-java/pom.xml index 2911f3353e..842cf293c9 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 - 2.5.4-SNAPSHOT + 2.5.4 4.0.0 diff --git a/addons/pkg-npm/pom.xml b/addons/pkg-npm/pom.xml index b79bc25ac5..4094475962 100644 --- a/addons/pkg-npm/pom.xml +++ b/addons/pkg-npm/pom.xml @@ -20,7 +20,7 @@ indy-addons org.commonjava.indy - 2.5.4-SNAPSHOT + 2.5.4 4.0.0 diff --git a/addons/pom.xml b/addons/pom.xml index 7f4cd653aa..024699a02b 100644 --- a/addons/pom.xml +++ b/addons/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-parent - 2.5.4-SNAPSHOT + 2.5.4 indy-addons diff --git a/addons/promote/client-java/pom.xml b/addons/promote/client-java/pom.xml index 1f2d8434d9..3c646c3d04 100644 --- a/addons/promote/client-java/pom.xml +++ b/addons/promote/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.5.4-SNAPSHOT + 2.5.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 89352ab386..5abf4054c0 100644 --- a/addons/promote/common/pom.xml +++ b/addons/promote/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.5.4-SNAPSHOT + 2.5.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 7f4c44a558..be86bd0072 100644 --- a/addons/promote/ftests/pom.xml +++ b/addons/promote/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.5.4-SNAPSHOT + 2.5.4 indy-ftests-promote diff --git a/addons/promote/jaxrs/pom.xml b/addons/promote/jaxrs/pom.xml index 05dac2549e..4a94777485 100644 --- a/addons/promote/jaxrs/pom.xml +++ b/addons/promote/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.5.4-SNAPSHOT + 2.5.4 indy-promote-jaxrs diff --git a/addons/promote/model-java/pom.xml b/addons/promote/model-java/pom.xml index 42b7e3a330..9329a0f7e4 100644 --- a/addons/promote/model-java/pom.xml +++ b/addons/promote/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.5.4-SNAPSHOT + 2.5.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 981a6e43da..e571376e58 100644 --- a/addons/promote/pom.xml +++ b/addons/promote/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4-SNAPSHOT + 2.5.4 indy-promote Indy :: Add-Ons :: Artifact Promotion :: Parent diff --git a/addons/repo-proxy/common/pom.xml b/addons/repo-proxy/common/pom.xml index a351a616d0..905f0d524f 100644 --- a/addons/repo-proxy/common/pom.xml +++ b/addons/repo-proxy/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-repo-proxy - 2.5.4-SNAPSHOT + 2.5.4 indy-repo-proxy-common Indy :: Add-Ons :: Repository-Proxy :: Common diff --git a/addons/repo-proxy/ftests/pom.xml b/addons/repo-proxy/ftests/pom.xml index 308965e0ce..27a3f27c60 100644 --- a/addons/repo-proxy/ftests/pom.xml +++ b/addons/repo-proxy/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-repo-proxy - 2.5.4-SNAPSHOT + 2.5.4 indy-ftests-repo-proxy diff --git a/addons/repo-proxy/jaxrs/pom.xml b/addons/repo-proxy/jaxrs/pom.xml index c5127f6e08..4c7f3577f4 100644 --- a/addons/repo-proxy/jaxrs/pom.xml +++ b/addons/repo-proxy/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-repo-proxy - 2.5.4-SNAPSHOT + 2.5.4 indy-repo-proxy-jaxrs diff --git a/addons/repo-proxy/pom.xml b/addons/repo-proxy/pom.xml index d050c47606..adc7d3c7ef 100644 --- a/addons/repo-proxy/pom.xml +++ b/addons/repo-proxy/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4-SNAPSHOT + 2.5.4 indy-repo-proxy Indy :: Add-Ons :: Repository-Proxy :: Parent diff --git a/addons/revisions/common/pom.xml b/addons/revisions/common/pom.xml index 5d8befd899..0283806304 100644 --- a/addons/revisions/common/pom.xml +++ b/addons/revisions/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-revisions - 2.5.4-SNAPSHOT + 2.5.4 indy-revisions-common Indy :: Add-Ons :: Revisions :: Common diff --git a/addons/revisions/jaxrs/pom.xml b/addons/revisions/jaxrs/pom.xml index 906b3d14b4..658617677d 100644 --- a/addons/revisions/jaxrs/pom.xml +++ b/addons/revisions/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-revisions - 2.5.4-SNAPSHOT + 2.5.4 indy-revisions-jaxrs diff --git a/addons/revisions/pom.xml b/addons/revisions/pom.xml index 1f34c0ae8e..e99d3b4843 100644 --- a/addons/revisions/pom.xml +++ b/addons/revisions/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4-SNAPSHOT + 2.5.4 indy-revisions Indy :: Add-Ons :: Revisions :: Parent diff --git a/addons/sli/pom.xml b/addons/sli/pom.xml index 103a649936..a6d6125e7a 100644 --- a/addons/sli/pom.xml +++ b/addons/sli/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4-SNAPSHOT + 2.5.4 indy-sli Indy :: Add-Ons :: Service Level Indicators Reporting :: JAX-RS diff --git a/api/pom.xml b/api/pom.xml index fa63cc906a..d3facf2069 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.4-SNAPSHOT + 2.5.4 indy-api diff --git a/bindings/jaxrs/pom.xml b/bindings/jaxrs/pom.xml index 2804239bde..54f584cc2b 100644 --- a/bindings/jaxrs/pom.xml +++ b/bindings/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-bindings - 2.5.4-SNAPSHOT + 2.5.4 indy-bindings-jaxrs diff --git a/bindings/pom.xml b/bindings/pom.xml index 4faec030b2..7302e7f4f0 100644 --- a/bindings/pom.xml +++ b/bindings/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-parent - 2.5.4-SNAPSHOT + 2.5.4 indy-bindings diff --git a/boot/jaxrs/pom.xml b/boot/jaxrs/pom.xml index 19fa1b5483..ba3b019abf 100644 --- a/boot/jaxrs/pom.xml +++ b/boot/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.boot indy-booters - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy.boot diff --git a/boot/pom.xml b/boot/pom.xml index 2e26c19fec..b205c23d1f 100644 --- a/boot/pom.xml +++ b/boot/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy.boot diff --git a/clients/core-java/pom.xml b/clients/core-java/pom.xml index fc8bc4c87d..98f8e4ee05 100644 --- a/clients/core-java/pom.xml +++ b/clients/core-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-clients-parent - 2.5.4-SNAPSHOT + 2.5.4 indy-client-core-java diff --git a/clients/pom.xml b/clients/pom.xml index 2bfa8fa400..8fccb22e93 100644 --- a/clients/pom.xml +++ b/clients/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.4-SNAPSHOT + 2.5.4 indy-clients-parent diff --git a/core/pom.xml b/core/pom.xml index 4d4ebf4bb9..2404b389ec 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.4-SNAPSHOT + 2.5.4 indy-core diff --git a/db/common/pom.xml b/db/common/pom.xml index dff3d74962..39e128f071 100644 --- a/db/common/pom.xml +++ b/db/common/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-db - 2.5.4-SNAPSHOT + 2.5.4 indy-db-common diff --git a/db/flat/pom.xml b/db/flat/pom.xml index 389466b0eb..5d040744fb 100644 --- a/db/flat/pom.xml +++ b/db/flat/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.5.4-SNAPSHOT + 2.5.4 indy-db-flat diff --git a/db/infinispan/pom.xml b/db/infinispan/pom.xml index 336fc65a13..fe3278204e 100644 --- a/db/infinispan/pom.xml +++ b/db/infinispan/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-db - 2.5.4-SNAPSHOT + 2.5.4 indy-db-infinispan diff --git a/db/memory/pom.xml b/db/memory/pom.xml index 3413f490b3..8b8519f545 100644 --- a/db/memory/pom.xml +++ b/db/memory/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.5.4-SNAPSHOT + 2.5.4 indy-db-memory diff --git a/db/metrics/pom.xml b/db/metrics/pom.xml index d13ca123e6..e19dc13a97 100644 --- a/db/metrics/pom.xml +++ b/db/metrics/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.5.4-SNAPSHOT + 2.5.4 indy-db-metrics diff --git a/db/pom.xml b/db/pom.xml index dcd10ac8e2..186104cfbb 100644 --- a/db/pom.xml +++ b/db/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.4-SNAPSHOT + 2.5.4 indy-db diff --git a/deployments/launcher/pom.xml b/deployments/launcher/pom.xml index 2e31785d30..48410380c7 100644 --- a/deployments/launcher/pom.xml +++ b/deployments/launcher/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-deployments - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy.launch diff --git a/deployments/pom.xml b/deployments/pom.xml index 8bea5b1fd2..07e195b8af 100644 --- a/deployments/pom.xml +++ b/deployments/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.4-SNAPSHOT + 2.5.4 indy-deployments diff --git a/embedder/pom.xml b/embedder/pom.xml index 1ed0c6f0c0..e36049a1d3 100644 --- a/embedder/pom.xml +++ b/embedder/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy.embed diff --git a/filers/default/pom.xml b/filers/default/pom.xml index b14a815036..1ba7d4b7c7 100644 --- a/filers/default/pom.xml +++ b/filers/default/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-file-managers - 2.5.4-SNAPSHOT + 2.5.4 indy-filer-default diff --git a/filers/pom.xml b/filers/pom.xml index 624732d85b..bcc01a917e 100644 --- a/filers/pom.xml +++ b/filers/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.4-SNAPSHOT + 2.5.4 indy-file-managers diff --git a/ftests/common/pom.xml b/ftests/common/pom.xml index 97233205c8..1f7d1d3297 100644 --- a/ftests/common/pom.xml +++ b/ftests/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-ftests-parent - 2.5.4-SNAPSHOT + 2.5.4 indy-ftests-common diff --git a/ftests/core/pom.xml b/ftests/core/pom.xml index 5a4de29e3d..fcda2df298 100644 --- a/ftests/core/pom.xml +++ b/ftests/core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-ftests-parent - 2.5.4-SNAPSHOT + 2.5.4 indy-ftests-core diff --git a/ftests/pom.xml b/ftests/pom.xml index e588b7819b..7f30dd248a 100644 --- a/ftests/pom.xml +++ b/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.4-SNAPSHOT + 2.5.4 indy-ftests-parent diff --git a/models/core-java/pom.xml b/models/core-java/pom.xml index 50f0df2d50..abd71f2e6f 100644 --- a/models/core-java/pom.xml +++ b/models/core-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-models-parent - 2.5.4-SNAPSHOT + 2.5.4 indy-model-core-java diff --git a/models/pom.xml b/models/pom.xml index 087f4b521b..b7ee6d87b6 100644 --- a/models/pom.xml +++ b/models/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.4-SNAPSHOT + 2.5.4 indy-models-parent diff --git a/pom.xml b/pom.xml index 23505abaf9..27b77a23d2 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.commonjava.indy indy-parent - 2.5.4-SNAPSHOT + 2.5.4 pom @@ -37,7 +37,7 @@ scm:git:https://github.com/CommonJava/indy scm:git:https://github.com/CommonJava/indy http://github.com/Commonjava/indy - indy-parent-2.5.2 + indy-parent-2.5.4 @@ -187,7 +187,7 @@ org.commonjava.indy.ui indy-ui-layover - 2.5.4-SNAPSHOT + 2.5.4 runtime @@ -195,22 +195,22 @@ org.commonjava.indy indy-model-core-java - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-api - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-core - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-core - 2.5.4-SNAPSHOT + 2.5.4 tar.gz confset provided @@ -218,32 +218,32 @@ org.commonjava.indy indy-db-flat - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-db-metrics - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-db-common - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-db-infinispan - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-bindings-jaxrs - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy.launch indy-launcher - 2.5.4-SNAPSHOT + 2.5.4 tar.gz skinny provided @@ -251,7 +251,7 @@ org.commonjava.indy.launch indy-launcher - 2.5.4-SNAPSHOT + 2.5.4 tar.gz complete provided @@ -259,7 +259,7 @@ org.commonjava.indy.launch indy-launcher - 2.5.4-SNAPSHOT + 2.5.4 tar.gz data provided @@ -267,7 +267,7 @@ org.commonjava.indy.launch indy-launcher - 2.5.4-SNAPSHOT + 2.5.4 tar.gz etc provided @@ -276,17 +276,17 @@ org.commonjava.indy indy-revisions-jaxrs - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-revisions-common - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-revisions-common - 2.5.4-SNAPSHOT + 2.5.4 tar.gz confset provided @@ -294,7 +294,7 @@ org.commonjava.indy indy-revisions-common - 2.5.4-SNAPSHOT + 2.5.4 tar.gz uiset provided @@ -302,12 +302,12 @@ org.commonjava.indy indy-dot-maven-common - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-dot-maven-common - 2.5.4-SNAPSHOT + 2.5.4 tar.gz dataset provided @@ -315,22 +315,22 @@ org.commonjava.indy indy-dot-maven-jaxrs - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-ftests-dot-maven - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-httprox-common - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-httprox-common - 2.5.4-SNAPSHOT + 2.5.4 tar.gz confset provided @@ -338,17 +338,17 @@ org.commonjava.indy indy-ftests-httprox - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-content-index - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-content-index - 2.5.4-SNAPSHOT + 2.5.4 tar.gz confset provided @@ -356,51 +356,51 @@ org.commonjava.indy indy-db-memory - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-test-db - 2.5.4-SNAPSHOT + 2.5.4 test org.commonjava.indy indy-test-fixtures-core - 2.5.4-SNAPSHOT + 2.5.4 test org.commonjava.indy indy-test-providers-core - 2.5.4-SNAPSHOT + 2.5.4 test org.commonjava.indy indy-test-utils - 2.5.4-SNAPSHOT + 2.5.4 test org.commonjava.indy indy-filer-default - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-subsys-jaxrs - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-subsys-honeycomb - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-subsys-honeycomb - 2.5.4-SNAPSHOT + 2.5.4 tar.gz confset provided @@ -408,17 +408,17 @@ org.commonjava.indy indy-subsys-flatfile - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-subsys-cassandra - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-subsys-cassandra - 2.5.4-SNAPSHOT + 2.5.4 tar.gz confset provided @@ -426,79 +426,79 @@ org.commonjava.indy indy-subsys-infinispan - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-subsys-http - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-subsys-git - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-subsys-groovy - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-subsys-prefetch - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-subsys-cpool - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-client-core-java - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-ftests-common - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-ftests-core - 2.5.4-SNAPSHOT + 2.5.4 test org.commonjava.indy indy-folo-jaxrs - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-ftests-folo - 2.5.4-SNAPSHOT + 2.5.4 test org.commonjava.indy indy-folo-client-java - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-folo-model-java - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-folo-common - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-folo-common - 2.5.4-SNAPSHOT + 2.5.4 tar.gz dataset provided @@ -506,7 +506,7 @@ org.commonjava.indy indy-folo-common - 2.5.4-SNAPSHOT + 2.5.4 tar.gz confset provided @@ -514,33 +514,33 @@ org.commonjava.indy indy-promote-jaxrs - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-ftests-promote - 2.5.4-SNAPSHOT + 2.5.4 test org.commonjava.indy indy-promote-client-java - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-promote-model-java - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-promote-common - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-promote-common - 2.5.4-SNAPSHOT + 2.5.4 tar.gz confset provided @@ -548,7 +548,7 @@ org.commonjava.indy indy-promote-common - 2.5.4-SNAPSHOT + 2.5.4 tar.gz dataset provided @@ -556,19 +556,19 @@ org.commonjava.indy indy-promote-common - 2.5.4-SNAPSHOT + 2.5.4 dataset provided org.commonjava.indy indy-implied-repos-common - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-implied-repos-common - 2.5.4-SNAPSHOT + 2.5.4 tar.gz confset provided @@ -576,37 +576,37 @@ org.commonjava.indy indy-implied-repos-model-java - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-implied-repos-client-java - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-ftests-implied-repos - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy.embed indy-embedder - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy.boot indy-booter-jaxrs - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-subsys-keycloak - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-subsys-keycloak - 2.5.4-SNAPSHOT + 2.5.4 tar.gz confset provided @@ -614,7 +614,7 @@ org.commonjava.indy indy-subsys-infinispan - 2.5.4-SNAPSHOT + 2.5.4 tar.gz confset provided @@ -622,7 +622,7 @@ org.commonjava.indy indy-subsys-prefetch - 2.5.4-SNAPSHOT + 2.5.4 tar.gz confset provided @@ -631,7 +631,7 @@ org.commonjava.indy indy-koji-common - 2.5.4-SNAPSHOT + 2.5.4 tar.gz confset provided @@ -639,103 +639,103 @@ org.commonjava.indy indy-koji-common - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-koji-model-java - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-koji-client-java - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-koji-jaxrs - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-path-mapped-common - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-path-mapped-model-java - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-path-mapped-jaxrs - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-pkg-maven-common - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-pkg-maven-jaxrs - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-pkg-npm-jaxrs - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-ftests-pkg-maven - 2.5.4-SNAPSHOT + 2.5.4 test org.commonjava.indy indy-ftests-pkg-npm - 2.5.4-SNAPSHOT + 2.5.4 test org.commonjava.indy indy-pkg-npm-common - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-pkg-npm-model-java - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-diagnostics-jaxrs - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-diagnostics-client-java - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-diagnostics-common - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-ftests-diagnostics - 2.5.4-SNAPSHOT + 2.5.4 test org.commonjava.indy indy-diagnostics-common - 2.5.4-SNAPSHOT + 2.5.4 confset tar.gz provided @@ -743,28 +743,28 @@ org.commonjava.indy indy-hosted-by-archive-common - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-hosted-by-archive-client-java - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-ftests-hosted-by-archive - 2.5.4-SNAPSHOT + 2.5.4 test org.commonjava.indy indy-hosted-by-archive-jaxrs - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-hosted-by-archive-common - 2.5.4-SNAPSHOT + 2.5.4 confset tar.gz @@ -772,12 +772,12 @@ org.commonjava.indy indy-subsys-metrics - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-subsys-metrics - 2.5.4-SNAPSHOT + 2.5.4 confset tar.gz provided @@ -786,21 +786,21 @@ org.commonjava.indy indy-sli - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy.rest indy-rest-api yaml - 2.5.4-SNAPSHOT + 2.5.4 provided org.commonjava.indy.rest indy-rest-api json - 2.5.4-SNAPSHOT + 2.5.4 provided @@ -839,33 +839,33 @@ org.commonjava.indy indy-content-browse-common - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-content-browse-jaxrs - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-ftests-content-browse - 2.5.4-SNAPSHOT + 2.5.4 test org.commonjava.indy indy-content-browse-model-java - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-content-browse-client-java - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-content-browse-common - 2.5.4-SNAPSHOT + 2.5.4 confset tar.gz provided @@ -873,35 +873,35 @@ org.commonjava.indy indy-content-browse-ui - 2.5.4-SNAPSHOT + 2.5.4 reactui tar.gz org.commonjava.indy indy-changelog-common - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-changelog-client-java - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-ftests-changelog - 2.5.4-SNAPSHOT + 2.5.4 test org.commonjava.indy indy-changelog-jaxrs - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-changelog-common - 2.5.4-SNAPSHOT + 2.5.4 confset tar.gz @@ -919,12 +919,12 @@ org.commonjava.indy indy-event-audit-common - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-event-audit-common - 2.5.4-SNAPSHOT + 2.5.4 confset tar.gz provided @@ -939,23 +939,23 @@ org.commonjava.indy indy-repo-proxy-common - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-repo-proxy-jaxrs - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy indy-ftests-repo-proxy - 2.5.4-SNAPSHOT + 2.5.4 test org.commonjava.indy indy-repo-proxy-common - 2.5.4-SNAPSHOT + 2.5.4 confset tar.gz diff --git a/rest/api/pom.xml b/rest/api/pom.xml index 79f6ff21e8..eacd0620f3 100644 --- a/rest/api/pom.xml +++ b/rest/api/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.rest indy-rest-parent - 2.5.4-SNAPSHOT + 2.5.4 indy-rest-api diff --git a/rest/pom.xml b/rest/pom.xml index eb5740891b..b0a9fa7568 100644 --- a/rest/pom.xml +++ b/rest/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy.rest diff --git a/subsys/cassandra/pom.xml b/subsys/cassandra/pom.xml index c9d45b4fe5..19d62d37e5 100644 --- a/subsys/cassandra/pom.xml +++ b/subsys/cassandra/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-subsystems - 2.5.4-SNAPSHOT + 2.5.4 indy-subsys-cassandra diff --git a/subsys/cpool/pom.xml b/subsys/cpool/pom.xml index 1a0df46332..6f58b3fc5a 100644 --- a/subsys/cpool/pom.xml +++ b/subsys/cpool/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.4-SNAPSHOT + 2.5.4 indy-subsys-cpool diff --git a/subsys/flatfile/pom.xml b/subsys/flatfile/pom.xml index b3dcf09164..b8db85668b 100644 --- a/subsys/flatfile/pom.xml +++ b/subsys/flatfile/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.4-SNAPSHOT + 2.5.4 indy-subsys-flatfile diff --git a/subsys/git/pom.xml b/subsys/git/pom.xml index 7fa1ed2833..393d82a307 100644 --- a/subsys/git/pom.xml +++ b/subsys/git/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.4-SNAPSHOT + 2.5.4 indy-subsys-git diff --git a/subsys/groovy/pom.xml b/subsys/groovy/pom.xml index fe3b52bf01..130764e5a5 100644 --- a/subsys/groovy/pom.xml +++ b/subsys/groovy/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.4-SNAPSHOT + 2.5.4 indy-subsys-groovy diff --git a/subsys/honeycomb/pom.xml b/subsys/honeycomb/pom.xml index 122bf6ddbe..9505617d06 100644 --- a/subsys/honeycomb/pom.xml +++ b/subsys/honeycomb/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.5.4-SNAPSHOT + 2.5.4 4.0.0 diff --git a/subsys/http/pom.xml b/subsys/http/pom.xml index b8fab98e5e..2923cf30ea 100644 --- a/subsys/http/pom.xml +++ b/subsys/http/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.4-SNAPSHOT + 2.5.4 indy-subsys-http diff --git a/subsys/infinispan/pom.xml b/subsys/infinispan/pom.xml index b58b1a7403..876f9bf513 100644 --- a/subsys/infinispan/pom.xml +++ b/subsys/infinispan/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.4-SNAPSHOT + 2.5.4 indy-subsys-infinispan diff --git a/subsys/jaxrs/pom.xml b/subsys/jaxrs/pom.xml index 9c906fb150..3b93da265e 100644 --- a/subsys/jaxrs/pom.xml +++ b/subsys/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.4-SNAPSHOT + 2.5.4 indy-subsys-jaxrs diff --git a/subsys/kafka/pom.xml b/subsys/kafka/pom.xml index feb563d07b..9347cfb2bd 100644 --- a/subsys/kafka/pom.xml +++ b/subsys/kafka/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.5.4-SNAPSHOT + 2.5.4 4.0.0 diff --git a/subsys/keycloak/pom.xml b/subsys/keycloak/pom.xml index 54869b2a33..e39fe83d68 100644 --- a/subsys/keycloak/pom.xml +++ b/subsys/keycloak/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.4-SNAPSHOT + 2.5.4 indy-subsys-keycloak Indy :: Subsystems :: Keycloak diff --git a/subsys/metrics/pom.xml b/subsys/metrics/pom.xml index 576250f7ab..5b7e286b7e 100644 --- a/subsys/metrics/pom.xml +++ b/subsys/metrics/pom.xml @@ -20,7 +20,7 @@ org.commonjava.indy indy-subsystems - 2.5.4-SNAPSHOT + 2.5.4 4.0.0 diff --git a/subsys/pom.xml b/subsys/pom.xml index ed072777f6..ddd77d6d10 100644 --- a/subsys/pom.xml +++ b/subsys/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.4-SNAPSHOT + 2.5.4 indy-subsystems diff --git a/subsys/prefetch/pom.xml b/subsys/prefetch/pom.xml index ba20b88d0a..77eb132b0c 100644 --- a/subsys/prefetch/pom.xml +++ b/subsys/prefetch/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.5.4-SNAPSHOT + 2.5.4 4.0.0 diff --git a/test/db/pom.xml b/test/db/pom.xml index d8d2a901e5..ff43e29cad 100644 --- a/test/db/pom.xml +++ b/test/db/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.5.4-SNAPSHOT + 2.5.4 indy-test-db diff --git a/test/fixtures-core/pom.xml b/test/fixtures-core/pom.xml index 19d9cd6257..03fc2e4c62 100644 --- a/test/fixtures-core/pom.xml +++ b/test/fixtures-core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.5.4-SNAPSHOT + 2.5.4 indy-test-fixtures-core diff --git a/test/pom.xml b/test/pom.xml index dbc53f2af5..5fe4cc3b66 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.4-SNAPSHOT + 2.5.4 indy-test diff --git a/test/providers-core/pom.xml b/test/providers-core/pom.xml index 843585e449..d228fea6ea 100644 --- a/test/providers-core/pom.xml +++ b/test/providers-core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.5.4-SNAPSHOT + 2.5.4 indy-test-providers-core diff --git a/test/utils/pom.xml b/test/utils/pom.xml index 01675cfc11..10a746b1b5 100644 --- a/test/utils/pom.xml +++ b/test/utils/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.5.4-SNAPSHOT + 2.5.4 indy-test-utils diff --git a/tools/assemblies/pom.xml b/tools/assemblies/pom.xml index 2aeb73d8fb..f083f5e4c9 100644 --- a/tools/assemblies/pom.xml +++ b/tools/assemblies/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.tools indy-tools - 2.5.4-SNAPSHOT + 2.5.4 indy-assemblies diff --git a/tools/pom.xml b/tools/pom.xml index 92dc3cf8f8..5db36431ed 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy.tools diff --git a/uis/layover/pom.xml b/uis/layover/pom.xml index 29304cf709..fb44850748 100644 --- a/uis/layover/pom.xml +++ b/uis/layover/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.ui indy-uis - 2.5.4-SNAPSHOT + 2.5.4 indy-ui-layover diff --git a/uis/pom.xml b/uis/pom.xml index 826e232d9d..5ac7735af4 100644 --- a/uis/pom.xml +++ b/uis/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.4-SNAPSHOT + 2.5.4 org.commonjava.indy.ui From 830b1fd78ce987559b16abba1abb43f90956ee1a Mon Sep 17 00:00:00 2001 From: ruhan Date: Wed, 12 Jun 2024 16:22:22 +0800 Subject: [PATCH 43/50] Prepare for development iteration 2.5.4.x --- addons/changelog/client-java/pom.xml | 2 +- addons/changelog/common/pom.xml | 2 +- addons/changelog/ftests/pom.xml | 2 +- addons/changelog/jaxrs/pom.xml | 2 +- addons/changelog/pom.xml | 2 +- addons/content-browse/client-java/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/event-audit/common/pom.xml | 2 +- addons/event-audit/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/path-mapped/common/pom.xml | 2 +- addons/path-mapped/jaxrs/pom.xml | 2 +- addons/path-mapped/model-java/pom.xml | 2 +- addons/path-mapped/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/repo-proxy/common/pom.xml | 2 +- addons/repo-proxy/ftests/pom.xml | 2 +- addons/repo-proxy/jaxrs/pom.xml | 2 +- addons/repo-proxy/pom.xml | 2 +- addons/revisions/common/pom.xml | 2 +- addons/revisions/jaxrs/pom.xml | 2 +- addons/revisions/pom.xml | 2 +- addons/sli/pom.xml | 2 +- api/pom.xml | 2 +- bindings/jaxrs/pom.xml | 2 +- bindings/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/common/pom.xml | 2 +- db/flat/pom.xml | 2 +- db/infinispan/pom.xml | 2 +- db/memory/pom.xml | 2 +- db/metrics/pom.xml | 2 +- db/pom.xml | 2 +- deployments/docker/pom.xml | 2 +- deployments/launcher/pom.xml | 2 +- deployments/pom.xml | 2 +- deployments/standalone/launcher/pom.xml | 2 +- deployments/standalone/pom.xml | 2 +- embedder-tests/pom.xml | 2 +- embedder-tests/sonar-report/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/pom.xml | 2 +- models/core-java/pom.xml | 2 +- models/pom.xml | 2 +- pom.xml | 246 +++++++++---------- rest/api/pom.xml | 2 +- rest/pom.xml | 2 +- subsys/cassandra/pom.xml | 2 +- subsys/cpool/pom.xml | 2 +- subsys/flatfile/pom.xml | 2 +- subsys/git/pom.xml | 2 +- subsys/groovy/pom.xml | 2 +- subsys/honeycomb/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/pom.xml | 2 +- subsys/pom.xml | 2 +- subsys/prefetch/pom.xml | 2 +- test/db/pom.xml | 2 +- test/docker/gogs-test-appliance/pom.xml | 2 +- test/docker/keycloak-test-appliance/pom.xml | 2 +- test/docker/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 +- 135 files changed, 257 insertions(+), 257 deletions(-) diff --git a/addons/changelog/client-java/pom.xml b/addons/changelog/client-java/pom.xml index ddd85e7ca9..4d883b405e 100644 --- a/addons/changelog/client-java/pom.xml +++ b/addons/changelog/client-java/pom.xml @@ -20,7 +20,7 @@ indy-changelog org.commonjava.indy - 2.5.4 + 2.5.4.1-SNAPSHOT 4.0.0 diff --git a/addons/changelog/common/pom.xml b/addons/changelog/common/pom.xml index cf6136d98c..961dbf5f11 100644 --- a/addons/changelog/common/pom.xml +++ b/addons/changelog/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.5.4 + 2.5.4.1-SNAPSHOT indy-changelog-common Indy :: Add-Ons :: ChangeLog :: Common diff --git a/addons/changelog/ftests/pom.xml b/addons/changelog/ftests/pom.xml index 91003d266b..f135f2a01e 100644 --- a/addons/changelog/ftests/pom.xml +++ b/addons/changelog/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.5.4 + 2.5.4.1-SNAPSHOT indy-ftests-changelog diff --git a/addons/changelog/jaxrs/pom.xml b/addons/changelog/jaxrs/pom.xml index 3ef7afa457..238562d2b1 100644 --- a/addons/changelog/jaxrs/pom.xml +++ b/addons/changelog/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.5.4 + 2.5.4.1-SNAPSHOT indy-changelog-jaxrs diff --git a/addons/changelog/pom.xml b/addons/changelog/pom.xml index c8ee82dc83..55589cdce4 100644 --- a/addons/changelog/pom.xml +++ b/addons/changelog/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4 + 2.5.4.1-SNAPSHOT indy-changelog Indy :: Add-Ons :: ChangeLog :: Parent diff --git a/addons/content-browse/client-java/pom.xml b/addons/content-browse/client-java/pom.xml index 25e11a3a71..88ed251615 100644 --- a/addons/content-browse/client-java/pom.xml +++ b/addons/content-browse/client-java/pom.xml @@ -20,7 +20,7 @@ indy-content-browse org.commonjava.indy - 2.5.4 + 2.5.4.1-SNAPSHOT 4.0.0 diff --git a/addons/content-browse/common/pom.xml b/addons/content-browse/common/pom.xml index 491f6e4b3f..d952b7806f 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 - 2.5.4 + 2.5.4.1-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 fb24925d5d..530111364b 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 - 2.5.4 + 2.5.4.1-SNAPSHOT indy-ftests-content-browse diff --git a/addons/content-browse/jaxrs/pom.xml b/addons/content-browse/jaxrs/pom.xml index 76dc69f728..5d113bf2d2 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 - 2.5.4 + 2.5.4.1-SNAPSHOT indy-content-browse-jaxrs diff --git a/addons/content-browse/model-java/pom.xml b/addons/content-browse/model-java/pom.xml index 23119463be..89662f4eed 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 - 2.5.4 + 2.5.4.1-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 48bfda86e6..c7786aed0a 100644 --- a/addons/content-browse/pom.xml +++ b/addons/content-browse/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4 + 2.5.4.1-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 5e2bf94ac3..b0fd226651 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 - 2.5.4 + 2.5.4.1-SNAPSHOT 4.0.0 diff --git a/addons/content-index/pom.xml b/addons/content-index/pom.xml index 088d8d9576..9f45f7ac48 100644 --- a/addons/content-index/pom.xml +++ b/addons/content-index/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4 + 2.5.4.1-SNAPSHOT indy-content-index diff --git a/addons/diagnostics/client-java/pom.xml b/addons/diagnostics/client-java/pom.xml index 983906678a..bb24627a62 100644 --- a/addons/diagnostics/client-java/pom.xml +++ b/addons/diagnostics/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.5.4 + 2.5.4.1-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 d9c10f95fa..4e483248ac 100644 --- a/addons/diagnostics/common/pom.xml +++ b/addons/diagnostics/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.5.4 + 2.5.4.1-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 60848979cc..0f40f579d4 100644 --- a/addons/diagnostics/ftests/pom.xml +++ b/addons/diagnostics/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.5.4 + 2.5.4.1-SNAPSHOT indy-ftests-diagnostics diff --git a/addons/diagnostics/jaxrs/pom.xml b/addons/diagnostics/jaxrs/pom.xml index 114a7dcb65..2bf13a7bf0 100644 --- a/addons/diagnostics/jaxrs/pom.xml +++ b/addons/diagnostics/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.5.4 + 2.5.4.1-SNAPSHOT indy-diagnostics-jaxrs diff --git a/addons/diagnostics/pom.xml b/addons/diagnostics/pom.xml index 9b5d1f0034..7c1eb151f2 100644 --- a/addons/diagnostics/pom.xml +++ b/addons/diagnostics/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4 + 2.5.4.1-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 3fd2b8300c..99642d9f84 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 - 2.5.4 + 2.5.4.1-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 b0fa515d71..46454f5295 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 - 2.5.4 + 2.5.4.1-SNAPSHOT indy-ftests-dot-maven diff --git a/addons/dot-maven/jaxrs/pom.xml b/addons/dot-maven/jaxrs/pom.xml index 713cef0194..c4c4e5ace0 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 - 2.5.4 + 2.5.4.1-SNAPSHOT indy-dot-maven-jaxrs diff --git a/addons/dot-maven/pom.xml b/addons/dot-maven/pom.xml index 73028ad879..f6fdc100fc 100644 --- a/addons/dot-maven/pom.xml +++ b/addons/dot-maven/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4 + 2.5.4.1-SNAPSHOT indy-dot-maven diff --git a/addons/event-audit/common/pom.xml b/addons/event-audit/common/pom.xml index 9e60ba548d..a3d8eede38 100644 --- a/addons/event-audit/common/pom.xml +++ b/addons/event-audit/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-event-audit - 2.5.4 + 2.5.4.1-SNAPSHOT indy-event-audit-common diff --git a/addons/event-audit/pom.xml b/addons/event-audit/pom.xml index 7a33851538..22cde362b5 100644 --- a/addons/event-audit/pom.xml +++ b/addons/event-audit/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4 + 2.5.4.1-SNAPSHOT indy-event-audit diff --git a/addons/folo/client-java/pom.xml b/addons/folo/client-java/pom.xml index 40114a42d4..e5c1624a9d 100644 --- a/addons/folo/client-java/pom.xml +++ b/addons/folo/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.5.4 + 2.5.4.1-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 3932d2faf2..fed55d562b 100644 --- a/addons/folo/common/pom.xml +++ b/addons/folo/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.5.4 + 2.5.4.1-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 aed34280c5..e7e4eb6ab7 100644 --- a/addons/folo/ftests/pom.xml +++ b/addons/folo/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.5.4 + 2.5.4.1-SNAPSHOT indy-ftests-folo diff --git a/addons/folo/jaxrs/pom.xml b/addons/folo/jaxrs/pom.xml index 2a03d11572..190861d1e6 100644 --- a/addons/folo/jaxrs/pom.xml +++ b/addons/folo/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.5.4 + 2.5.4.1-SNAPSHOT indy-folo-jaxrs diff --git a/addons/folo/model-java/pom.xml b/addons/folo/model-java/pom.xml index 51cd3f40b6..cea0d81520 100644 --- a/addons/folo/model-java/pom.xml +++ b/addons/folo/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.5.4 + 2.5.4.1-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 3221ceee57..dcc753163b 100644 --- a/addons/folo/pom.xml +++ b/addons/folo/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4 + 2.5.4.1-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 bd6018d4fc..5e8cdd1c25 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 - 2.5.4 + 2.5.4.1-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 07e5cdaaf8..40c6ca25fb 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 - 2.5.4 + 2.5.4.1-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 9bb32395a6..f3b55e6b58 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 - 2.5.4 + 2.5.4.1-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 524f72e5eb..e692072a77 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 - 2.5.4 + 2.5.4.1-SNAPSHOT indy-hosted-by-archive-jaxrs diff --git a/addons/hosted-by-archive/pom.xml b/addons/hosted-by-archive/pom.xml index b58da24b1f..1f6df322f7 100644 --- a/addons/hosted-by-archive/pom.xml +++ b/addons/hosted-by-archive/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4 + 2.5.4.1-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 41376a6a67..fce632a3be 100644 --- a/addons/httprox/common/pom.xml +++ b/addons/httprox/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.5.4 + 2.5.4.1-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 65a8ef983f..6ad25b8ee7 100644 --- a/addons/httprox/ftests/pom.xml +++ b/addons/httprox/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.5.4 + 2.5.4.1-SNAPSHOT indy-ftests-httprox diff --git a/addons/httprox/jaxrs/pom.xml b/addons/httprox/jaxrs/pom.xml index 2d5b55cf64..2cd821fddd 100644 --- a/addons/httprox/jaxrs/pom.xml +++ b/addons/httprox/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.5.4 + 2.5.4.1-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 6ca0485b76..4eebadfa7c 100644 --- a/addons/httprox/pom.xml +++ b/addons/httprox/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4 + 2.5.4.1-SNAPSHOT indy-httprox diff --git a/addons/implied-repos/client-java/pom.xml b/addons/implied-repos/client-java/pom.xml index 947fdcd38a..b30f1c3663 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 - 2.5.4 + 2.5.4.1-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 53da87c148..d95f5303d4 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 - 2.5.4 + 2.5.4.1-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 256bb91cb8..cc81ca96fe 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 - 2.5.4 + 2.5.4.1-SNAPSHOT indy-ftests-implied-repos diff --git a/addons/implied-repos/model-java/pom.xml b/addons/implied-repos/model-java/pom.xml index 12cf3593d4..b4b1f04bfa 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 - 2.5.4 + 2.5.4.1-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 699a0c4223..07c48d15b0 100644 --- a/addons/implied-repos/pom.xml +++ b/addons/implied-repos/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4 + 2.5.4.1-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 03b3267c1b..f136998dce 100644 --- a/addons/koji/client-java/pom.xml +++ b/addons/koji/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.5.4 + 2.5.4.1-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 bd818edbae..e8202e9f1d 100644 --- a/addons/koji/common/pom.xml +++ b/addons/koji/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.5.4 + 2.5.4.1-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 fb86e69e24..eaa16d34c7 100644 --- a/addons/koji/jaxrs/pom.xml +++ b/addons/koji/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.5.4 + 2.5.4.1-SNAPSHOT indy-koji-jaxrs diff --git a/addons/koji/model-java/pom.xml b/addons/koji/model-java/pom.xml index fc2614b96f..7f68e28d78 100644 --- a/addons/koji/model-java/pom.xml +++ b/addons/koji/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.5.4 + 2.5.4.1-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 b69a2db8a8..aad159a866 100644 --- a/addons/koji/pom.xml +++ b/addons/koji/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4 + 2.5.4.1-SNAPSHOT indy-koji Indy :: Add-Ons :: Koji Integration :: Parent diff --git a/addons/path-mapped/common/pom.xml b/addons/path-mapped/common/pom.xml index 3a7e9a222a..833d21d37d 100644 --- a/addons/path-mapped/common/pom.xml +++ b/addons/path-mapped/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.5.4 + 2.5.4.1-SNAPSHOT indy-path-mapped-common diff --git a/addons/path-mapped/jaxrs/pom.xml b/addons/path-mapped/jaxrs/pom.xml index 24beda393b..c89ae09d73 100644 --- a/addons/path-mapped/jaxrs/pom.xml +++ b/addons/path-mapped/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.5.4 + 2.5.4.1-SNAPSHOT indy-path-mapped-jaxrs diff --git a/addons/path-mapped/model-java/pom.xml b/addons/path-mapped/model-java/pom.xml index eddc382228..ba5a1155ba 100644 --- a/addons/path-mapped/model-java/pom.xml +++ b/addons/path-mapped/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.5.4 + 2.5.4.1-SNAPSHOT indy-path-mapped-model-java diff --git a/addons/path-mapped/pom.xml b/addons/path-mapped/pom.xml index bd8acd6946..ae4f414e97 100644 --- a/addons/path-mapped/pom.xml +++ b/addons/path-mapped/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4 + 2.5.4.1-SNAPSHOT indy-path-mapped Indy :: Add-Ons :: Path Mapped :: Parent diff --git a/addons/pkg-maven/common/pom.xml b/addons/pkg-maven/common/pom.xml index e36acd51a1..d24cd5365a 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 - 2.5.4 + 2.5.4.1-SNAPSHOT 4.0.0 diff --git a/addons/pkg-maven/ftests/pom.xml b/addons/pkg-maven/ftests/pom.xml index a228e2e7ae..addc5debe9 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 - 2.5.4 + 2.5.4.1-SNAPSHOT 4.0.0 diff --git a/addons/pkg-maven/jaxrs/pom.xml b/addons/pkg-maven/jaxrs/pom.xml index 47bef5d3a0..44a56c616e 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 - 2.5.4 + 2.5.4.1-SNAPSHOT 4.0.0 diff --git a/addons/pkg-maven/pom.xml b/addons/pkg-maven/pom.xml index 84a06c19cb..0d9e6a0b14 100644 --- a/addons/pkg-maven/pom.xml +++ b/addons/pkg-maven/pom.xml @@ -20,7 +20,7 @@ indy-addons org.commonjava.indy - 2.5.4 + 2.5.4.1-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/common/pom.xml b/addons/pkg-npm/common/pom.xml index 2bcefcc374..e2b6cf0d6a 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 - 2.5.4 + 2.5.4.1-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/ftests/pom.xml b/addons/pkg-npm/ftests/pom.xml index 343d92ee93..a76439b121 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 - 2.5.4 + 2.5.4.1-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/jaxrs/pom.xml b/addons/pkg-npm/jaxrs/pom.xml index bd49623c92..a66f0d46a1 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 - 2.5.4 + 2.5.4.1-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/model-java/pom.xml b/addons/pkg-npm/model-java/pom.xml index 842cf293c9..ef5d466dfa 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 - 2.5.4 + 2.5.4.1-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/pom.xml b/addons/pkg-npm/pom.xml index 4094475962..2465bf989d 100644 --- a/addons/pkg-npm/pom.xml +++ b/addons/pkg-npm/pom.xml @@ -20,7 +20,7 @@ indy-addons org.commonjava.indy - 2.5.4 + 2.5.4.1-SNAPSHOT 4.0.0 diff --git a/addons/pom.xml b/addons/pom.xml index 024699a02b..e38cb4cd1b 100644 --- a/addons/pom.xml +++ b/addons/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-parent - 2.5.4 + 2.5.4.1-SNAPSHOT indy-addons diff --git a/addons/promote/client-java/pom.xml b/addons/promote/client-java/pom.xml index 3c646c3d04..df6c9774fa 100644 --- a/addons/promote/client-java/pom.xml +++ b/addons/promote/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.5.4 + 2.5.4.1-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 5abf4054c0..787e1c00d4 100644 --- a/addons/promote/common/pom.xml +++ b/addons/promote/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.5.4 + 2.5.4.1-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 be86bd0072..dd7f1221c8 100644 --- a/addons/promote/ftests/pom.xml +++ b/addons/promote/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.5.4 + 2.5.4.1-SNAPSHOT indy-ftests-promote diff --git a/addons/promote/jaxrs/pom.xml b/addons/promote/jaxrs/pom.xml index 4a94777485..0295784650 100644 --- a/addons/promote/jaxrs/pom.xml +++ b/addons/promote/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.5.4 + 2.5.4.1-SNAPSHOT indy-promote-jaxrs diff --git a/addons/promote/model-java/pom.xml b/addons/promote/model-java/pom.xml index 9329a0f7e4..f9cce5d27e 100644 --- a/addons/promote/model-java/pom.xml +++ b/addons/promote/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.5.4 + 2.5.4.1-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 e571376e58..8a7bf1bead 100644 --- a/addons/promote/pom.xml +++ b/addons/promote/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4 + 2.5.4.1-SNAPSHOT indy-promote Indy :: Add-Ons :: Artifact Promotion :: Parent diff --git a/addons/repo-proxy/common/pom.xml b/addons/repo-proxy/common/pom.xml index 905f0d524f..6317c6badd 100644 --- a/addons/repo-proxy/common/pom.xml +++ b/addons/repo-proxy/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-repo-proxy - 2.5.4 + 2.5.4.1-SNAPSHOT indy-repo-proxy-common Indy :: Add-Ons :: Repository-Proxy :: Common diff --git a/addons/repo-proxy/ftests/pom.xml b/addons/repo-proxy/ftests/pom.xml index 27a3f27c60..07ae704c65 100644 --- a/addons/repo-proxy/ftests/pom.xml +++ b/addons/repo-proxy/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-repo-proxy - 2.5.4 + 2.5.4.1-SNAPSHOT indy-ftests-repo-proxy diff --git a/addons/repo-proxy/jaxrs/pom.xml b/addons/repo-proxy/jaxrs/pom.xml index 4c7f3577f4..47eb1348f4 100644 --- a/addons/repo-proxy/jaxrs/pom.xml +++ b/addons/repo-proxy/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-repo-proxy - 2.5.4 + 2.5.4.1-SNAPSHOT indy-repo-proxy-jaxrs diff --git a/addons/repo-proxy/pom.xml b/addons/repo-proxy/pom.xml index adc7d3c7ef..da0385c522 100644 --- a/addons/repo-proxy/pom.xml +++ b/addons/repo-proxy/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4 + 2.5.4.1-SNAPSHOT indy-repo-proxy Indy :: Add-Ons :: Repository-Proxy :: Parent diff --git a/addons/revisions/common/pom.xml b/addons/revisions/common/pom.xml index 0283806304..5a8bfed63b 100644 --- a/addons/revisions/common/pom.xml +++ b/addons/revisions/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-revisions - 2.5.4 + 2.5.4.1-SNAPSHOT indy-revisions-common Indy :: Add-Ons :: Revisions :: Common diff --git a/addons/revisions/jaxrs/pom.xml b/addons/revisions/jaxrs/pom.xml index 658617677d..dc0bad70a9 100644 --- a/addons/revisions/jaxrs/pom.xml +++ b/addons/revisions/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-revisions - 2.5.4 + 2.5.4.1-SNAPSHOT indy-revisions-jaxrs diff --git a/addons/revisions/pom.xml b/addons/revisions/pom.xml index e99d3b4843..ac97da15d1 100644 --- a/addons/revisions/pom.xml +++ b/addons/revisions/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4 + 2.5.4.1-SNAPSHOT indy-revisions Indy :: Add-Ons :: Revisions :: Parent diff --git a/addons/sli/pom.xml b/addons/sli/pom.xml index a6d6125e7a..3eff95124c 100644 --- a/addons/sli/pom.xml +++ b/addons/sli/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4 + 2.5.4.1-SNAPSHOT indy-sli Indy :: Add-Ons :: Service Level Indicators Reporting :: JAX-RS diff --git a/api/pom.xml b/api/pom.xml index d3facf2069..33a282bb49 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.4 + 2.5.4.1-SNAPSHOT indy-api diff --git a/bindings/jaxrs/pom.xml b/bindings/jaxrs/pom.xml index 54f584cc2b..69d2998f42 100644 --- a/bindings/jaxrs/pom.xml +++ b/bindings/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-bindings - 2.5.4 + 2.5.4.1-SNAPSHOT indy-bindings-jaxrs diff --git a/bindings/pom.xml b/bindings/pom.xml index 7302e7f4f0..e8a4d1f67f 100644 --- a/bindings/pom.xml +++ b/bindings/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-parent - 2.5.4 + 2.5.4.1-SNAPSHOT indy-bindings diff --git a/boot/jaxrs/pom.xml b/boot/jaxrs/pom.xml index ba3b019abf..044e426f11 100644 --- a/boot/jaxrs/pom.xml +++ b/boot/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.boot indy-booters - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy.boot diff --git a/boot/pom.xml b/boot/pom.xml index b205c23d1f..618dfea729 100644 --- a/boot/pom.xml +++ b/boot/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy.boot diff --git a/clients/core-java/pom.xml b/clients/core-java/pom.xml index 98f8e4ee05..67cef1027a 100644 --- a/clients/core-java/pom.xml +++ b/clients/core-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-clients-parent - 2.5.4 + 2.5.4.1-SNAPSHOT indy-client-core-java diff --git a/clients/pom.xml b/clients/pom.xml index 8fccb22e93..9ca19ebbeb 100644 --- a/clients/pom.xml +++ b/clients/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.4 + 2.5.4.1-SNAPSHOT indy-clients-parent diff --git a/core/pom.xml b/core/pom.xml index 2404b389ec..59f6b196ee 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.4 + 2.5.4.1-SNAPSHOT indy-core diff --git a/db/common/pom.xml b/db/common/pom.xml index 39e128f071..412d11fce8 100644 --- a/db/common/pom.xml +++ b/db/common/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-db - 2.5.4 + 2.5.4.1-SNAPSHOT indy-db-common diff --git a/db/flat/pom.xml b/db/flat/pom.xml index 5d040744fb..8507553661 100644 --- a/db/flat/pom.xml +++ b/db/flat/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.5.4 + 2.5.4.1-SNAPSHOT indy-db-flat diff --git a/db/infinispan/pom.xml b/db/infinispan/pom.xml index fe3278204e..237f3e7d84 100644 --- a/db/infinispan/pom.xml +++ b/db/infinispan/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-db - 2.5.4 + 2.5.4.1-SNAPSHOT indy-db-infinispan diff --git a/db/memory/pom.xml b/db/memory/pom.xml index 8b8519f545..e75c5d9b15 100644 --- a/db/memory/pom.xml +++ b/db/memory/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.5.4 + 2.5.4.1-SNAPSHOT indy-db-memory diff --git a/db/metrics/pom.xml b/db/metrics/pom.xml index e19dc13a97..58d3121f31 100644 --- a/db/metrics/pom.xml +++ b/db/metrics/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.5.4 + 2.5.4.1-SNAPSHOT indy-db-metrics diff --git a/db/pom.xml b/db/pom.xml index 186104cfbb..c31af63cc4 100644 --- a/db/pom.xml +++ b/db/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.4 + 2.5.4.1-SNAPSHOT indy-db diff --git a/deployments/docker/pom.xml b/deployments/docker/pom.xml index 48d1f3719f..ba0afbd6d4 100644 --- a/deployments/docker/pom.xml +++ b/deployments/docker/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-deployments - 2.5.3-SNAPSHOT + 2.5.4.1-SNAPSHOT org.commonjava.indy.docker diff --git a/deployments/launcher/pom.xml b/deployments/launcher/pom.xml index 48410380c7..d4c653ac5b 100644 --- a/deployments/launcher/pom.xml +++ b/deployments/launcher/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-deployments - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy.launch diff --git a/deployments/pom.xml b/deployments/pom.xml index 07e195b8af..9fcc2b5c18 100644 --- a/deployments/pom.xml +++ b/deployments/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.4 + 2.5.4.1-SNAPSHOT indy-deployments diff --git a/deployments/standalone/launcher/pom.xml b/deployments/standalone/launcher/pom.xml index a9b3331d32..a8279698cf 100644 --- a/deployments/standalone/launcher/pom.xml +++ b/deployments/standalone/launcher/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-standalone - 2.5.3-SNAPSHOT + 2.5.4.1-SNAPSHOT indy-standalone-launcher diff --git a/deployments/standalone/pom.xml b/deployments/standalone/pom.xml index 288dea34c8..5b166c0e61 100644 --- a/deployments/standalone/pom.xml +++ b/deployments/standalone/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-deployments - 2.5.3-SNAPSHOT + 2.5.4.1-SNAPSHOT indy-standalone diff --git a/embedder-tests/pom.xml b/embedder-tests/pom.xml index 665f7d2468..d804133374 100644 --- a/embedder-tests/pom.xml +++ b/embedder-tests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.3-SNAPSHOT + 2.5.4.1-SNAPSHOT org.commonjava.indy.embed.test diff --git a/embedder-tests/sonar-report/pom.xml b/embedder-tests/sonar-report/pom.xml index 702ded554e..cb3e14016c 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 - 2.5.3-SNAPSHOT + 2.5.4.1-SNAPSHOT 4.0.0 diff --git a/embedder/pom.xml b/embedder/pom.xml index e36049a1d3..e1f35c0742 100644 --- a/embedder/pom.xml +++ b/embedder/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy.embed diff --git a/filers/default/pom.xml b/filers/default/pom.xml index 1ba7d4b7c7..5cf709b7d1 100644 --- a/filers/default/pom.xml +++ b/filers/default/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-file-managers - 2.5.4 + 2.5.4.1-SNAPSHOT indy-filer-default diff --git a/filers/pom.xml b/filers/pom.xml index bcc01a917e..40174da215 100644 --- a/filers/pom.xml +++ b/filers/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.4 + 2.5.4.1-SNAPSHOT indy-file-managers diff --git a/ftests/common/pom.xml b/ftests/common/pom.xml index 1f7d1d3297..d925da0416 100644 --- a/ftests/common/pom.xml +++ b/ftests/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-ftests-parent - 2.5.4 + 2.5.4.1-SNAPSHOT indy-ftests-common diff --git a/ftests/core/pom.xml b/ftests/core/pom.xml index fcda2df298..0a99956145 100644 --- a/ftests/core/pom.xml +++ b/ftests/core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-ftests-parent - 2.5.4 + 2.5.4.1-SNAPSHOT indy-ftests-core diff --git a/ftests/pom.xml b/ftests/pom.xml index 7f30dd248a..69e3d41b9e 100644 --- a/ftests/pom.xml +++ b/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.4 + 2.5.4.1-SNAPSHOT indy-ftests-parent diff --git a/models/core-java/pom.xml b/models/core-java/pom.xml index abd71f2e6f..dcfec33aad 100644 --- a/models/core-java/pom.xml +++ b/models/core-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-models-parent - 2.5.4 + 2.5.4.1-SNAPSHOT indy-model-core-java diff --git a/models/pom.xml b/models/pom.xml index b7ee6d87b6..f8b2897c02 100644 --- a/models/pom.xml +++ b/models/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.4 + 2.5.4.1-SNAPSHOT indy-models-parent diff --git a/pom.xml b/pom.xml index 27b77a23d2..0b31f58706 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.commonjava.indy indy-parent - 2.5.4 + 2.5.4.1-SNAPSHOT pom @@ -187,7 +187,7 @@ org.commonjava.indy.ui indy-ui-layover - 2.5.4 + 2.5.4.1-SNAPSHOT runtime @@ -195,22 +195,22 @@ org.commonjava.indy indy-model-core-java - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-api - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-core - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-core - 2.5.4 + 2.5.4.1-SNAPSHOT tar.gz confset provided @@ -218,32 +218,32 @@ org.commonjava.indy indy-db-flat - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-db-metrics - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-db-common - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-db-infinispan - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-bindings-jaxrs - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy.launch indy-launcher - 2.5.4 + 2.5.4.1-SNAPSHOT tar.gz skinny provided @@ -251,7 +251,7 @@ org.commonjava.indy.launch indy-launcher - 2.5.4 + 2.5.4.1-SNAPSHOT tar.gz complete provided @@ -259,7 +259,7 @@ org.commonjava.indy.launch indy-launcher - 2.5.4 + 2.5.4.1-SNAPSHOT tar.gz data provided @@ -267,7 +267,7 @@ org.commonjava.indy.launch indy-launcher - 2.5.4 + 2.5.4.1-SNAPSHOT tar.gz etc provided @@ -276,17 +276,17 @@ org.commonjava.indy indy-revisions-jaxrs - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-revisions-common - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-revisions-common - 2.5.4 + 2.5.4.1-SNAPSHOT tar.gz confset provided @@ -294,7 +294,7 @@ org.commonjava.indy indy-revisions-common - 2.5.4 + 2.5.4.1-SNAPSHOT tar.gz uiset provided @@ -302,12 +302,12 @@ org.commonjava.indy indy-dot-maven-common - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-dot-maven-common - 2.5.4 + 2.5.4.1-SNAPSHOT tar.gz dataset provided @@ -315,22 +315,22 @@ org.commonjava.indy indy-dot-maven-jaxrs - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-ftests-dot-maven - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-httprox-common - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-httprox-common - 2.5.4 + 2.5.4.1-SNAPSHOT tar.gz confset provided @@ -338,17 +338,17 @@ org.commonjava.indy indy-ftests-httprox - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-content-index - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-content-index - 2.5.4 + 2.5.4.1-SNAPSHOT tar.gz confset provided @@ -356,51 +356,51 @@ org.commonjava.indy indy-db-memory - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-test-db - 2.5.4 + 2.5.4.1-SNAPSHOT test org.commonjava.indy indy-test-fixtures-core - 2.5.4 + 2.5.4.1-SNAPSHOT test org.commonjava.indy indy-test-providers-core - 2.5.4 + 2.5.4.1-SNAPSHOT test org.commonjava.indy indy-test-utils - 2.5.4 + 2.5.4.1-SNAPSHOT test org.commonjava.indy indy-filer-default - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-subsys-jaxrs - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-subsys-honeycomb - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-subsys-honeycomb - 2.5.4 + 2.5.4.1-SNAPSHOT tar.gz confset provided @@ -408,17 +408,17 @@ org.commonjava.indy indy-subsys-flatfile - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-subsys-cassandra - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-subsys-cassandra - 2.5.4 + 2.5.4.1-SNAPSHOT tar.gz confset provided @@ -426,79 +426,79 @@ org.commonjava.indy indy-subsys-infinispan - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-subsys-http - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-subsys-git - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-subsys-groovy - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-subsys-prefetch - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-subsys-cpool - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-client-core-java - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-ftests-common - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-ftests-core - 2.5.4 + 2.5.4.1-SNAPSHOT test org.commonjava.indy indy-folo-jaxrs - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-ftests-folo - 2.5.4 + 2.5.4.1-SNAPSHOT test org.commonjava.indy indy-folo-client-java - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-folo-model-java - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-folo-common - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-folo-common - 2.5.4 + 2.5.4.1-SNAPSHOT tar.gz dataset provided @@ -506,7 +506,7 @@ org.commonjava.indy indy-folo-common - 2.5.4 + 2.5.4.1-SNAPSHOT tar.gz confset provided @@ -514,33 +514,33 @@ org.commonjava.indy indy-promote-jaxrs - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-ftests-promote - 2.5.4 + 2.5.4.1-SNAPSHOT test org.commonjava.indy indy-promote-client-java - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-promote-model-java - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-promote-common - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-promote-common - 2.5.4 + 2.5.4.1-SNAPSHOT tar.gz confset provided @@ -548,7 +548,7 @@ org.commonjava.indy indy-promote-common - 2.5.4 + 2.5.4.1-SNAPSHOT tar.gz dataset provided @@ -556,19 +556,19 @@ org.commonjava.indy indy-promote-common - 2.5.4 + 2.5.4.1-SNAPSHOT dataset provided org.commonjava.indy indy-implied-repos-common - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-implied-repos-common - 2.5.4 + 2.5.4.1-SNAPSHOT tar.gz confset provided @@ -576,37 +576,37 @@ org.commonjava.indy indy-implied-repos-model-java - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-implied-repos-client-java - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-ftests-implied-repos - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy.embed indy-embedder - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy.boot indy-booter-jaxrs - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-subsys-keycloak - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-subsys-keycloak - 2.5.4 + 2.5.4.1-SNAPSHOT tar.gz confset provided @@ -614,7 +614,7 @@ org.commonjava.indy indy-subsys-infinispan - 2.5.4 + 2.5.4.1-SNAPSHOT tar.gz confset provided @@ -622,7 +622,7 @@ org.commonjava.indy indy-subsys-prefetch - 2.5.4 + 2.5.4.1-SNAPSHOT tar.gz confset provided @@ -631,7 +631,7 @@ org.commonjava.indy indy-koji-common - 2.5.4 + 2.5.4.1-SNAPSHOT tar.gz confset provided @@ -639,103 +639,103 @@ org.commonjava.indy indy-koji-common - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-koji-model-java - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-koji-client-java - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-koji-jaxrs - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-path-mapped-common - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-path-mapped-model-java - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-path-mapped-jaxrs - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-pkg-maven-common - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-pkg-maven-jaxrs - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-pkg-npm-jaxrs - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-ftests-pkg-maven - 2.5.4 + 2.5.4.1-SNAPSHOT test org.commonjava.indy indy-ftests-pkg-npm - 2.5.4 + 2.5.4.1-SNAPSHOT test org.commonjava.indy indy-pkg-npm-common - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-pkg-npm-model-java - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-diagnostics-jaxrs - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-diagnostics-client-java - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-diagnostics-common - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-ftests-diagnostics - 2.5.4 + 2.5.4.1-SNAPSHOT test org.commonjava.indy indy-diagnostics-common - 2.5.4 + 2.5.4.1-SNAPSHOT confset tar.gz provided @@ -743,28 +743,28 @@ org.commonjava.indy indy-hosted-by-archive-common - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-hosted-by-archive-client-java - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-ftests-hosted-by-archive - 2.5.4 + 2.5.4.1-SNAPSHOT test org.commonjava.indy indy-hosted-by-archive-jaxrs - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-hosted-by-archive-common - 2.5.4 + 2.5.4.1-SNAPSHOT confset tar.gz @@ -772,12 +772,12 @@ org.commonjava.indy indy-subsys-metrics - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-subsys-metrics - 2.5.4 + 2.5.4.1-SNAPSHOT confset tar.gz provided @@ -786,21 +786,21 @@ org.commonjava.indy indy-sli - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy.rest indy-rest-api yaml - 2.5.4 + 2.5.4.1-SNAPSHOT provided org.commonjava.indy.rest indy-rest-api json - 2.5.4 + 2.5.4.1-SNAPSHOT provided @@ -839,33 +839,33 @@ org.commonjava.indy indy-content-browse-common - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-content-browse-jaxrs - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-ftests-content-browse - 2.5.4 + 2.5.4.1-SNAPSHOT test org.commonjava.indy indy-content-browse-model-java - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-content-browse-client-java - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-content-browse-common - 2.5.4 + 2.5.4.1-SNAPSHOT confset tar.gz provided @@ -873,35 +873,35 @@ org.commonjava.indy indy-content-browse-ui - 2.5.4 + 2.5.4.1-SNAPSHOT reactui tar.gz org.commonjava.indy indy-changelog-common - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-changelog-client-java - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-ftests-changelog - 2.5.4 + 2.5.4.1-SNAPSHOT test org.commonjava.indy indy-changelog-jaxrs - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-changelog-common - 2.5.4 + 2.5.4.1-SNAPSHOT confset tar.gz @@ -919,12 +919,12 @@ org.commonjava.indy indy-event-audit-common - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-event-audit-common - 2.5.4 + 2.5.4.1-SNAPSHOT confset tar.gz provided @@ -939,23 +939,23 @@ org.commonjava.indy indy-repo-proxy-common - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-repo-proxy-jaxrs - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy indy-ftests-repo-proxy - 2.5.4 + 2.5.4.1-SNAPSHOT test org.commonjava.indy indy-repo-proxy-common - 2.5.4 + 2.5.4.1-SNAPSHOT confset tar.gz diff --git a/rest/api/pom.xml b/rest/api/pom.xml index eacd0620f3..ae2e05ea18 100644 --- a/rest/api/pom.xml +++ b/rest/api/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.rest indy-rest-parent - 2.5.4 + 2.5.4.1-SNAPSHOT indy-rest-api diff --git a/rest/pom.xml b/rest/pom.xml index b0a9fa7568..dc8e308c9a 100644 --- a/rest/pom.xml +++ b/rest/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy.rest diff --git a/subsys/cassandra/pom.xml b/subsys/cassandra/pom.xml index 19d62d37e5..ea030ccedc 100644 --- a/subsys/cassandra/pom.xml +++ b/subsys/cassandra/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-subsystems - 2.5.4 + 2.5.4.1-SNAPSHOT indy-subsys-cassandra diff --git a/subsys/cpool/pom.xml b/subsys/cpool/pom.xml index 6f58b3fc5a..ed8f04c1fa 100644 --- a/subsys/cpool/pom.xml +++ b/subsys/cpool/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.4 + 2.5.4.1-SNAPSHOT indy-subsys-cpool diff --git a/subsys/flatfile/pom.xml b/subsys/flatfile/pom.xml index b8db85668b..4cac4b090e 100644 --- a/subsys/flatfile/pom.xml +++ b/subsys/flatfile/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.4 + 2.5.4.1-SNAPSHOT indy-subsys-flatfile diff --git a/subsys/git/pom.xml b/subsys/git/pom.xml index 393d82a307..c07958792f 100644 --- a/subsys/git/pom.xml +++ b/subsys/git/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.4 + 2.5.4.1-SNAPSHOT indy-subsys-git diff --git a/subsys/groovy/pom.xml b/subsys/groovy/pom.xml index 130764e5a5..aa445c72b7 100644 --- a/subsys/groovy/pom.xml +++ b/subsys/groovy/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.4 + 2.5.4.1-SNAPSHOT indy-subsys-groovy diff --git a/subsys/honeycomb/pom.xml b/subsys/honeycomb/pom.xml index 9505617d06..d93767f61f 100644 --- a/subsys/honeycomb/pom.xml +++ b/subsys/honeycomb/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.5.4 + 2.5.4.1-SNAPSHOT 4.0.0 diff --git a/subsys/http/pom.xml b/subsys/http/pom.xml index 2923cf30ea..592477b628 100644 --- a/subsys/http/pom.xml +++ b/subsys/http/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.4 + 2.5.4.1-SNAPSHOT indy-subsys-http diff --git a/subsys/infinispan/pom.xml b/subsys/infinispan/pom.xml index 876f9bf513..13e7ec3920 100644 --- a/subsys/infinispan/pom.xml +++ b/subsys/infinispan/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.4 + 2.5.4.1-SNAPSHOT indy-subsys-infinispan diff --git a/subsys/jaxrs/pom.xml b/subsys/jaxrs/pom.xml index 3b93da265e..8fc1fa6b76 100644 --- a/subsys/jaxrs/pom.xml +++ b/subsys/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.4 + 2.5.4.1-SNAPSHOT indy-subsys-jaxrs diff --git a/subsys/kafka/pom.xml b/subsys/kafka/pom.xml index 9347cfb2bd..eb3691bc9d 100644 --- a/subsys/kafka/pom.xml +++ b/subsys/kafka/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.5.4 + 2.5.4.1-SNAPSHOT 4.0.0 diff --git a/subsys/keycloak/pom.xml b/subsys/keycloak/pom.xml index e39fe83d68..44c0eaf121 100644 --- a/subsys/keycloak/pom.xml +++ b/subsys/keycloak/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.4 + 2.5.4.1-SNAPSHOT indy-subsys-keycloak Indy :: Subsystems :: Keycloak diff --git a/subsys/metrics/pom.xml b/subsys/metrics/pom.xml index 5b7e286b7e..d072e7f211 100644 --- a/subsys/metrics/pom.xml +++ b/subsys/metrics/pom.xml @@ -20,7 +20,7 @@ org.commonjava.indy indy-subsystems - 2.5.4 + 2.5.4.1-SNAPSHOT 4.0.0 diff --git a/subsys/pom.xml b/subsys/pom.xml index ddd77d6d10..3e026e8c54 100644 --- a/subsys/pom.xml +++ b/subsys/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.4 + 2.5.4.1-SNAPSHOT indy-subsystems diff --git a/subsys/prefetch/pom.xml b/subsys/prefetch/pom.xml index 77eb132b0c..04a8703563 100644 --- a/subsys/prefetch/pom.xml +++ b/subsys/prefetch/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.5.4 + 2.5.4.1-SNAPSHOT 4.0.0 diff --git a/test/db/pom.xml b/test/db/pom.xml index ff43e29cad..2ee645a582 100644 --- a/test/db/pom.xml +++ b/test/db/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.5.4 + 2.5.4.1-SNAPSHOT indy-test-db diff --git a/test/docker/gogs-test-appliance/pom.xml b/test/docker/gogs-test-appliance/pom.xml index d5d1f7e532..0c4afc934a 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 - 2.5.3-SNAPSHOT + 2.5.4.1-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 67b3a974a5..75bf0ca929 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 - 2.5.3-SNAPSHOT + 2.5.4.1-SNAPSHOT indy-docker-keycloak-test-appliance diff --git a/test/docker/pom.xml b/test/docker/pom.xml index cba87f0d93..aa21d0ea1d 100644 --- a/test/docker/pom.xml +++ b/test/docker/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.5.3-SNAPSHOT + 2.5.4.1-SNAPSHOT org.commonjava.indy.docker diff --git a/test/fixtures-core/pom.xml b/test/fixtures-core/pom.xml index 03fc2e4c62..1550ad60ec 100644 --- a/test/fixtures-core/pom.xml +++ b/test/fixtures-core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.5.4 + 2.5.4.1-SNAPSHOT indy-test-fixtures-core diff --git a/test/pom.xml b/test/pom.xml index 5fe4cc3b66..ee77714cfd 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.4 + 2.5.4.1-SNAPSHOT indy-test diff --git a/test/providers-core/pom.xml b/test/providers-core/pom.xml index d228fea6ea..38d39529c2 100644 --- a/test/providers-core/pom.xml +++ b/test/providers-core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.5.4 + 2.5.4.1-SNAPSHOT indy-test-providers-core diff --git a/test/utils/pom.xml b/test/utils/pom.xml index 10a746b1b5..c899011830 100644 --- a/test/utils/pom.xml +++ b/test/utils/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.5.4 + 2.5.4.1-SNAPSHOT indy-test-utils diff --git a/tools/assemblies/pom.xml b/tools/assemblies/pom.xml index f083f5e4c9..2902c1e519 100644 --- a/tools/assemblies/pom.xml +++ b/tools/assemblies/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.tools indy-tools - 2.5.4 + 2.5.4.1-SNAPSHOT indy-assemblies diff --git a/tools/pom.xml b/tools/pom.xml index 5db36431ed..f76dea470d 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy.tools diff --git a/uis/layover/pom.xml b/uis/layover/pom.xml index fb44850748..67f4fb1f6b 100644 --- a/uis/layover/pom.xml +++ b/uis/layover/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.ui indy-uis - 2.5.4 + 2.5.4.1-SNAPSHOT indy-ui-layover diff --git a/uis/pom.xml b/uis/pom.xml index 5ac7735af4..599b653ab5 100644 --- a/uis/pom.xml +++ b/uis/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.4 + 2.5.4.1-SNAPSHOT org.commonjava.indy.ui From 3e14356771d0695fd64d9b1d3db6fa1dea2e0f4b Mon Sep 17 00:00:00 2001 From: ruhan Date: Tue, 11 Jun 2024 18:34:25 +0800 Subject: [PATCH 44/50] Backport promote tracking api --- .../client/IndyPromoteAdminClientModule.java | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 addons/promote/client-java/src/main/java/org/commonjava/indy/promote/client/IndyPromoteAdminClientModule.java diff --git a/addons/promote/client-java/src/main/java/org/commonjava/indy/promote/client/IndyPromoteAdminClientModule.java b/addons/promote/client-java/src/main/java/org/commonjava/indy/promote/client/IndyPromoteAdminClientModule.java new file mode 100644 index 0000000000..9dcea8b443 --- /dev/null +++ b/addons/promote/client-java/src/main/java/org/commonjava/indy/promote/client/IndyPromoteAdminClientModule.java @@ -0,0 +1,36 @@ +/** + * Copyright (C) 2011-2020 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.client; + +import org.commonjava.indy.client.core.IndyClientException; +import org.commonjava.indy.client.core.IndyClientModule; + +import static org.commonjava.indy.client.core.util.UrlUtils.buildUrl; +import static org.commonjava.indy.promote.client.IndyPromoteClientModule.PROMOTE_BASEPATH; + +public class IndyPromoteAdminClientModule + extends IndyClientModule +{ + public static final String PROMOTE_ADMIN_BASEPATH = PROMOTE_BASEPATH + "/admin"; + + public static final String TRACKING = PROMOTE_ADMIN_BASEPATH + "/tracking"; + + public void deleteTrackingRecords( final String trackingId ) + throws IndyClientException + { + http.delete( buildUrl( TRACKING, trackingId ) ); + } +} From a876553faefe5a69ceea8eb3826e88d95015c7bb Mon Sep 17 00:00:00 2001 From: ruhan Date: Tue, 11 Jun 2024 18:48:33 +0800 Subject: [PATCH 45/50] Add github actions --- .github/workflows/maven-build.yml | 96 +++++++++++++++++++++++++++++++ .github/workflows/toolchains.xml | 40 +++++++++++++ 2 files changed, 136 insertions(+) create mode 100644 .github/workflows/maven-build.yml create mode 100644 .github/workflows/toolchains.xml diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml new file mode 100644 index 0000000000..9e086c3295 --- /dev/null +++ b/.github/workflows/maven-build.yml @@ -0,0 +1,96 @@ +# +# Copyright (C) 2011-2022 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. +# + +# This workflow will build a Java project with Maven +# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven + +name: build on maven + +on: + watch: + types: [started] + pull_request: + types: [opened, reopened, edited, synchronize, ready_for_review] + push: + branches: + - main + - master + - '**' + + workflow_dispatch: + +jobs: + verify: + name: verify with maven + runs-on: ubuntu-latest + env: + MAVEN_OPTS: "-Xmx4096m -Xms2048m -XX:MaxMetaspaceSize=4096m -Xss8m" + SKIP_NPM_CONFIG: false + NPMREGISTRY: https://registry.npmjs.org + steps: + - uses: actions/checkout@v4 + + - name: Set up JDK 8 & 11 for x64 + uses: actions/setup-java@v3 + with: + distribution: 'temurin' + architecture: x64 + java-version: | + 8 + 11 + + - uses: s4u/maven-settings-action@v2.8.0 + with: + sonatypeSnapshots: true + + - name: Build the Maven verify phase + run: mvn -B -V clean verify -Prun-its -Pci --global-toolchains .github/workflows/toolchains.xml + + build: + name: Build and push + runs-on: ubuntu-latest + needs: verify + if: ${{ github.event_name == 'push' }} + env: + MAVEN_OPTS: "-Xmx4096m -Xms2048m -XX:MaxMetaspaceSize=4096m -Xss8m" + SKIP_NPM_CONFIG: false + NPMREGISTRY: https://registry.npmjs.org + steps: + - uses: actions/checkout@v4 + + - name: Set up JDK 8 & 11 for x64 + uses: actions/setup-java@v3 + with: + distribution: 'temurin' + architecture: x64 + java-version: | + 8 + 11 + + - uses: s4u/maven-settings-action@v2.8.0 + with: + servers: | + [{ + "id": "sonatype-nexus-snapshots", + "username": "${{ secrets.SONATYPE_BOT_USERNAME }}", + "password": "${{ secrets.SONATYPE_BOT_TOKEN }}" + }] + + - name: Build with toolchains + run: mvn -B -V clean install -DskipNpmConfig=false --global-toolchains .github/workflows/toolchains.xml + + - name: Deploy the artifact + run: mvn help:effective-settings -B -V -DskipTests=true -DskipNpmConfig=false deploy -e --global-toolchains .github/workflows/toolchains.xml diff --git a/.github/workflows/toolchains.xml b/.github/workflows/toolchains.xml new file mode 100644 index 0000000000..6e03019822 --- /dev/null +++ b/.github/workflows/toolchains.xml @@ -0,0 +1,40 @@ + + + + + jdk + + 1.8 + OpenJDK + + + /usr/lib/jvm/temurin-8-jdk-amd64 + + + + jdk + + 11 + OpenJDK + + + /usr/lib/jvm/temurin-11-jdk-amd64 + + + From 5c73b03a09c3785beb6ffb77b2985b8955c0c941 Mon Sep 17 00:00:00 2001 From: ruhan Date: Wed, 12 Jun 2024 18:10:20 +0800 Subject: [PATCH 46/50] Disable some modules to make it simple --- .github/workflows/maven-build.yml | 2 +- addons/pom.xml | 4 ++-- pom.xml | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml index 9e086c3295..f437d7f8c2 100644 --- a/.github/workflows/maven-build.yml +++ b/.github/workflows/maven-build.yml @@ -57,7 +57,7 @@ jobs: sonatypeSnapshots: true - name: Build the Maven verify phase - run: mvn -B -V clean verify -Prun-its -Pci --global-toolchains .github/workflows/toolchains.xml + run: mvn -B -V clean verify -Pci --global-toolchains .github/workflows/toolchains.xml build: name: Build and push diff --git a/addons/pom.xml b/addons/pom.xml index e38cb4cd1b..caf17870e4 100644 --- a/addons/pom.xml +++ b/addons/pom.xml @@ -43,12 +43,12 @@ diagnostics pkg-npm hosted-by-archive - content-browse + changelog event-audit sli path-mapped - repo-proxy + diff --git a/pom.xml b/pom.xml index 0b31f58706..5da822cec2 100644 --- a/pom.xml +++ b/pom.xml @@ -140,7 +140,7 @@ - uis + models api addons @@ -152,14 +152,14 @@ filers test tools - embedder + ftests - rest + clients - deployments + From 14f650daef21f62d239bb77c03135b85d0fab4a9 Mon Sep 17 00:00:00 2001 From: commonjava-bot Date: Wed, 24 Jul 2024 05:01:53 +0000 Subject: [PATCH 47/50] Update license header --- .../src/main/resources/META-INF/beans.xml | 23 ++++++++++++------- .../src/main/resources/META-INF/beans.xml | 21 +++++++++++------ .../ftests/src/main/resources/beans.xml | 23 ++++++++++++------- .../src/main/resources/META-INF/beans.xml | 23 ++++++++++++------- .../src/main/resources/META-INF/beans.xml | 2 +- .../src/test/resources/META-INF/beans.xml | 23 ++++++++++++------- embedder/src/test/resources/logback-test.xml | 2 +- .../api/src/main/resources/META-INF/beans.xml | 17 ++++++++++++++ .../api/src/main/resources/indy-rest-api.yaml | 16 +++++++++++++ .../api/src/test/resources/META-INF/beans.xml | 17 ++++++++++++++ rest/api/src/test/resources/logback-test.xml | 2 +- 11 files changed, 127 insertions(+), 42 deletions(-) diff --git a/addons/content-browse/common/src/main/resources/META-INF/beans.xml b/addons/content-browse/common/src/main/resources/META-INF/beans.xml index 5d417ccdd6..a1000f99d3 100644 --- a/addons/content-browse/common/src/main/resources/META-INF/beans.xml +++ b/addons/content-browse/common/src/main/resources/META-INF/beans.xml @@ -1,13 +1,20 @@ + + Date: Wed, 24 Jul 2024 13:06:32 +0800 Subject: [PATCH 48/50] Update license headers --- .github/workflows/maven-build.yml | 2 +- .github/workflows/toolchains.xml | 2 +- .../src/main/resources/META-INF/beans.xml | 23 ++++++++++++------- .../src/main/resources/META-INF/beans.xml | 21 +++++++++++------ .../ftests/src/main/resources/beans.xml | 23 ++++++++++++------- .../src/main/resources/META-INF/beans.xml | 23 ++++++++++++------- .../src/main/resources/META-INF/beans.xml | 2 +- .../src/test/resources/META-INF/beans.xml | 23 ++++++++++++------- embedder/src/test/resources/logback-test.xml | 2 +- .../api/src/main/resources/META-INF/beans.xml | 17 ++++++++++++++ .../api/src/main/resources/indy-rest-api.yaml | 16 +++++++++++++ .../api/src/test/resources/META-INF/beans.xml | 17 ++++++++++++++ rest/api/src/test/resources/logback-test.xml | 2 +- 13 files changed, 129 insertions(+), 44 deletions(-) diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml index f437d7f8c2..7bf144fbb9 100644 --- a/.github/workflows/maven-build.yml +++ b/.github/workflows/maven-build.yml @@ -1,5 +1,5 @@ # -# Copyright (C) 2011-2022 Red Hat, Inc. (https://github.com/Commonjava/indy) +# Copyright (C) 2011-2020 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/.github/workflows/toolchains.xml b/.github/workflows/toolchains.xml index 6e03019822..2cfee79899 100644 --- a/.github/workflows/toolchains.xml +++ b/.github/workflows/toolchains.xml @@ -1,7 +1,7 @@ + + Date: Wed, 24 Jul 2024 05:15:17 +0000 Subject: [PATCH 49/50] [maven-release-plugin] prepare release indy-parent-2.5.4.1 --- addons/changelog/client-java/pom.xml | 2 +- addons/changelog/common/pom.xml | 2 +- addons/changelog/ftests/pom.xml | 2 +- addons/changelog/jaxrs/pom.xml | 2 +- addons/changelog/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/event-audit/common/pom.xml | 2 +- addons/event-audit/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/path-mapped/common/pom.xml | 2 +- addons/path-mapped/jaxrs/pom.xml | 2 +- addons/path-mapped/model-java/pom.xml | 2 +- addons/path-mapped/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/revisions/common/pom.xml | 2 +- addons/revisions/jaxrs/pom.xml | 2 +- addons/revisions/pom.xml | 2 +- addons/sli/pom.xml | 2 +- api/pom.xml | 2 +- bindings/jaxrs/pom.xml | 2 +- bindings/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/common/pom.xml | 2 +- db/flat/pom.xml | 2 +- db/infinispan/pom.xml | 2 +- db/memory/pom.xml | 2 +- db/metrics/pom.xml | 2 +- db/pom.xml | 2 +- filers/default/pom.xml | 2 +- filers/pom.xml | 2 +- ftests/common/pom.xml | 2 +- ftests/core/pom.xml | 2 +- ftests/pom.xml | 2 +- models/core-java/pom.xml | 2 +- models/pom.xml | 2 +- pom.xml | 210 +++++++++---------- subsys/cassandra/pom.xml | 2 +- subsys/cpool/pom.xml | 2 +- subsys/flatfile/pom.xml | 2 +- subsys/git/pom.xml | 2 +- subsys/groovy/pom.xml | 2 +- subsys/honeycomb/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/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 +- 109 files changed, 213 insertions(+), 213 deletions(-) diff --git a/addons/changelog/client-java/pom.xml b/addons/changelog/client-java/pom.xml index 4d883b405e..f1403155e7 100644 --- a/addons/changelog/client-java/pom.xml +++ b/addons/changelog/client-java/pom.xml @@ -20,7 +20,7 @@ indy-changelog org.commonjava.indy - 2.5.4.1-SNAPSHOT + 2.5.4.1 4.0.0 diff --git a/addons/changelog/common/pom.xml b/addons/changelog/common/pom.xml index 961dbf5f11..576a28daaa 100644 --- a/addons/changelog/common/pom.xml +++ b/addons/changelog/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-changelog-common Indy :: Add-Ons :: ChangeLog :: Common diff --git a/addons/changelog/ftests/pom.xml b/addons/changelog/ftests/pom.xml index f135f2a01e..0cdefd3528 100644 --- a/addons/changelog/ftests/pom.xml +++ b/addons/changelog/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-ftests-changelog diff --git a/addons/changelog/jaxrs/pom.xml b/addons/changelog/jaxrs/pom.xml index 238562d2b1..722eb8b5c1 100644 --- a/addons/changelog/jaxrs/pom.xml +++ b/addons/changelog/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-changelog-jaxrs diff --git a/addons/changelog/pom.xml b/addons/changelog/pom.xml index 55589cdce4..c3293b2031 100644 --- a/addons/changelog/pom.xml +++ b/addons/changelog/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-changelog Indy :: Add-Ons :: ChangeLog :: Parent diff --git a/addons/content-index/pom.xml b/addons/content-index/pom.xml index 9f45f7ac48..4d8bca1b9f 100644 --- a/addons/content-index/pom.xml +++ b/addons/content-index/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-content-index diff --git a/addons/diagnostics/client-java/pom.xml b/addons/diagnostics/client-java/pom.xml index bb24627a62..1f0d5488b5 100644 --- a/addons/diagnostics/client-java/pom.xml +++ b/addons/diagnostics/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.5.4.1-SNAPSHOT + 2.5.4.1 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 4e483248ac..9d64fc7cd3 100644 --- a/addons/diagnostics/common/pom.xml +++ b/addons/diagnostics/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-diagnostics-common Indy :: Add-Ons :: Diagnostic Tools :: Common diff --git a/addons/diagnostics/ftests/pom.xml b/addons/diagnostics/ftests/pom.xml index 0f40f579d4..17a7073919 100644 --- a/addons/diagnostics/ftests/pom.xml +++ b/addons/diagnostics/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-ftests-diagnostics diff --git a/addons/diagnostics/jaxrs/pom.xml b/addons/diagnostics/jaxrs/pom.xml index 2bf13a7bf0..9be7071c8c 100644 --- a/addons/diagnostics/jaxrs/pom.xml +++ b/addons/diagnostics/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-diagnostics-jaxrs diff --git a/addons/diagnostics/pom.xml b/addons/diagnostics/pom.xml index 7c1eb151f2..5e10c5b777 100644 --- a/addons/diagnostics/pom.xml +++ b/addons/diagnostics/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4.1-SNAPSHOT + 2.5.4.1 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 99642d9f84..f3646472c4 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 - 2.5.4.1-SNAPSHOT + 2.5.4.1 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 46454f5295..b0ab9b6154 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 - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-ftests-dot-maven diff --git a/addons/dot-maven/jaxrs/pom.xml b/addons/dot-maven/jaxrs/pom.xml index c4c4e5ace0..b43efb7bf1 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 - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-dot-maven-jaxrs diff --git a/addons/dot-maven/pom.xml b/addons/dot-maven/pom.xml index f6fdc100fc..e12a427200 100644 --- a/addons/dot-maven/pom.xml +++ b/addons/dot-maven/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-dot-maven diff --git a/addons/event-audit/common/pom.xml b/addons/event-audit/common/pom.xml index a3d8eede38..c6bfc93484 100644 --- a/addons/event-audit/common/pom.xml +++ b/addons/event-audit/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-event-audit - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-event-audit-common diff --git a/addons/event-audit/pom.xml b/addons/event-audit/pom.xml index 22cde362b5..20986e0dc5 100644 --- a/addons/event-audit/pom.xml +++ b/addons/event-audit/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-event-audit diff --git a/addons/folo/client-java/pom.xml b/addons/folo/client-java/pom.xml index e5c1624a9d..206395dce0 100644 --- a/addons/folo/client-java/pom.xml +++ b/addons/folo/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.5.4.1-SNAPSHOT + 2.5.4.1 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 fed55d562b..86f4be761e 100644 --- a/addons/folo/common/pom.xml +++ b/addons/folo/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.5.4.1-SNAPSHOT + 2.5.4.1 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 e7e4eb6ab7..2dd4497fe8 100644 --- a/addons/folo/ftests/pom.xml +++ b/addons/folo/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-ftests-folo diff --git a/addons/folo/jaxrs/pom.xml b/addons/folo/jaxrs/pom.xml index 190861d1e6..e8e2889fd1 100644 --- a/addons/folo/jaxrs/pom.xml +++ b/addons/folo/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-folo-jaxrs diff --git a/addons/folo/model-java/pom.xml b/addons/folo/model-java/pom.xml index cea0d81520..367980fd6b 100644 --- a/addons/folo/model-java/pom.xml +++ b/addons/folo/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.5.4.1-SNAPSHOT + 2.5.4.1 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 dcc753163b..9b0ca9e0eb 100644 --- a/addons/folo/pom.xml +++ b/addons/folo/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4.1-SNAPSHOT + 2.5.4.1 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 5e8cdd1c25..cdd93fd7ce 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 - 2.5.4.1-SNAPSHOT + 2.5.4.1 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 40c6ca25fb..8083286f2f 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 - 2.5.4.1-SNAPSHOT + 2.5.4.1 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 f3b55e6b58..06db34e816 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 - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-ftests-hosted-by-archive diff --git a/addons/hosted-by-archive/jaxrs/pom.xml b/addons/hosted-by-archive/jaxrs/pom.xml index e692072a77..f8fce6d27b 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 - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-hosted-by-archive-jaxrs diff --git a/addons/hosted-by-archive/pom.xml b/addons/hosted-by-archive/pom.xml index 1f6df322f7..b0f1d4c5c0 100644 --- a/addons/hosted-by-archive/pom.xml +++ b/addons/hosted-by-archive/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4.1-SNAPSHOT + 2.5.4.1 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 fce632a3be..32a25a6a35 100644 --- a/addons/httprox/common/pom.xml +++ b/addons/httprox/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.5.4.1-SNAPSHOT + 2.5.4.1 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 6ad25b8ee7..62491e1791 100644 --- a/addons/httprox/ftests/pom.xml +++ b/addons/httprox/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-ftests-httprox diff --git a/addons/httprox/jaxrs/pom.xml b/addons/httprox/jaxrs/pom.xml index 2cd821fddd..d4c75b8daa 100644 --- a/addons/httprox/jaxrs/pom.xml +++ b/addons/httprox/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.5.4.1-SNAPSHOT + 2.5.4.1 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 4eebadfa7c..b67ce7a9c4 100644 --- a/addons/httprox/pom.xml +++ b/addons/httprox/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-httprox diff --git a/addons/implied-repos/client-java/pom.xml b/addons/implied-repos/client-java/pom.xml index b30f1c3663..218ceb5eb1 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 - 2.5.4.1-SNAPSHOT + 2.5.4.1 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 d95f5303d4..2fea12da2b 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 - 2.5.4.1-SNAPSHOT + 2.5.4.1 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 cc81ca96fe..c1df35e577 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 - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-ftests-implied-repos diff --git a/addons/implied-repos/model-java/pom.xml b/addons/implied-repos/model-java/pom.xml index b4b1f04bfa..920957a610 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 - 2.5.4.1-SNAPSHOT + 2.5.4.1 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 07c48d15b0..a6c7e84498 100644 --- a/addons/implied-repos/pom.xml +++ b/addons/implied-repos/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4.1-SNAPSHOT + 2.5.4.1 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 f136998dce..be2fe63dc3 100644 --- a/addons/koji/client-java/pom.xml +++ b/addons/koji/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.5.4.1-SNAPSHOT + 2.5.4.1 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 e8202e9f1d..a7459fffff 100644 --- a/addons/koji/common/pom.xml +++ b/addons/koji/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-koji-common Indy :: Add-Ons :: Koji Integration :: Common diff --git a/addons/koji/jaxrs/pom.xml b/addons/koji/jaxrs/pom.xml index eaa16d34c7..2acbe99292 100644 --- a/addons/koji/jaxrs/pom.xml +++ b/addons/koji/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-koji-jaxrs diff --git a/addons/koji/model-java/pom.xml b/addons/koji/model-java/pom.xml index 7f68e28d78..01210e9b19 100644 --- a/addons/koji/model-java/pom.xml +++ b/addons/koji/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.5.4.1-SNAPSHOT + 2.5.4.1 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 aad159a866..eb1d39752d 100644 --- a/addons/koji/pom.xml +++ b/addons/koji/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-koji Indy :: Add-Ons :: Koji Integration :: Parent diff --git a/addons/path-mapped/common/pom.xml b/addons/path-mapped/common/pom.xml index 833d21d37d..d86ae51818 100644 --- a/addons/path-mapped/common/pom.xml +++ b/addons/path-mapped/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-path-mapped-common diff --git a/addons/path-mapped/jaxrs/pom.xml b/addons/path-mapped/jaxrs/pom.xml index c89ae09d73..a31dad423d 100644 --- a/addons/path-mapped/jaxrs/pom.xml +++ b/addons/path-mapped/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-path-mapped-jaxrs diff --git a/addons/path-mapped/model-java/pom.xml b/addons/path-mapped/model-java/pom.xml index ba5a1155ba..8ed963ab52 100644 --- a/addons/path-mapped/model-java/pom.xml +++ b/addons/path-mapped/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-path-mapped-model-java diff --git a/addons/path-mapped/pom.xml b/addons/path-mapped/pom.xml index ae4f414e97..fa45b8b49e 100644 --- a/addons/path-mapped/pom.xml +++ b/addons/path-mapped/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-path-mapped Indy :: Add-Ons :: Path Mapped :: Parent diff --git a/addons/pkg-maven/common/pom.xml b/addons/pkg-maven/common/pom.xml index d24cd5365a..f46a547b6e 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 - 2.5.4.1-SNAPSHOT + 2.5.4.1 4.0.0 diff --git a/addons/pkg-maven/ftests/pom.xml b/addons/pkg-maven/ftests/pom.xml index addc5debe9..7c79d1f5f9 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 - 2.5.4.1-SNAPSHOT + 2.5.4.1 4.0.0 diff --git a/addons/pkg-maven/jaxrs/pom.xml b/addons/pkg-maven/jaxrs/pom.xml index 44a56c616e..6608351d37 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 - 2.5.4.1-SNAPSHOT + 2.5.4.1 4.0.0 diff --git a/addons/pkg-maven/pom.xml b/addons/pkg-maven/pom.xml index 0d9e6a0b14..b2704297a1 100644 --- a/addons/pkg-maven/pom.xml +++ b/addons/pkg-maven/pom.xml @@ -20,7 +20,7 @@ indy-addons org.commonjava.indy - 2.5.4.1-SNAPSHOT + 2.5.4.1 4.0.0 diff --git a/addons/pkg-npm/common/pom.xml b/addons/pkg-npm/common/pom.xml index e2b6cf0d6a..766bd06d37 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 - 2.5.4.1-SNAPSHOT + 2.5.4.1 4.0.0 diff --git a/addons/pkg-npm/ftests/pom.xml b/addons/pkg-npm/ftests/pom.xml index a76439b121..f44b91b1d1 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 - 2.5.4.1-SNAPSHOT + 2.5.4.1 4.0.0 diff --git a/addons/pkg-npm/jaxrs/pom.xml b/addons/pkg-npm/jaxrs/pom.xml index a66f0d46a1..09eb53b21a 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 - 2.5.4.1-SNAPSHOT + 2.5.4.1 4.0.0 diff --git a/addons/pkg-npm/model-java/pom.xml b/addons/pkg-npm/model-java/pom.xml index ef5d466dfa..8c14a04735 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 - 2.5.4.1-SNAPSHOT + 2.5.4.1 4.0.0 diff --git a/addons/pkg-npm/pom.xml b/addons/pkg-npm/pom.xml index 2465bf989d..f6671052c2 100644 --- a/addons/pkg-npm/pom.xml +++ b/addons/pkg-npm/pom.xml @@ -20,7 +20,7 @@ indy-addons org.commonjava.indy - 2.5.4.1-SNAPSHOT + 2.5.4.1 4.0.0 diff --git a/addons/pom.xml b/addons/pom.xml index caf17870e4..fb9bd0a345 100644 --- a/addons/pom.xml +++ b/addons/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-parent - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-addons diff --git a/addons/promote/client-java/pom.xml b/addons/promote/client-java/pom.xml index df6c9774fa..74cabcd185 100644 --- a/addons/promote/client-java/pom.xml +++ b/addons/promote/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.5.4.1-SNAPSHOT + 2.5.4.1 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 787e1c00d4..7ec0a60ca7 100644 --- a/addons/promote/common/pom.xml +++ b/addons/promote/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-promote-common Indy :: Add-Ons :: Artifact Promotion :: Common diff --git a/addons/promote/ftests/pom.xml b/addons/promote/ftests/pom.xml index dd7f1221c8..aaac3b63ec 100644 --- a/addons/promote/ftests/pom.xml +++ b/addons/promote/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-ftests-promote diff --git a/addons/promote/jaxrs/pom.xml b/addons/promote/jaxrs/pom.xml index 0295784650..56f6fac1ab 100644 --- a/addons/promote/jaxrs/pom.xml +++ b/addons/promote/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-promote-jaxrs diff --git a/addons/promote/model-java/pom.xml b/addons/promote/model-java/pom.xml index f9cce5d27e..f4a414afa8 100644 --- a/addons/promote/model-java/pom.xml +++ b/addons/promote/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.5.4.1-SNAPSHOT + 2.5.4.1 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 8a7bf1bead..93e905c123 100644 --- a/addons/promote/pom.xml +++ b/addons/promote/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-promote Indy :: Add-Ons :: Artifact Promotion :: Parent diff --git a/addons/revisions/common/pom.xml b/addons/revisions/common/pom.xml index 5a8bfed63b..d54d3da5c5 100644 --- a/addons/revisions/common/pom.xml +++ b/addons/revisions/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-revisions - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-revisions-common Indy :: Add-Ons :: Revisions :: Common diff --git a/addons/revisions/jaxrs/pom.xml b/addons/revisions/jaxrs/pom.xml index dc0bad70a9..0bcdcc4f43 100644 --- a/addons/revisions/jaxrs/pom.xml +++ b/addons/revisions/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-revisions - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-revisions-jaxrs diff --git a/addons/revisions/pom.xml b/addons/revisions/pom.xml index ac97da15d1..c1896312cb 100644 --- a/addons/revisions/pom.xml +++ b/addons/revisions/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-revisions Indy :: Add-Ons :: Revisions :: Parent diff --git a/addons/sli/pom.xml b/addons/sli/pom.xml index 3eff95124c..91c4946aca 100644 --- a/addons/sli/pom.xml +++ b/addons/sli/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-sli Indy :: Add-Ons :: Service Level Indicators Reporting :: JAX-RS diff --git a/api/pom.xml b/api/pom.xml index 33a282bb49..cf8da12cc9 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-api diff --git a/bindings/jaxrs/pom.xml b/bindings/jaxrs/pom.xml index 69d2998f42..0552dd8b45 100644 --- a/bindings/jaxrs/pom.xml +++ b/bindings/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-bindings - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-bindings-jaxrs diff --git a/bindings/pom.xml b/bindings/pom.xml index e8a4d1f67f..f8cc5c7ae1 100644 --- a/bindings/pom.xml +++ b/bindings/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-parent - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-bindings diff --git a/boot/jaxrs/pom.xml b/boot/jaxrs/pom.xml index 044e426f11..7dace07c45 100644 --- a/boot/jaxrs/pom.xml +++ b/boot/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.boot indy-booters - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy.boot diff --git a/boot/pom.xml b/boot/pom.xml index 618dfea729..4536f9b83b 100644 --- a/boot/pom.xml +++ b/boot/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy.boot diff --git a/clients/core-java/pom.xml b/clients/core-java/pom.xml index 67cef1027a..9b58790340 100644 --- a/clients/core-java/pom.xml +++ b/clients/core-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-clients-parent - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-client-core-java diff --git a/clients/pom.xml b/clients/pom.xml index 9ca19ebbeb..fb8c37bc44 100644 --- a/clients/pom.xml +++ b/clients/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-clients-parent diff --git a/core/pom.xml b/core/pom.xml index 59f6b196ee..3be35939f9 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-core diff --git a/db/common/pom.xml b/db/common/pom.xml index 412d11fce8..3110f4135a 100644 --- a/db/common/pom.xml +++ b/db/common/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-db - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-db-common diff --git a/db/flat/pom.xml b/db/flat/pom.xml index 8507553661..f568dde257 100644 --- a/db/flat/pom.xml +++ b/db/flat/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-db-flat diff --git a/db/infinispan/pom.xml b/db/infinispan/pom.xml index 237f3e7d84..2181ca6763 100644 --- a/db/infinispan/pom.xml +++ b/db/infinispan/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-db - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-db-infinispan diff --git a/db/memory/pom.xml b/db/memory/pom.xml index e75c5d9b15..07de658f5f 100644 --- a/db/memory/pom.xml +++ b/db/memory/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-db-memory diff --git a/db/metrics/pom.xml b/db/metrics/pom.xml index 58d3121f31..977db7f44c 100644 --- a/db/metrics/pom.xml +++ b/db/metrics/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-db-metrics diff --git a/db/pom.xml b/db/pom.xml index c31af63cc4..4e7b22c75f 100644 --- a/db/pom.xml +++ b/db/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-db diff --git a/filers/default/pom.xml b/filers/default/pom.xml index 5cf709b7d1..6da3c9a55c 100644 --- a/filers/default/pom.xml +++ b/filers/default/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-file-managers - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-filer-default diff --git a/filers/pom.xml b/filers/pom.xml index 40174da215..7106c2c963 100644 --- a/filers/pom.xml +++ b/filers/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-file-managers diff --git a/ftests/common/pom.xml b/ftests/common/pom.xml index d925da0416..ec6b1e751b 100644 --- a/ftests/common/pom.xml +++ b/ftests/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-ftests-parent - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-ftests-common diff --git a/ftests/core/pom.xml b/ftests/core/pom.xml index 0a99956145..20924099e3 100644 --- a/ftests/core/pom.xml +++ b/ftests/core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-ftests-parent - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-ftests-core diff --git a/ftests/pom.xml b/ftests/pom.xml index 69e3d41b9e..5fffbb1706 100644 --- a/ftests/pom.xml +++ b/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-ftests-parent diff --git a/models/core-java/pom.xml b/models/core-java/pom.xml index dcfec33aad..6da66cf5c2 100644 --- a/models/core-java/pom.xml +++ b/models/core-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-models-parent - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-model-core-java diff --git a/models/pom.xml b/models/pom.xml index f8b2897c02..eda3215673 100644 --- a/models/pom.xml +++ b/models/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-models-parent diff --git a/pom.xml b/pom.xml index 5da822cec2..9a0f8b02cc 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.commonjava.indy indy-parent - 2.5.4.1-SNAPSHOT + 2.5.4.1 pom @@ -37,7 +37,7 @@ scm:git:https://github.com/CommonJava/indy scm:git:https://github.com/CommonJava/indy http://github.com/Commonjava/indy - indy-parent-2.5.4 + indy-parent-2.5.4.1 @@ -195,22 +195,22 @@ org.commonjava.indy indy-model-core-java - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-api - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-core - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-core - 2.5.4.1-SNAPSHOT + 2.5.4.1 tar.gz confset provided @@ -218,27 +218,27 @@ org.commonjava.indy indy-db-flat - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-db-metrics - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-db-common - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-db-infinispan - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-bindings-jaxrs - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy.launch @@ -276,17 +276,17 @@ org.commonjava.indy indy-revisions-jaxrs - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-revisions-common - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-revisions-common - 2.5.4.1-SNAPSHOT + 2.5.4.1 tar.gz confset provided @@ -294,7 +294,7 @@ org.commonjava.indy indy-revisions-common - 2.5.4.1-SNAPSHOT + 2.5.4.1 tar.gz uiset provided @@ -302,12 +302,12 @@ org.commonjava.indy indy-dot-maven-common - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-dot-maven-common - 2.5.4.1-SNAPSHOT + 2.5.4.1 tar.gz dataset provided @@ -315,22 +315,22 @@ org.commonjava.indy indy-dot-maven-jaxrs - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-ftests-dot-maven - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-httprox-common - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-httprox-common - 2.5.4.1-SNAPSHOT + 2.5.4.1 tar.gz confset provided @@ -338,17 +338,17 @@ org.commonjava.indy indy-ftests-httprox - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-content-index - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-content-index - 2.5.4.1-SNAPSHOT + 2.5.4.1 tar.gz confset provided @@ -356,51 +356,51 @@ org.commonjava.indy indy-db-memory - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-test-db - 2.5.4.1-SNAPSHOT + 2.5.4.1 test org.commonjava.indy indy-test-fixtures-core - 2.5.4.1-SNAPSHOT + 2.5.4.1 test org.commonjava.indy indy-test-providers-core - 2.5.4.1-SNAPSHOT + 2.5.4.1 test org.commonjava.indy indy-test-utils - 2.5.4.1-SNAPSHOT + 2.5.4.1 test org.commonjava.indy indy-filer-default - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-subsys-jaxrs - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-subsys-honeycomb - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-subsys-honeycomb - 2.5.4.1-SNAPSHOT + 2.5.4.1 tar.gz confset provided @@ -408,17 +408,17 @@ org.commonjava.indy indy-subsys-flatfile - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-subsys-cassandra - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-subsys-cassandra - 2.5.4.1-SNAPSHOT + 2.5.4.1 tar.gz confset provided @@ -426,79 +426,79 @@ org.commonjava.indy indy-subsys-infinispan - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-subsys-http - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-subsys-git - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-subsys-groovy - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-subsys-prefetch - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-subsys-cpool - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-client-core-java - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-ftests-common - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-ftests-core - 2.5.4.1-SNAPSHOT + 2.5.4.1 test org.commonjava.indy indy-folo-jaxrs - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-ftests-folo - 2.5.4.1-SNAPSHOT + 2.5.4.1 test org.commonjava.indy indy-folo-client-java - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-folo-model-java - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-folo-common - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-folo-common - 2.5.4.1-SNAPSHOT + 2.5.4.1 tar.gz dataset provided @@ -506,7 +506,7 @@ org.commonjava.indy indy-folo-common - 2.5.4.1-SNAPSHOT + 2.5.4.1 tar.gz confset provided @@ -514,33 +514,33 @@ org.commonjava.indy indy-promote-jaxrs - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-ftests-promote - 2.5.4.1-SNAPSHOT + 2.5.4.1 test org.commonjava.indy indy-promote-client-java - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-promote-model-java - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-promote-common - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-promote-common - 2.5.4.1-SNAPSHOT + 2.5.4.1 tar.gz confset provided @@ -548,7 +548,7 @@ org.commonjava.indy indy-promote-common - 2.5.4.1-SNAPSHOT + 2.5.4.1 tar.gz dataset provided @@ -556,19 +556,19 @@ org.commonjava.indy indy-promote-common - 2.5.4.1-SNAPSHOT + 2.5.4.1 dataset provided org.commonjava.indy indy-implied-repos-common - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-implied-repos-common - 2.5.4.1-SNAPSHOT + 2.5.4.1 tar.gz confset provided @@ -576,17 +576,17 @@ org.commonjava.indy indy-implied-repos-model-java - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-implied-repos-client-java - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-ftests-implied-repos - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy.embed @@ -596,17 +596,17 @@ org.commonjava.indy.boot indy-booter-jaxrs - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-subsys-keycloak - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-subsys-keycloak - 2.5.4.1-SNAPSHOT + 2.5.4.1 tar.gz confset provided @@ -614,7 +614,7 @@ org.commonjava.indy indy-subsys-infinispan - 2.5.4.1-SNAPSHOT + 2.5.4.1 tar.gz confset provided @@ -622,7 +622,7 @@ org.commonjava.indy indy-subsys-prefetch - 2.5.4.1-SNAPSHOT + 2.5.4.1 tar.gz confset provided @@ -631,7 +631,7 @@ org.commonjava.indy indy-koji-common - 2.5.4.1-SNAPSHOT + 2.5.4.1 tar.gz confset provided @@ -639,103 +639,103 @@ org.commonjava.indy indy-koji-common - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-koji-model-java - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-koji-client-java - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-koji-jaxrs - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-path-mapped-common - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-path-mapped-model-java - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-path-mapped-jaxrs - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-pkg-maven-common - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-pkg-maven-jaxrs - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-pkg-npm-jaxrs - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-ftests-pkg-maven - 2.5.4.1-SNAPSHOT + 2.5.4.1 test org.commonjava.indy indy-ftests-pkg-npm - 2.5.4.1-SNAPSHOT + 2.5.4.1 test org.commonjava.indy indy-pkg-npm-common - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-pkg-npm-model-java - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-diagnostics-jaxrs - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-diagnostics-client-java - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-diagnostics-common - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-ftests-diagnostics - 2.5.4.1-SNAPSHOT + 2.5.4.1 test org.commonjava.indy indy-diagnostics-common - 2.5.4.1-SNAPSHOT + 2.5.4.1 confset tar.gz provided @@ -743,28 +743,28 @@ org.commonjava.indy indy-hosted-by-archive-common - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-hosted-by-archive-client-java - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-ftests-hosted-by-archive - 2.5.4.1-SNAPSHOT + 2.5.4.1 test org.commonjava.indy indy-hosted-by-archive-jaxrs - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-hosted-by-archive-common - 2.5.4.1-SNAPSHOT + 2.5.4.1 confset tar.gz @@ -772,12 +772,12 @@ org.commonjava.indy indy-subsys-metrics - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-subsys-metrics - 2.5.4.1-SNAPSHOT + 2.5.4.1 confset tar.gz provided @@ -786,7 +786,7 @@ org.commonjava.indy indy-sli - 2.5.4.1-SNAPSHOT + 2.5.4.1 @@ -880,28 +880,28 @@ org.commonjava.indy indy-changelog-common - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-changelog-client-java - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-ftests-changelog - 2.5.4.1-SNAPSHOT + 2.5.4.1 test org.commonjava.indy indy-changelog-jaxrs - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-changelog-common - 2.5.4.1-SNAPSHOT + 2.5.4.1 confset tar.gz @@ -919,12 +919,12 @@ org.commonjava.indy indy-event-audit-common - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy indy-event-audit-common - 2.5.4.1-SNAPSHOT + 2.5.4.1 confset tar.gz provided diff --git a/subsys/cassandra/pom.xml b/subsys/cassandra/pom.xml index ea030ccedc..10d06a8eba 100644 --- a/subsys/cassandra/pom.xml +++ b/subsys/cassandra/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-subsystems - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-subsys-cassandra diff --git a/subsys/cpool/pom.xml b/subsys/cpool/pom.xml index ed8f04c1fa..2007730d07 100644 --- a/subsys/cpool/pom.xml +++ b/subsys/cpool/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-subsys-cpool diff --git a/subsys/flatfile/pom.xml b/subsys/flatfile/pom.xml index 4cac4b090e..6f7e77d7db 100644 --- a/subsys/flatfile/pom.xml +++ b/subsys/flatfile/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-subsys-flatfile diff --git a/subsys/git/pom.xml b/subsys/git/pom.xml index c07958792f..e31219b6dd 100644 --- a/subsys/git/pom.xml +++ b/subsys/git/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-subsys-git diff --git a/subsys/groovy/pom.xml b/subsys/groovy/pom.xml index aa445c72b7..49916d24b7 100644 --- a/subsys/groovy/pom.xml +++ b/subsys/groovy/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-subsys-groovy diff --git a/subsys/honeycomb/pom.xml b/subsys/honeycomb/pom.xml index d93767f61f..a0833172f4 100644 --- a/subsys/honeycomb/pom.xml +++ b/subsys/honeycomb/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.5.4.1-SNAPSHOT + 2.5.4.1 4.0.0 diff --git a/subsys/http/pom.xml b/subsys/http/pom.xml index 592477b628..b896337562 100644 --- a/subsys/http/pom.xml +++ b/subsys/http/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-subsys-http diff --git a/subsys/infinispan/pom.xml b/subsys/infinispan/pom.xml index 13e7ec3920..1c1f718b87 100644 --- a/subsys/infinispan/pom.xml +++ b/subsys/infinispan/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-subsys-infinispan diff --git a/subsys/jaxrs/pom.xml b/subsys/jaxrs/pom.xml index 8fc1fa6b76..7ba15a3cc3 100644 --- a/subsys/jaxrs/pom.xml +++ b/subsys/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-subsys-jaxrs diff --git a/subsys/kafka/pom.xml b/subsys/kafka/pom.xml index eb3691bc9d..b94d94b1ee 100644 --- a/subsys/kafka/pom.xml +++ b/subsys/kafka/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.5.4.1-SNAPSHOT + 2.5.4.1 4.0.0 diff --git a/subsys/keycloak/pom.xml b/subsys/keycloak/pom.xml index 44c0eaf121..137fdacbb2 100644 --- a/subsys/keycloak/pom.xml +++ b/subsys/keycloak/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-subsys-keycloak Indy :: Subsystems :: Keycloak diff --git a/subsys/metrics/pom.xml b/subsys/metrics/pom.xml index d072e7f211..b6bf1b0f62 100644 --- a/subsys/metrics/pom.xml +++ b/subsys/metrics/pom.xml @@ -20,7 +20,7 @@ org.commonjava.indy indy-subsystems - 2.5.4.1-SNAPSHOT + 2.5.4.1 4.0.0 diff --git a/subsys/pom.xml b/subsys/pom.xml index 3e026e8c54..a8bc65e03f 100644 --- a/subsys/pom.xml +++ b/subsys/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-subsystems diff --git a/subsys/prefetch/pom.xml b/subsys/prefetch/pom.xml index 04a8703563..cc5f8770a0 100644 --- a/subsys/prefetch/pom.xml +++ b/subsys/prefetch/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.5.4.1-SNAPSHOT + 2.5.4.1 4.0.0 diff --git a/test/db/pom.xml b/test/db/pom.xml index 2ee645a582..0959376334 100644 --- a/test/db/pom.xml +++ b/test/db/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-test-db diff --git a/test/fixtures-core/pom.xml b/test/fixtures-core/pom.xml index 1550ad60ec..1801e86061 100644 --- a/test/fixtures-core/pom.xml +++ b/test/fixtures-core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-test-fixtures-core diff --git a/test/pom.xml b/test/pom.xml index ee77714cfd..1964d9e6d1 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-test diff --git a/test/providers-core/pom.xml b/test/providers-core/pom.xml index 38d39529c2..fbc61bc58d 100644 --- a/test/providers-core/pom.xml +++ b/test/providers-core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-test-providers-core diff --git a/test/utils/pom.xml b/test/utils/pom.xml index c899011830..87e1efd961 100644 --- a/test/utils/pom.xml +++ b/test/utils/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-test-utils diff --git a/tools/assemblies/pom.xml b/tools/assemblies/pom.xml index 2902c1e519..3c4382d093 100644 --- a/tools/assemblies/pom.xml +++ b/tools/assemblies/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.tools indy-tools - 2.5.4.1-SNAPSHOT + 2.5.4.1 indy-assemblies diff --git a/tools/pom.xml b/tools/pom.xml index f76dea470d..10a16d523b 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.4.1-SNAPSHOT + 2.5.4.1 org.commonjava.indy.tools From 267c06f7df2ba7c99ddb8ce9c3814849722f3fd9 Mon Sep 17 00:00:00 2001 From: commonjava-bot Date: Wed, 24 Jul 2024 05:15:20 +0000 Subject: [PATCH 50/50] [maven-release-plugin] prepare for next development iteration --- addons/changelog/client-java/pom.xml | 2 +- addons/changelog/common/pom.xml | 2 +- addons/changelog/ftests/pom.xml | 2 +- addons/changelog/jaxrs/pom.xml | 2 +- addons/changelog/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/event-audit/common/pom.xml | 2 +- addons/event-audit/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/path-mapped/common/pom.xml | 2 +- addons/path-mapped/jaxrs/pom.xml | 2 +- addons/path-mapped/model-java/pom.xml | 2 +- addons/path-mapped/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/revisions/common/pom.xml | 2 +- addons/revisions/jaxrs/pom.xml | 2 +- addons/revisions/pom.xml | 2 +- addons/sli/pom.xml | 2 +- api/pom.xml | 2 +- bindings/jaxrs/pom.xml | 2 +- bindings/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/common/pom.xml | 2 +- db/flat/pom.xml | 2 +- db/infinispan/pom.xml | 2 +- db/memory/pom.xml | 2 +- db/metrics/pom.xml | 2 +- db/pom.xml | 2 +- filers/default/pom.xml | 2 +- filers/pom.xml | 2 +- ftests/common/pom.xml | 2 +- ftests/core/pom.xml | 2 +- ftests/pom.xml | 2 +- models/core-java/pom.xml | 2 +- models/pom.xml | 2 +- pom.xml | 210 +++++++++---------- subsys/cassandra/pom.xml | 2 +- subsys/cpool/pom.xml | 2 +- subsys/flatfile/pom.xml | 2 +- subsys/git/pom.xml | 2 +- subsys/groovy/pom.xml | 2 +- subsys/honeycomb/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/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 +- 109 files changed, 213 insertions(+), 213 deletions(-) diff --git a/addons/changelog/client-java/pom.xml b/addons/changelog/client-java/pom.xml index f1403155e7..b5c21c5b9e 100644 --- a/addons/changelog/client-java/pom.xml +++ b/addons/changelog/client-java/pom.xml @@ -20,7 +20,7 @@ indy-changelog org.commonjava.indy - 2.5.4.1 + 2.5.4.2-SNAPSHOT 4.0.0 diff --git a/addons/changelog/common/pom.xml b/addons/changelog/common/pom.xml index 576a28daaa..cb16474e94 100644 --- a/addons/changelog/common/pom.xml +++ b/addons/changelog/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-changelog-common Indy :: Add-Ons :: ChangeLog :: Common diff --git a/addons/changelog/ftests/pom.xml b/addons/changelog/ftests/pom.xml index 0cdefd3528..4a2c9c4bd8 100644 --- a/addons/changelog/ftests/pom.xml +++ b/addons/changelog/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-ftests-changelog diff --git a/addons/changelog/jaxrs/pom.xml b/addons/changelog/jaxrs/pom.xml index 722eb8b5c1..1af24dbf40 100644 --- a/addons/changelog/jaxrs/pom.xml +++ b/addons/changelog/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-changelog - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-changelog-jaxrs diff --git a/addons/changelog/pom.xml b/addons/changelog/pom.xml index c3293b2031..d5cad9f011 100644 --- a/addons/changelog/pom.xml +++ b/addons/changelog/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-changelog Indy :: Add-Ons :: ChangeLog :: Parent diff --git a/addons/content-index/pom.xml b/addons/content-index/pom.xml index 4d8bca1b9f..b6ee50dc94 100644 --- a/addons/content-index/pom.xml +++ b/addons/content-index/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-content-index diff --git a/addons/diagnostics/client-java/pom.xml b/addons/diagnostics/client-java/pom.xml index 1f0d5488b5..0b6ea7f082 100644 --- a/addons/diagnostics/client-java/pom.xml +++ b/addons/diagnostics/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.5.4.1 + 2.5.4.2-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 9d64fc7cd3..5d1cd8a9f6 100644 --- a/addons/diagnostics/common/pom.xml +++ b/addons/diagnostics/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.5.4.1 + 2.5.4.2-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 17a7073919..062cf48aa4 100644 --- a/addons/diagnostics/ftests/pom.xml +++ b/addons/diagnostics/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-ftests-diagnostics diff --git a/addons/diagnostics/jaxrs/pom.xml b/addons/diagnostics/jaxrs/pom.xml index 9be7071c8c..e6733f2fda 100644 --- a/addons/diagnostics/jaxrs/pom.xml +++ b/addons/diagnostics/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-diagnostics - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-diagnostics-jaxrs diff --git a/addons/diagnostics/pom.xml b/addons/diagnostics/pom.xml index 5e10c5b777..c090bf6e65 100644 --- a/addons/diagnostics/pom.xml +++ b/addons/diagnostics/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4.1 + 2.5.4.2-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 f3646472c4..a0230703dc 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 - 2.5.4.1 + 2.5.4.2-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 b0ab9b6154..df238474f3 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 - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-ftests-dot-maven diff --git a/addons/dot-maven/jaxrs/pom.xml b/addons/dot-maven/jaxrs/pom.xml index b43efb7bf1..622c78d1fd 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 - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-dot-maven-jaxrs diff --git a/addons/dot-maven/pom.xml b/addons/dot-maven/pom.xml index e12a427200..278be18962 100644 --- a/addons/dot-maven/pom.xml +++ b/addons/dot-maven/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-dot-maven diff --git a/addons/event-audit/common/pom.xml b/addons/event-audit/common/pom.xml index c6bfc93484..da1b873a12 100644 --- a/addons/event-audit/common/pom.xml +++ b/addons/event-audit/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-event-audit - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-event-audit-common diff --git a/addons/event-audit/pom.xml b/addons/event-audit/pom.xml index 20986e0dc5..7eadf1b388 100644 --- a/addons/event-audit/pom.xml +++ b/addons/event-audit/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-event-audit diff --git a/addons/folo/client-java/pom.xml b/addons/folo/client-java/pom.xml index 206395dce0..263c86a9af 100644 --- a/addons/folo/client-java/pom.xml +++ b/addons/folo/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.5.4.1 + 2.5.4.2-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 86f4be761e..97398f1453 100644 --- a/addons/folo/common/pom.xml +++ b/addons/folo/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.5.4.1 + 2.5.4.2-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 2dd4497fe8..b6408006a6 100644 --- a/addons/folo/ftests/pom.xml +++ b/addons/folo/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-ftests-folo diff --git a/addons/folo/jaxrs/pom.xml b/addons/folo/jaxrs/pom.xml index e8e2889fd1..eb67bf2866 100644 --- a/addons/folo/jaxrs/pom.xml +++ b/addons/folo/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-folo-jaxrs diff --git a/addons/folo/model-java/pom.xml b/addons/folo/model-java/pom.xml index 367980fd6b..570f85691a 100644 --- a/addons/folo/model-java/pom.xml +++ b/addons/folo/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-folo - 2.5.4.1 + 2.5.4.2-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 9b0ca9e0eb..d592f9bca3 100644 --- a/addons/folo/pom.xml +++ b/addons/folo/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4.1 + 2.5.4.2-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 cdd93fd7ce..17a77620d2 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 - 2.5.4.1 + 2.5.4.2-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 8083286f2f..d9e10e9b0f 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 - 2.5.4.1 + 2.5.4.2-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 06db34e816..5a751d7ee2 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 - 2.5.4.1 + 2.5.4.2-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 f8fce6d27b..7169c8e244 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 - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-hosted-by-archive-jaxrs diff --git a/addons/hosted-by-archive/pom.xml b/addons/hosted-by-archive/pom.xml index b0f1d4c5c0..0071e9fac0 100644 --- a/addons/hosted-by-archive/pom.xml +++ b/addons/hosted-by-archive/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4.1 + 2.5.4.2-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 32a25a6a35..6108a833a2 100644 --- a/addons/httprox/common/pom.xml +++ b/addons/httprox/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.5.4.1 + 2.5.4.2-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 62491e1791..45988d1ce2 100644 --- a/addons/httprox/ftests/pom.xml +++ b/addons/httprox/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-ftests-httprox diff --git a/addons/httprox/jaxrs/pom.xml b/addons/httprox/jaxrs/pom.xml index d4c75b8daa..36a6443ecd 100644 --- a/addons/httprox/jaxrs/pom.xml +++ b/addons/httprox/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-httprox - 2.5.4.1 + 2.5.4.2-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 b67ce7a9c4..0c512bac71 100644 --- a/addons/httprox/pom.xml +++ b/addons/httprox/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-httprox diff --git a/addons/implied-repos/client-java/pom.xml b/addons/implied-repos/client-java/pom.xml index 218ceb5eb1..73f229c055 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 - 2.5.4.1 + 2.5.4.2-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 2fea12da2b..f53c1872d3 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 - 2.5.4.1 + 2.5.4.2-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 c1df35e577..2ca1e88456 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 - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-ftests-implied-repos diff --git a/addons/implied-repos/model-java/pom.xml b/addons/implied-repos/model-java/pom.xml index 920957a610..dccc4b5cb6 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 - 2.5.4.1 + 2.5.4.2-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 a6c7e84498..c0e4041510 100644 --- a/addons/implied-repos/pom.xml +++ b/addons/implied-repos/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4.1 + 2.5.4.2-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 be2fe63dc3..be83923f9a 100644 --- a/addons/koji/client-java/pom.xml +++ b/addons/koji/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.5.4.1 + 2.5.4.2-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 a7459fffff..80549c0891 100644 --- a/addons/koji/common/pom.xml +++ b/addons/koji/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.5.4.1 + 2.5.4.2-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 2acbe99292..9242f99264 100644 --- a/addons/koji/jaxrs/pom.xml +++ b/addons/koji/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-koji-jaxrs diff --git a/addons/koji/model-java/pom.xml b/addons/koji/model-java/pom.xml index 01210e9b19..8fab9e751e 100644 --- a/addons/koji/model-java/pom.xml +++ b/addons/koji/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-koji - 2.5.4.1 + 2.5.4.2-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 eb1d39752d..8c21ce54e1 100644 --- a/addons/koji/pom.xml +++ b/addons/koji/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-koji Indy :: Add-Ons :: Koji Integration :: Parent diff --git a/addons/path-mapped/common/pom.xml b/addons/path-mapped/common/pom.xml index d86ae51818..1fa1c114de 100644 --- a/addons/path-mapped/common/pom.xml +++ b/addons/path-mapped/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-path-mapped-common diff --git a/addons/path-mapped/jaxrs/pom.xml b/addons/path-mapped/jaxrs/pom.xml index a31dad423d..cdd1fc66dc 100644 --- a/addons/path-mapped/jaxrs/pom.xml +++ b/addons/path-mapped/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-path-mapped-jaxrs diff --git a/addons/path-mapped/model-java/pom.xml b/addons/path-mapped/model-java/pom.xml index 8ed963ab52..f80916a9fd 100644 --- a/addons/path-mapped/model-java/pom.xml +++ b/addons/path-mapped/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-path-mapped - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-path-mapped-model-java diff --git a/addons/path-mapped/pom.xml b/addons/path-mapped/pom.xml index fa45b8b49e..cfd55264ee 100644 --- a/addons/path-mapped/pom.xml +++ b/addons/path-mapped/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-path-mapped Indy :: Add-Ons :: Path Mapped :: Parent diff --git a/addons/pkg-maven/common/pom.xml b/addons/pkg-maven/common/pom.xml index f46a547b6e..2139fb6eec 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 - 2.5.4.1 + 2.5.4.2-SNAPSHOT 4.0.0 diff --git a/addons/pkg-maven/ftests/pom.xml b/addons/pkg-maven/ftests/pom.xml index 7c79d1f5f9..0caad8c1ec 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 - 2.5.4.1 + 2.5.4.2-SNAPSHOT 4.0.0 diff --git a/addons/pkg-maven/jaxrs/pom.xml b/addons/pkg-maven/jaxrs/pom.xml index 6608351d37..840fc7fb62 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 - 2.5.4.1 + 2.5.4.2-SNAPSHOT 4.0.0 diff --git a/addons/pkg-maven/pom.xml b/addons/pkg-maven/pom.xml index b2704297a1..984862e1d1 100644 --- a/addons/pkg-maven/pom.xml +++ b/addons/pkg-maven/pom.xml @@ -20,7 +20,7 @@ indy-addons org.commonjava.indy - 2.5.4.1 + 2.5.4.2-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/common/pom.xml b/addons/pkg-npm/common/pom.xml index 766bd06d37..7e08b5f5f6 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 - 2.5.4.1 + 2.5.4.2-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/ftests/pom.xml b/addons/pkg-npm/ftests/pom.xml index f44b91b1d1..24a3aebe44 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 - 2.5.4.1 + 2.5.4.2-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/jaxrs/pom.xml b/addons/pkg-npm/jaxrs/pom.xml index 09eb53b21a..f1b902dee6 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 - 2.5.4.1 + 2.5.4.2-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/model-java/pom.xml b/addons/pkg-npm/model-java/pom.xml index 8c14a04735..755e09ec84 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 - 2.5.4.1 + 2.5.4.2-SNAPSHOT 4.0.0 diff --git a/addons/pkg-npm/pom.xml b/addons/pkg-npm/pom.xml index f6671052c2..6cce19d904 100644 --- a/addons/pkg-npm/pom.xml +++ b/addons/pkg-npm/pom.xml @@ -20,7 +20,7 @@ indy-addons org.commonjava.indy - 2.5.4.1 + 2.5.4.2-SNAPSHOT 4.0.0 diff --git a/addons/pom.xml b/addons/pom.xml index fb9bd0a345..4f79f983eb 100644 --- a/addons/pom.xml +++ b/addons/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-parent - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-addons diff --git a/addons/promote/client-java/pom.xml b/addons/promote/client-java/pom.xml index 74cabcd185..613ded1157 100644 --- a/addons/promote/client-java/pom.xml +++ b/addons/promote/client-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.5.4.1 + 2.5.4.2-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 7ec0a60ca7..5e8c30c2b3 100644 --- a/addons/promote/common/pom.xml +++ b/addons/promote/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.5.4.1 + 2.5.4.2-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 aaac3b63ec..250e260b60 100644 --- a/addons/promote/ftests/pom.xml +++ b/addons/promote/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-ftests-promote diff --git a/addons/promote/jaxrs/pom.xml b/addons/promote/jaxrs/pom.xml index 56f6fac1ab..942d4416f8 100644 --- a/addons/promote/jaxrs/pom.xml +++ b/addons/promote/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-promote-jaxrs diff --git a/addons/promote/model-java/pom.xml b/addons/promote/model-java/pom.xml index f4a414afa8..f4411ca6b2 100644 --- a/addons/promote/model-java/pom.xml +++ b/addons/promote/model-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-promote - 2.5.4.1 + 2.5.4.2-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 93e905c123..76121b47f4 100644 --- a/addons/promote/pom.xml +++ b/addons/promote/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-promote Indy :: Add-Ons :: Artifact Promotion :: Parent diff --git a/addons/revisions/common/pom.xml b/addons/revisions/common/pom.xml index d54d3da5c5..8c988176d2 100644 --- a/addons/revisions/common/pom.xml +++ b/addons/revisions/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-revisions - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-revisions-common Indy :: Add-Ons :: Revisions :: Common diff --git a/addons/revisions/jaxrs/pom.xml b/addons/revisions/jaxrs/pom.xml index 0bcdcc4f43..497ef31eef 100644 --- a/addons/revisions/jaxrs/pom.xml +++ b/addons/revisions/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-revisions - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-revisions-jaxrs diff --git a/addons/revisions/pom.xml b/addons/revisions/pom.xml index c1896312cb..28fc786d92 100644 --- a/addons/revisions/pom.xml +++ b/addons/revisions/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-revisions Indy :: Add-Ons :: Revisions :: Parent diff --git a/addons/sli/pom.xml b/addons/sli/pom.xml index 91c4946aca..0be8711bbd 100644 --- a/addons/sli/pom.xml +++ b/addons/sli/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-addons - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-sli Indy :: Add-Ons :: Service Level Indicators Reporting :: JAX-RS diff --git a/api/pom.xml b/api/pom.xml index cf8da12cc9..a3c82a81d0 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-api diff --git a/bindings/jaxrs/pom.xml b/bindings/jaxrs/pom.xml index 0552dd8b45..c4915ba4fe 100644 --- a/bindings/jaxrs/pom.xml +++ b/bindings/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-bindings - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-bindings-jaxrs diff --git a/bindings/pom.xml b/bindings/pom.xml index f8cc5c7ae1..5762336c68 100644 --- a/bindings/pom.xml +++ b/bindings/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-parent - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-bindings diff --git a/boot/jaxrs/pom.xml b/boot/jaxrs/pom.xml index 7dace07c45..5189856a7d 100644 --- a/boot/jaxrs/pom.xml +++ b/boot/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.boot indy-booters - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy.boot diff --git a/boot/pom.xml b/boot/pom.xml index 4536f9b83b..60bc99ef6c 100644 --- a/boot/pom.xml +++ b/boot/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy.boot diff --git a/clients/core-java/pom.xml b/clients/core-java/pom.xml index 9b58790340..c9d13cb419 100644 --- a/clients/core-java/pom.xml +++ b/clients/core-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-clients-parent - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-client-core-java diff --git a/clients/pom.xml b/clients/pom.xml index fb8c37bc44..f6c8e4cc9e 100644 --- a/clients/pom.xml +++ b/clients/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-clients-parent diff --git a/core/pom.xml b/core/pom.xml index 3be35939f9..0bbfda43fd 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-core diff --git a/db/common/pom.xml b/db/common/pom.xml index 3110f4135a..b3bb863f15 100644 --- a/db/common/pom.xml +++ b/db/common/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-db - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-db-common diff --git a/db/flat/pom.xml b/db/flat/pom.xml index f568dde257..ff81356bf3 100644 --- a/db/flat/pom.xml +++ b/db/flat/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-db-flat diff --git a/db/infinispan/pom.xml b/db/infinispan/pom.xml index 2181ca6763..47ed770875 100644 --- a/db/infinispan/pom.xml +++ b/db/infinispan/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-db - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-db-infinispan diff --git a/db/memory/pom.xml b/db/memory/pom.xml index 07de658f5f..6754a54b1b 100644 --- a/db/memory/pom.xml +++ b/db/memory/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-db-memory diff --git a/db/metrics/pom.xml b/db/metrics/pom.xml index 977db7f44c..8dfbb93376 100644 --- a/db/metrics/pom.xml +++ b/db/metrics/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-db - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-db-metrics diff --git a/db/pom.xml b/db/pom.xml index 4e7b22c75f..f0bd26269e 100644 --- a/db/pom.xml +++ b/db/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-db diff --git a/filers/default/pom.xml b/filers/default/pom.xml index 6da3c9a55c..8334b14e51 100644 --- a/filers/default/pom.xml +++ b/filers/default/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-file-managers - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-filer-default diff --git a/filers/pom.xml b/filers/pom.xml index 7106c2c963..f98fe05c3c 100644 --- a/filers/pom.xml +++ b/filers/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-file-managers diff --git a/ftests/common/pom.xml b/ftests/common/pom.xml index ec6b1e751b..a8b6165050 100644 --- a/ftests/common/pom.xml +++ b/ftests/common/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-ftests-parent - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-ftests-common diff --git a/ftests/core/pom.xml b/ftests/core/pom.xml index 20924099e3..8c8de46cbd 100644 --- a/ftests/core/pom.xml +++ b/ftests/core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-ftests-parent - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-ftests-core diff --git a/ftests/pom.xml b/ftests/pom.xml index 5fffbb1706..b3cc40f93f 100644 --- a/ftests/pom.xml +++ b/ftests/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-ftests-parent diff --git a/models/core-java/pom.xml b/models/core-java/pom.xml index 6da66cf5c2..cad85d2a32 100644 --- a/models/core-java/pom.xml +++ b/models/core-java/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-models-parent - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-model-core-java diff --git a/models/pom.xml b/models/pom.xml index eda3215673..edfa09c8b4 100644 --- a/models/pom.xml +++ b/models/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-models-parent diff --git a/pom.xml b/pom.xml index 9a0f8b02cc..93d7c27bab 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.commonjava.indy indy-parent - 2.5.4.1 + 2.5.4.2-SNAPSHOT pom @@ -37,7 +37,7 @@ scm:git:https://github.com/CommonJava/indy scm:git:https://github.com/CommonJava/indy http://github.com/Commonjava/indy - indy-parent-2.5.4.1 + indy-parent-2.5.4 @@ -195,22 +195,22 @@ org.commonjava.indy indy-model-core-java - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-api - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-core - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-core - 2.5.4.1 + 2.5.4.2-SNAPSHOT tar.gz confset provided @@ -218,27 +218,27 @@ org.commonjava.indy indy-db-flat - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-db-metrics - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-db-common - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-db-infinispan - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-bindings-jaxrs - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy.launch @@ -276,17 +276,17 @@ org.commonjava.indy indy-revisions-jaxrs - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-revisions-common - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-revisions-common - 2.5.4.1 + 2.5.4.2-SNAPSHOT tar.gz confset provided @@ -294,7 +294,7 @@ org.commonjava.indy indy-revisions-common - 2.5.4.1 + 2.5.4.2-SNAPSHOT tar.gz uiset provided @@ -302,12 +302,12 @@ org.commonjava.indy indy-dot-maven-common - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-dot-maven-common - 2.5.4.1 + 2.5.4.2-SNAPSHOT tar.gz dataset provided @@ -315,22 +315,22 @@ org.commonjava.indy indy-dot-maven-jaxrs - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-ftests-dot-maven - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-httprox-common - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-httprox-common - 2.5.4.1 + 2.5.4.2-SNAPSHOT tar.gz confset provided @@ -338,17 +338,17 @@ org.commonjava.indy indy-ftests-httprox - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-content-index - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-content-index - 2.5.4.1 + 2.5.4.2-SNAPSHOT tar.gz confset provided @@ -356,51 +356,51 @@ org.commonjava.indy indy-db-memory - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-test-db - 2.5.4.1 + 2.5.4.2-SNAPSHOT test org.commonjava.indy indy-test-fixtures-core - 2.5.4.1 + 2.5.4.2-SNAPSHOT test org.commonjava.indy indy-test-providers-core - 2.5.4.1 + 2.5.4.2-SNAPSHOT test org.commonjava.indy indy-test-utils - 2.5.4.1 + 2.5.4.2-SNAPSHOT test org.commonjava.indy indy-filer-default - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-subsys-jaxrs - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-subsys-honeycomb - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-subsys-honeycomb - 2.5.4.1 + 2.5.4.2-SNAPSHOT tar.gz confset provided @@ -408,17 +408,17 @@ org.commonjava.indy indy-subsys-flatfile - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-subsys-cassandra - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-subsys-cassandra - 2.5.4.1 + 2.5.4.2-SNAPSHOT tar.gz confset provided @@ -426,79 +426,79 @@ org.commonjava.indy indy-subsys-infinispan - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-subsys-http - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-subsys-git - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-subsys-groovy - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-subsys-prefetch - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-subsys-cpool - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-client-core-java - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-ftests-common - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-ftests-core - 2.5.4.1 + 2.5.4.2-SNAPSHOT test org.commonjava.indy indy-folo-jaxrs - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-ftests-folo - 2.5.4.1 + 2.5.4.2-SNAPSHOT test org.commonjava.indy indy-folo-client-java - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-folo-model-java - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-folo-common - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-folo-common - 2.5.4.1 + 2.5.4.2-SNAPSHOT tar.gz dataset provided @@ -506,7 +506,7 @@ org.commonjava.indy indy-folo-common - 2.5.4.1 + 2.5.4.2-SNAPSHOT tar.gz confset provided @@ -514,33 +514,33 @@ org.commonjava.indy indy-promote-jaxrs - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-ftests-promote - 2.5.4.1 + 2.5.4.2-SNAPSHOT test org.commonjava.indy indy-promote-client-java - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-promote-model-java - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-promote-common - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-promote-common - 2.5.4.1 + 2.5.4.2-SNAPSHOT tar.gz confset provided @@ -548,7 +548,7 @@ org.commonjava.indy indy-promote-common - 2.5.4.1 + 2.5.4.2-SNAPSHOT tar.gz dataset provided @@ -556,19 +556,19 @@ org.commonjava.indy indy-promote-common - 2.5.4.1 + 2.5.4.2-SNAPSHOT dataset provided org.commonjava.indy indy-implied-repos-common - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-implied-repos-common - 2.5.4.1 + 2.5.4.2-SNAPSHOT tar.gz confset provided @@ -576,17 +576,17 @@ org.commonjava.indy indy-implied-repos-model-java - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-implied-repos-client-java - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-ftests-implied-repos - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy.embed @@ -596,17 +596,17 @@ org.commonjava.indy.boot indy-booter-jaxrs - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-subsys-keycloak - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-subsys-keycloak - 2.5.4.1 + 2.5.4.2-SNAPSHOT tar.gz confset provided @@ -614,7 +614,7 @@ org.commonjava.indy indy-subsys-infinispan - 2.5.4.1 + 2.5.4.2-SNAPSHOT tar.gz confset provided @@ -622,7 +622,7 @@ org.commonjava.indy indy-subsys-prefetch - 2.5.4.1 + 2.5.4.2-SNAPSHOT tar.gz confset provided @@ -631,7 +631,7 @@ org.commonjava.indy indy-koji-common - 2.5.4.1 + 2.5.4.2-SNAPSHOT tar.gz confset provided @@ -639,103 +639,103 @@ org.commonjava.indy indy-koji-common - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-koji-model-java - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-koji-client-java - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-koji-jaxrs - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-path-mapped-common - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-path-mapped-model-java - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-path-mapped-jaxrs - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-pkg-maven-common - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-pkg-maven-jaxrs - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-pkg-npm-jaxrs - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-ftests-pkg-maven - 2.5.4.1 + 2.5.4.2-SNAPSHOT test org.commonjava.indy indy-ftests-pkg-npm - 2.5.4.1 + 2.5.4.2-SNAPSHOT test org.commonjava.indy indy-pkg-npm-common - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-pkg-npm-model-java - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-diagnostics-jaxrs - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-diagnostics-client-java - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-diagnostics-common - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-ftests-diagnostics - 2.5.4.1 + 2.5.4.2-SNAPSHOT test org.commonjava.indy indy-diagnostics-common - 2.5.4.1 + 2.5.4.2-SNAPSHOT confset tar.gz provided @@ -743,28 +743,28 @@ org.commonjava.indy indy-hosted-by-archive-common - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-hosted-by-archive-client-java - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-ftests-hosted-by-archive - 2.5.4.1 + 2.5.4.2-SNAPSHOT test org.commonjava.indy indy-hosted-by-archive-jaxrs - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-hosted-by-archive-common - 2.5.4.1 + 2.5.4.2-SNAPSHOT confset tar.gz @@ -772,12 +772,12 @@ org.commonjava.indy indy-subsys-metrics - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-subsys-metrics - 2.5.4.1 + 2.5.4.2-SNAPSHOT confset tar.gz provided @@ -786,7 +786,7 @@ org.commonjava.indy indy-sli - 2.5.4.1 + 2.5.4.2-SNAPSHOT @@ -880,28 +880,28 @@ org.commonjava.indy indy-changelog-common - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-changelog-client-java - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-ftests-changelog - 2.5.4.1 + 2.5.4.2-SNAPSHOT test org.commonjava.indy indy-changelog-jaxrs - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-changelog-common - 2.5.4.1 + 2.5.4.2-SNAPSHOT confset tar.gz @@ -919,12 +919,12 @@ org.commonjava.indy indy-event-audit-common - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy indy-event-audit-common - 2.5.4.1 + 2.5.4.2-SNAPSHOT confset tar.gz provided diff --git a/subsys/cassandra/pom.xml b/subsys/cassandra/pom.xml index 10d06a8eba..33aa834183 100644 --- a/subsys/cassandra/pom.xml +++ b/subsys/cassandra/pom.xml @@ -22,7 +22,7 @@ org.commonjava.indy indy-subsystems - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-subsys-cassandra diff --git a/subsys/cpool/pom.xml b/subsys/cpool/pom.xml index 2007730d07..05af017cf3 100644 --- a/subsys/cpool/pom.xml +++ b/subsys/cpool/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-subsys-cpool diff --git a/subsys/flatfile/pom.xml b/subsys/flatfile/pom.xml index 6f7e77d7db..8c221f5478 100644 --- a/subsys/flatfile/pom.xml +++ b/subsys/flatfile/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-subsys-flatfile diff --git a/subsys/git/pom.xml b/subsys/git/pom.xml index e31219b6dd..22e6c651ec 100644 --- a/subsys/git/pom.xml +++ b/subsys/git/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-subsys-git diff --git a/subsys/groovy/pom.xml b/subsys/groovy/pom.xml index 49916d24b7..a2d865d6fe 100644 --- a/subsys/groovy/pom.xml +++ b/subsys/groovy/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-subsys-groovy diff --git a/subsys/honeycomb/pom.xml b/subsys/honeycomb/pom.xml index a0833172f4..4089fdc9b8 100644 --- a/subsys/honeycomb/pom.xml +++ b/subsys/honeycomb/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.5.4.1 + 2.5.4.2-SNAPSHOT 4.0.0 diff --git a/subsys/http/pom.xml b/subsys/http/pom.xml index b896337562..a596efc34a 100644 --- a/subsys/http/pom.xml +++ b/subsys/http/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-subsys-http diff --git a/subsys/infinispan/pom.xml b/subsys/infinispan/pom.xml index 1c1f718b87..61be429492 100644 --- a/subsys/infinispan/pom.xml +++ b/subsys/infinispan/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-subsys-infinispan diff --git a/subsys/jaxrs/pom.xml b/subsys/jaxrs/pom.xml index 7ba15a3cc3..0ddbcf4df8 100644 --- a/subsys/jaxrs/pom.xml +++ b/subsys/jaxrs/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-subsys-jaxrs diff --git a/subsys/kafka/pom.xml b/subsys/kafka/pom.xml index b94d94b1ee..ef91fb508e 100644 --- a/subsys/kafka/pom.xml +++ b/subsys/kafka/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.5.4.1 + 2.5.4.2-SNAPSHOT 4.0.0 diff --git a/subsys/keycloak/pom.xml b/subsys/keycloak/pom.xml index 137fdacbb2..e9015c9ce8 100644 --- a/subsys/keycloak/pom.xml +++ b/subsys/keycloak/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-subsystems - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-subsys-keycloak Indy :: Subsystems :: Keycloak diff --git a/subsys/metrics/pom.xml b/subsys/metrics/pom.xml index b6bf1b0f62..5cc23716c8 100644 --- a/subsys/metrics/pom.xml +++ b/subsys/metrics/pom.xml @@ -20,7 +20,7 @@ org.commonjava.indy indy-subsystems - 2.5.4.1 + 2.5.4.2-SNAPSHOT 4.0.0 diff --git a/subsys/pom.xml b/subsys/pom.xml index a8bc65e03f..b7f1be86fa 100644 --- a/subsys/pom.xml +++ b/subsys/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-subsystems diff --git a/subsys/prefetch/pom.xml b/subsys/prefetch/pom.xml index cc5f8770a0..0ccf73d93b 100644 --- a/subsys/prefetch/pom.xml +++ b/subsys/prefetch/pom.xml @@ -20,7 +20,7 @@ indy-subsystems org.commonjava.indy - 2.5.4.1 + 2.5.4.2-SNAPSHOT 4.0.0 diff --git a/test/db/pom.xml b/test/db/pom.xml index 0959376334..f9b1fb35c0 100644 --- a/test/db/pom.xml +++ b/test/db/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-test-db diff --git a/test/fixtures-core/pom.xml b/test/fixtures-core/pom.xml index 1801e86061..b51869abbf 100644 --- a/test/fixtures-core/pom.xml +++ b/test/fixtures-core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-test-fixtures-core diff --git a/test/pom.xml b/test/pom.xml index 1964d9e6d1..ab106b93ca 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-test diff --git a/test/providers-core/pom.xml b/test/providers-core/pom.xml index fbc61bc58d..8fa37f489c 100644 --- a/test/providers-core/pom.xml +++ b/test/providers-core/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-test-providers-core diff --git a/test/utils/pom.xml b/test/utils/pom.xml index 87e1efd961..ada181c34d 100644 --- a/test/utils/pom.xml +++ b/test/utils/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-test - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-test-utils diff --git a/tools/assemblies/pom.xml b/tools/assemblies/pom.xml index 3c4382d093..dd8b929d2f 100644 --- a/tools/assemblies/pom.xml +++ b/tools/assemblies/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy.tools indy-tools - 2.5.4.1 + 2.5.4.2-SNAPSHOT indy-assemblies diff --git a/tools/pom.xml b/tools/pom.xml index 10a16d523b..1304bfdc87 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -21,7 +21,7 @@ org.commonjava.indy indy-parent - 2.5.4.1 + 2.5.4.2-SNAPSHOT org.commonjava.indy.tools