From 12ba74abf265f61df7a9c9a49fa25313064abf00 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Tue, 4 Oct 2011 09:05:30 +0000 Subject: [PATCH] fix @since 1.4 with @since 1.4-M1 git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1178731 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/archiva/common/FileTypeUtils.java | 2 +- .../indexer/search/ArtifactInfoFiler.java | 2 +- .../archiva/indexer/search/SearchFields.java | 12 +++++------ .../indexer/search/SearchResultHit.java | 20 +++++++++---------- .../archiva/indexer/search/SearchResults.java | 4 ++-- .../common/plexusbridge/DigesterUtils.java | 2 +- .../plexusbridge/MavenIndexerUtils.java | 2 +- .../proxy/common/DebugTransferListener.java | 2 +- .../proxy/common/DefaultWagonFactory.java | 2 +- .../proxy/common/WagonFactoryException.java | 2 +- .../model/AbstractRepositoryConnector.java | 2 +- .../archiva/admin/model/AuditInformation.java | 2 +- .../admin/model/RepositoryAdminException.java | 2 +- .../model/admin/ArchivaAdministration.java | 2 +- .../admin/model/beans/AbstractRepository.java | 2 +- .../archiva/admin/model/beans/FileType.java | 2 +- .../admin/model/beans/LegacyArtifactPath.java | 2 +- .../admin/model/beans/ManagedRepository.java | 2 +- .../model/beans/NetworkConfiguration.java | 2 +- .../admin/model/beans/NetworkProxy.java | 2 +- .../model/beans/OrganisationInformation.java | 2 +- .../admin/model/beans/ProxyConnector.java | 2 +- .../admin/model/beans/RemoteRepository.java | 2 +- .../admin/model/beans/RepositoryGroup.java | 2 +- .../admin/model/beans/UiConfiguration.java | 2 +- .../model/group/RepositoryGroupAdmin.java | 2 +- .../model/managed/ManagedRepositoryAdmin.java | 2 +- .../model/networkproxy/NetworkProxyAdmin.java | 2 +- .../proxyconnector/ProxyConnectorAdmin.java | 2 +- .../ProxyConnectorOrderComparator.java | 2 +- .../ProxyConnectorSelectionPredicate.java | 2 +- .../model/remote/RemoteRepositoryAdmin.java | 2 +- .../repository/AbstractRepositoryAdmin.java | 2 +- .../repository/RepositoryCommonValidator.java | 2 +- .../admin/FiletypeToMapClosure.java | 2 +- .../DefaultNetworkProxyAdmin.java | 2 +- .../DefaultProxyConnectorAdmin.java | 2 +- .../remote/DefaultRemoteRepositoryAdmin.java | 2 +- .../utils/RepositoryComparator.java | 2 +- .../indexing/ArtifactIndexingTask.java | 2 +- .../DefaultDownloadRemoteIndexScheduler.java | 2 +- .../DownloadRemoteIndexException.java | 2 +- .../DownloadRemoteIndexScheduler.java | 2 +- .../indexing/DownloadRemoteIndexTask.java | 2 +- .../DownloadRemoteIndexTaskRequest.java | 2 +- .../archiva/rest/api/model/Artifact.java | 20 +++++++++---------- .../archiva/rest/api/model/SearchRequest.java | 8 ++++---- .../ArchivaAdministrationService.java | 2 +- .../services/ArchivaRestServiceException.java | 2 +- .../services/ManagedRepositoriesService.java | 2 +- .../api/services/NetworkProxyService.java | 2 +- .../rest/api/services/PingService.java | 2 +- .../api/services/ProxyConnectorService.java | 2 +- .../services/RemoteRepositoriesService.java | 2 +- .../api/services/RepositoriesService.java | 2 +- .../api/services/RepositoryGroupService.java | 2 +- .../rest/services/AbstractRestService.java | 2 +- .../DefaultArchivaAdministrationService.java | 2 +- .../DefaultManagedRepositoriesService.java | 2 +- .../rest/services/DefaultPingService.java | 2 +- .../DefaultRemoteRepositoriesService.java | 2 +- .../services/DefaultRepositoriesService.java | 2 +- .../services/interceptors/HttpContext.java | 2 +- .../interceptors/HttpContextThreadLocal.java | 2 +- .../HttpContextThreadLocalCleaner.java | 2 +- .../rest/services/PingServiceTest.java | 2 +- .../web/action/AbstractActionSupport.java | 2 +- .../archiva/web/action/SearchAction.java | 12 +++++------ 68 files changed, 100 insertions(+), 100 deletions(-) diff --git a/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/FileTypeUtils.java b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/FileTypeUtils.java index b0621bb3a..eed3d27d6 100644 --- a/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/FileTypeUtils.java +++ b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/FileTypeUtils.java @@ -23,7 +23,7 @@ import java.util.List; /** * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ public class FileTypeUtils { diff --git a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/ArtifactInfoFiler.java b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/ArtifactInfoFiler.java index 432580055..e9f217faf 100644 --- a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/ArtifactInfoFiler.java +++ b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/ArtifactInfoFiler.java @@ -24,7 +24,7 @@ import java.util.Map; /** * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ public interface ArtifactInfoFiler { diff --git a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/SearchFields.java b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/SearchFields.java index 7e333847b..ca99d6b80 100644 --- a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/SearchFields.java +++ b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/SearchFields.java @@ -58,42 +58,42 @@ public class SearchFields /** * contains osgi metadata Bundle-Version if available * - * @since 1.4 + * @since 1.4-M1 */ private String bundleVersion; /** * contains osgi metadata Bundle-SymbolicName if available * - * @since 1.4 + * @since 1.4-M1 */ private String bundleSymbolicName; /** * contains osgi metadata Export-Package if available * - * @since 1.4 + * @since 1.4-M1 */ private String bundleExportPackage; /** * contains osgi metadata import package if available * - * @since 1.4 + * @since 1.4-M1 */ private String bundleImportPackage; /** * contains osgi metadata name if available * - * @since 1.4 + * @since 1.4-M1 */ private String bundleName; /** * contains osgi metadata Export-Service if available * - * @since 1.4 + * @since 1.4-M1 */ private String bundleExportService; diff --git a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/SearchResultHit.java b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/SearchResultHit.java index 0cfbec314..8a2a76c97 100644 --- a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/SearchResultHit.java +++ b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/SearchResultHit.java @@ -60,70 +60,70 @@ public class SearchResultHit /** * contains osgi metadata Bundle-Version if available * - * @since 1.4 + * @since 1.4-M1 */ private String bundleVersion; /** * contains osgi metadata Bundle-SymbolicName if available * - * @since 1.4 + * @since 1.4-M1 */ private String bundleSymbolicName; /** * contains osgi metadata Export-Package if available * - * @since 1.4 + * @since 1.4-M1 */ private String bundleExportPackage; /** * contains osgi metadata Export-Service if available * - * @since 1.4 + * @since 1.4-M1 */ private String bundleExportService; /** * contains osgi metadata Bundle-Description if available * - * @since 1.4 + * @since 1.4-M1 */ private String bundleDescription; /** * contains osgi metadata Bundle-Name if available * - * @since 1.4 + * @since 1.4-M1 */ private String bundleName; /** * contains osgi metadata Bundle-License if available * - * @since 1.4 + * @since 1.4-M1 */ private String bundleLicense; /** * contains osgi metadata Bundle-DocURL if available * - * @since 1.4 + * @since 1.4-M1 */ private String bundleDocUrl; /** * contains osgi metadata Import-Package if available * - * @since 1.4 + * @since 1.4-M1 */ private String bundleImportPackage; /** * contains osgi metadata Require-Bundle if available * - * @since 1.4 + * @since 1.4-M1 */ private String bundleRequireBundle; diff --git a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/SearchResults.java b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/SearchResults.java index bd8d65a81..980a3d216 100644 --- a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/SearchResults.java +++ b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/SearchResults.java @@ -104,7 +104,7 @@ public class SearchResults /** * @return - * @since 1.4 + * @since 1.4-M1 */ public int getReturnedHitsCount() { @@ -113,7 +113,7 @@ public class SearchResults /** * @param returnedHitsCount - * @since 1.4 + * @since 1.4-M1 */ public void setReturnedHitsCount( int returnedHitsCount ) { diff --git a/archiva-modules/archiva-base/archiva-plexus-bridge/src/main/java/org/apache/archiva/common/plexusbridge/DigesterUtils.java b/archiva-modules/archiva-base/archiva-plexus-bridge/src/main/java/org/apache/archiva/common/plexusbridge/DigesterUtils.java index dcb22ef71..befd7decb 100644 --- a/archiva-modules/archiva-base/archiva-plexus-bridge/src/main/java/org/apache/archiva/common/plexusbridge/DigesterUtils.java +++ b/archiva-modules/archiva-base/archiva-plexus-bridge/src/main/java/org/apache/archiva/common/plexusbridge/DigesterUtils.java @@ -32,7 +32,7 @@ import java.util.List; /** * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ @Service( "digesterUtils" ) public class DigesterUtils diff --git a/archiva-modules/archiva-base/archiva-plexus-bridge/src/main/java/org/apache/archiva/common/plexusbridge/MavenIndexerUtils.java b/archiva-modules/archiva-base/archiva-plexus-bridge/src/main/java/org/apache/archiva/common/plexusbridge/MavenIndexerUtils.java index 8dd948c43..448851ee7 100644 --- a/archiva-modules/archiva-base/archiva-plexus-bridge/src/main/java/org/apache/archiva/common/plexusbridge/MavenIndexerUtils.java +++ b/archiva-modules/archiva-base/archiva-plexus-bridge/src/main/java/org/apache/archiva/common/plexusbridge/MavenIndexerUtils.java @@ -36,7 +36,7 @@ import java.util.List; /** * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ @Service( "mavenIndexerUtils" ) public class MavenIndexerUtils diff --git a/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/DebugTransferListener.java b/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/DebugTransferListener.java index 226a118f7..19bd59373 100644 --- a/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/DebugTransferListener.java +++ b/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/DebugTransferListener.java @@ -27,7 +27,7 @@ import java.util.Arrays; /** * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ public class DebugTransferListener implements TransferListener diff --git a/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/DefaultWagonFactory.java b/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/DefaultWagonFactory.java index 9316bbf49..3f8f311b9 100755 --- a/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/DefaultWagonFactory.java +++ b/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/DefaultWagonFactory.java @@ -29,7 +29,7 @@ import javax.inject.Inject; /** * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ @Service( "wagonFactory" ) public class DefaultWagonFactory diff --git a/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/WagonFactoryException.java b/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/WagonFactoryException.java index aba311cf5..649e7eed7 100755 --- a/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/WagonFactoryException.java +++ b/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/WagonFactoryException.java @@ -21,7 +21,7 @@ package org.apache.archiva.proxy.common; /** * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ public class WagonFactoryException extends Exception diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/AbstractRepositoryConnector.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/AbstractRepositoryConnector.java index 84f9a5117..8f36e5ba2 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/AbstractRepositoryConnector.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/AbstractRepositoryConnector.java @@ -26,7 +26,7 @@ import java.util.Map; /** * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ public abstract class AbstractRepositoryConnector implements Serializable diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/AuditInformation.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/AuditInformation.java index 6d96a42e0..950e5396e 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/AuditInformation.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/AuditInformation.java @@ -22,7 +22,7 @@ import org.codehaus.plexus.redback.users.User; /** * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ public class AuditInformation { diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/RepositoryAdminException.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/RepositoryAdminException.java index 0237bca8c..207e41af4 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/RepositoryAdminException.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/RepositoryAdminException.java @@ -21,7 +21,7 @@ package org.apache.archiva.admin.model; /** * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ public class RepositoryAdminException extends Exception diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/admin/ArchivaAdministration.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/admin/ArchivaAdministration.java index 975b045f3..7037f4957 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/admin/ArchivaAdministration.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/admin/ArchivaAdministration.java @@ -30,7 +30,7 @@ import java.util.List; /** * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ public interface ArchivaAdministration { diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/AbstractRepository.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/AbstractRepository.java index ac48d5685..7fd190c04 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/AbstractRepository.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/AbstractRepository.java @@ -22,7 +22,7 @@ import java.io.Serializable; /** * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ public class AbstractRepository implements Serializable diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/FileType.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/FileType.java index e6230748d..4b650451d 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/FileType.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/FileType.java @@ -25,7 +25,7 @@ import java.util.List; /** * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ @XmlRootElement( name = "fileType" ) public class FileType diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/LegacyArtifactPath.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/LegacyArtifactPath.java index b89d810d8..1f4abdca8 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/LegacyArtifactPath.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/LegacyArtifactPath.java @@ -23,7 +23,7 @@ import java.io.Serializable; /** * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ @XmlRootElement( name = "legacyArtifactPath" ) public class LegacyArtifactPath diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/ManagedRepository.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/ManagedRepository.java index 60ffc9bb5..7902f0863 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/ManagedRepository.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/ManagedRepository.java @@ -24,7 +24,7 @@ import java.io.Serializable; /** * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ @XmlRootElement( name = "managedRepository" ) public class ManagedRepository diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/NetworkConfiguration.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/NetworkConfiguration.java index 26e732d73..d5ba39b42 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/NetworkConfiguration.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/NetworkConfiguration.java @@ -23,7 +23,7 @@ import java.io.Serializable; /** * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ @XmlRootElement( name = "networkConfiguration" ) public class NetworkConfiguration diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/NetworkProxy.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/NetworkProxy.java index bb38cd4f3..6cc9f7974 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/NetworkProxy.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/NetworkProxy.java @@ -23,7 +23,7 @@ import java.io.Serializable; /** * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ @XmlRootElement( name = "networkProxy" ) public class NetworkProxy diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/OrganisationInformation.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/OrganisationInformation.java index d6dd22794..83c57cfeb 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/OrganisationInformation.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/OrganisationInformation.java @@ -22,7 +22,7 @@ import javax.xml.bind.annotation.XmlRootElement; /** * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ @XmlRootElement( name = "organisationInformation" ) public class OrganisationInformation diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/ProxyConnector.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/ProxyConnector.java index e9e85434c..93ffd9dd2 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/ProxyConnector.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/ProxyConnector.java @@ -25,7 +25,7 @@ import java.io.Serializable; /** * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ @XmlRootElement( name = "proxyConnector" ) public class ProxyConnector diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RemoteRepository.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RemoteRepository.java index 1c251a7a9..5e9575811 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RemoteRepository.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RemoteRepository.java @@ -24,7 +24,7 @@ import java.io.Serializable; /** * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ @XmlRootElement( name = "repositoryGroup" ) public class RemoteRepository diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RepositoryGroup.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RepositoryGroup.java index d340aacb4..a20ee68ec 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RepositoryGroup.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RepositoryGroup.java @@ -25,7 +25,7 @@ import java.util.List; /** * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ @XmlRootElement( name = "repositoryGroup" ) public class RepositoryGroup diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/UiConfiguration.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/UiConfiguration.java index f9eba943d..80d76ae04 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/UiConfiguration.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/UiConfiguration.java @@ -22,7 +22,7 @@ import javax.xml.bind.annotation.XmlRootElement; /** * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ @XmlRootElement( name = "uiConfiguration" ) public class UiConfiguration diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/group/RepositoryGroupAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/group/RepositoryGroupAdmin.java index f4d7d3546..5f191d279 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/group/RepositoryGroupAdmin.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/group/RepositoryGroupAdmin.java @@ -27,7 +27,7 @@ import java.util.Map; /** * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ public interface RepositoryGroupAdmin { diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/managed/ManagedRepositoryAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/managed/ManagedRepositoryAdmin.java index 813a8dc92..ff3c1ed03 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/managed/ManagedRepositoryAdmin.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/managed/ManagedRepositoryAdmin.java @@ -28,7 +28,7 @@ import java.util.Map; /** * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ public interface ManagedRepositoryAdmin { diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/networkproxy/NetworkProxyAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/networkproxy/NetworkProxyAdmin.java index fa5f22f1e..bb81d5506 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/networkproxy/NetworkProxyAdmin.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/networkproxy/NetworkProxyAdmin.java @@ -26,7 +26,7 @@ import java.util.List; /** * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ public interface NetworkProxyAdmin { diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/proxyconnector/ProxyConnectorAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/proxyconnector/ProxyConnectorAdmin.java index 361962ace..f06a1e6ea 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/proxyconnector/ProxyConnectorAdmin.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/proxyconnector/ProxyConnectorAdmin.java @@ -29,7 +29,7 @@ import java.util.Map; * No update method for changing source and target here as id is : sourceRepoId and targetRepoId, use delete then add. * * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ public interface ProxyConnectorAdmin { diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/proxyconnector/ProxyConnectorOrderComparator.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/proxyconnector/ProxyConnectorOrderComparator.java index 5ef0e4773..0c80eabd2 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/proxyconnector/ProxyConnectorOrderComparator.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/proxyconnector/ProxyConnectorOrderComparator.java @@ -24,7 +24,7 @@ import java.util.Comparator; /** * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ public class ProxyConnectorOrderComparator implements Comparator diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/proxyconnector/ProxyConnectorSelectionPredicate.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/proxyconnector/ProxyConnectorSelectionPredicate.java index 9b55a90a8..44cd0b0d4 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/proxyconnector/ProxyConnectorSelectionPredicate.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/proxyconnector/ProxyConnectorSelectionPredicate.java @@ -24,7 +24,7 @@ import org.apache.commons.lang.StringUtils; /** * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ public class ProxyConnectorSelectionPredicate implements Predicate diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/remote/RemoteRepositoryAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/remote/RemoteRepositoryAdmin.java index 0149b9530..887ad925b 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/remote/RemoteRepositoryAdmin.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/remote/RemoteRepositoryAdmin.java @@ -28,7 +28,7 @@ import java.util.Map; /** * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ public interface RemoteRepositoryAdmin { diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/AbstractRepositoryAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/AbstractRepositoryAdmin.java index f8ed87627..bb26445e8 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/AbstractRepositoryAdmin.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/AbstractRepositoryAdmin.java @@ -38,7 +38,7 @@ import java.util.List; /** * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ public abstract class AbstractRepositoryAdmin { diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/RepositoryCommonValidator.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/RepositoryCommonValidator.java index ee5668e03..22d45f53f 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/RepositoryCommonValidator.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/RepositoryCommonValidator.java @@ -35,7 +35,7 @@ import javax.inject.Named; * Check if already exists. * * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ @Service public class RepositoryCommonValidator diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/admin/FiletypeToMapClosure.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/admin/FiletypeToMapClosure.java index 1de855d1a..0e4161718 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/admin/FiletypeToMapClosure.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/admin/FiletypeToMapClosure.java @@ -28,7 +28,7 @@ import java.util.Map; /** * FiletypeToMapClosure * - * @since 1.4 + * @since 1.4-M1 */ public class FiletypeToMapClosure implements Closure diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/networkproxy/DefaultNetworkProxyAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/networkproxy/DefaultNetworkProxyAdmin.java index f97c2ee01..4daaddaf6 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/networkproxy/DefaultNetworkProxyAdmin.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/networkproxy/DefaultNetworkProxyAdmin.java @@ -37,7 +37,7 @@ import java.util.List; /** * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ @Service( "networkProxyAdmin#default" ) public class DefaultNetworkProxyAdmin diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnector/DefaultProxyConnectorAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnector/DefaultProxyConnectorAdmin.java index 856d7080a..a059f0605 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnector/DefaultProxyConnectorAdmin.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnector/DefaultProxyConnectorAdmin.java @@ -45,7 +45,7 @@ import java.util.Map; /** * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ @Service( "proxyConnectorAdmin#default" ) public class DefaultProxyConnectorAdmin diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/remote/DefaultRemoteRepositoryAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/remote/DefaultRemoteRepositoryAdmin.java index e68c9d954..36350af2d 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/remote/DefaultRemoteRepositoryAdmin.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/remote/DefaultRemoteRepositoryAdmin.java @@ -37,7 +37,7 @@ import java.util.Map; /** * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ @Service( "remoteRepositoryAdmin#default" ) public class DefaultRemoteRepositoryAdmin diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/utils/RepositoryComparator.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/utils/RepositoryComparator.java index 975f4520f..5e2d66d2e 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/utils/RepositoryComparator.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/utils/RepositoryComparator.java @@ -24,7 +24,7 @@ import java.util.Comparator; /** * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ public class RepositoryComparator implements Comparator diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java index 7120eab91..a41b32a8d 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java @@ -52,7 +52,7 @@ public class ArtifactIndexingTask private boolean executeOnEntireRepo = true; /** - * @since 1.4 + * @since 1.4-M1 */ private boolean onlyUpdate = false; diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java index 3ceb79199..18a5a98e3 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java @@ -55,7 +55,7 @@ import java.util.concurrent.CopyOnWriteArrayList; /** * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ @Service( "downloadRemoteIndexScheduler#default" ) public class DefaultDownloadRemoteIndexScheduler diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexException.java b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexException.java index f1f82eff0..c9f6af67b 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexException.java +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexException.java @@ -20,7 +20,7 @@ package org.apache.archiva.scheduler.indexing; /** * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ public class DownloadRemoteIndexException extends Exception diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexScheduler.java b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexScheduler.java index bdb1ab27f..39da82728 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexScheduler.java +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexScheduler.java @@ -20,7 +20,7 @@ package org.apache.archiva.scheduler.indexing; /** * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ public interface DownloadRemoteIndexScheduler { diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java index 021b55a23..2c25468fd 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java @@ -58,7 +58,7 @@ import java.util.List; /** * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ public class DownloadRemoteIndexTask implements Runnable diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTaskRequest.java b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTaskRequest.java index 536091036..46a7e638e 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTaskRequest.java +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTaskRequest.java @@ -26,7 +26,7 @@ import org.apache.maven.index.updater.IndexUpdater; /** * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ public class DownloadRemoteIndexTaskRequest { diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/Artifact.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/Artifact.java index cb45a4a60..bcb5fa436 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/Artifact.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/Artifact.java @@ -56,70 +56,70 @@ public class Artifact /** * contains osgi metadata Bundle-Version if available * - * @since 1.4 + * @since 1.4-M1 */ private String bundleVersion; /** * contains osgi metadata Bundle-SymbolicName if available * - * @since 1.4 + * @since 1.4-M1 */ private String bundleSymbolicName; /** * contains osgi metadata Export-Package if available * - * @since 1.4 + * @since 1.4-M1 */ private String bundleExportPackage; /** * contains osgi metadata Export-Service if available * - * @since 1.4 + * @since 1.4-M1 */ private String bundleExportService; /** * contains osgi metadata Bundle-Description if available * - * @since 1.4 + * @since 1.4-M1 */ private String bundleDescription; /** * contains osgi metadata Bundle-Name if available * - * @since 1.4 + * @since 1.4-M1 */ private String bundleName; /** * contains osgi metadata Bundle-License if available * - * @since 1.4 + * @since 1.4-M1 */ private String bundleLicense; /** * contains osgi metadata Bundle-DocURL if available * - * @since 1.4 + * @since 1.4-M1 */ private String bundleDocUrl; /** * contains osgi metadata Import-Package if available * - * @since 1.4 + * @since 1.4-M1 */ private String bundleImportPackage; /** * contains osgi metadata Require-Bundle if available * - * @since 1.4 + * @since 1.4-M1 */ private String bundleRequireBundle; diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/SearchRequest.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/SearchRequest.java index e2edc4178..f71743a0f 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/SearchRequest.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/SearchRequest.java @@ -59,28 +59,28 @@ public class SearchRequest /** * contains osgi metadata Bundle-Version if available * - * @since 1.4 + * @since 1.4-M1 */ private String bundleVersion; /** * contains osgi metadata Bundle-SymbolicName if available * - * @since 1.4 + * @since 1.4-M1 */ private String bundleSymbolicName; /** * contains osgi metadata Export-Package if available * - * @since 1.4 + * @since 1.4-M1 */ private String bundleExportPackage; /** * contains osgi metadata Export-Service if available * - * @since 1.4 + * @since 1.4-M1 */ private String bundleExportService; diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ArchivaAdministrationService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ArchivaAdministrationService.java index e1210dfcf..bfdd4fe91 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ArchivaAdministrationService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ArchivaAdministrationService.java @@ -37,7 +37,7 @@ import java.util.List; /** * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ @Path( "/archivaAdministrationService/" ) public interface ArchivaAdministrationService diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ArchivaRestServiceException.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ArchivaRestServiceException.java index 43c7641fb..5aa322170 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ArchivaRestServiceException.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ArchivaRestServiceException.java @@ -20,7 +20,7 @@ package org.apache.archiva.rest.api.services; /** * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ public class ArchivaRestServiceException extends Exception diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ManagedRepositoriesService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ManagedRepositoriesService.java index e99922472..cfe0ebad1 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ManagedRepositoriesService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ManagedRepositoriesService.java @@ -35,7 +35,7 @@ import java.util.List; /** * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ @Path( "/managedRepositoriesService/" ) public interface ManagedRepositoriesService diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/NetworkProxyService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/NetworkProxyService.java index 7a01952a5..d1c803119 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/NetworkProxyService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/NetworkProxyService.java @@ -33,7 +33,7 @@ import java.util.List; /** * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ @Path( "/networkProxyService/" ) public interface NetworkProxyService diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/PingService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/PingService.java index c5ac49534..c629bf341 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/PingService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/PingService.java @@ -28,7 +28,7 @@ import javax.ws.rs.core.MediaType; /** * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ @Path( "/pingService/" ) public interface PingService diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ProxyConnectorService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ProxyConnectorService.java index 44fe58553..2b88bd2a6 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ProxyConnectorService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ProxyConnectorService.java @@ -35,7 +35,7 @@ import java.util.List; * No update method for changing source and target here as id is : sourceRepoId and targetRepoId, use delete then add. * * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ @Path( "/proxyConnectorService/" ) public interface ProxyConnectorService diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/RemoteRepositoriesService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/RemoteRepositoriesService.java index 45d981e29..51b4c9cbd 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/RemoteRepositoriesService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/RemoteRepositoriesService.java @@ -34,7 +34,7 @@ import java.util.List; /** * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ @Path( "/remoteRepositoriesService/" ) public interface RemoteRepositoriesService diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/RepositoriesService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/RepositoriesService.java index a961a0a90..963a0a567 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/RepositoriesService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/RepositoriesService.java @@ -34,7 +34,7 @@ import javax.ws.rs.core.MediaType; /** * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ @Path( "/repositoriesService/" ) public interface RepositoriesService diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/RepositoryGroupService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/RepositoryGroupService.java index d9fd9274d..c0493e52b 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/RepositoryGroupService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/RepositoryGroupService.java @@ -34,7 +34,7 @@ import java.util.List; /** * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ @Path( "/repositoryGroupService/" ) public interface RepositoryGroupService diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java index 86be24001..46f12d464 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java @@ -34,7 +34,7 @@ import java.util.List; * abstract class with common utilities methods * * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ public abstract class AbstractRestService { diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaAdministrationService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaAdministrationService.java index 82db3f003..655d90513 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaAdministrationService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaAdministrationService.java @@ -36,7 +36,7 @@ import java.util.List; /** * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ @Service( "archivaAdministrationService#default" ) public class DefaultArchivaAdministrationService diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java index 51cf0493b..7de4cc5c6 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java @@ -33,7 +33,7 @@ import java.util.List; /** * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ @Service( "managedRepositoriesService#rest" ) public class DefaultManagedRepositoriesService diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultPingService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultPingService.java index 3f7a5c80f..b9b0060ec 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultPingService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultPingService.java @@ -24,7 +24,7 @@ import org.springframework.stereotype.Service; /** * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ @Service( "pingService#rest" ) public class DefaultPingService diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRemoteRepositoriesService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRemoteRepositoriesService.java index 18ae91642..f3781787d 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRemoteRepositoriesService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRemoteRepositoriesService.java @@ -32,7 +32,7 @@ import java.util.List; /** * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ @Service( "remoteRepositoriesService#rest" ) public class DefaultRemoteRepositoriesService diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java index e1ff84c88..354b55db5 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java @@ -81,7 +81,7 @@ import java.util.List; /** * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ @Service( "repositoriesService#rest" ) public class DefaultRepositoriesService diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/interceptors/HttpContext.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/interceptors/HttpContext.java index 1949799a4..84b69ff7f 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/interceptors/HttpContext.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/interceptors/HttpContext.java @@ -23,7 +23,7 @@ import java.io.Serializable; /** * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ public class HttpContext implements Serializable diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/interceptors/HttpContextThreadLocal.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/interceptors/HttpContextThreadLocal.java index 04f3212c4..6b032aec7 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/interceptors/HttpContextThreadLocal.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/interceptors/HttpContextThreadLocal.java @@ -22,7 +22,7 @@ import org.codehaus.redback.rest.services.RedbackRequestInformation; /** * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ public class HttpContextThreadLocal { diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/interceptors/HttpContextThreadLocalCleaner.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/interceptors/HttpContextThreadLocalCleaner.java index 874e7583c..517cccaf5 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/interceptors/HttpContextThreadLocalCleaner.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/interceptors/HttpContextThreadLocalCleaner.java @@ -33,7 +33,7 @@ import javax.ws.rs.core.Response; /** * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ @Service( "httpContextThreadLocalCleaner#rest" ) public class HttpContextThreadLocalCleaner diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/PingServiceTest.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/PingServiceTest.java index 08cdc829f..2786a25d0 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/PingServiceTest.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/PingServiceTest.java @@ -27,7 +27,7 @@ import org.junit.Test; /** * @author Olivier Lamy - * @since 1.4 + * @since 1.4-M1 */ public class PingServiceTest extends AbstractArchivaRestTest diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/AbstractActionSupport.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/AbstractActionSupport.java index e8459591b..9b009a4f3 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/AbstractActionSupport.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/AbstractActionSupport.java @@ -217,7 +217,7 @@ public abstract class AbstractActionSupport /** * dummy information for audit events * - * @since 1.4 + * @since 1.4-M1 */ private static class SimpleUser implements User diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/SearchAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/SearchAction.java index c107c9182..b58ef3436 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/SearchAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/SearchAction.java @@ -99,42 +99,42 @@ public class SearchAction /** * contains osgi metadata Bundle-Version if available * - * @since 1.4 + * @since 1.4-M1 */ private String bundleVersion; /** * contains osgi metadata Bundle-SymbolicName if available * - * @since 1.4 + * @since 1.4-M1 */ private String bundleSymbolicName; /** * contains osgi metadata Export-Package if available * - * @since 1.4 + * @since 1.4-M1 */ private String bundleExportPackage; /** * contains osgi metadata import package if available * - * @since 1.4 + * @since 1.4-M1 */ private String bundleImportPackage; /** * contains osgi metadata name if available * - * @since 1.4 + * @since 1.4-M1 */ private String bundleName; /** * contains osgi metadata Export-Service if available * - * @since 1.4 + * @since 1.4-M1 */ private String bundleExportService; -- 2.39.5