Apache
/
archiva-redback-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no more bundle as no one use that and this just stuck the build on Jenkins.... 

Signed-off-by: olivier lamy <olamy@apache.org>
This commit is contained in:
olivier lamy 2018-12-30 12:04:10 +10:00
parent 1f1c5a3750
commit 714f508973
39 changed files with 34 additions and 709 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pom.xml
View File

@ -54,7 +54,6 @@
<module>redback-users</module> <module>redback-users</module>
<module>redback-data-management</module> <module>redback-data-management</module>
<module>redback-integrations</module> <module>redback-integrations</module>
<module>redback-features</module>
</modules> </modules>
<scm> <scm>

26
redback-authentication/redback-authentication-api/pom.xml
View File

@ -27,7 +27,6 @@
</parent> </parent>
<artifactId>redback-authentication-api</artifactId> <artifactId>redback-authentication-api</artifactId>
<packaging>bundle</packaging>
<properties> <properties>
<site.staging.base>${project.parent.parent.basedir}</site.staging.base> <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
</properties> </properties>
@ -52,29 +51,4 @@
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
<Export-Package>
org.apache.archiva.redback.authentication;version=${project.version};-split-package:=import-first
</Export-Package>
<Import-Package>
javax.annotation,
javax.inject;version="[1,2)",
org.apache.archiva.redback.policy;version=${project.version},
org.apache.archiva.redback.users;version=${project.version},
org.apache.commons.lang;version="[2.6,3)",
org.springframework*;version="[3,4)",
org.slf4j;resolution:=optional
</Import-Package>
</instructions>
</configuration>
</plugin>
</plugins>
</build>
</project> </project>

23
redback-authentication/redback-authentication-providers/redback-authentication-ldap/pom.xml
View File

@ -28,7 +28,6 @@
</parent> </parent>
<artifactId>redback-authentication-ldap</artifactId> <artifactId>redback-authentication-ldap</artifactId>
<packaging>bundle</packaging>
<name>Redback :: Authentication Provider :: Ldap</name> <name>Redback :: Authentication Provider :: Ldap</name>
<properties> <properties>
@ -98,28 +97,6 @@
<build> <build>
<plugins> <plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
<Export-Package>
org.apache.archiva.redback.authentication.ldap;version=${project.version};-split-package:=merge-first
</Export-Package>
<Import-Package>
javax.naming*,
javax.inject;version="[1,2)",
org.apache.archiva.redback.authentication;version=${project.version},
org.apache.archiva.redback.common.ldap*;version=${project.version},
org.apache.archiva.redback.configuration;version=${project.version},
org.apache.archiva.redback.users.ldap.service;version=${project.version},
org.apache.commons.lang;version="[2.6,3)",
org.springframework.stereotype;version="[3,4)",
org.slf4j;resolution:=optional
</Import-Package>
</instructions>
</configuration>
</plugin>
<plugin> <plugin>
<groupId>org.sonatype.plugins</groupId> <groupId>org.sonatype.plugins</groupId>
<artifactId>port-allocator-maven-plugin</artifactId> <artifactId>port-allocator-maven-plugin</artifactId>

21
redback-authentication/redback-authentication-providers/redback-authentication-memory/pom.xml
View File

@ -28,7 +28,6 @@
</parent> </parent>
<artifactId>redback-authentication-memory</artifactId> <artifactId>redback-authentication-memory</artifactId>
<packaging>bundle</packaging>
<properties> <properties>
<site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base> <site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base>
</properties> </properties>
@ -58,24 +57,4 @@
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
<Export-Package>
org.apache.archiva.redback.authentication.memory;version=${project.version};-split-package:=merge-first
</Export-Package>
<Import-Package>
org.apache.archiva.redback.authentication;version=${project.version},
org.springframework.stereotype;version="[3,4)"
</Import-Package>
</instructions>
</configuration>
</plugin>
</plugins>
</build>
</project> </project>

22
redback-authentication/redback-authentication-providers/redback-authentication-open/pom.xml
View File

@ -28,7 +28,6 @@
</parent> </parent>
<artifactId>redback-authentication-open</artifactId> <artifactId>redback-authentication-open</artifactId>
<packaging>bundle</packaging>
<properties> <properties>
<site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base> <site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base>
</properties> </properties>
@ -49,25 +48,4 @@
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
<Export-Package>
org.apache.archiva.redback.authentication.open;version=${project.version};-split-package:=merge-first
</Export-Package>
<Import-Package>
org.apache.archiva.redback.authentication;version=${project.version},
org.apache.archiva.redback.policy;version=${project.version},
org.springframework.stereotype;version="[3,4)"
</Import-Package>
</instructions>
</configuration>
</plugin>
</plugins>
</build>
</project> </project>

10
redback-authentication/redback-authentication-providers/redback-authentication-users/pom.xml
View File

@ -28,7 +28,6 @@
</parent> </parent>
<artifactId>redback-authentication-users</artifactId> <artifactId>redback-authentication-users</artifactId>
<packaging>bundle</packaging>
<properties> <properties>
<site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base> <site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base>
</properties> </properties>
@ -71,13 +70,4 @@
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
</plugin>
</plugins>
</build>
</project> </project>

20
redback-authorization/redback-authorization-api/pom.xml
View File

@ -28,29 +28,9 @@
</parent> </parent>
<artifactId>redback-authorization-api</artifactId> <artifactId>redback-authorization-api</artifactId>
<packaging>bundle</packaging>
<properties> <properties>
<site.staging.base>${project.parent.parent.basedir}</site.staging.base> <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
</properties> </properties>
<name>Redback :: Authorization API</name> <name>Redback :: Authorization API</name>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
<Export-Package>
org.apache.archiva.redback.authorization;version=${project.version};-split-package:=merge-first
</Export-Package>
<Import-Package>
org.apache.archiva.redback.users;version=${project.version}
</Import-Package>
</instructions>
</configuration>
</plugin>
</plugins>
</build>
</project> </project>

21
redback-authorization/redback-authorization-providers/redback-authorization-open/pom.xml
View File

@ -28,7 +28,6 @@
</parent> </parent>
<artifactId>redback-authorization-open</artifactId> <artifactId>redback-authorization-open</artifactId>
<packaging>bundle</packaging>
<properties> <properties>
<site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base> <site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base>
</properties> </properties>
@ -49,24 +48,4 @@
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
<Export-Package>
org.apache.archiva.redback.authorization.open;version=${project.version};-split-package:=merge-first
</Export-Package>
<Import-Package>
org.apache.archiva.redback.authorization;version=${project.version},
org.springframework.stereotype;version="[3,4)"
</Import-Package>
</instructions>
</configuration>
</plugin>
</plugins>
</build>
</project> </project>

10
redback-authorization/redback-authorization-providers/redback-authorization-rbac/pom.xml
View File

@ -28,7 +28,6 @@
</parent> </parent>
<artifactId>redback-authorization-rbac</artifactId> <artifactId>redback-authorization-rbac</artifactId>
<packaging>bundle</packaging>
<properties> <properties>
<site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base> <site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base>
</properties> </properties>
@ -81,13 +80,4 @@
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
</plugin>
</plugins>
</build>
</project> </project>

58
redback-common/redback-common-jpa/pom.xml
View File

@ -20,41 +20,41 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<artifactId>redback-common</artifactId> <artifactId>redback-common</artifactId>
<groupId>org.apache.archiva.redback</groupId> <groupId>org.apache.archiva.redback</groupId>
<version>3.0.0-SNAPSHOT</version> <version>3.0.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>redback-common-jpa</artifactId> <artifactId>redback-common-jpa</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<properties> <properties>
<site.staging.base>${project.parent.parent.basedir}</site.staging.base> <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
</properties> </properties>
<name>Redback :: JPA Common Package</name> <name>Redback :: JPA Common Package</name>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.archiva.redback</groupId> <groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-rbac-model</artifactId> <artifactId>redback-rbac-model</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.archiva.redback</groupId> <groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-users-api</artifactId> <artifactId>redback-users-api</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.openjpa</groupId> <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId> <artifactId>openjpa</artifactId>
<version>${openjpa.version}</version> <version>${openjpa.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hsqldb</groupId> <groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId> <artifactId>hsqldb</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

24
redback-common/redback-common-ldap/pom.xml
View File

@ -28,7 +28,6 @@
</parent> </parent>
<artifactId>redback-common-ldap</artifactId> <artifactId>redback-common-ldap</artifactId>
<packaging>bundle</packaging>
<properties> <properties>
<site.staging.base>${project.parent.parent.basedir}</site.staging.base> <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
</properties> </properties>
@ -84,29 +83,6 @@
<build> <build>
<plugins> <plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
<Export-Package>
org.apache.archiva.redback.common.ldap*;version=${project.version};-split-package:=merge-first
</Export-Package>
<Import-Package>
javax.annotation,
javax.naming*,
javax.inject;version="[1,2)",
org.apache.archiva.redback.configuration;version=${project.version},
org.apache.archiva.redback.users;version=${project.version},
org.apache.commons.lang;version="[2.6,3)",
org.springframework.stereotype;version="[3,4)",
com.google.common.collect,
com.sun.jndi.ldap;resolution:=optional,
org.slf4j;resolution:=optional
</Import-Package>
</instructions>
</configuration>
</plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId> <artifactId>build-helper-maven-plugin</artifactId>

25
redback-configuration/pom.xml
View File

@ -28,7 +28,6 @@
</parent> </parent>
<artifactId>redback-configuration</artifactId> <artifactId>redback-configuration</artifactId>
<packaging>bundle</packaging>
<properties> <properties>
<site.staging.base>${project.parent.basedir}</site.staging.base> <site.staging.base>${project.parent.basedir}</site.staging.base>
</properties> </properties>
@ -70,28 +69,4 @@
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
<Export-Package>
org.apache.archiva.redback.configuration;version=${project.version};-split-package:=merge-first
</Export-Package>
<Import-Package>
javax.annotation,
javax.inject;version="[1,2)",
org.apache.archiva.redback.components.evaluator*;version=${project.version},
org.apache.archiva.redback.components.registry;version=${project.version},
org.springframework.stereotype;version="[3,4)",
org.slf4j;resolution:=optional
</Import-Package>
</instructions>
</configuration>
</plugin>
</plugins>
</build>
</project> </project>

21
redback-data-management/pom.xml
View File

@ -28,7 +28,6 @@
</parent> </parent>
<artifactId>redback-data-management</artifactId> <artifactId>redback-data-management</artifactId>
<packaging>bundle</packaging>
<properties> <properties>
<site.staging.base>${project.parent.basedir}</site.staging.base> <site.staging.base>${project.parent.basedir}</site.staging.base>
</properties> </properties>
@ -99,26 +98,6 @@
<build> <build>
<plugins> <plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
<Export-Package>
org.apache.archiva.redback.management;version=${project.version};-split-package:=merge-first
</Export-Package>
<Import-Package>
javax.xml.stream,
org.apache.archiva.redback.keys*;version=${project.version},
org.apache.archiva.redback.rbac*;version=${project.version},
org.apache.archiva.redback.users*;version=${project.version},
org.codehaus.plexus.util;version="[3,4)",
org.apache.commons.io,
org.springframework.stereotype;version="[3,4)"
</Import-Package>
</instructions>
</configuration>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>

94
redback-features/pom.xml
View File

@ -1,94 +0,0 @@
<?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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback</artifactId>
<version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>redback-features</artifactId>
<packaging>pom</packaging>
<name>Redback :: Karaf Features</name>
<properties>
<site.staging.base>${project.parent.basedir}</site.staging.base>
<javax-inject.bundle.version>1_2</javax-inject.bundle.version>
</properties>
<build>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
<includes>
<include>**/*</include>
</includes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<configuration>
<useDefaultDelimiters>false</useDefaultDelimiters>
<delimiters>
<delimiter>${*}</delimiter>
</delimiters>
</configuration>
<executions>
<execution>
<id>filter</id>
<phase>generate-resources</phase>
<goals>
<goal>resources</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>attach-artifact</id>
<phase>package</phase>
<goals>
<goal>attach-artifact</goal>
</goals>
<configuration>
<artifacts>
<artifact>
<file>${project.build.outputDirectory}/features.xml</file>
<type>xml</type>
<classifier>features</classifier>
</artifact>
</artifacts>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

50
redback-features/src/main/resources/features.xml
View File

@ -1,50 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed 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.
-->
<features name="redback-core-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.0.0">
<feature name="redback-configuration" version="${project.version}" resolver="(obr)">
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/${javax-inject.bundle.version}</bundle>
<bundle>mvn:org.apache.archiva.redback/redback-configuration/${project.version}</bundle>
</feature>
<feature name="redback-policy" version="${project.version}" resolver="(obr)">
<feature version="${project.version}">redback-configuration</feature>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/${javax-inject.bundle.version}</bundle>
<bundle>mvn:org.apache.archiva.redback/redback-policy/${project.version}</bundle>
</feature>
<feature name="redback-authentication-api" version="${project.version}" resolver="(obr)">
<feature version="${project.version}">redback-policy</feature>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/${javax-inject.bundle.version}</bundle>
<bundle>mvn:org.apache.archiva.redback/redback-authentication-api/${project.version}</bundle>
</feature>
<feature name="redback-authentication-ldap" version="${project.version}" resolver="(obr)">
<feature version="${project.version}">redback-authentication-api</feature>
<bundle>mvn:org.apache.archiva.redback/redback-authentication-ldap/${project.version}</bundle>
</feature>
<feature name="redback-authentication-memory" version="${project.version}" resolver="(obr)">
<feature version="${project.version}">redback-authentication-api</feature>
<bundle>mvn:org.apache.archiva.redback/redback-authentication-memory/${project.version}</bundle>
</feature>
<feature name="redback-authentication-open" version="${project.version}" resolver="(obr)">
<feature version="${project.version}">redback-authentication-api</feature>
<bundle>mvn:org.apache.archiva.redback/redback-authentication-open/${project.version}</bundle>
</feature>
</features>

35
redback-integrations/redback-common-integrations/pom.xml
View File

@ -28,7 +28,6 @@
</parent> </parent>
<artifactId>redback-common-integrations</artifactId> <artifactId>redback-common-integrations</artifactId>
<packaging>bundle</packaging>
<properties> <properties>
<site.staging.base>${project.parent.parent.basedir}</site.staging.base> <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
</properties> </properties>
@ -189,40 +188,6 @@
<build> <build>
<plugins> <plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
<Export-Package>
org.apache.archiva.redback.integration*;version=${project.version};-split-package:=merge-first
</Export-Package>
<Import-Package>
javax.annotation,
javax.inject;version="[1,2)",
javax.mail*,
javax.servlet*,
org.apache.archiva.redback.authentication;version=${project.version},
org.apache.archiva.redback.authorization;version=${project.version},
org.apache.archiva.redback.configuration;version=${project.version},
org.apache.archiva.redback.keys;version=${project.version},
org.apache.archiva.redback.policy;version=${project.version},
org.apache.archiva.redback.rbac;version=${project.version},
org.apache.archiva.redback.role*;version=${project.version},
org.apache.archiva.redback.system*;version=${project.version},
org.apache.archiva.redback.users;version=${project.version},
org.apache.commons.beanutils;version="[1.7,2)",
org.apache.commons.codec.binary;version="[1.6,2)",
org.apache.commons.lang;version="[2.6,3)",
org.apache.velocity*;version="[1.7,2)",
org.codehaus.plexus.util;version="[3,4)",
org.springframework*;version="[3,4)",
org.apache.commons.io,
org.slf4j;resolution:=optional
</Import-Package>
</instructions>
</configuration>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>

21
redback-integrations/redback-integrations-security/pom.xml
View File

@ -28,29 +28,8 @@
</parent> </parent>
<artifactId>redback-integrations-security</artifactId> <artifactId>redback-integrations-security</artifactId>
<packaging>bundle</packaging>
<properties> <properties>
<site.staging.base>${project.parent.parent.basedir}</site.staging.base> <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
</properties> </properties>
<name>Redback :: Integration :: Security</name> <name>Redback :: Integration :: Security</name>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
<Export-Package>
org.apache.archiva.redback.integration.security.role;version=${project.version};-split-package:=merge-first
</Export-Package>
<Import-Package>
</Import-Package>
</instructions>
</configuration>
</plugin>
</plugins>
</build>
</project> </project>

57
redback-integrations/redback-rest/redback-rest-api/pom.xml
View File

@ -28,8 +28,6 @@
</parent> </parent>
<artifactId>redback-rest-api</artifactId> <artifactId>redback-rest-api</artifactId>
<!-- DO NOT USE bundle packaging generated documentation is not included in the jar !!! -->
<packaging>jar</packaging>
<name>Redback :: Integration :: REST :: Api</name> <name>Redback :: Integration :: REST :: Api</name>
<properties> <properties>
@ -61,59 +59,4 @@
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
<Export-Package>
org.apache.archiva.redback.rest.api*;version=${project.version};-split-package:=merge-first
</Export-Package>
<Import-Package>
javax.ws.rs,
javax.xml.bind.annotation,
org.apache.archiva.redback.authorization;version=${project.version},
org.apache.archiva.redback.integration.util;version=${project.version},
org.apache.archiva.redback.rbac;version=${project.version},
org.apache.archiva.redback.users;version=${project.version},
org.apache.commons.lang;version="[2.6,3)"
</Import-Package>
</instructions>
</configuration>
<executions>
<execution>
<id>create-manifest</id>
<phase>process-test-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>bind-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>
</plugins>
</build>
</project> </project>

50
redback-integrations/redback-rest/redback-rest-services/pom.xml
View File

@ -28,7 +28,6 @@
</parent> </parent>
<artifactId>redback-rest-services</artifactId> <artifactId>redback-rest-services</artifactId>
<packaging>bundle</packaging>
<name>Redback :: Integration :: REST :: Services</name> <name>Redback :: Integration :: REST :: Services</name>
<properties> <properties>
@ -214,55 +213,6 @@
<build> <build>
<plugins> <plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
<Export-Package>
org.apache.archiva.redback.rest.services*;version=${project.version};-split-package:=merge-first
</Export-Package>
<Import-Package>
javax.annotation,
javax.inject;version="[1,2)",
javax.mail.internet,
javax.servlet.http,
javax.ws.rs.core,
javax.ws.rs.ext,
net.sf.ehcache,
org.apache.archiva.redback.authentication;version=${project.version},
org.apache.archiva.redback.authorization;version=${project.version},
org.apache.archiva.redback.components.cache;version=${project.version},
org.apache.archiva.redback.configuration;version=${project.version},
org.apache.archiva.redback.integration.filter.authentication*;version=${project.version},
org.apache.archiva.redback.integration.mail;version=${project.version},
org.apache.archiva.redback.integration.model;version=${project.version},
org.apache.archiva.redback.integration.util;version=${project.version},
org.apache.archiva.redback.keys*;version=${project.version},
org.apache.archiva.redback.policy;version=${project.version},
org.apache.archiva.redback.rbac;version=${project.version},
org.apache.archiva.redback.rest.api.model;version=${project.version},
org.apache.archiva.redback.rest.api.services;version=${project.version},
org.apache.archiva.redback.role*;version=${project.version},
org.apache.archiva.redback.system*;version=${project.version},
org.apache.archiva.redback.users;version=${project.version},
org.apache.commons.io;version="[1.4,2)",
org.apache.commons.lang;version="[2.6,3)",
org.apache.cxf*;version="[3.0.3,4)",
com.fasterxml.jackson.databind;version="[2.2,3)",
org.codehaus.plexus.util;version="[3,4)",
org.springframework*;version="[3,4)",
org.apache.commons.lang.time,
org.slf4j;resolution:=optional,
javax.naming,
javax.naming.directory,
org.apache.archiva.redback.common.ldap,
org.apache.archiva.redback.common.ldap.connection,
org.apache.archiva.redback.common.ldap.role
</Import-Package>
</instructions>
</configuration>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId> <artifactId>maven-clean-plugin</artifactId>

10
redback-keys/redback-authentication-keys/pom.xml
View File

@ -29,7 +29,6 @@
</parent> </parent>
<artifactId>redback-authentication-keys</artifactId> <artifactId>redback-authentication-keys</artifactId>
<packaging>bundle</packaging>
<properties> <properties>
<site.staging.base>${project.parent.parent.basedir}</site.staging.base> <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
</properties> </properties>
@ -58,13 +57,4 @@
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
</plugin>
</plugins>
</build>
</project> </project>

10
redback-keys/redback-keys-api/pom.xml
View File

@ -28,7 +28,6 @@
</parent> </parent>
<artifactId>redback-keys-api</artifactId> <artifactId>redback-keys-api</artifactId>
<packaging>bundle</packaging>
<properties> <properties>
<site.staging.base>${project.parent.parent.basedir}</site.staging.base> <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
</properties> </properties>
@ -61,13 +60,4 @@
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
</plugin>
</plugins>
</build>
</project> </project>

10
redback-keys/redback-keys-providers/redback-keys-cached/pom.xml
View File

@ -28,7 +28,6 @@
</parent> </parent>
<artifactId>redback-keys-cached</artifactId> <artifactId>redback-keys-cached</artifactId>
<packaging>bundle</packaging>
<properties> <properties>
<site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base> <site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base>
</properties> </properties>
@ -89,13 +88,4 @@
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
</plugin>
</plugins>
</build>
</project> </project>

2
redback-keys/redback-keys-providers/redback-keys-jpa/pom.xml
View File

@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>redback-keys-jpa</artifactId> <artifactId>redback-keys-jpa</artifactId>
<packaging>jar</packaging>
<properties> <properties>
<site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base> <site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base>
</properties> </properties>

10
redback-keys/redback-keys-providers/redback-keys-memory/pom.xml
View File

@ -28,7 +28,6 @@
</parent> </parent>
<artifactId>redback-keys-memory</artifactId> <artifactId>redback-keys-memory</artifactId>
<packaging>bundle</packaging>
<properties> <properties>
<site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base> <site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base>
</properties> </properties>
@ -67,13 +66,4 @@
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
</plugin>
</plugins>
</build>
</project> </project>

1
redback-keys/redback-keys-tests/pom.xml
View File

@ -26,7 +26,6 @@
</parent> </parent>
<artifactId>redback-keys-tests</artifactId> <artifactId>redback-keys-tests</artifactId>
<name>Redback :: Key Management Test Harness</name> <name>Redback :: Key Management Test Harness</name>
<packaging>jar</packaging>
<properties> <properties>
<site.staging.base>${project.parent.parent.basedir}</site.staging.base> <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
</properties> </properties>

10
redback-policy/pom.xml
View File

@ -28,7 +28,6 @@
</parent> </parent>
<artifactId>redback-policy</artifactId> <artifactId>redback-policy</artifactId>
<packaging>bundle</packaging>
<properties> <properties>
<site.staging.base>${project.parent.basedir}</site.staging.base> <site.staging.base>${project.parent.basedir}</site.staging.base>
</properties> </properties>
@ -66,13 +65,4 @@
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
</plugin>
</plugins>
</build>
</project> </project>

11
redback-rbac/redback-rbac-model/pom.xml
View File

@ -28,7 +28,7 @@
</parent> </parent>
<artifactId>redback-rbac-model</artifactId> <artifactId>redback-rbac-model</artifactId>
<packaging>bundle</packaging>
<properties> <properties>
<site.staging.base>${project.parent.parent.basedir}</site.staging.base> <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
</properties> </properties>
@ -63,13 +63,4 @@
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
</plugin>
</plugins>
</build>
</project> </project>

10
redback-rbac/redback-rbac-providers/redback-rbac-cached/pom.xml
View File

@ -28,7 +28,6 @@
</parent> </parent>
<artifactId>redback-rbac-cached</artifactId> <artifactId>redback-rbac-cached</artifactId>
<packaging>bundle</packaging>
<properties> <properties>
<site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base> <site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base>
</properties> </properties>
@ -93,13 +92,4 @@
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
</plugin>
</plugins>
</build>
</project> </project>

2
redback-rbac/redback-rbac-providers/redback-rbac-jpa/pom.xml
View File

@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>redback-rbac-jpa</artifactId> <artifactId>redback-rbac-jpa</artifactId>
<packaging>jar</packaging>
<properties> <properties>
<site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base> <site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base>
</properties> </properties>

5
redback-rbac/redback-rbac-providers/redback-rbac-ldap/pom.xml
View File

@ -28,7 +28,6 @@
</parent> </parent>
<artifactId>redback-rbac-ldap</artifactId> <artifactId>redback-rbac-ldap</artifactId>
<packaging>bundle</packaging>
<properties> <properties>
<site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base> <site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base>
</properties> </properties>
@ -108,10 +107,6 @@
<build> <build>
<plugins> <plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
</plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId> <artifactId>build-helper-maven-plugin</artifactId>

10
redback-rbac/redback-rbac-providers/redback-rbac-memory/pom.xml
View File

@ -28,7 +28,6 @@
</parent> </parent>
<artifactId>redback-rbac-memory</artifactId> <artifactId>redback-rbac-memory</artifactId>
<packaging>bundle</packaging>
<properties> <properties>
<site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base> <site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base>
</properties> </properties>
@ -72,13 +71,4 @@
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
</plugin>
</plugins>
</build>
</project> </project>

5
redback-rbac/redback-rbac-role-manager/pom.xml
View File

@ -28,7 +28,6 @@
</parent> </parent>
<artifactId>redback-rbac-role-manager</artifactId> <artifactId>redback-rbac-role-manager</artifactId>
<packaging>bundle</packaging>
<properties> <properties>
<site.staging.base>${project.parent.parent.basedir}</site.staging.base> <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
</properties> </properties>
@ -98,10 +97,6 @@
<build> <build>
<plugins> <plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
</plugin>
<plugin> <plugin>
<groupId>org.codehaus.modello</groupId> <groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId> <artifactId>modello-maven-plugin</artifactId>

10
redback-system/pom.xml
View File

@ -28,7 +28,6 @@
</parent> </parent>
<artifactId>redback-system</artifactId> <artifactId>redback-system</artifactId>
<packaging>bundle</packaging>
<properties> <properties>
<site.staging.base>${project.parent.basedir}</site.staging.base> <site.staging.base>${project.parent.basedir}</site.staging.base>
</properties> </properties>
@ -88,13 +87,4 @@
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
</plugin>
</plugins>
</build>
</project> </project>

11
redback-users/redback-users-api/pom.xml
View File

@ -28,7 +28,7 @@
</parent> </parent>
<artifactId>redback-users-api</artifactId> <artifactId>redback-users-api</artifactId>
<packaging>bundle</packaging>
<properties> <properties>
<site.staging.base>${project.parent.parent.basedir}</site.staging.base> <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
</properties> </properties>
@ -41,13 +41,4 @@
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
</plugin>
</plugins>
</build>
</project> </project>

10
redback-users/redback-users-providers/redback-users-cached/pom.xml
View File

@ -28,7 +28,6 @@
</parent> </parent>
<artifactId>redback-users-cached</artifactId> <artifactId>redback-users-cached</artifactId>
<packaging>bundle</packaging>
<properties> <properties>
<site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base> <site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base>
</properties> </properties>
@ -89,13 +88,4 @@
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
</plugin>
</plugins>
</build>
</project> </project>

10
redback-users/redback-users-providers/redback-users-configurable/pom.xml
View File

@ -28,7 +28,6 @@
</parent> </parent>
<artifactId>redback-users-configurable</artifactId> <artifactId>redback-users-configurable</artifactId>
<packaging>bundle</packaging>
<properties> <properties>
<site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base> <site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base>
</properties> </properties>
@ -54,13 +53,4 @@
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
</plugin>
</plugins>
</build>
</project> </project>

1
redback-users/redback-users-providers/redback-users-jpa/pom.xml
View File

@ -28,7 +28,6 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>redback-users-jpa</artifactId> <artifactId>redback-users-jpa</artifactId>
<packaging>jar</packaging>
<properties> <properties>
<site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base> <site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base>
</properties> </properties>

6
redback-users/redback-users-providers/redback-users-ldap/pom.xml
View File

@ -28,7 +28,7 @@
</parent> </parent>
<artifactId>redback-users-ldap</artifactId> <artifactId>redback-users-ldap</artifactId>
<packaging>bundle</packaging>
<properties> <properties>
<site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base> <site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base>
</properties> </properties>
@ -85,10 +85,6 @@
<build> <build>
<plugins> <plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
</plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId> <artifactId>build-helper-maven-plugin</artifactId>

10
redback-users/redback-users-providers/redback-users-memory/pom.xml
View File

@ -28,7 +28,6 @@
</parent> </parent>
<artifactId>redback-users-memory</artifactId> <artifactId>redback-users-memory</artifactId>
<packaging>bundle</packaging>
<properties> <properties>
<site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base> <site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base>
</properties> </properties>
@ -63,13 +62,4 @@
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
</plugin>
</plugins>
</build>
</project> </project>