Menu
▾
▴
[CIShell-SVN] SF.net SVN: cishell:[1159] branches/tycho
|
From: <fu...@us...> - 2010-11-14 09:28:36
|
Revision: 1159
http://cishell.svn.sourceforge.net/cishell/?rev=1159&view=rev
Author: fugu13
Date: 2010-11-14 09:28:26 +0000 (Sun, 14 Nov 2010)
Log Message:
-----------
I still haven't quite got the library system worked out; it might turn out to be best to continue with our current practice of making our own wrapped jars and storing them, but I think it should be possible to have that become part of the build process instead.
Modified Paths:
--------------
branches/tycho/core/org.cishell.reference/META-INF/MANIFEST.MF
Added Paths:
-----------
branches/tycho/core/org.cishell.framework/pom.xml
branches/tycho/core/org.cishell.framework/src/main/
branches/tycho/core/org.cishell.framework/src/main/java/
branches/tycho/core/org.cishell.framework/src/main/java/org/
branches/tycho/core/org.cishell.reference/pom.xml
branches/tycho/core/org.cishell.reference/src/main/
branches/tycho/core/org.cishell.reference/src/main/java/
branches/tycho/core/org.cishell.reference/src/main/java/org/
branches/tycho/core/pom.xml
branches/tycho/libs/
branches/tycho/libs/colt/
branches/tycho/libs/colt/osgi.bnd
branches/tycho/libs/colt/pom.xml
branches/tycho/libs/commons-collections/
branches/tycho/libs/commons-collections/osgi.bnd
branches/tycho/libs/commons-collections/pom.xml
branches/tycho/libs/concurrent/
branches/tycho/libs/concurrent/osgi.bnd
branches/tycho/libs/concurrent/pom.xml
branches/tycho/libs/jung/
branches/tycho/libs/jung/osgi.bnd
branches/tycho/libs/jung/pom.xml
branches/tycho/libs/pom.xml
branches/tycho/libs/poms/
branches/tycho/libs/poms/compiled/
branches/tycho/libs/poms/compiled/pom.xml
branches/tycho/libs/poms/pom.xml
branches/tycho/libs/poms/wrappers/
branches/tycho/libs/poms/wrappers/pom.xml
branches/tycho/libs/provision/
branches/tycho/libs/provision/pom.xml
branches/tycho/pom.xml
Removed Paths:
-------------
branches/tycho/core/org.cishell.framework/src/org/
branches/tycho/core/org.cishell.reference/src/org/
Added: branches/tycho/core/org.cishell.framework/pom.xml
===================================================================
--- branches/tycho/core/org.cishell.framework/pom.xml (rev 0)
+++ branches/tycho/core/org.cishell.framework/pom.xml 2010-11-14 09:28:26 UTC (rev 1159)
@@ -0,0 +1,15 @@
+<?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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>cishell</groupId>
+ <artifactId>core-build</artifactId>
+ <version>1.0.0</version>
+ </parent>
+
+ <artifactId>org.cishell.framework</artifactId>
+ <packaging>eclipse-plugin</packaging>
+
+</project>
Modified: branches/tycho/core/org.cishell.reference/META-INF/MANIFEST.MF
===================================================================
--- branches/tycho/core/org.cishell.reference/META-INF/MANIFEST.MF 2010-11-14 09:06:07 UTC (rev 1158)
+++ branches/tycho/core/org.cishell.reference/META-INF/MANIFEST.MF 2010-11-14 09:28:26 UTC (rev 1159)
@@ -19,5 +19,5 @@
org.cishell.reference.service.conversion,
org.cishell.reference.service.metatype
Eclipse-LazyStart: true
-Require-Bundle: edu.uci.ics.jung
+Require-Bundle: jung
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Added: branches/tycho/core/org.cishell.reference/pom.xml
===================================================================
--- branches/tycho/core/org.cishell.reference/pom.xml (rev 0)
+++ branches/tycho/core/org.cishell.reference/pom.xml 2010-11-14 09:28:26 UTC (rev 1159)
@@ -0,0 +1,15 @@
+<?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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>cishell</groupId>
+ <artifactId>core-build</artifactId>
+ <version>1.0.0</version>
+ </parent>
+
+ <artifactId>org.cishell.reference</artifactId>
+ <packaging>eclipse-plugin</packaging>
+
+</project>
Added: branches/tycho/core/pom.xml
===================================================================
--- branches/tycho/core/pom.xml (rev 0)
+++ branches/tycho/core/pom.xml 2010-11-14 09:28:26 UTC (rev 1159)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <prerequisites>
+ <maven>3.0</maven>
+ </prerequisites>
+
+ <groupId>cishell</groupId>
+ <artifactId>core-build</artifactId>
+ <version>1.0.0</version>
+ <packaging>pom</packaging>
+
+ <properties>
+ <tycho-version>0.10.0</tycho-version>
+ </properties>
+
+ <modules>
+ <module>org.cishell.framework</module>
+ <module>org.cishell.reference</module>
+<!-- <module>tycho.demo.itp02.bundle.tests</module> -->
+ </modules>
+
+ <dependencies>
+ <dependency>
+ <groupId>cishell.libs</groupId>
+ <artifactId>jung</artifactId>
+ <version>1.7.6-001-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+ <repositories>
+ <repository>
+ <id>ganymede</id>
+ <layout>p2</layout>
+ <url>http://download.eclipse.org/releases/ganymede</url>
+ </repository>
+ </repositories>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.sonatype.tycho</groupId>
+ <artifactId>tycho-maven-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <extensions>true</extensions>
+ </plugin>
+ <plugin>
+ <groupId>org.sonatype.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <resolver>p2</resolver>
+ <pomDependencies>consider</pomDependencies>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Added: branches/tycho/libs/colt/osgi.bnd
===================================================================
--- branches/tycho/libs/colt/osgi.bnd (rev 0)
+++ branches/tycho/libs/colt/osgi.bnd 2010-11-14 09:28:26 UTC (rev 1159)
@@ -0,0 +1,9 @@
+#--------------------------------------------------------------------------
+# Use this file to add customized Bnd instructions for the wrapped library
+#--------------------------------------------------------------------------
+
+#
+# this unpacks the contents of the wrapped jar artifact inside the bundle
+# to also inline dependencies of this artifact add Embed-Transitive: true
+#
+Embed-Dependency: *;scope=compile|runtime;type=!pom;inline=true
Added: branches/tycho/libs/colt/pom.xml
===================================================================
--- branches/tycho/libs/colt/pom.xml (rev 0)
+++ branches/tycho/libs/colt/pom.xml 2010-11-14 09:28:26 UTC (rev 1159)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <parent>
+ <relativePath>../poms/wrappers/</relativePath>
+ <groupId>cishell.libs.build</groupId>
+ <artifactId>wrapper-bundle-settings</artifactId>
+ <version>1.0.0</version>
+ </parent>
+
+ <properties>
+ <bundle.symbolicName>colt</bundle.symbolicName>
+ <wrapped.groupId>colt</wrapped.groupId>
+ <wrapped.artifactId>colt</wrapped.artifactId>
+ <wrapped.version>1.2.0</wrapped.version>
+ </properties>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>cishell.libs</groupId>
+ <artifactId>colt</artifactId>
+ <version>1.2.0-001-SNAPSHOT</version>
+
+ <name>${bundle.symbolicName} ${wrapped.version} [osgi]</name>
+
+ <packaging>bundle</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>${wrapped.groupId}</groupId>
+ <artifactId>${wrapped.artifactId}</artifactId>
+ <version>${wrapped.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>cishell.libs</groupId>
+ <artifactId>concurrent</artifactId>
+ <version>1.3.4-001-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
Added: branches/tycho/libs/commons-collections/osgi.bnd
===================================================================
--- branches/tycho/libs/commons-collections/osgi.bnd (rev 0)
+++ branches/tycho/libs/commons-collections/osgi.bnd 2010-11-14 09:28:26 UTC (rev 1159)
@@ -0,0 +1,9 @@
+#--------------------------------------------------------------------------
+# Use this file to add customized Bnd instructions for the wrapped library
+#--------------------------------------------------------------------------
+
+#
+# this unpacks the contents of the wrapped jar artifact inside the bundle
+# to also inline dependencies of this artifact add Embed-Transitive: true
+#
+Embed-Dependency: *;scope=compile|runtime;type=!pom;inline=true
Added: branches/tycho/libs/commons-collections/pom.xml
===================================================================
--- branches/tycho/libs/commons-collections/pom.xml (rev 0)
+++ branches/tycho/libs/commons-collections/pom.xml 2010-11-14 09:28:26 UTC (rev 1159)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <parent>
+ <relativePath>../poms/wrappers/</relativePath>
+ <groupId>cishell.libs.build</groupId>
+ <artifactId>wrapper-bundle-settings</artifactId>
+ <version>1.0.0</version>
+ </parent>
+
+ <properties>
+ <bundle.symbolicName>commons-collections</bundle.symbolicName>
+ <wrapped.groupId>commons-collections</wrapped.groupId>
+ <wrapped.artifactId>commons-collections</wrapped.artifactId>
+ <wrapped.version>3.1</wrapped.version>
+ </properties>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>cishell.libs</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.1-001-SNAPSHOT</version>
+
+ <name>${bundle.symbolicName} ${wrapped.version} [osgi]</name>
+
+ <packaging>bundle</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>${wrapped.groupId}</groupId>
+ <artifactId>${wrapped.artifactId}</artifactId>
+ <version>${wrapped.version}</version>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
Added: branches/tycho/libs/concurrent/osgi.bnd
===================================================================
--- branches/tycho/libs/concurrent/osgi.bnd (rev 0)
+++ branches/tycho/libs/concurrent/osgi.bnd 2010-11-14 09:28:26 UTC (rev 1159)
@@ -0,0 +1,9 @@
+#--------------------------------------------------------------------------
+# Use this file to add customized Bnd instructions for the wrapped library
+#--------------------------------------------------------------------------
+
+#
+# this unpacks the contents of the wrapped jar artifact inside the bundle
+# to also inline dependencies of this artifact add Embed-Transitive: true
+#
+Embed-Dependency: *;scope=compile|runtime;type=!pom;inline=true
Added: branches/tycho/libs/concurrent/pom.xml
===================================================================
--- branches/tycho/libs/concurrent/pom.xml (rev 0)
+++ branches/tycho/libs/concurrent/pom.xml 2010-11-14 09:28:26 UTC (rev 1159)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <parent>
+ <relativePath>../poms/wrappers/</relativePath>
+ <groupId>cishell.libs.build</groupId>
+ <artifactId>wrapper-bundle-settings</artifactId>
+ <version>1.0.0</version>
+ </parent>
+
+ <properties>
+ <bundle.symbolicName>concurrent</bundle.symbolicName>
+ <wrapped.groupId>concurrent</wrapped.groupId>
+ <wrapped.artifactId>concurrent</wrapped.artifactId>
+ <wrapped.version>1.3.4</wrapped.version>
+ </properties>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>cishell.libs</groupId>
+ <artifactId>concurrent</artifactId>
+ <version>1.3.4-001-SNAPSHOT</version>
+
+ <name>${bundle.symbolicName} ${wrapped.version} [osgi]</name>
+
+ <packaging>bundle</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>${wrapped.groupId}</groupId>
+ <artifactId>${wrapped.artifactId}</artifactId>
+ <version>${wrapped.version}</version>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
Added: branches/tycho/libs/jung/osgi.bnd
===================================================================
--- branches/tycho/libs/jung/osgi.bnd (rev 0)
+++ branches/tycho/libs/jung/osgi.bnd 2010-11-14 09:28:26 UTC (rev 1159)
@@ -0,0 +1,9 @@
+#--------------------------------------------------------------------------
+# Use this file to add customized Bnd instructions for the wrapped library
+#--------------------------------------------------------------------------
+
+#
+# this unpacks the contents of the wrapped jar artifact inside the bundle
+# to also inline dependencies of this artifact add Embed-Transitive: true
+#
+Embed-Dependency: *;scope=compile|runtime;type=!pom;inline=true
Added: branches/tycho/libs/jung/pom.xml
===================================================================
--- branches/tycho/libs/jung/pom.xml (rev 0)
+++ branches/tycho/libs/jung/pom.xml 2010-11-14 09:28:26 UTC (rev 1159)
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <parent>
+ <relativePath>../poms/wrappers/</relativePath>
+ <groupId>cishell.libs.build</groupId>
+ <artifactId>wrapper-bundle-settings</artifactId>
+ <version>1.0.0</version>
+ </parent>
+
+ <properties>
+ <bundle.symbolicName>jung</bundle.symbolicName>
+ <wrapped.groupId>jung</wrapped.groupId>
+ <wrapped.artifactId>jung</wrapped.artifactId>
+ <wrapped.version>1.7.6</wrapped.version>
+ </properties>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>cishell.libs</groupId>
+ <artifactId>jung</artifactId>
+ <version>1.7.6-001-SNAPSHOT</version>
+
+ <name>${bundle.symbolicName} ${wrapped.version} [osgi]</name>
+
+ <packaging>bundle</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>${wrapped.groupId}</groupId>
+ <artifactId>${wrapped.artifactId}</artifactId>
+ <version>${wrapped.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>cishell.libs</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.1-001-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>cishell.libs</groupId>
+ <artifactId>colt</artifactId>
+ <version>1.2.0-001-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
Added: branches/tycho/libs/pom.xml
===================================================================
--- branches/tycho/libs/pom.xml (rev 0)
+++ branches/tycho/libs/pom.xml 2010-11-14 09:28:26 UTC (rev 1159)
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <!--
+ | put company details here
+ <organization>
+ <name>...</name>
+ <url>http://...</url>
+ </organization>
+ -->
+
+ <!--
+ | put license details here
+ <licenses>
+ <license>
+ <name>...</name>
+ <url>http://...</url>
+ <comments>
+ </comments>
+ </license>
+ </licenses>
+ -->
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>cishell</groupId>
+ <artifactId>libs</artifactId>
+ <version>1.0.0</version>
+
+ <name>cishell.libs (OSGi project)</name>
+
+ <!--
+ | describe your project here
+ -->
+
+ <description>Generated using Pax-Construct</description>
+
+ <properties>
+ <!--
+ | some example OSGi runtime properties
+ -->
+ <org.osgi.service.http.port>8080</org.osgi.service.http.port>
+ <org.osgi.service.http.port.secure>8443</org.osgi.service.http.port.secure>
+ </properties>
+
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>poms</module>
+ <module>provision</module>
+ <module>jung</module>
+ <module>commons-collections</module>
+ <module>colt</module>
+ <module>concurrent</module>
+ </modules>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.ops4j</groupId>
+ <artifactId>maven-pax-plugin</artifactId>
+ <version>1.4</version>
+ <configuration>
+ <!--
+ | some example Pax-Runner settings
+ -->
+ <provision>
+ <param>--platform=felix</param>
+ </provision>
+ </configuration>
+ <executions>
+ <!--
+ | uncomment to auto-generate IDE files
+ <execution>
+ <id>ide-support</id>
+ <goals>
+ <goal>eclipse</goal>
+ </goals>
+ </execution>
+ -->
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
Added: branches/tycho/libs/poms/compiled/pom.xml
===================================================================
--- branches/tycho/libs/poms/compiled/pom.xml (rev 0)
+++ branches/tycho/libs/poms/compiled/pom.xml 2010-11-14 09:28:26 UTC (rev 1159)
@@ -0,0 +1,61 @@
+<?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/maven-v4_0_0.xsd">
+
+ <parent>
+ <groupId>cishell.libs.build</groupId>
+ <artifactId>shared-plugin-settings</artifactId>
+ <version>1.0.0</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>compiled-bundle-settings</artifactId>
+
+ <name>libs - bundle instructions</name>
+
+ <packaging>pom</packaging>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <!--
+ | example additional resource entries, useful when building Eclipse RCP applications
+ -->
+ <resource>
+ <directory>.</directory>
+ <includes>
+ <include>plugin.xml</include>
+ <include>plugin.properties</include>
+ <include>icons/**</include>
+ </includes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <!--
+ | the following instructions build a simple set of public/private classes into an OSGi bundle
+ -->
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${bundle.symbolicName}</Bundle-SymbolicName>
+ <Bundle-Version>${pom.version}</Bundle-Version>
+ <!--
+ | assume public classes are in the top package, and private classes are under ".internal"
+ -->
+ <Export-Package>!${bundle.namespace}.internal.*,${bundle.namespace}.*;version="${pom.version}"</Export-Package>
+ <Private-Package>${bundle.namespace}.internal.*</Private-Package>
+ <!--
+ | each module can override these defaults in their osgi.bnd file
+ -->
+ <_include>-osgi.bnd</_include>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Added: branches/tycho/libs/poms/pom.xml
===================================================================
--- branches/tycho/libs/poms/pom.xml (rev 0)
+++ branches/tycho/libs/poms/pom.xml 2010-11-14 09:28:26 UTC (rev 1159)
@@ -0,0 +1,76 @@
+<?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/maven-v4_0_0.xsd">
+
+ <parent>
+ <groupId>cishell</groupId>
+ <artifactId>libs</artifactId>
+ <version>1.0.0</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>cishell.libs.build</groupId>
+ <artifactId>shared-plugin-settings</artifactId>
+
+ <name>libs - plugin configuration</name>
+
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>wrappers</module>
+ <module>compiled</module>
+ </modules>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.ops4j</groupId>
+ <artifactId>maven-pax-plugin</artifactId>
+ <!--
+ | enable improved OSGi compilation support for the bundle life-cycle.
+ | to switch back to the standard bundle life-cycle, move this setting
+ | down to the maven-bundle-plugin section
+ -->
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>1.4.3</version>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <!--
+ | dependency pom representing the global classpath of imported bundles
+ -->
+ <type>pom</type>
+ <groupId>cishell.libs.build</groupId>
+ <artifactId>provision</artifactId>
+ <version>1.0.0</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi_R4_core</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi_R4_compendium</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+</project>
Added: branches/tycho/libs/poms/wrappers/pom.xml
===================================================================
--- branches/tycho/libs/poms/wrappers/pom.xml (rev 0)
+++ branches/tycho/libs/poms/wrappers/pom.xml 2010-11-14 09:28:26 UTC (rev 1159)
@@ -0,0 +1,56 @@
+<?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/maven-v4_0_0.xsd">
+
+ <parent>
+ <groupId>cishell.libs.build</groupId>
+ <artifactId>shared-plugin-settings</artifactId>
+ <version>1.0.0</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>wrapper-bundle-settings</artifactId>
+
+ <name>libs - wrapper instructions</name>
+
+ <!--
+ | don't apply project details to wrapped jars
+ -->
+ <organization/>
+ <description>
+ Simple OSGi wrapper around third-party jar(s)
+ </description>
+ <licenses>
+ <license/>
+ </licenses>
+
+ <packaging>pom</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <!--
+ | the following instructions are optimized for wrapping third-party libraries as OSGi bundles
+ -->
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${bundle.symbolicName}</Bundle-SymbolicName>
+ <Bundle-Version>${wrapped.version}</Bundle-Version>
+ <!--
+ | export wrapped contents: don't use Export-Package:* as this bundles everything on the classpath
+ -->
+ <_exportcontents>*</_exportcontents>
+ <Private-Package>!*</Private-Package>
+ <!--
+ | each module can override these defaults in their osgi.bnd file
+ -->
+ <_include>-osgi.bnd</_include>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Added: branches/tycho/libs/provision/pom.xml
===================================================================
--- branches/tycho/libs/provision/pom.xml (rev 0)
+++ branches/tycho/libs/provision/pom.xml 2010-11-14 09:28:26 UTC (rev 1159)
@@ -0,0 +1,25 @@
+<?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/maven-v4_0_0.xsd">
+
+ <parent>
+ <groupId>cishell</groupId>
+ <artifactId>libs</artifactId>
+ <version>1.0.0</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>cishell.libs.build</groupId>
+ <artifactId>provision</artifactId>
+
+ <name>libs - imported bundles</name>
+
+ <packaging>pom</packaging>
+
+ <!--
+ | imported (non-local) bundles are listed here as dependencies
+ | and will be deployed by pax:provision unless they are marked
+ | with <optional>true</optional>
+ -->
+
+</project>
Added: branches/tycho/pom.xml
===================================================================
--- branches/tycho/pom.xml (rev 0)
+++ branches/tycho/pom.xml 2010-11-14 09:28:26 UTC (rev 1159)
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <prerequisites>
+ <maven>3.0</maven>
+ </prerequisites>
+ <groupId>cishell</groupId>
+ <artifactId>build</artifactId>
+ <version>1.0.0</version>
+
+ <packaging>pom</packaging>
+
+ <properties>
+ <tycho-version>0.10.0</tycho-version>
+ </properties>
+
+ <modules>
+ <module>core</module>
+ <!-- <module>tycho.demo.itp02.bundle.tests</module> -->
+ <module>libs</module>
+ </modules>
+
+ <repositories>
+ <repository>
+ <id>ganymede</id>
+ <layout>p2</layout>
+ <url>http://download.eclipse.org/releases/ganymede</url>
+ </repository>
+ </repositories>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.sonatype.tycho</groupId>
+ <artifactId>tycho-maven-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <extensions>true</extensions>
+ </plugin>
+ <plugin>
+ <groupId>org.sonatype.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <resolver>p2</resolver>
+ <pomDependencies>consider</pomDependencies>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
