This is an automated email from the ASF dual-hosted git repository. martin_s pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/archiva-components.git
commit 5dd898ba7e701ac53cd9f4e70bf33c49395584d3 Author: Martin Stockhammer <[email protected]> AuthorDate: Sat Nov 16 17:24:21 2019 +0100 Fixing path settings in pom.xml --- expression-evaluator/pom.xml | 7 +------ graph/pom.xml | 3 +++ spring-apacheds/pom.xml | 6 +----- spring-registry/Jenkinsfile | 20 -------------------- spring-registry/pom.xml | 12 ++++-------- spring-registry/spring-registry-api/pom.xml | 10 +++------- spring-registry/spring-registry-commons/pom.xml | 13 ++++--------- 7 files changed, 16 insertions(+), 55 deletions(-) diff --git a/expression-evaluator/pom.xml b/expression-evaluator/pom.xml index fd69415..f323200 100644 --- a/expression-evaluator/pom.xml +++ b/expression-evaluator/pom.xml @@ -32,17 +32,12 @@ <name>Archiva Components :: Expression Evaluator</name> <properties> - <site.staging.base>${project.basedir}/..</site.staging.base> + <site.staging.base>${project.parent.basedir}</site.staging.base> </properties> <url>${webUrl}/${project.artifactId}</url> - <scm> - <url>${scmBrowseUrl}</url> - </scm> - - <dependencies> <dependency> <groupId>org.apache.commons</groupId> diff --git a/graph/pom.xml b/graph/pom.xml index 803b981..186d111 100644 --- a/graph/pom.xml +++ b/graph/pom.xml @@ -32,6 +32,9 @@ <name>Archiva Components :: Graph</name> <description>Simple implementation of graph structure and utility class for traversal.</description> + <properties> + <site.staging.base>${project.parent.basedir}</site.staging.base> + </properties> <dependencies> <dependency> diff --git a/spring-apacheds/pom.xml b/spring-apacheds/pom.xml index a841685..113fc15 100644 --- a/spring-apacheds/pom.xml +++ b/spring-apacheds/pom.xml @@ -33,12 +33,8 @@ <properties> <apacheds.version>1.5.1</apacheds.version> <apacheds.shared.version>0.9.7</apacheds.shared.version> - <site.staging.base>${project.basedir}/..</site.staging.base> + <site.staging.base>${project.parent.basedir}</site.staging.base> </properties> - <scm> - <url>${scmBrowseUrl}</url> - </scm> - <url>${webUrl}/${project.artifactId}</url> diff --git a/spring-registry/Jenkinsfile b/spring-registry/Jenkinsfile deleted file mode 100644 index 5f264a1..0000000 --- a/spring-registry/Jenkinsfile +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -asfStandardBuild() diff --git a/spring-registry/pom.xml b/spring-registry/pom.xml index e299086..7da5f94 100644 --- a/spring-registry/pom.xml +++ b/spring-registry/pom.xml @@ -22,21 +22,17 @@ </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.archiva.components.registry</groupId> - <artifactId>spring-registry</artifactId> + <artifactId>archiva-components-spring-registry</artifactId> <version>3.0-SNAPSHOT</version> <name>Archiva Components :: Spring Registry</name> <packaging>pom</packaging> <properties> - <site.staging.base>${project.basedir}/../site</site.staging.base> + <site.staging.base>${project.parent.basedir}</site.staging.base> </properties> <url>${webUrl}/${project.artifactId}</url> - <scm> - <url>${scmBrowseUrl}</url> - </scm> - <modules> <module>spring-registry-api</module> <module>spring-registry-commons</module> @@ -46,12 +42,12 @@ <dependencies> <dependency> <groupId>org.apache.archiva.components.registry</groupId> - <artifactId>spring-registry-api</artifactId> + <artifactId>archiva-components-spring-registry-api</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.archiva.components.registry</groupId> - <artifactId>spring-registry-commons</artifactId> + <artifactId>archiva-components-spring-registry-commons</artifactId> <version>${project.version}</version> </dependency> diff --git a/spring-registry/spring-registry-api/pom.xml b/spring-registry/spring-registry-api/pom.xml index 11c7ce7..8f61718 100644 --- a/spring-registry/spring-registry-api/pom.xml +++ b/spring-registry/spring-registry-api/pom.xml @@ -23,21 +23,17 @@ <parent> <groupId>org.apache.archiva.components.registry</groupId> - <artifactId>spring-registry</artifactId> + <artifactId>archiva-components-spring-registry</artifactId> <version>3.0-SNAPSHOT</version> </parent> <groupId>org.apache.archiva.components.registry</groupId> - <artifactId>spring-registry-api</artifactId> + <artifactId>archiva-components-spring-registry-api</artifactId> <name>Archiva Components :: Spring Registry Api</name> <properties> - <site.staging.base>${project.parent.basedir}/../site</site.staging.base> + <site.staging.base>${project.parent.parent.basedir}</site.staging.base> </properties> <url>${webUrl}/spring-registry/${project.artifactId}</url> - <scm> - <url>${scmBrowseUrl};f=${project.artifactId}</url> - </scm> - </project> diff --git a/spring-registry/spring-registry-commons/pom.xml b/spring-registry/spring-registry-commons/pom.xml index fd38209..1f4e67b 100644 --- a/spring-registry/spring-registry-commons/pom.xml +++ b/spring-registry/spring-registry-commons/pom.xml @@ -23,27 +23,22 @@ <parent> <groupId>org.apache.archiva.components.registry</groupId> - <artifactId>spring-registry</artifactId> + <artifactId>archiva-components-spring-registry</artifactId> <version>3.0-SNAPSHOT</version> </parent> - <artifactId>spring-registry-commons</artifactId> + <artifactId>archiva-components-spring-registry-commons</artifactId> <name>Archiva Components :: Spring Registry Commons</name> <properties> - <site.staging.base>${project.parent.basedir}/../site</site.staging.base> + <site.staging.base>${project.parent.parent.basedir}</site.staging.base> </properties> <url>${webUrl}/spring-registry/${project.artifactId}</url> - <scm> - <url>${scmBrowseUrl};f=${project.artifactId}</url> - </scm> - - <dependencies> <dependency> <groupId>org.apache.archiva.components.registry</groupId> - <artifactId>spring-registry-api</artifactId> + <artifactId>archiva-components-spring-registry-api</artifactId> </dependency> <dependency> <groupId>commons-configuration</groupId>
