You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2015/02/17 12:54:32 UTC

[24/49] incubator-taverna-workbench-product git commit: org.osgi.* provided

org.osgi.* provided

git-svn-id: https://taverna.googlecode.com/svn/taverna/products/taverna-workbench-product/trunk@15998 bf327186-88b3-11dd-a302-d386e5130c1c


Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/commit/924969f0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/924969f0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/924969f0

Branch: refs/heads/master
Commit: 924969f069e9c6217336ae9aa900f8b50ea49a9e
Parents: c10cf9b
Author: stian@mygrid.org.uk <st...@bf327186-88b3-11dd-a302-d386e5130c1c>
Authored: Fri Aug 2 15:49:08 2013 +0000
Committer: stian@mygrid.org.uk <st...@bf327186-88b3-11dd-a302-d386e5130c1c>
Committed: Fri Aug 2 15:49:08 2013 +0000

----------------------------------------------------------------------
 pom.xml | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/924969f0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2cc281f..01267ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,6 +111,45 @@
 				</configuration>
 			</plugin>
 		</plugins>
+		<pluginManagement>
+		    <plugins>
+		        <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+		        <plugin>
+		            <groupId>org.eclipse.m2e</groupId>
+		            <artifactId>lifecycle-mapping</artifactId>
+		            <version>1.0.0</version>
+		            <configuration>
+		                <lifecycleMappingMetadata>
+		                    <pluginExecutions>
+		                        <pluginExecution>
+		                            <pluginExecutionFilter>
+		                                <groupId>
+		                                    net.sf.taverna.t2.maven.plugins
+		                                </groupId>
+		                                <artifactId>
+		                                    taverna-maven-plugin
+		                                </artifactId>
+		                                <versionRange>
+		                                    [0.3.1-SNAPSHOT,)
+		                                </versionRange>
+		                                <goals>
+		                                    <goal>
+		                                        profile-generate
+		                                    </goal>
+		                                </goals>
+		                            </pluginExecutionFilter>
+		                            <action>
+		                                <execute>
+                                            <runOnIncremental>false</runOnIncremental>
+                                        </execute>
+		                            </action>
+		                        </pluginExecution>
+		                    </pluginExecutions>
+		                </lifecycleMappingMetadata>
+		            </configuration>
+		        </plugin>
+		    </plugins>
+		</pluginManagement>
 	</build>
 	<distributionManagement>
 		<snapshotRepository>
@@ -126,6 +165,27 @@
 			<artifactId>com.springsource.net.sf.cglib</artifactId>
 			<version>2.1.3</version>
 		</dependency>
+
+        <!-- Explicit org.osgi.* with <scope>provided as these are also provided by
+             the felix osgi package.
+            Avoids:
+            Caused by: java.lang.SecurityException: class "org.osgi.framework.hooks.bundle.CollisionHook"'s signer information does not match signer information of other classes in the same package
+        -->
+
+        <dependency>
+          <groupId>org.osgi</groupId>
+          <artifactId>org.osgi.core</artifactId>
+          <version>4.3.1</version>
+          <scope>provided</scope>
+        </dependency>
+        <dependency>
+          <groupId>org.osgi</groupId>
+          <artifactId>org.osgi.compendium</artifactId>
+          <version>4.2.0</version>
+          <scope>provided</scope>
+        </dependency>
+        <!--    -->
+
 		<dependency>
 			<groupId>org.springframework.osgi</groupId>
 			<artifactId>spring-osgi-annotation</artifactId>