You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ma...@apache.org on 2020/01/30 21:55:21 UTC
[archiva] branch master updated (7128675 -> 5fe962c)
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git.
from 7128675 Switching to new xmlunit version
new 52ed4a3 Adding status file for dependency cleanup
new 8d6062c Cleanup of dependencies
new 5fe962c Adding dependency information
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../archiva-base/archiva-configuration/pom.xml | 56 +++++++---------------
.../archiva-base/archiva-filelock/pom.xml | 7 +++
pom.xml | 1 +
status-dep.txt | 43 +++++++++++++++++
4 files changed, 68 insertions(+), 39 deletions(-)
create mode 100644 status-dep.txt
[archiva] 01/03: Adding status file for dependency cleanup
Posted by ma...@apache.org.
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.git
commit 52ed4a352c9e850d888ba460ca8d2399e4cd3c56
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Thu Jan 30 22:34:26 2020 +0100
Adding status file for dependency cleanup
---
pom.xml | 1 +
status-dep.txt | 14 ++++++++++++++
2 files changed, 15 insertions(+)
diff --git a/pom.xml b/pom.xml
index f726f9b..8bdb65d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1974,6 +1974,7 @@
<exclude>**/*.log</exclude>
<exclude>**/.site-content/**</exclude>
<exclude>**/git-sparse-checkout-pattern</exclude>
+ <exclude>status-dep.txt</exclude>
</excludes>
</configuration>
</plugin>
diff --git a/status-dep.txt b/status-dep.txt
new file mode 100644
index 0000000..6a25ef6
--- /dev/null
+++ b/status-dep.txt
@@ -0,0 +1,14 @@
+# Just for keeping track of the dependency check status
+# Will be deleted when dependency cleanup is finished
+# MST - 2020-01-30
+
+archiva-modules
+ archiva-base
+ archiva-common
+ archiva-storage-api
+ archiva-storage-fs
+ archiva-filelock
+ archiva-model
+ archiva-checksum
+ archiva-policies
+ archiva-configuration
[archiva] 03/03: Adding dependency information
Posted by ma...@apache.org.
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.git
commit 5fe962ccce28d60c2745343e0174fed42bd5e2b5
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Thu Jan 30 22:54:31 2020 +0100
Adding dependency information
---
status-dep.txt | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/status-dep.txt b/status-dep.txt
index 6a25ef6..04f86f4 100644
--- a/status-dep.txt
+++ b/status-dep.txt
@@ -12,3 +12,32 @@ archiva-modules
archiva-checksum
archiva-policies
archiva-configuration
+
+
+
+
+---
+
+Identical package names in different modules:
+
+find . -name *.java -exec grep -H '^package' {} \; |grep -v '/target/' |awk -F':' '{ print $2 " " $1 }' | sed -e 's/\(.*\)\.\/\(.*\)\/src\/.*/\1 \2/g' |awk '{ if ( x[$2]++ >= 1 && ll[$2] != $3 ) { print "Duplicate entry " $2 " " $3 " --- " ll[$2] ; }; ll[$2] = $3 ; }'
+Duplicate entry org.apache.archiva.metadata.audit; archiva-modules/archiva-web/archiva-webdav --- archiva-modules/metadata/metadata-repository-api
+Duplicate entry org.apache.archiva.security; archiva-modules/archiva-web/archiva-web-common --- archiva-modules/archiva-web/archiva-security
+Duplicate entry org.apache.archiva.metadata.repository.stats; archiva-modules/plugins/repository-statistics --- archiva-modules/plugins/metadata-store-jcr
+Duplicate entry org.apache.archiva.repository.mock; archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers --- archiva-modules/archiva-base/archiva-repository-layer
+Duplicate entry org.apache.archiva.proxy; archiva-modules/archiva-base/archiva-proxy --- archiva-modules/archiva-base/archiva-proxy-api
+Duplicate entry org.apache.archiva.repository.storage; archiva-modules/archiva-base/archiva-storage-api --- archiva-modules/archiva-base/archiva-storage-fs
+Duplicate entry org.apache.archiva.mock; archiva-modules/archiva-scheduler/archiva-scheduler-repository --- archiva-modules/archiva-base/archiva-mock
+Duplicate entry org.apache.archiva.proxy; archiva-modules/archiva-maven/archiva-maven-proxy --- archiva-modules/archiva-base/archiva-proxy
+Duplicate entry org.apache.archiva.metadata.repository; archiva-modules/archiva-maven/archiva-maven-proxy --- archiva-modules/metadata/metadata-repository-api
+Duplicate entry org.apache.archiva.repository.mock; archiva-modules/archiva-maven/archiva-maven-proxy --- archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers
+Duplicate entry org.apache.archiva.proxy.maven; archiva-modules/archiva-maven/archiva-maven-common --- archiva-modules/archiva-maven/archiva-maven-proxy
+Duplicate entry org.apache.archiva.stagerepository.merge; archiva-modules/archiva-maven/archiva-maven-repository --- archiva-modules/plugins/stage-repository-merge
+Duplicate entry org.apache.archiva.metadata.repository; archiva-modules/archiva-maven/archiva-maven-repository --- archiva-modules/archiva-maven/archiva-maven-proxy
+Duplicate entry org.apache.archiva.configuration; archiva-modules/archiva-maven/archiva-maven-repository --- archiva-modules/archiva-base/archiva-configuration
+Duplicate entry org.apache.archiva.repository; archiva-modules/archiva-maven/archiva-maven-repository --- archiva-modules/archiva-base/archiva-repository-api
+Duplicate entry org.apache.archiva.repository.metadata; archiva-modules/archiva-maven/archiva-maven-repository --- archiva-modules/archiva-base/archiva-repository-api
+Duplicate entry org.apache.archiva.indexer.util; archiva-modules/archiva-maven/archiva-maven-indexer --- archiva-modules/archiva-base/archiva-repository-api
+Duplicate entry org.apache.archiva.indexer.search; archiva-modules/archiva-maven/archiva-maven-indexer --- archiva-modules/archiva-base/archiva-repository-api
+
+
[archiva] 02/03: Cleanup of dependencies
Posted by ma...@apache.org.
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.git
commit 8d6062c209f3574a8d91c45d00e6fcbce816fbd1
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Thu Jan 30 22:34:43 2020 +0100
Cleanup of dependencies
---
.../archiva-base/archiva-configuration/pom.xml | 56 +++++++---------------
.../archiva-base/archiva-filelock/pom.xml | 7 +++
2 files changed, 24 insertions(+), 39 deletions(-)
diff --git a/archiva-modules/archiva-base/archiva-configuration/pom.xml b/archiva-modules/archiva-base/archiva-configuration/pom.xml
index 792ec36..ec79c43 100644
--- a/archiva-modules/archiva-base/archiva-configuration/pom.xml
+++ b/archiva-modules/archiva-base/archiva-configuration/pom.xml
@@ -75,50 +75,34 @@
<groupId>org.apache.archiva.components</groupId>
<artifactId>archiva-components-expression-evaluator</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-configuration2</artifactId>
+ <scope>runtime</scope>
<exclusions>
<exclusion>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils-core</artifactId>
- </exclusion>
- <!-- targeting JDK 1.4, xml parser/apis not needed -->
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xerces</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- <exclusion>
- <groupId>servletapi</groupId>
- <artifactId>servletapi</artifactId>
- </exclusion>
- <exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
- <exclusion>
- <groupId>ant</groupId>
- <artifactId>ant-optional</artifactId>
- </exclusion>
</exclusions>
</dependency>
+ <!--
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.2.2</version>
</dependency>
+ -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
@@ -131,22 +115,16 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
</dependency>
+ <!--
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
</dependency>
+ -->
<!-- Test scope -->
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-text</artifactId>
- </dependency>
<dependency>
<groupId>org.easymock</groupId>
diff --git a/archiva-modules/archiva-base/archiva-filelock/pom.xml b/archiva-modules/archiva-base/archiva-filelock/pom.xml
index 258597b..448aa42 100644
--- a/archiva-modules/archiva-base/archiva-filelock/pom.xml
+++ b/archiva-modules/archiva-base/archiva-filelock/pom.xml
@@ -67,6 +67,13 @@
<scope>test</scope>
</dependency>
+ <!--
+ NOTE:
+ The multithreadedtc project looks abandoned.
+ But I have no suitable alternative found yet.
+ So we keep this version as long as it works with our java versions.
+ MST
+ -->
<dependency>
<groupId>com.googlecode.multithreadedtc</groupId>
<artifactId>multithreadedtc</artifactId>