mirror of https://github.com/apache/archiva.git
Moving metadata store providers to metadata folder
This commit is contained in:
Martin Stockhammer
parent
5a35e01601
commit
5d058d7f4d
|
|
@ -273,27 +273,6 @@
|
|||
<artifactId>archiva-metadata-consumer</artifactId>
|
||||
<scope>runtime</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.archiva</groupId>
|
||||
<artifactId>archiva-lucene-consumers</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.lucene</groupId>
|
||||
<artifactId>lucene-core</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.lucene</groupId>
|
||||
<artifactId>lucene-queries</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.lucene</groupId>
|
||||
<artifactId>lucene-memory</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.lucene</groupId>
|
||||
<artifactId>lucene-highlighter</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.apache.archiva</groupId>
|
||||
<artifactId>stage-repository-merge</artifactId>
|
||||
|
|
|
|||
|
|
@ -21,12 +21,13 @@
|
|||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<artifactId>plugins</artifactId>
|
||||
<artifactId>metadata-store-provider</artifactId>
|
||||
<groupId>org.apache.archiva</groupId>
|
||||
<version>3.0.0-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>metadata-store-cassandra</artifactId>
|
||||
<name>Archiva Core Plugins :: Cassandra Storage for Metadata</name>
|
||||
<name>Archiva Metadata :: Store Provider :: Cassandra</name>
|
||||
<description>Metadata Provider using Cassandra as backend</description>
|
||||
|
||||
<properties>
|
||||
<site.staging.base>${project.parent.parent.basedir}</site.staging.base>
|
||||
|
|
@ -20,12 +20,13 @@
|
|||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<artifactId>plugins</artifactId>
|
||||
<artifactId>metadata-store-provider</artifactId>
|
||||
<groupId>org.apache.archiva</groupId>
|
||||
<version>3.0.0-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>metadata-store-file</artifactId>
|
||||
<name>Archiva Core Plugins :: File System Backed Metadata Repository</name>
|
||||
<name>Archiva Metadata :: Store Provider :: File System</name>
|
||||
<description>Metadata Provider based on file system</description>
|
||||
|
||||
<properties>
|
||||
<site.staging.base>${project.parent.parent.basedir}</site.staging.base>
|
||||
|
|
@ -21,12 +21,13 @@
|
|||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<artifactId>plugins</artifactId>
|
||||
<artifactId>oak-jcr</artifactId>
|
||||
<groupId>org.apache.archiva</groupId>
|
||||
<version>3.0.0-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>metadata-store-jcr</artifactId>
|
||||
<name>Archiva Core Plugins :: JCR Storage for Metadata</name>
|
||||
<name>Archiva Metadata :: Store Provider :: JCR :: OAK</name>
|
||||
<description>Metadata provider that uses JCR Oak as backend</description>
|
||||
|
||||
<properties>
|
||||
<site.staging.base>${project.parent.parent.basedir}</site.staging.base>
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
oak-jcr-lucene
|
||||
==============
|
||||
|
||||
|
||||
This module is only to provide the oak-lucene dependency with lucene shaded into a different
|
||||
java package.
|
||||
Jackrabbit Oak has dependencies to Apache Lucene 4, which is very old and merely out of support.
|
||||
|
||||
We move the lucene dependencies to the package shaded_oak.org.apache.lucene to allow using
|
||||
a more recent version for Archiva.
|
||||
|
||||
For some reason the oak-lucene (1.22.3) package is a fat jar that contains the lucene classes itself,
|
||||
therefore we are excluding the lucene dependencies in the pom.
|
||||
|
||||
|
|
@ -21,19 +21,22 @@
|
|||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<parent>
|
||||
<artifactId>plugins</artifactId>
|
||||
<artifactId>oak-jcr</artifactId>
|
||||
<groupId>org.apache.archiva</groupId>
|
||||
<version>3.0.0-SNAPSHOT</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>oak-jcr-lucene</artifactId>
|
||||
<name>Archiva Metadata :: Store Provider :: JCR :: Shaded OAK Lucene</name>
|
||||
<description>This module shades the lucene dependencies of jcr oak to avoid version conflicts</description>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.apache.jackrabbit</groupId>
|
||||
<artifactId>oak-lucene</artifactId>
|
||||
<version>${jcr-oak.version}</version>
|
||||
<!-- Lucene classes are included already in the oak-lucene.jar, so we exclude this dependency -->
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>org.apache.lucene</groupId>
|
||||
|
|
@ -69,6 +72,8 @@
|
|||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<!-- We reapply the original transitive dependencies -->
|
||||
<!-- If you change the version of jcr-oak you may have to check the dependencies -->
|
||||
<dependency>
|
||||
<groupId>org.apache.jackrabbit</groupId>
|
||||
<artifactId>oak-api</artifactId>
|
||||
|
|
@ -110,6 +115,7 @@
|
|||
<configuration>
|
||||
<excludes>
|
||||
<exclude>dependency-reduced-pom.xml</exclude>
|
||||
<exclude>README.md</exclude>
|
||||
</excludes>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
|
@ -0,0 +1,41 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!--
|
||||
~ 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.
|
||||
-->
|
||||
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<parent>
|
||||
<artifactId>metadata-store-provider</artifactId>
|
||||
<groupId>org.apache.archiva</groupId>
|
||||
<version>3.0.0-SNAPSHOT</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>oak-jcr</artifactId>
|
||||
<name>Archiva Metadata :: Store Provider :: JCR :: Parent</name>
|
||||
<description>Parent module for the JCR Provider</description>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<modules>
|
||||
<module>oak-jcr-lucene</module>
|
||||
<module>metadata-store-jcr</module>
|
||||
</modules>
|
||||
|
||||
|
||||
</project>
|
||||
|
|
@ -0,0 +1,41 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!--
|
||||
~ 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.
|
||||
-->
|
||||
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<parent>
|
||||
<artifactId>metadata</artifactId>
|
||||
<groupId>org.apache.archiva</groupId>
|
||||
<version>3.0.0-SNAPSHOT</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>metadata-store-provider</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
<name>Archiva Metadata :: Store Provider</name>
|
||||
|
||||
<modules>
|
||||
<module>metadata-store-file</module>
|
||||
<module>metadata-store-cassandra</module>
|
||||
<module>oak-jcr</module>
|
||||
</modules>
|
||||
|
||||
|
||||
</project>
|
||||
|
|
@ -37,5 +37,6 @@
|
|||
<module>metadata-repository-api</module>
|
||||
<module>metadata-statistics-api</module>
|
||||
<module>test-repository</module>
|
||||
<module>metadata-store-provider</module>
|
||||
</modules>
|
||||
</project>
|
||||
|
|
@ -33,15 +33,11 @@
|
|||
</properties>
|
||||
|
||||
<modules>
|
||||
<module>metadata-store-file</module>
|
||||
<module>repository-statistics</module>
|
||||
<module>problem-reports</module>
|
||||
<module>audit</module>
|
||||
<module>stage-repository-merge</module>
|
||||
<module>generic-metadata-support</module>
|
||||
<module>metadata-store-jcr</module>
|
||||
<module>metadata-store-cassandra</module>
|
||||
<module>oak-jcr-lucene</module>
|
||||
</modules>
|
||||
|
||||
</project>
|
||||
|
|
|
|||
Loading…
Reference in New Issue