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

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 b0621bb3a4f1a073023f9d9c4330c7e1580209b0..eed3d27d6b3dfb54cbdf627b77a63399db99b2e3 100644 (file)
--- 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 432580055d6b91c1c7fe99cda41d79b7cb3200ab..e9f217faf44e8c418d75d596530c230a61f5d855 100644 (file)
--- 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 7e333847bf21f3d540b6902c30e176e0daa34e8d..ca99d6b80703c5160d10ffe752583d997afda194 100644 (file)
--- 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 0cfbec314f66bd95e1919447a9334de2a4def73d..8a2a76c971bf17a2103f907008969f040179471f 100644 (file)
--- 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 bd8d65a811578495130d9e1e0b206fd7f502b174..980a3d2169ac86964d5798df565629ea21968060 100644 (file)
--- 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 dcb22ef710311d246cfce0152ede56e5cbf65bca..befd7decb5188c8eb1862ae46deaf9c849dc7155 100644 (file)
--- 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 8dd948c43d1db7a9a218a7fbfc58a47feb781305..448851ee768d994c6f337813a28929d3841505cd 100644 (file)
--- 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 226a118f71dbd126a2a5d91423cf02cb20fc33bd..19bd5937353f39707d9fc6b602f798aed77b0a95 100644 (file)
--- 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 9316bbf49af7db3ca20279cc6b0c0b49caeab3b6..3f8f311b9fd165d7f9580a9364bade1799636a98 100755 (executable)
--- 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 aba311cf5ce9779099af905c0ec147dbd95b08ce..649e7eed7f37defa68ef12a38956917fd7c36db1 100755 (executable)
--- 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 84f9a5117ab4e96476e74a834e5f4213ba254d14..8f36e5ba233104c50621157463137b3984f5172e 100644 (file)
--- 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 6d96a42e064edab1c2a7ae59a8f09742bc0346c3..950e5396e168b12ffbd217360c3479bcf1effe06 100644 (file)
--- 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 0237bca8c4ba60046deec6409196edf5ae0dcd37..207e41af429baa093fb9b3f8ee743cc7cccf7607 100644 (file)
--- 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 975b045f3c8f453d114324dd37f6addd695eb223..7037f4957cda88f4669acb57ddbb07b423bfe963 100644 (file)
--- 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 ac48d5685a5784dda5ec40c35979e51277947258..7fd190c04452764f826337fcb034434311095a60 100644 (file)
--- 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 e6230748d5433b12d174a2b6e758ef6c81c60d53..4b650451dcbf7f87c7989d1a4776a0c6da193ca5 100644 (file)
--- 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 b89d810d8e4a06b1796fe48c2b2c1535fc7bb783..1f4abdca8671ca22b78d49a9352e6c87542cd5b2 100644 (file)
--- 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 60ffc9bb5c36ba0d1ce843526e5923339c48b56e..7902f08639b3999870e5be38ef0918efed8ef56f 100644 (file)
--- 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 26e732d73a334e8005ac3a95fd531971aba9d73f..d5ba39b42af385b4323f452a08d6ddcf5d46b0d0 100644 (file)
--- 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 bb38cd4f31d0b0fc8f07667c19446621329232d2..6cc9f7974affedc2256757f3f6fad16baf3d8122 100644 (file)
--- 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 d6dd22794acf8140f1808402057fc66491eba25e..83c57cfeb61223e03845d5c2ef1afc00e15da171 100644 (file)
--- 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 e9e85434c0202c8697d0eadafb854809d90b7936..93ffd9dd201de2cbee9970eeb04f9a6e56b6922a 100644 (file)
--- 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 1c251a7a9a0a1a56d76917007ad0ef5246b2d55a..5e95758116773a37ef93ec37080111e4db153e18 100644 (file)
--- 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 d340aacb40fb317c290f5a538e1f59239e594d48..a20ee68ec28f33b29c7d0f574269b93e369dfcbe 100644 (file)
--- 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 f9eba943d5dcf9c9a71672bf6105fcecaaa53c10..80d76ae04c714d5897d52104b95981d9550e63aa 100644 (file)
--- 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 f4d7d354673fb1e4e5ccccc3cf5b32fcbef0eb8d..5f191d279af178290d31902e20e8725cf2c5ba2f 100644 (file)
--- 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 813a8dc92babd4532660a57b4b92b35337409a50..ff3c1ed033009d7c4bd6659308ec4fb0e114feeb 100644 (file)
--- 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 fa5f22f1ea8a3635c7554f096ca9a6a543dc3f37..bb81d5506d735e5da34ea0357d3ab4b65812af6c 100644 (file)
--- 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 361962ace12bf141fb8139affec7f0d53e9de579..f06a1e6eac886fce7b397fa063cc9e9364a20eb6 100644 (file)
--- 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;
  * <b>No update method for changing source and target here as id is : sourceRepoId and targetRepoId, use delete then add.</b>
  *
  * @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 5ef0e4773fbb9467f2ecc9d9c449ae24e5d5e2b1..0c80eabd2fe0eb84f33627ac4bed43469667fe41 100644 (file)
--- 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<ProxyConnector>

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 9b55a90a8fa4e6d959740617d02b6a78bba92da0..44cd0b0d46037165df6c7f923e559a78fd99802e 100644 (file)
--- 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 0149b9530fb54df7b8ed1fce6f6dece6573db8bd..887ad925b75f127e3982a04254bcec7d8414b253 100644 (file)
--- 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 f8ed87627e1df65f60e90cdd69f7e8dd5fe1e9b1..bb26445e80f3852a97b2e6646f4d791a4d73ac10 100644 (file)
--- 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 ee5668e03e25588447995c0f7dfa1661e81b1593..22d45f53f4b607e213fc46d6807b0c60dc64913c 100644 (file)
--- 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 1de855d1ae90e7b5045348401e884bcfa1ef0a40..0e4161718a1242482dae9886a64596138f5f449a 100644 (file)
--- 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 f97c2ee016683ad44b9c5f9cb3b2dab3bf01454a..4daaddaf633fc8f6f7a145dc3c4b801af94ba248 100644 (file)
--- 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 856d7080a2980bc5f360ea5a2eb8e7ec0af4dd3f..a059f0605e040726dd425225965b78a2a8924194 100644 (file)
--- 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 e68c9d95450003d9e10f81462d7c0dceead8717a..36350af2d7af2d629d9ae65c50025035f960386b 100644 (file)
--- 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 975f4520fdd1f97269bfa7214f717c37aa6bf34e..5e2d66d2ef338258703ba87afe476ae2c537ad4c 100644 (file)
--- 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<AbstractRepository>

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 7120eab91d3857722b97f08905e912bc33b685a5..a41b32a8da2a01a7b80cfc2fb61ff99369676a0b 100644 (file)
--- 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 3ceb791997f54a00734fa381201c7408f709f05e..18a5a98e32b2b28d3a3f1219d5e5851453ac1896 100644 (file)
--- 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 f1f82eff0ad4a6ac01fe676b67da128851fec8b1..c9f6af67be5021da06cf2ef7c83a6ecbda0183a2 100644 (file)
--- 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 bdb1ab27f3f42426f80f10f08a106ac73fbeead3..39da82728a49398bde73702596deb7bb3c7aa173 100644 (file)
--- 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 021b55a2331a6a02b4acd7c789b4de8fce8c268b..2c25468fdfac83c67da176a757b37eb485e7b8fe 100644 (file)
--- 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 536091036a1f5aa7597b616e6a033ac033b08a14..46a7e638e480081b4a82d3d7d623ef538026c1f5 100644 (file)
--- 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 cb45a4a605424cc123fed375b102f0dc9b3233b3..bcb5fa43668c44a63d9007102b1e9491eb231d61 100644 (file)
--- 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 e2edc4178ab670282117add9ac57099591a5d598..f71743a0fa25e232dd0ef2aeaf11df5e978ad266 100644 (file)
--- 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 e1210dfcf34210469fd0ae4848d69b53c186c22a..bfdd4fe91564b2bac9e51ded6687bb7258f81276 100644 (file)
--- 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 43c7641fbd467f0ac2a490cab63799094ea8e513..5aa32217006d0e5c59719614c7bf7571e05063ee 100644 (file)
--- 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 e9992247219b22cee33d7197bc71089dd666ca6f..cfe0ebad1c505790237eda8b6440bf0a7cd14bcc 100644 (file)
--- 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 7a01952a57cdf6c9a8d20e79f82232373c50795a..d1c80311963a63946cef5ebd0265b075bc4d880c 100644 (file)
--- 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 c5ac495344b46660a79c1e5ab5c46d7d481fb4af..c629bf3416636baa831c93fc99c7262ff7a7018f 100644 (file)
--- 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 44fe5855343d7b632b78b1a68776336ad8f41c02..2b88bd2a6221bb9a58ff4ae15f8acf1ca9fdffdf 100644 (file)
--- 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;
  * <b>No update method for changing source and target here as id is : sourceRepoId and targetRepoId, use delete then add.</b>
  *
  * @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 45d981e29204dacd2ef2c20620c3412692874a94..51b4c9cbd52fca532f2d03dfee9d25807cb5ab67 100644 (file)
--- 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 a961a0a904acd504d7ae1ec067d3fc48b1b33865..963a0a567a28af8c09b88b848b631ddcbd88516a 100644 (file)
--- 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 d9fd9274d44c7ff3e0d1b5e11918a8217fb58879..c0493e52be7c4c1549afd31e2a7359d386ad257a 100644 (file)
--- 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 86be240011a5e47471cab347961e3106dd0e5646..46f12d464fd65372eea70e97d09478d3ff29e4f7 100644 (file)
--- 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 82db3f0030944849a903ae1dfde716a497ffc57b..655d90513c70123b9be4fd477c7534927235c9a1 100644 (file)
--- 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 51cf0493be32dc3dfac4db1c1885d1a2d3c5bede..7de4cc5c6d60e90eb2b39f4a2a0816f9d2ea106d 100644 (file)
--- 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 3f7a5c80fa3dbad352e5b423aea6eca46c9702fd..b9b0060ec7a7651e9d096e167c8ac5e34d61b064 100644 (file)
--- 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 18ae916426c5f44d9e5da775b4b66825c2b38552..f3781787d3b4c7cb357666fe50019a5a81c7d506 100644 (file)
--- 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 e1ff84c885ee0d3381a59e21e76ae6794a129f9d..354b55db595659103651aac1cce47c38af362c05 100644 (file)
--- 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 1949799a4966a38b149b1837f330ded2caa8dcbb..84b69ff7f55e5d200bd0ed03c4db5979e82240c7 100644 (file)
--- 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 04f3212c455ae15484450f9b103da37ffee2e423..6b032aec7ebeeac572fc49821bfa80c0af1e9005 100644 (file)
--- 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 874e7583c7ca4516b5836ee7a7bd9a92fea1aaaf..517cccaf5e922ae19baaa2d13175df801d3c5f51 100644 (file)
--- 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 08cdc829f83e00304a7a2e4eb64c496291a04383..2786a25d0f17f377c783a311b0379bf6bb78bce6 100644 (file)
--- 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 e8459591b22a946e25c2d009c92c4f0cf4c47164..9b009a4f3e3e97177214bdd9424d0a80033d8600 100644 (file)
--- 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 c107c9182461a48cd98e288c30ada056ff58a154..b58ef3436efa262dcd201be32fe84709e37fbed4 100644 (file)
--- 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;