You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2014/02/25 15:06:53 UTC
git commit: [KARAF-2771] Move the repository as a "top" module and
let tycho generates the content and artifact jar files
Repository: karaf-eik
Updated Branches:
refs/heads/master 73bb522fc -> 995fceb7a
[KARAF-2771] Move the repository as a "top" module and let tycho generates the content and artifact jar files
Project: http://git-wip-us.apache.org/repos/asf/karaf-eik/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-eik/commit/995fceb7
Tree: http://git-wip-us.apache.org/repos/asf/karaf-eik/tree/995fceb7
Diff: http://git-wip-us.apache.org/repos/asf/karaf-eik/diff/995fceb7
Branch: refs/heads/master
Commit: 995fceb7a902d91ad3d9d0b40d5388ff479bafe5
Parents: 73bb522
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Tue Feb 25 15:06:09 2014 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Tue Feb 25 15:06:09 2014 +0100
----------------------------------------------------------------------
features/org.apache.karaf.eik.repository/NOTICE | 31 ---
.../artifacts.jar | Bin 942 -> 0 bytes
.../category.xml | 14 --
.../org.apache.karaf.eik.repository/content.jar | Bin 10574 -> 0 bytes
.../org.apache.karaf.eik.repository/pom.xml | 198 -------------------
pom.xml | 4 +-
repository/NOTICE | 31 +++
repository/category.xml | 14 ++
repository/pom.xml | 198 +++++++++++++++++++
9 files changed, 246 insertions(+), 244 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-eik/blob/995fceb7/features/org.apache.karaf.eik.repository/NOTICE
----------------------------------------------------------------------
diff --git a/features/org.apache.karaf.eik.repository/NOTICE b/features/org.apache.karaf.eik.repository/NOTICE
deleted file mode 100644
index 5771057..0000000
--- a/features/org.apache.karaf.eik.repository/NOTICE
+++ /dev/null
@@ -1,31 +0,0 @@
-Apache Karaf EIK
-Copyright 2010-2014 The Apache Software Foundation
-
-
-I. Used Software
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2010).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-FUSE Source (http://www.fusesource.org/).
-Licensed under the Apache License 2.0.
-
-This product includes software developed at
-Eclipse Foundation (http://www.eclipse.org/).
-Licensed under the EPL.
-
-
-II. License Summary
-- Apache License 2.0
-- EPL License
http://git-wip-us.apache.org/repos/asf/karaf-eik/blob/995fceb7/features/org.apache.karaf.eik.repository/artifacts.jar
----------------------------------------------------------------------
diff --git a/features/org.apache.karaf.eik.repository/artifacts.jar b/features/org.apache.karaf.eik.repository/artifacts.jar
deleted file mode 100644
index 16831a0..0000000
Binary files a/features/org.apache.karaf.eik.repository/artifacts.jar and /dev/null differ
http://git-wip-us.apache.org/repos/asf/karaf-eik/blob/995fceb7/features/org.apache.karaf.eik.repository/category.xml
----------------------------------------------------------------------
diff --git a/features/org.apache.karaf.eik.repository/category.xml b/features/org.apache.karaf.eik.repository/category.xml
deleted file mode 100644
index d34edfc..0000000
--- a/features/org.apache.karaf.eik.repository/category.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
- <feature url="features/org.apache.karaf.eik.wtp.feature_3.0.0.jar" id="org.apache.karaf.eik.wtp.feature" version="3.0.0">
- <category name="Eclipse Web Tools Platform Integration for Apache Karaf"/>
- </feature>
- <feature url="features/org.apache.karaf.eik.feature_3.0.0.jar" id="org.apache.karaf.eik.feature" version="3.0.0">
- <category name="Eclipse Integration for Apache Karaf"/>
- </feature>
- <feature url="features/org.apache.karaf.eik.jmx.feature_3.0.0.jar" id="org.apache.karaf.eik.jmx.feature" version="3.0.0">
- <category name="Eclipse Integration for Apache Karaf"/>
- </feature>
- <category-def name="Eclipse Integration for Apache Karaf" label="Eclipse Integration for Apache Karaf"/>
- <category-def name="Eclipse Web Tools Platform Integration for Apache Karaf" label="Eclipse Web Tools Platform Integration for Apache Karaf"/>
-</site>
http://git-wip-us.apache.org/repos/asf/karaf-eik/blob/995fceb7/features/org.apache.karaf.eik.repository/content.jar
----------------------------------------------------------------------
diff --git a/features/org.apache.karaf.eik.repository/content.jar b/features/org.apache.karaf.eik.repository/content.jar
deleted file mode 100644
index 5e613e4..0000000
Binary files a/features/org.apache.karaf.eik.repository/content.jar and /dev/null differ
http://git-wip-us.apache.org/repos/asf/karaf-eik/blob/995fceb7/features/org.apache.karaf.eik.repository/pom.xml
----------------------------------------------------------------------
diff --git a/features/org.apache.karaf.eik.repository/pom.xml b/features/org.apache.karaf.eik.repository/pom.xml
deleted file mode 100644
index 77ceedf..0000000
--- a/features/org.apache.karaf.eik.repository/pom.xml
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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">
-
- <!--
-
- 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.
- -->
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.karaf.eik</groupId>
- <artifactId>parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
- <relativePath>../../parent/pom.xml</relativePath>
- </parent>
-
- <groupId>org.apache.karaf.eik.features</groupId>
- <artifactId>org.apache.karaf.eik.repository</artifactId>
- <packaging>eclipse-repository</packaging>
- <name>Apache Karaf :: EIK :: Features :: Eclipse P2 Repository</name>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-dependencies</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.karaf.eik.plugins</groupId>
- <artifactId>org.apache.aries.jmx.api</artifactId>
- <version>${aries.jmx.version}</version>
- <outputDirectory>plugins</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.karaf.eik.plugins</groupId>
- <artifactId>org.apache.aries.jmx.core</artifactId>
- <version>${aries.jmx.version}</version>
- <outputDirectory>plugins</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.karaf.eik.plugins</groupId>
- <artifactId>org.fusesource.jansi</artifactId>
- <version>${jansi.version}</version>
- <outputDirectory>plugins</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.karaf.eik.plugins</groupId>
- <artifactId>org.ops4j.pax.url.mvn</artifactId>
- <version>${pax.url.version}</version>
- <outputDirectory>plugins</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.karaf.eik.plugins</groupId>
- <artifactId>sshd-core</artifactId>
- <version>${sshd.version}</version>
- <outputDirectory>plugins</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.karaf.eik.plugins</groupId>
- <artifactId>org.apache.commons.collections</artifactId>
- <version>${commons-collections.version}</version>
- <outputDirectory>plugins</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.karaf.eik.plugins</groupId>
- <artifactId>org.apache.commons.lang</artifactId>
- <version>${commons-lang.version}</version>
- <outputDirectory>plugins</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.karaf.eik.plugins</groupId>
- <artifactId>jdom</artifactId>
- <version>${jdom.version}</version>
- <outputDirectory>plugins</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.karaf.eik.features</groupId>
- <artifactId>org.apache.karaf.eik.feature</artifactId>
- <version>${project.version}</version>
- <outputDirectory>features</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.karaf.eik.features</groupId>
- <artifactId>org.apache.karaf.eik.jmx.feature</artifactId>
- <version>${project.version}</version>
- <outputDirectory>features</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.karaf.eik.features</groupId>
- <artifactId>org.apache.karaf.eik.wtp.feature</artifactId>
- <version>${project.version}</version>
- <outputDirectory>features</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <resolver>p2</resolver>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-resources</id>
- <phase>validate</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${basedir}/target/repository</outputDirectory>
- <resources>
- <resource>
- <directory>.</directory>
- <includes>
- <include>index.html</include>
- <include>web/*</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>plugins</directory>
- </fileset>
- <fileset>
- <directory>features</directory>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <!-- this plugin configuration is used to store Eclipse m2e settings only. It doesn't affect the core Maven build -->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <versionRange>[2.1,)</versionRange>
- <goals>
- <goal>copy</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/karaf-eik/blob/995fceb7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 72b6605..4a40134 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,9 @@
<module>features/org.apache.karaf.eik.jmx.feature</module>
<module>features/org.apache.karaf.eik.wtp.feature</module>
<module>features/org.apache.karaf.eik.feature</module>
- <module>features/org.apache.karaf.eik.repository</module>
+
+ <!-- Repository -->
+ <module>repository</module>
<!-- Archetypes -->
<module>archetypes/eik-camel-archetype</module>
http://git-wip-us.apache.org/repos/asf/karaf-eik/blob/995fceb7/repository/NOTICE
----------------------------------------------------------------------
diff --git a/repository/NOTICE b/repository/NOTICE
new file mode 100644
index 0000000..5771057
--- /dev/null
+++ b/repository/NOTICE
@@ -0,0 +1,31 @@
+Apache Karaf EIK
+Copyright 2010-2014 The Apache Software Foundation
+
+
+I. Used Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2010).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+OPS4J (http://www.ops4j.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+FUSE Source (http://www.fusesource.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+Eclipse Foundation (http://www.eclipse.org/).
+Licensed under the EPL.
+
+
+II. License Summary
+- Apache License 2.0
+- EPL License
http://git-wip-us.apache.org/repos/asf/karaf-eik/blob/995fceb7/repository/category.xml
----------------------------------------------------------------------
diff --git a/repository/category.xml b/repository/category.xml
new file mode 100644
index 0000000..d34edfc
--- /dev/null
+++ b/repository/category.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+ <feature url="features/org.apache.karaf.eik.wtp.feature_3.0.0.jar" id="org.apache.karaf.eik.wtp.feature" version="3.0.0">
+ <category name="Eclipse Web Tools Platform Integration for Apache Karaf"/>
+ </feature>
+ <feature url="features/org.apache.karaf.eik.feature_3.0.0.jar" id="org.apache.karaf.eik.feature" version="3.0.0">
+ <category name="Eclipse Integration for Apache Karaf"/>
+ </feature>
+ <feature url="features/org.apache.karaf.eik.jmx.feature_3.0.0.jar" id="org.apache.karaf.eik.jmx.feature" version="3.0.0">
+ <category name="Eclipse Integration for Apache Karaf"/>
+ </feature>
+ <category-def name="Eclipse Integration for Apache Karaf" label="Eclipse Integration for Apache Karaf"/>
+ <category-def name="Eclipse Web Tools Platform Integration for Apache Karaf" label="Eclipse Web Tools Platform Integration for Apache Karaf"/>
+</site>
http://git-wip-us.apache.org/repos/asf/karaf-eik/blob/995fceb7/repository/pom.xml
----------------------------------------------------------------------
diff --git a/repository/pom.xml b/repository/pom.xml
new file mode 100644
index 0000000..ae60f28
--- /dev/null
+++ b/repository/pom.xml
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+
+ <!--
+
+ 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.
+ -->
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.karaf.eik</groupId>
+ <artifactId>parent</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.karaf.eik</groupId>
+ <artifactId>org.apache.karaf.eik.repository</artifactId>
+ <packaging>eclipse-repository</packaging>
+ <name>Apache Karaf :: EIK :: P2 Repository</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.karaf.eik.plugins</groupId>
+ <artifactId>org.apache.aries.jmx.api</artifactId>
+ <version>${aries.jmx.version}</version>
+ <outputDirectory>plugins</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.karaf.eik.plugins</groupId>
+ <artifactId>org.apache.aries.jmx.core</artifactId>
+ <version>${aries.jmx.version}</version>
+ <outputDirectory>plugins</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.karaf.eik.plugins</groupId>
+ <artifactId>org.fusesource.jansi</artifactId>
+ <version>${jansi.version}</version>
+ <outputDirectory>plugins</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.karaf.eik.plugins</groupId>
+ <artifactId>org.ops4j.pax.url.mvn</artifactId>
+ <version>${pax.url.version}</version>
+ <outputDirectory>plugins</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.karaf.eik.plugins</groupId>
+ <artifactId>sshd-core</artifactId>
+ <version>${sshd.version}</version>
+ <outputDirectory>plugins</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.karaf.eik.plugins</groupId>
+ <artifactId>org.apache.commons.collections</artifactId>
+ <version>${commons-collections.version}</version>
+ <outputDirectory>plugins</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.karaf.eik.plugins</groupId>
+ <artifactId>org.apache.commons.lang</artifactId>
+ <version>${commons-lang.version}</version>
+ <outputDirectory>plugins</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.karaf.eik.plugins</groupId>
+ <artifactId>jdom</artifactId>
+ <version>${jdom.version}</version>
+ <outputDirectory>plugins</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.karaf.eik.features</groupId>
+ <artifactId>org.apache.karaf.eik.feature</artifactId>
+ <version>${project.version}</version>
+ <outputDirectory>features</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.karaf.eik.features</groupId>
+ <artifactId>org.apache.karaf.eik.jmx.feature</artifactId>
+ <version>${project.version}</version>
+ <outputDirectory>features</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.karaf.eik.features</groupId>
+ <artifactId>org.apache.karaf.eik.wtp.feature</artifactId>
+ <version>${project.version}</version>
+ <outputDirectory>features</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <resolver>p2</resolver>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-resources</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${basedir}/target/repository</outputDirectory>
+ <resources>
+ <resource>
+ <directory>.</directory>
+ <includes>
+ <include>index.html</include>
+ <include>web/*</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>plugins</directory>
+ </fileset>
+ <fileset>
+ <directory>features</directory>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <!-- this plugin configuration is used to store Eclipse m2e settings only. It doesn't affect the core Maven build -->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <versionRange>[2.1,)</versionRange>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+</project>