Sync with current master
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/c6f5732a Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/c6f5732a Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/c6f5732a Branch: refs/heads/citest Commit: c6f5732af80a2888fbbac2a2af7916e018b1a345 Parents: 90529e1 Author: Martin Stockhammer <[email protected]> Authored: Sun May 14 17:56:30 2017 +0200 Committer: Martin Stockhammer <[email protected]> Committed: Sun May 14 17:56:30 2017 +0200 ---------------------------------------------------------------------- archiva-cli/pom.xml | 2 +- archiva-docs/pom.xml | 2 +- .../apt/adminguide/configuration-files.apt.vm | 4 +- .../apt/adminguide/customising-security.apt | 58 +----- .../redback-runtime-configuration.apt | 4 +- .../src/site/apt/adminguide/repositories.apt | 193 ++++++++++--------- archiva-docs/src/site/apt/release-notes.apt.vm | 19 +- archiva-docs/src/site/resources/css/site.css | 9 + archiva-jetty/pom.xml | 2 +- .../archiva-base/archiva-checksum/pom.xml | 2 +- .../archiva-base/archiva-common/pom.xml | 2 +- .../archiva-base/archiva-configuration/pom.xml | 4 +- .../DefaultArchivaConfiguration.java | 107 +++++++++- .../src/main/mdo/configuration.mdo | 62 +++++- .../archiva/configuration/default-archiva.xml | 14 +- .../configuration/ArchivaConfigurationTest.java | 1 - .../archiva-consumer-api/pom.xml | 2 +- .../archiva-consumer-archetype/pom.xml | 2 +- .../archiva-core-consumers/pom.xml | 2 +- .../archiva-lucene-consumers/pom.xml | 2 +- .../archiva-metadata-consumer/pom.xml | 2 +- .../archiva-signature-consumers/pom.xml | 2 +- .../archiva-base/archiva-consumers/pom.xml | 2 +- .../archiva-base/archiva-converter/pom.xml | 2 +- .../archiva-base/archiva-filelock/pom.xml | 2 +- .../archiva-base/archiva-indexer/pom.xml | 2 +- .../archiva-maven2-metadata/pom.xml | 2 +- .../archiva-base/archiva-maven2-model/pom.xml | 2 +- .../archiva-base/archiva-mock/pom.xml | 2 +- .../archiva-base/archiva-model/pom.xml | 2 +- .../archiva-base/archiva-plexus-bridge/pom.xml | 2 +- .../archiva-base/archiva-policies/pom.xml | 2 +- .../archiva-base/archiva-proxy-api/pom.xml | 2 +- .../archiva-base/archiva-proxy-common/pom.xml | 2 +- .../archiva-base/archiva-proxy/pom.xml | 2 +- .../archiva-repository-admin-api/pom.xml | 2 +- .../admin/model/beans/RemoteRepository.java | 29 ++- .../archiva-repository-admin-default/pom.xml | 2 +- .../remote/DefaultRemoteRepositoryAdmin.java | 17 +- .../archiva-repository-admin/pom.xml | 2 +- .../archiva-repository-layer/pom.xml | 2 +- .../archiva-repository-scanner/pom.xml | 2 +- .../archiva-security-common/pom.xml | 2 +- .../archiva-base/archiva-test-utils/pom.xml | 2 +- .../archiva-base/archiva-transaction/pom.xml | 2 +- .../archiva-base/archiva-xml-tools/pom.xml | 2 +- archiva-modules/archiva-base/pom.xml | 2 +- .../archiva-karaf/archiva-features/pom.xml | 2 +- archiva-modules/archiva-karaf/pom.xml | 2 +- .../archiva-scheduler-api/pom.xml | 2 +- .../archiva-scheduler-indexing/pom.xml | 2 +- .../archiva-scheduler-repository-api/pom.xml | 2 +- .../archiva-scheduler-repository/pom.xml | 2 +- archiva-modules/archiva-scheduler/pom.xml | 2 +- .../archiva-rest/archiva-rest-api/pom.xml | 2 +- .../archiva-rest/archiva-rest-services/pom.xml | 2 +- .../DefaultRemoteRepositoriesService.java | 186 ++++++++---------- .../services/RemoteRepositoriesServiceTest.java | 52 +++++ .../archiva-web/archiva-rest/pom.xml | 2 +- archiva-modules/archiva-web/archiva-rss/pom.xml | 2 +- .../archiva-web/archiva-security/pom.xml | 2 +- .../archiva-web/archiva-test-mocks/pom.xml | 2 +- .../archiva-web/archiva-web-common/pom.xml | 2 +- .../org/apache/archiva/i18n/default.properties | 10 +- .../archiva-web/archiva-webapp-test/pom.xml | 2 +- .../archiva-web/archiva-webapp/pom.xml | 2 +- .../admin/repository/maven2/repositories.js | 7 +- .../src/main/webapp/js/archiva/main.js | 22 ++- .../js/templates/archiva/repositories.html | 14 ++ .../archiva-web/archiva-webdav/pom.xml | 2 +- archiva-modules/archiva-web/pom.xml | 2 +- .../metadata/metadata-model-maven2/pom.xml | 2 +- archiva-modules/metadata/metadata-model/pom.xml | 2 +- .../metadata/metadata-repository-api/pom.xml | 2 +- archiva-modules/metadata/pom.xml | 2 +- .../metadata/test-repository/pom.xml | 2 +- archiva-modules/plugins/audit/pom.xml | 2 +- .../plugins/generic-metadata-support/pom.xml | 2 +- .../plugins/maven2-repository/pom.xml | 2 +- .../plugins/metadata-store-cassandra/pom.xml | 2 +- .../plugins/metadata-store-file/pom.xml | 2 +- .../plugins/metadata-store-jcr/pom.xml | 2 +- archiva-modules/plugins/pom.xml | 2 +- archiva-modules/plugins/problem-reports/pom.xml | 2 +- .../plugins/repository-statistics/pom.xml | 2 +- .../plugins/stage-repository-merge/pom.xml | 2 +- archiva-modules/pom.xml | 4 +- pom.xml | 6 +- src/ci/scripts/cleanup.bat | 17 ++ 89 files changed, 625 insertions(+), 348 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-cli/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-cli/pom.xml b/archiva-cli/pom.xml index 3f2a3f7..24b1cc8 100644 --- a/archiva-cli/pom.xml +++ b/archiva-cli/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.archiva</groupId> <artifactId>archiva</artifactId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>archiva-cli</artifactId> http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-docs/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-docs/pom.xml b/archiva-docs/pom.xml index d9df802..0780098 100644 --- a/archiva-docs/pom.xml +++ b/archiva-docs/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.archiva</groupId> <artifactId>archiva</artifactId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>archiva-docs</artifactId> http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-docs/src/site/apt/adminguide/configuration-files.apt.vm ---------------------------------------------------------------------- diff --git a/archiva-docs/src/site/apt/adminguide/configuration-files.apt.vm b/archiva-docs/src/site/apt/adminguide/configuration-files.apt.vm index 7b7fe8e..22f17dc 100644 --- a/archiva-docs/src/site/apt/adminguide/configuration-files.apt.vm +++ b/archiva-docs/src/site/apt/adminguide/configuration-files.apt.vm @@ -31,7 +31,9 @@ Configuration Files of Apache Archiva * <<<archiva.xml>>> - this is the primary Archiva configuration file - * <<<security.properties>>> - this configures the security as described in the {{{./security.html} security configuration documentation}} + * <<<security.properties>>> - This file, if it exists, is only read once to populate the + Redback Runtime Configuration properties (see {{{./redback-runtime-configuration.html#Runtime_Properties}Redback Runtime Configuration}}, + stored in <<<archiva.xml>>>. The file will be ignored after this. This section will focus on the <<<archiva.xml>>> file. http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-docs/src/site/apt/adminguide/customising-security.apt ---------------------------------------------------------------------- diff --git a/archiva-docs/src/site/apt/adminguide/customising-security.apt b/archiva-docs/src/site/apt/adminguide/customising-security.apt index d42c227..797b2f3 100644 --- a/archiva-docs/src/site/apt/adminguide/customising-security.apt +++ b/archiva-docs/src/site/apt/adminguide/customising-security.apt @@ -27,66 +27,24 @@ Archiva Security Configuration - Security properties and password rules can be configured in the - <<<security.properties>>> file, which by default is searched for in: + Security properties and password rules are configured now in the Redback Runtime Configuration + properties (see {{{./redback-runtime-configuration.html#Runtime_properties}Redback Runtime Configuration}}). - * <<<~/.m2/security.properties>>> - - * <<<conf/security.properties>>> in the Archiva installation + The Redback Runtime Configuration properties are stored in <<<archiva.xml>>>. + The former <<<security.properties>>> file, if it exists, is only used once for populating the + Runtime Configuration settings. After that, this file will be ignored. [] - (In the above list, <<<~>>> is the home directory of the user who is running - Archiva.) ~~TODO: Link to plexus-redback documentation when available - Following are some of the properties you can modify. For a complete list, - consult the default properties file in Redback's svn repo: + These are the default properties. The file can be found in in Redback's svn repo: {{{http://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk/redback-configuration/src/main/resources/org/apache/archiva/redback/config-defaults.properties} config-defaults.properties}} -+-----+ -# Security Policies -# ----------------- -#security.policy.password.encoder= -security.policy.password.previous.count=6 -security.policy.password.expiration.days=90 -security.policy.password.expiration.enabled=true -security.policy.allowed.login.attempt=3 - -# Password Rules -# -------------- -security.policy.password.rule.alphanumeric.enabled=false -security.policy.password.rule.alphacount.enabled=true -security.policy.password.rule.alphacount.minimum=1 -security.policy.password.rule.characterlength.enabled=true -security.policy.password.rule.characterlength.minimum=1 -security.policy.password.rule.characterlength.maximum=8 -security.policy.password.rule.musthave.enabled=true -security.policy.password.rule.numericalcount.enabled=true -security.policy.password.rule.numericalcount.minimum=1 -security.policy.password.rule.reuse.enabled=true -security.policy.password.rule.nowhitespace.enabled=true - -# Cross Site Request Forgery (CSRF) Prevention -# -------------------------------------------- -# Enable/Disable CSRF filtering. -# Possible values: true, false -rest.csrffilter.enabled=true -# Base URL used to verify the origin headers of the requests. If not set or empty -# it tries to determine the base url automatically -rest.baseUrl= -# What to do, if the request contains no Origin or Referer header. -# If true, requests without Origin or Referer Header are denied, otherwise accepted. -# Possible values: true, false -rest.csrffilter.absentorigin.deny=true -# Enable/Disable the token validation only. -# If true, the validation of the CSRF tokens will be disabled. -# Possible values: true, false -rest.csrffilter.disableTokenValidation=false -+-----+ - +%{snippet|ignoreDownloadError=true|url=https://raw.githubusercontent.com/apache/archiva-redback-core/master/redback-configuration/src/main/resources/org/apache/archiva/redback/config-defaults.properties} + <<Note:>> If installed standalone, Archiva's list of configuration files is <itself> configurable, and can be found in: <<<apps/archiva/WEB-INF/applicationContext.xml>>> http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-docs/src/site/apt/adminguide/redback-runtime-configuration.apt ---------------------------------------------------------------------- diff --git a/archiva-docs/src/site/apt/adminguide/redback-runtime-configuration.apt b/archiva-docs/src/site/apt/adminguide/redback-runtime-configuration.apt index 143589a..7e000aa 100644 --- a/archiva-docs/src/site/apt/adminguide/redback-runtime-configuration.apt +++ b/archiva-docs/src/site/apt/adminguide/redback-runtime-configuration.apt @@ -29,7 +29,7 @@ Apache Archiva Redback Runtime Configuration * Apache Redback User Manager/RbacManager Implementations - Since 1.4-M4, you can choose to switch dynamically + You can choose to switch dynamically * User Manager Implementations (from Database and/or LDAP). @@ -49,7 +49,7 @@ Apache Archiva Redback Runtime Configuration * LDAP Group-Roles mapping - Since 1.4-M4, you can map dynamically LDAP Group to Archiva Roles + You can map dynamically LDAP Group to Archiva Roles [../images/ldap-group-roles-mapping.png] http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-docs/src/site/apt/adminguide/repositories.apt ---------------------------------------------------------------------- diff --git a/archiva-docs/src/site/apt/adminguide/repositories.apt b/archiva-docs/src/site/apt/adminguide/repositories.apt index 850b30a..7ec7753 100644 --- a/archiva-docs/src/site/apt/adminguide/repositories.apt +++ b/archiva-docs/src/site/apt/adminguide/repositories.apt @@ -42,56 +42,58 @@ Understanding Repository Configuration of Apache Archiva Managed repository fields: - * <<identifier>> - the id of the repository. This must be unique. - - * <<name>> - the name of the repository. - - * <<directory>> - the location of the repository. If the path specified does not - exist, Archiva will create the missing directories. - - * <<index directory>> - the location of the index files generated by Archiva. If - no location is specified, then the index directory (named <<<.indexer>>>) - will be created at the root of the repository directory. - This directory contains the packaged/bundled index which is consumed by different consumers of the index such as M2Eclipse. - - * <<type>> - the repository layout (maven 2 or maven 1) - - * <<cron>> - the - {{{http://quartz-scheduler.org/api/2.1.5/org/quartz/CronTrigger.html}cron schedule}} when - repository scanning will be executed. - - * <<repository purge by days older>> - the first option for repository purge. - Archiva will check how old the artifact is and if it is older than the set - number of days in this field, then the artifact will be deleted respecting - the retention count of course. In order to disable the purge by - number of days old and set Archiva to purge by retention count, just set the - repository purge field to 0. The maximum number of days which can be set - here is 1000. See the Repository Purge section below for more details. -~~ above was:the retention count (see #7) of course no idea what is was linkeed to - - * <<repository purge by retention count>> - the second option for repository - purge. When running the repository purge, Archiva will retain only the - number of artifacts set for this field for a specific snapshot version. See - the Repository Purge section below for more details. - - * <<releases included>> - specifies whether there are released artifacts in the - repository. - - * <<block re-deployment of released artifacts>> - specifies whether released - artifacts that are already existing in the repository can be overwritten. - Note that this only take effects for non-snapshot deployments. - - * <<snapshots included>> - specifies whether there are snapshot artifacts in the - repository. - - * <<scannable>> - specifies whether the repository can be scanned, meaning it is - a local repository which can be indexed, browsed, purged, etc. - - * <<delete released snapshots>> - specifies whether to remove those snapshot - artifacts which already has release versions of it in the repository during - repository purge. - - * << Skip Packed Index creation >> - avoid creation of compressed index for IDE usage. +*----------------------+----------------------------------------------------------------------------------+ +| <<Id>> | The identifier of the repository. This must be unique. +*----------------------+----------------------------------------------------------------------------------+ +| <<Name>> | The name of the repository. This is the display name. +*----------------------+----------------------------------------------------------------------------------+ +| <<Directory>> | The location of the repository. If the path specified does not +| | exist, Archiva will create the missing directories. +*----------------------+----------------------------------------------------------------------------------+ +| <<Index Directory>> | The location of the index files generated by Archiva. If +| | no location is specified, then the index directory (named <<<.indexer>>>) +| | will be created at the root of the repository directory. +| | This directory contains the packaged/bundled index which is consumed by different +| | consumers of the index such as M2Eclipse. +*----------------------+----------------------------------------------------------------------------------+ +| <<Type>> | The repository layout (maven 2 or maven 1) +*----------------------+----------------------------------------------------------------------------------+ +| <<Cron Expression>> | The +| | {{{http://www.quartz-scheduler.org/documentation/quartz-2.x/tutorials/crontrigger.html}cron schedule}} +| | when repository scanning will be executed. +*----------------------+----------------------------------------------------------------------------------+ +| <<Days Older>> | The first option for repository purge. +| | Archiva will check how old the artifact is and if it is older than the set +| | number of days in this field, then the artifact will be deleted respecting +| | the retention count of course. In order to disable the purge by +| | number of days old and set Archiva to purge by retention count, just set the +| | repository purge field to 0. The maximum number of days which can be set +| | here is 1000. See the Repository Purge section below for more details. +*----------------------+----------------------------------------------------------------------------------+ +| <<Retention Count>> | The second option for repository purge. When running the repository purge, +| | Archiva will retain only the number of artifacts set for this field for a +| | specific snapshot version. See the Repository Purge section below for more details. +*----------------------+----------------------------------------------------------------------------------+ +| <<Description>> | Additional information about the repository. +*----------------------+----------------------------------------------------------------------------------+ +| <<Releases>> | Specifies whether there are released artifacts in the repository. +*----------------------+----------------------------------------------------------------------------------+ +| <<Snapshots>> | Specifies whether there are snapshot artifacts in the repository. +*----------------------+----------------------------------------------------------------------------------+ +| <<Block Redeployments>> | Specifies whether released artifacts that are already existing in the +| | repository can be overwritten. Note that this only take effects for non-snapshot +| | deployments. +*----------------------+----------------------------------------------------------------------------------+ +| <<Scanned>> | Specifies whether the repository can be scanned, meaning it is a local repository +| | which should be indexed, purged, etc. +*----------------------+----------------------------------------------------------------------------------+ +| <<Delete Released Snapshots>> | Specifies whether to remove those snapshot artifacts which already has +| | release versions of it in the repository during repository purge. +*----------------------+----------------------------------------------------------------------------------+ +| <<Staging Repository>>| Automatic creation of a stage repository for this local repository. +*----------------------+----------------------------------------------------------------------------------+ +|<< Skip Packed Index Creation>> | Avoid creation of compressed index for IDE usage. +*----------------------+----------------------------------------------------------------------------------+ [] @@ -119,46 +121,57 @@ http://[URL TO ARCHIVA]/repository/[REPOSITORY ID] (e.g. http://localhost:8080/r Remote repository fields: - * <<identifier>> - the id of the remote repository. - - * <<name>> - the name of the remote repository. - - * <<url>> - the url of the remote repository. It is also possible to use a - 'file://' url to proxy a local repository. Be careful that if this local - repository is a managed repository of archiva which has some proxies - connectors, those ones won't be triggered. - - * <<username>> - the username (if authentication is needed) to be used to access - the repository. - - * <<password>> - the password (if authentication is needed) to be used to access - the repository. - - * <<type>> - the layout (maven 2 or maven 1) of the remote repository. - - * <<Activate download remote index>> - to activate downloading remote index to - add available remote artifacts in search queries. - - * <<Remote index url, can be relative to url>> - path of the remote index - directory. - - * <<Cron expression>> - cron expression for downloading remote index (default - weekly on sunday) - - * <<Directory index storage>> - path to store index directory, default will be - $\{appserver.base\}/data/remotes/$\{repositoryId\}/.indexer - - * <<Download Remote Index Timeout in seconds>> - read time out for downloading - remote index files (default 300) - - * <<Network Proxy to Use for download Remote Index>> - proxy to use for - downloading remote index files. - - * <<Download Remote Index on Startup>> - will download remote index on Archiva startup. - - * <<Additionnal url parameters>> - key/value pairs to add to url when querying remote repository. - - * <<Additionnal Http Headers>> - key/value pairs to add as http headers when querying remote repository. +*----------------------+----------------------------------------------------------------------------------+ +| <<Id>> | The identifier of the remote repository. | +*----------------------+----------------------------------------------------------------------------------+ +| <<Name>> | The name of the remote repository. | +*----------------------+----------------------------------------------------------------------------------+ +| <<Url>> | The url of the remote repository. It is also possible to use a +| | 'file://' url to proxy a local repository. Be careful that if this local +| | repository is a managed repository of archiva which has some proxies +| | connectors, those ones won't be triggered. | +*----------------------+----------------------------------------------------------------------------------+ +| <<Username>> | The username (if authentication is needed) to be used to access +| | the repository. +*----------------------+----------------------------------------------------------------------------------+ +| <<Password>> | The password (if authentication is needed) to be used to access +| | the repository. +*----------------------+----------------------------------------------------------------------------------+ +| <<Download Timeout>> | The time in seconds after which a download from the remote repository is stopped. +*----------------------+----------------------------------------------------------------------------------+ +| <<Type>> | The layout (maven 2 or maven 1) of the remote repository. +*----------------------+----------------------------------------------------------------------------------+ +| <<Download Remote Index>> | To activate downloading remote index to +| | add available remote artifacts in search queries. +*----------------------+----------------------------------------------------------------------------------+ +| <<Remote Index Url>> | Can be relative to Url - path of the remote index +| | directory. +*----------------------+----------------------------------------------------------------------------------+ +| <<Cron expression>> | Cron expression for downloading remote index (default +| | weekly on sunday) +*----------------------+----------------------------------------------------------------------------------+ +| <<Index Directory>> | Path to store index directory, default will be +| | $\{appserver.base\}/data/remotes/$\{repositoryId\}/.indexer +*----------------------+----------------------------------------------------------------------------------+ +| <<Download Remote Index Timeout>> | Time in seconds, after which download of remote index files will be +| | stopped (default 300). +*----------------------+----------------------------------------------------------------------------------+ +| <<Proxy for Remote Download Index>> | Proxy to use for downloading remote index files. +*----------------------+----------------------------------------------------------------------------------+ +| <<Download Remote Index on Startup>> | If selected, the remote index will be downloaded on Archiva +| | startup. +*----------------------+----------------------------------------------------------------------------------+ +| <<Description>> | Can be used to store additional information about the repository. +*----------------------+----------------------------------------------------------------------------------+ +| <<Connection Check Path>> | If set, the connection to the remote repository is checked by validating the +| | existence of the given file / artifact. Some repositories do not allow to browse +| | the base directory and the standard check may fail. The path is relative to the +| | repository Url. +*----------------------+----------------------------------------------------------------------------------+ +| <<Additionnal Url Parameters>> | Key/Value pairs to add to url when querying remote repository. +*----------------------+----------------------------------------------------------------------------------+ +| <<Additionnal Http Headers>> | Key/Value pairs to add as http headers when querying remote repository. +*----------------------+----------------------------------------------------------------------------------+ [] http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-docs/src/site/apt/release-notes.apt.vm ---------------------------------------------------------------------- diff --git a/archiva-docs/src/site/apt/release-notes.apt.vm b/archiva-docs/src/site/apt/release-notes.apt.vm index e89f9a4..c650c14 100644 --- a/archiva-docs/src/site/apt/release-notes.apt.vm +++ b/archiva-docs/src/site/apt/release-notes.apt.vm @@ -48,11 +48,16 @@ Release Notes for Archiva ${project.version} and Referer header of the HTTP requests and adding an validation token to the Header. This prevents requests from malicious sites if they are open in the same browser. If you use the REST services from other clients you may change the behaviour with the new - configuration properties for the redback security (rest.csrffilter.*, rest.baseUrl) + configuration properties for the redback security (<<<rest.csrffilter.*>>>, <<<rest.baseUrl>>>). For more information see {{{./adminguide/customising-security.html}Archiva Security Configuration}} and - the {{{/redback/integration/rest.html}Redback REST documentation }} + the {{{/redback/integration/rest.html}Redback REST documentation }}. - * Archiva uses redback for authentication and authorization in version ${redback.version} + <<Note:>> If your archiva installation is behind a reverse proxy or load balancer, it may be possible + that the Archiva Web UI does not load after the upgrade. If this is the case you may access the WebUI + via localhost or edit archiva.xml manually. In the "Redback Runtime Configuration" properties you have to + enter the base URLs of your archiva installation to the <<<rest.baseUrl>>> field. + + * Archiva uses redback for authentication and authorization in version 2.6 * Release Notes @@ -76,7 +81,7 @@ Release Notes for Archiva ${project.version} * Adding origin header validation checks for REST requests - ** Bugs fixed +** Bugs fixed * [MRM-1859] - Error upon viewing 'Artifacts' tab when browsing an artifact @@ -91,9 +96,13 @@ Release Notes for Archiva ${project.version} * [MRM-1926] - Invalid checksum files in Archiva repository after download from remote repository * [MRM-1928] - Bad redirect URL when using Archiva through HTTP reverse proxy + + * [MRM-1933] - No message body writer has been found for class org.apache.archiva.rest.services.ArchivaRestError + + * [MRM-1940] - Slashes appended to remote repo url - ** Task +** Task http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-docs/src/site/resources/css/site.css ---------------------------------------------------------------------- diff --git a/archiva-docs/src/site/resources/css/site.css b/archiva-docs/src/site/resources/css/site.css index 0a3ebda..11f870b 100755 --- a/archiva-docs/src/site/resources/css/site.css +++ b/archiva-docs/src/site/resources/css/site.css @@ -70,6 +70,15 @@ pre.commandline { color: gray; } +img { + border-style: solid ; + border-width: 1px; + border-color: #ddd; + padding: 5px; + margin-top: 10px; + border-radius: 5px; +} + pre.commandline .input { color: #55f; } http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-jetty/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-jetty/pom.xml b/archiva-jetty/pom.xml index cebbe4c..e88f8e7 100644 --- a/archiva-jetty/pom.xml +++ b/archiva-jetty/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.archiva</groupId> <artifactId>archiva</artifactId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.4-SNAPSHOT</version> </parent> <artifactId>archiva-jetty</artifactId> <packaging>pom</packaging> http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-modules/archiva-base/archiva-checksum/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-checksum/pom.xml b/archiva-modules/archiva-base/archiva-checksum/pom.xml index 9c9b8e2..280af2a 100644 --- a/archiva-modules/archiva-base/archiva-checksum/pom.xml +++ b/archiva-modules/archiva-base/archiva-checksum/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.archiva</groupId> <artifactId>archiva-base</artifactId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.4-SNAPSHOT</version> </parent> <artifactId>archiva-checksum</artifactId> <packaging>bundle</packaging> http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-modules/archiva-base/archiva-common/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-common/pom.xml b/archiva-modules/archiva-base/archiva-common/pom.xml index 661400e..da59826 100644 --- a/archiva-modules/archiva-base/archiva-common/pom.xml +++ b/archiva-modules/archiva-base/archiva-common/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.archiva</groupId> <artifactId>archiva-base</artifactId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>archiva-common</artifactId> http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-modules/archiva-base/archiva-configuration/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-configuration/pom.xml b/archiva-modules/archiva-base/archiva-configuration/pom.xml index df5a1f2..64c189a 100644 --- a/archiva-modules/archiva-base/archiva-configuration/pom.xml +++ b/archiva-modules/archiva-base/archiva-configuration/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.archiva</groupId> <artifactId>archiva-base</artifactId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>archiva-configuration</artifactId> @@ -169,7 +169,7 @@ </execution> </executions> <configuration> - <version>1.4.1</version> + <version>1.4.2</version> <models> <model>src/main/mdo/configuration.mdo</model> </models> http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java index f37171a..44f2521 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java +++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java @@ -162,6 +162,9 @@ public class DefaultArchivaConfiguration private static final String KEY = "org.apache.archiva"; + // Section used for default only configuration + private static final String KEY_DEFAULT_ONLY = "org.apache.archiva_default"; + @Override public Configuration getConfiguration() { @@ -183,6 +186,11 @@ public class DefaultArchivaConfiguration return configuration; } + private boolean hasConfigVersionChanged(Configuration current, Registry defaultOnlyConfiguration) { + return current==null || current.getVersion()==null || + !current.getVersion().trim().equals(defaultOnlyConfiguration.getString("version","").trim()); + } + @SuppressWarnings("unchecked") private Configuration load() { @@ -200,6 +208,7 @@ public class DefaultArchivaConfiguration Configuration config = new ConfigurationRegistryReader().read( subset ); + config.getRepositoryGroups(); config.getRepositoryGroupsAsMap(); if ( !config.getRepositories().isEmpty() ) @@ -363,9 +372,63 @@ public class DefaultArchivaConfiguration } } + + return config; } + /* + * Updates the checkpath list for repositories. + * + * We are replacing existing ones and adding new ones. This allows to update the list with new releases. + * + * We are also updating existing remote repositories, if they exist already. + * + * This update method should only be called, if the config version changes to avoid overwriting + * user repository settings all the time. + */ + private void updateCheckPathDefaults(Configuration config, Registry defaultConfiguration) { + List<RepositoryCheckPath> existingCheckPathList = config.getArchivaDefaultConfiguration().getDefaultCheckPaths(); + HashMap<String, RepositoryCheckPath> existingCheckPaths = new HashMap<>(); + HashMap<String, RepositoryCheckPath> newCheckPaths = new HashMap<>(); + for (RepositoryCheckPath path : config.getArchivaDefaultConfiguration().getDefaultCheckPaths()) { + existingCheckPaths.put(path.getUrl(), path); + } + List defaultCheckPathsSubsets = defaultConfiguration.getSubsetList("archivaDefaultConfiguration.defaultCheckPaths.defaultCheckPath" ); + for ( Iterator i = defaultCheckPathsSubsets.iterator(); i.hasNext(); ) + { + RepositoryCheckPath v = readRepositoryCheckPath( (Registry) i.next() ); + if (existingCheckPaths.containsKey(v.getUrl())) { + existingCheckPathList.remove(existingCheckPaths.get(v.getUrl())); + } + existingCheckPathList.add(v); + newCheckPaths.put(v.getUrl(), v); + } + // Remote repositories update + for (RemoteRepositoryConfiguration remoteRepositoryConfiguration : config.getRemoteRepositories()) { + String url = remoteRepositoryConfiguration.getUrl().toLowerCase(); + if (newCheckPaths.containsKey(url)) { + String currentPath = remoteRepositoryConfiguration.getCheckPath(); + String newPath = newCheckPaths.get(url).getPath(); + log.info("Updating connection check path for repository {}, from '{}' to '{}'.", remoteRepositoryConfiguration.getId(), + currentPath, newPath); + remoteRepositoryConfiguration.setCheckPath(newPath); + } + } + } + + private RepositoryCheckPath readRepositoryCheckPath( Registry registry ) + { + RepositoryCheckPath value = new RepositoryCheckPath(); + + String url = registry.getString( "url", value.getUrl() ); + + value.setUrl( url ); + String path = registry.getString( "path", value.getPath() ); + value.setPath( path ); + return value; + } + private Policy findPolicy( String policyId ) { if ( MapUtils.isEmpty( prePolicies ) ) @@ -439,6 +502,25 @@ public class DefaultArchivaConfiguration return registry.getSubset( KEY ); } + /* + * Reads the default only configuration into a special prefix. This allows to check for changes + * of the default configuration. + */ + private Registry readDefaultOnlyConfiguration() + { + registry.removeSubset(KEY_DEFAULT_ONLY); + try + { + registry.addConfigurationFromResource( "org/apache/archiva/configuration/default-archiva.xml", KEY_DEFAULT_ONLY); + } + catch ( RegistryException e ) + { + throw new ConfigurationRuntimeException( + "Fatal error: Unable to find the built-in default configuration and load it into the registry", e ); + } + return registry.getSubset(KEY_DEFAULT_ONLY); + } + @SuppressWarnings("unchecked") @Override public synchronized void save( Configuration configuration ) @@ -527,6 +609,9 @@ public class DefaultArchivaConfiguration section.removeSubset( "repositoryScanning.invalidContentConsumers" ); } } + if (configuration.getArchivaRuntimeConfiguration()!=null) { + section.removeSubset("archivaRuntimeConfiguration.defaultCheckPaths"); + } new ConfigurationRegistryWriter().write( configuration, section ); section.save(); @@ -736,7 +821,7 @@ public class DefaultArchivaConfiguration } /** - * upgrade from 1.3 + * Handle upgrade to newer version */ private void handleUpgradeConfiguration() throws RegistryException, IndeterminateConfigurationException @@ -781,8 +866,24 @@ public class DefaultArchivaConfiguration knowContentConsumers.add( "duplicate-artifacts" ); configuration.getRepositoryScanning().setKnownContentConsumers( knowContentConsumers ); } - // save ?? - //save( configuration ); + + Registry defaultOnlyConfiguration = readDefaultOnlyConfiguration(); + // Currently we check only for configuration version change, not certain version numbers. + if (hasConfigVersionChanged(configuration, defaultOnlyConfiguration)) { + updateCheckPathDefaults(configuration, defaultOnlyConfiguration); + String newVersion = defaultOnlyConfiguration.getString("version"); + if (newVersion==null) { + throw new IndeterminateConfigurationException("The default configuration has no version information!"); + } + configuration.setVersion(newVersion); + try { + save(configuration); + } catch (IndeterminateConfigurationException e) { + log.error("Error occured during configuration update to new version: {}", e.getMessage()); + } catch (RegistryException e) { + log.error("Error occured during configuration update to new version: {}", e.getMessage()); + } + } } @Override http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo b/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo index fc5169f..494af12 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo +++ b/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo @@ -197,6 +197,15 @@ The list of ProxyConnectorRuleConfigurations. </description> </field> + <field> + <name>archivaDefaultConfiguration</name> + <version>1.4.2+</version> + <association> + <type>ArchivaDefaultConfiguration</type> + <multiplicity>1</multiplicity> + </association> + <description>Archiva default settings.</description> + </field> </fields> <codeSegments> <codeSegment> @@ -597,12 +606,18 @@ <name>extraHeaders</name> <version>1.4.0+</version> <type>Map</type> - <description>Additionnal http headers to add to url when requesting remote repositories.</description> + <description>Additional http headers to add to url when requesting remote repositories.</description> <association xml.mapStyle="inline"> <type>String</type> <multiplicity>*</multiplicity> </association> </field> + <field> + <name>checkPath</name> + <version>1.4.2+</version> + <type>String</type> + <description>The path to check the repository availability (relative to the repository URL). Some repositories do not allow browsing, so a certain artifact must be checked.</description> + </field> </fields> <codeSegments> <codeSegment> @@ -877,6 +892,30 @@ </field> </fields> </class> + <class> + <name>RepositoryCheckPath</name> + <version>1.4.2+</version> + <fields > + <field > + <name>url</name> + <version>1.4.2+</version> + <type>String</type> + <required>true</required> + <description> + The URL for which this path should be used + </description> + </field> + <field> + <name>path</name> + <version>1.4.2+</version> + <type>String</type> + <required>true</required> + <description> + The path to use for checking the repository connection. + </description> + </field> + </fields> + </class> <!-- ____ _ @@ -1584,6 +1623,25 @@ </class> <class> + <name>ArchivaDefaultConfiguration</name> + <version>1.4.2+</version> + <description> + Archiva default settings. + </description> + <fields> + <field> + <name>defaultCheckPaths</name> + <description>The default check paths for certain remote repositories</description> + <version>1.4.2+</version> + <association> + <type>RepositoryCheckPath</type> + <multiplicity>*</multiplicity> + </association> + </field> + </fields> + </class> + + <class> <name>LdapConfiguration</name> <version>1.4.0+</version> <description> @@ -1670,7 +1728,7 @@ <name>extraProperties</name> <version>1.4.0+</version> <type>Map</type> - <description>Additionnal properties to use for ldap connection.</description> + <description>Additional properties to use for ldap connection.</description> <association xml.mapStyle="inline"> <type>String</type> <multiplicity>*</multiplicity> http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-modules/archiva-base/archiva-configuration/src/main/resources/org/apache/archiva/configuration/default-archiva.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/resources/org/apache/archiva/configuration/default-archiva.xml b/archiva-modules/archiva-base/archiva-configuration/src/main/resources/org/apache/archiva/configuration/default-archiva.xml index a74f09c..877b6a5 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/resources/org/apache/archiva/configuration/default-archiva.xml +++ b/archiva-modules/archiva-base/archiva-configuration/src/main/resources/org/apache/archiva/configuration/default-archiva.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <configuration> - <version>2</version> + <version>3</version> <managedRepositories> <managedRepository> <id>internal</id> @@ -151,5 +151,17 @@ </rbacManagerImpls> </redbackRuntimeConfiguration> + <archivaDefaultConfiguration> + <defaultCheckPaths> + <defaultCheckPath> + <url>http://download.oracle.com/maven</url> + <path>com/sleepycat/je/license.txt</path> + </defaultCheckPath> + <defaultCheckPath> + <url>https://download.oracle.com/maven</url> + <path>com/sleepycat/je/license.txt</path> + </defaultCheckPath> + </defaultCheckPaths> + </archivaDefaultConfiguration> </configuration> http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java b/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java index 03bb489..15080d8 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java +++ b/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java @@ -814,7 +814,6 @@ public class ArchivaConfigurationTest { ArchivaConfiguration archivaConfiguration = lookup( ArchivaConfiguration.class, "test-configuration" ); - archivaConfiguration.reload(); Configuration configuration = archivaConfiguration.getConfiguration(); assertConfiguration( configuration, 2, 2, 2 ); assertEquals( "check remote repositories", 2, configuration.getRemoteRepositories().size() ); http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml index f99dcf4..5692181 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.archiva</groupId> <artifactId>archiva-consumers</artifactId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.4-SNAPSHOT</version> </parent> <artifactId>archiva-consumer-api</artifactId> <packaging>bundle</packaging> http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml index f43e329..f3bc95f 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.archiva</groupId> <artifactId>archiva-consumers</artifactId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.4-SNAPSHOT</version> </parent> <artifactId>archiva-consumer-archetype</artifactId> <packaging>maven-archetype</packaging> http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml index 92053df..00a8029 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.archiva</groupId> <artifactId>archiva-consumers</artifactId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.4-SNAPSHOT</version> </parent> <artifactId>archiva-core-consumers</artifactId> <packaging>bundle</packaging> http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml index 76a872a..5ae4dee 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.archiva</groupId> <artifactId>archiva-consumers</artifactId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.4-SNAPSHOT</version> </parent> <artifactId>archiva-lucene-consumers</artifactId> <packaging>bundle</packaging> http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml index 5e5703c..0c3c621 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml @@ -23,7 +23,7 @@ <parent> <artifactId>archiva-consumers</artifactId> <groupId>org.apache.archiva</groupId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.4-SNAPSHOT</version> </parent> <artifactId>archiva-metadata-consumer</artifactId> <packaging>bundle</packaging> http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml index 6b82442..b8a2af3 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.archiva</groupId> <artifactId>archiva-consumers</artifactId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.4-SNAPSHOT</version> </parent> <artifactId>archiva-signature-consumers</artifactId> http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-modules/archiva-base/archiva-consumers/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/pom.xml index 054363b..d8c41ac 100644 --- a/archiva-modules/archiva-base/archiva-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.archiva</groupId> <artifactId>archiva-base</artifactId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.4-SNAPSHOT</version> </parent> <artifactId>archiva-consumers</artifactId> http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-modules/archiva-base/archiva-converter/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-converter/pom.xml b/archiva-modules/archiva-base/archiva-converter/pom.xml index 38dab1a..cb91320 100644 --- a/archiva-modules/archiva-base/archiva-converter/pom.xml +++ b/archiva-modules/archiva-base/archiva-converter/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.archiva</groupId> <artifactId>archiva-base</artifactId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>archiva-converter</artifactId> http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-modules/archiva-base/archiva-filelock/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-filelock/pom.xml b/archiva-modules/archiva-base/archiva-filelock/pom.xml index cf99f1b..ed82887 100644 --- a/archiva-modules/archiva-base/archiva-filelock/pom.xml +++ b/archiva-modules/archiva-base/archiva-filelock/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.archiva</groupId> <artifactId>archiva-base</artifactId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>archiva-filelock</artifactId> http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-modules/archiva-base/archiva-indexer/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-indexer/pom.xml b/archiva-modules/archiva-base/archiva-indexer/pom.xml index 8bc18eb..906b92c 100644 --- a/archiva-modules/archiva-base/archiva-indexer/pom.xml +++ b/archiva-modules/archiva-base/archiva-indexer/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.archiva</groupId> <artifactId>archiva-base</artifactId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>archiva-indexer</artifactId> http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-modules/archiva-base/archiva-maven2-metadata/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-maven2-metadata/pom.xml b/archiva-modules/archiva-base/archiva-maven2-metadata/pom.xml index f6cf369..1b4b5dc 100644 --- a/archiva-modules/archiva-base/archiva-maven2-metadata/pom.xml +++ b/archiva-modules/archiva-base/archiva-maven2-metadata/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.archiva</groupId> <artifactId>archiva-base</artifactId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.4-SNAPSHOT</version> </parent> <artifactId>archiva-maven2-metadata</artifactId> http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-modules/archiva-base/archiva-maven2-model/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-maven2-model/pom.xml b/archiva-modules/archiva-base/archiva-maven2-model/pom.xml index 59682c0..58811e3 100644 --- a/archiva-modules/archiva-base/archiva-maven2-model/pom.xml +++ b/archiva-modules/archiva-base/archiva-maven2-model/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.archiva</groupId> <artifactId>archiva-base</artifactId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.4-SNAPSHOT</version> </parent> <artifactId>archiva-maven2-model</artifactId> http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-modules/archiva-base/archiva-mock/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-mock/pom.xml b/archiva-modules/archiva-base/archiva-mock/pom.xml index 4bde9b3..fac7c8f 100644 --- a/archiva-modules/archiva-base/archiva-mock/pom.xml +++ b/archiva-modules/archiva-base/archiva-mock/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.archiva</groupId> <artifactId>archiva-base</artifactId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>archiva-mock</artifactId> http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-modules/archiva-base/archiva-model/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-model/pom.xml b/archiva-modules/archiva-base/archiva-model/pom.xml index 3202ec9..aa1738c 100755 --- a/archiva-modules/archiva-base/archiva-model/pom.xml +++ b/archiva-modules/archiva-base/archiva-model/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.archiva</groupId> <artifactId>archiva-base</artifactId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>archiva-model</artifactId> http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml b/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml index 2ec93db..76e7e8a 100644 --- a/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml +++ b/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.archiva</groupId> <artifactId>archiva-base</artifactId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>archiva-plexus-bridge</artifactId> http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-modules/archiva-base/archiva-policies/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-policies/pom.xml b/archiva-modules/archiva-base/archiva-policies/pom.xml index ae6bbde..21194a9 100644 --- a/archiva-modules/archiva-base/archiva-policies/pom.xml +++ b/archiva-modules/archiva-base/archiva-policies/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.archiva</groupId> <artifactId>archiva-base</artifactId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>archiva-policies</artifactId> http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-modules/archiva-base/archiva-proxy-api/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-proxy-api/pom.xml b/archiva-modules/archiva-base/archiva-proxy-api/pom.xml index 4eba91d..148faff 100644 --- a/archiva-modules/archiva-base/archiva-proxy-api/pom.xml +++ b/archiva-modules/archiva-base/archiva-proxy-api/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>archiva-base</artifactId> <groupId>org.apache.archiva</groupId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.4-SNAPSHOT</version> </parent> <artifactId>archiva-proxy-api</artifactId> <packaging>bundle</packaging> http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-modules/archiva-base/archiva-proxy-common/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-proxy-common/pom.xml b/archiva-modules/archiva-base/archiva-proxy-common/pom.xml index d80a767..806dd86 100644 --- a/archiva-modules/archiva-base/archiva-proxy-common/pom.xml +++ b/archiva-modules/archiva-base/archiva-proxy-common/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>archiva-base</artifactId> <groupId>org.apache.archiva</groupId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.4-SNAPSHOT</version> </parent> <artifactId>archiva-proxy-common</artifactId> <packaging>bundle</packaging> http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-modules/archiva-base/archiva-proxy/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-proxy/pom.xml b/archiva-modules/archiva-base/archiva-proxy/pom.xml index 79d8615..d1f41f9 100644 --- a/archiva-modules/archiva-base/archiva-proxy/pom.xml +++ b/archiva-modules/archiva-base/archiva-proxy/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.archiva</groupId> <artifactId>archiva-base</artifactId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>archiva-proxy</artifactId> http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml index 2724e81..5223848 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.archiva</groupId> <artifactId>archiva-repository-admin</artifactId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.4-SNAPSHOT</version> </parent> <artifactId>archiva-repository-admin-api</artifactId> <packaging>bundle</packaging> http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RemoteRepository.java ---------------------------------------------------------------------- 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 db8021d..fd07ce9 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 @@ -19,6 +19,8 @@ package org.apache.archiva.admin.model.beans; * under the License. */ +import org.apache.commons.lang.StringUtils; + import javax.xml.bind.annotation.XmlRootElement; import java.io.Serializable; import java.util.ArrayList; @@ -45,6 +47,12 @@ public class RemoteRepository private int timeout = 60; /** + * @since 2.2.3 + * The path to use for checking availability of the remote repository + */ + private String checkPath; + + /** * Activate download of remote index if remoteIndexUrl is set too. */ private boolean downloadRemoteIndex = false; @@ -112,7 +120,7 @@ public class RemoteRepository int timeout ) { super( id, name, layout ); - this.url = url; + this.url = StringUtils.stripEnd(url,"/"); this.userName = userName; this.password = password; this.timeout = timeout; @@ -135,7 +143,7 @@ public class RemoteRepository public void setUrl( String url ) { - this.url = url; + this.url = StringUtils.stripEnd(url,"/"); } public String getUserName() @@ -314,6 +322,22 @@ public class RemoteRepository } } + public void setCheckPath(String checkPath) { + if (checkPath==null) { + this.checkPath=""; + } else if (checkPath.startsWith("/")) { + this.checkPath = StringUtils.removeStart(checkPath, "/"); + while(this.checkPath.startsWith("/")) { + this.checkPath = StringUtils.removeStart(checkPath, "/"); + } + } else { + this.checkPath = checkPath; + } + } + + public String getCheckPath() { + return checkPath; + } @Override public String toString() @@ -333,6 +357,7 @@ public class RemoteRepository sb.append( ", downloadRemoteIndexOnStartup=" ).append( downloadRemoteIndexOnStartup ); sb.append( ", extraParameters=" ).append( extraParameters ); sb.append( ", extraHeaders=" ).append( extraHeaders ); + sb.append( ", checkPath=").append(checkPath); sb.append( '}' ); return sb.toString(); } http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml index 4b6aaa8..52e61f0 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.archiva</groupId> <artifactId>archiva-repository-admin</artifactId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.4-SNAPSHOT</version> </parent> <artifactId>archiva-repository-admin-default</artifactId> <packaging>bundle</packaging> http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/remote/DefaultRemoteRepositoryAdmin.java ---------------------------------------------------------------------- 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 9f6a20b..8f39053 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 @@ -29,6 +29,7 @@ import org.apache.archiva.common.plexusbridge.PlexusSisuBridgeException; import org.apache.archiva.configuration.Configuration; import org.apache.archiva.configuration.ProxyConnectorConfiguration; import org.apache.archiva.configuration.RemoteRepositoryConfiguration; +import org.apache.archiva.configuration.RepositoryCheckPath; import org.apache.archiva.metadata.model.facets.AuditEvent; import org.apache.commons.lang.StringUtils; import org.apache.maven.index.NexusIndexer; @@ -137,6 +138,7 @@ public class DefaultRemoteRepositoryAdmin remoteRepository.setDescription( repositoryConfiguration.getDescription() ); remoteRepository.setExtraHeaders( repositoryConfiguration.getExtraHeaders() ); remoteRepository.setExtraParameters( repositoryConfiguration.getExtraParameters() ); + remoteRepository.setCheckPath(repositoryConfiguration.getCheckPath()); remoteRepositories.add( remoteRepository ); } return remoteRepositories; @@ -170,7 +172,19 @@ public class DefaultRemoteRepositoryAdmin } //MRM-752 - url needs trimming - remoteRepository.setUrl( StringUtils.trim( remoteRepository.getUrl() ) ); + //MRM-1940 - URL should not end with a slash + remoteRepository.setUrl( StringUtils.stripEnd(StringUtils.trim( remoteRepository.getUrl() ), "/")); + + if (StringUtils.isEmpty(remoteRepository.getCheckPath())) { + String checkUrl = remoteRepository.getUrl().toLowerCase(); + for (RepositoryCheckPath path : getArchivaConfiguration ().getConfiguration().getArchivaDefaultConfiguration().getDefaultCheckPaths()) { + log.debug("Checking path for urls: {} <-> {}", checkUrl, path.getUrl()); + if (checkUrl.startsWith(path.getUrl())) { + remoteRepository.setCheckPath(path.getPath()); + break; + } + } + } RemoteRepositoryConfiguration remoteRepositoryConfiguration = getRemoteRepositoryConfiguration( remoteRepository ); @@ -365,6 +379,7 @@ public class DefaultRemoteRepositoryAdmin remoteRepositoryConfiguration.setDescription( remoteRepository.getDescription() ); remoteRepositoryConfiguration.setExtraHeaders( remoteRepository.getExtraHeaders() ); remoteRepositoryConfiguration.setExtraParameters( remoteRepository.getExtraParameters() ); + remoteRepositoryConfiguration.setCheckPath(remoteRepository.getCheckPath()); return remoteRepositoryConfiguration; } http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-modules/archiva-base/archiva-repository-admin/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-repository-admin/pom.xml b/archiva-modules/archiva-base/archiva-repository-admin/pom.xml index 59ceaa9..1d9e136 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-admin/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.archiva</groupId> <artifactId>archiva-base</artifactId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.4-SNAPSHOT</version> </parent> <artifactId>archiva-repository-admin</artifactId> <name>Archiva Base :: Repository Admin</name> http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml index 97cdeb7..9d730ff 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.archiva</groupId> <artifactId>archiva-base</artifactId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>archiva-repository-layer</artifactId> http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml b/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml index 29b5e72..24e9b86 100644 --- a/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml @@ -23,7 +23,7 @@ <parent> <artifactId>archiva-base</artifactId> <groupId>org.apache.archiva</groupId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.4-SNAPSHOT</version> </parent> <artifactId>archiva-repository-scanner</artifactId> <packaging>bundle</packaging> http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-modules/archiva-base/archiva-security-common/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-security-common/pom.xml b/archiva-modules/archiva-base/archiva-security-common/pom.xml index 55c2ac8..5eb8e58 100644 --- a/archiva-modules/archiva-base/archiva-security-common/pom.xml +++ b/archiva-modules/archiva-base/archiva-security-common/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>archiva-base</artifactId> <groupId>org.apache.archiva</groupId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.4-SNAPSHOT</version> </parent> <groupId>org.apache.archiva</groupId> <artifactId>archiva-security-common</artifactId> http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-modules/archiva-base/archiva-test-utils/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-test-utils/pom.xml b/archiva-modules/archiva-base/archiva-test-utils/pom.xml index a518936..43d77c1 100644 --- a/archiva-modules/archiva-base/archiva-test-utils/pom.xml +++ b/archiva-modules/archiva-base/archiva-test-utils/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>archiva-base</artifactId> <groupId>org.apache.archiva</groupId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>archiva-test-utils</artifactId> http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-modules/archiva-base/archiva-transaction/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-transaction/pom.xml b/archiva-modules/archiva-base/archiva-transaction/pom.xml index 1d5db58..b8003c5 100644 --- a/archiva-modules/archiva-base/archiva-transaction/pom.xml +++ b/archiva-modules/archiva-base/archiva-transaction/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.archiva</groupId> <artifactId>archiva-base</artifactId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.4-SNAPSHOT</version> </parent> <artifactId>archiva-transaction</artifactId> <packaging>bundle</packaging> http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-modules/archiva-base/archiva-xml-tools/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-xml-tools/pom.xml b/archiva-modules/archiva-base/archiva-xml-tools/pom.xml index f022af9..4770d76 100644 --- a/archiva-modules/archiva-base/archiva-xml-tools/pom.xml +++ b/archiva-modules/archiva-base/archiva-xml-tools/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.archiva</groupId> <artifactId>archiva-base</artifactId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>archiva-xml-tools</artifactId> http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-modules/archiva-base/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/pom.xml b/archiva-modules/archiva-base/pom.xml index 62813e6..b6a66a7 100644 --- a/archiva-modules/archiva-base/pom.xml +++ b/archiva-modules/archiva-base/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.archiva</groupId> <artifactId>archiva-modules</artifactId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.4-SNAPSHOT</version> </parent> <artifactId>archiva-base</artifactId> http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-modules/archiva-karaf/archiva-features/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-karaf/archiva-features/pom.xml b/archiva-modules/archiva-karaf/archiva-features/pom.xml index ad711c7..4ceb5a0 100644 --- a/archiva-modules/archiva-karaf/archiva-features/pom.xml +++ b/archiva-modules/archiva-karaf/archiva-features/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.archiva</groupId> <artifactId>archiva-karaf</artifactId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.archiva.karaf</groupId> http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-modules/archiva-karaf/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-karaf/pom.xml b/archiva-modules/archiva-karaf/pom.xml index 746faca..23e673e 100644 --- a/archiva-modules/archiva-karaf/pom.xml +++ b/archiva-modules/archiva-karaf/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.archiva</groupId> <artifactId>archiva-modules</artifactId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>archiva-karaf</artifactId> http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml index 9dea969..224e047 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>archiva-scheduler</artifactId> <groupId>org.apache.archiva</groupId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.4-SNAPSHOT</version> </parent> <artifactId>archiva-scheduler-api</artifactId> <packaging>bundle</packaging> http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml index 2dcbd99..97d855e 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>archiva-scheduler</artifactId> <groupId>org.apache.archiva</groupId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.4-SNAPSHOT</version> </parent> <artifactId>archiva-scheduler-indexing</artifactId> <packaging>bundle</packaging> http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/pom.xml index 2bc488a..fc2e17b 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/pom.xml +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>archiva-scheduler</artifactId> <groupId>org.apache.archiva</groupId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.4-SNAPSHOT</version> </parent> <artifactId>archiva-scheduler-repository-api</artifactId> <packaging>bundle</packaging> http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml index aea7a6d..a7ce836 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>archiva-scheduler</artifactId> <groupId>org.apache.archiva</groupId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.4-SNAPSHOT</version> </parent> <artifactId>archiva-scheduler-repository</artifactId> <packaging>bundle</packaging> http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-modules/archiva-scheduler/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-scheduler/pom.xml b/archiva-modules/archiva-scheduler/pom.xml index 76d6306..5523468 100644 --- a/archiva-modules/archiva-scheduler/pom.xml +++ b/archiva-modules/archiva-scheduler/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.archiva</groupId> <artifactId>archiva-modules</artifactId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>archiva-scheduler</artifactId> http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml index 7bd5111..e462bde 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>archiva-rest</artifactId> <groupId>org.apache.archiva</groupId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.4-SNAPSHOT</version> </parent> <artifactId>archiva-rest-api</artifactId> <!-- DO NOT USE bundle packaging generated documentation is not included in the jar !!! --> http://git-wip-us.apache.org/repos/asf/archiva/blob/c6f5732a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml index cc44422..e620e9f 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.archiva</groupId> <artifactId>archiva-rest</artifactId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.4-SNAPSHOT</version> </parent> <artifactId>archiva-rest-services</artifactId> <packaging>bundle</packaging>
