You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by io...@apache.org on 2012/02/19 13:10:18 UTC
svn commit: r1290993 - in /servicemix/smx4/bundles/trunk: ./ bundles-pom/
jung-2.0.1/ jung-api-2.0.1/ jung-graph-impl-2.0.1/
jung-graph-impl-2.0.1/src/ jung-graph-impl-2.0.1/src/main/
jung-graph-impl-2.0.1/src/main/resources/ jung-graph-impl-2.0.1/src/...
Author: iocanel
Date: Sun Feb 19 12:10:17 2012
New Revision: 1290993
URL: http://svn.apache.org/viewvc?rev=1290993&view=rev
Log:
[SMX4-1090] Split jung to jung-api and jung-graph-impl
Added:
servicemix/smx4/bundles/trunk/jung-api-2.0.1/
- copied from r1243351, servicemix/smx4/bundles/trunk/jung-2.0.1/
servicemix/smx4/bundles/trunk/jung-graph-impl-2.0.1/
servicemix/smx4/bundles/trunk/jung-graph-impl-2.0.1/pom.xml
servicemix/smx4/bundles/trunk/jung-graph-impl-2.0.1/src/
servicemix/smx4/bundles/trunk/jung-graph-impl-2.0.1/src/main/
servicemix/smx4/bundles/trunk/jung-graph-impl-2.0.1/src/main/resources/
servicemix/smx4/bundles/trunk/jung-graph-impl-2.0.1/src/main/resources/OSGI-INF/
servicemix/smx4/bundles/trunk/jung-graph-impl-2.0.1/src/main/resources/OSGI-INF/bundle.info
Removed:
servicemix/smx4/bundles/trunk/jung-2.0.1/
Modified:
servicemix/smx4/bundles/trunk/bundles-pom/pom.xml
servicemix/smx4/bundles/trunk/jung-api-2.0.1/pom.xml
servicemix/smx4/bundles/trunk/pom.xml
Modified: servicemix/smx4/bundles/trunk/bundles-pom/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/bundles-pom/pom.xml?rev=1290993&r1=1290992&r2=1290993&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/bundles-pom/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/bundles-pom/pom.xml Sun Feb 19 12:10:17 2012
@@ -31,7 +31,7 @@
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
<packaging>pom</packaging>
- <version>9-SNAPSHOT</version>
+ <version>10-SNAPSHOT</version>
<name>Apache ServiceMix :: Bundles</name>
<properties>
@@ -44,6 +44,7 @@
<servicemix.osgi.dynamicimport.pkg />
<servicemix.osgi.failok>false</servicemix.osgi.failok>
<servicemix.osgi.embed.dependency />
+ <servicemix.osgi.fragment.host/>
</properties>
<prerequisites>
@@ -189,6 +190,7 @@
<Embed-Dependency>${servicemix.osgi.embed.dependency}</Embed-Dependency>
<Bundle-NativeCode>${servicemix.osgi.native}</Bundle-NativeCode>
<Bundle-Activator>${servicemix.osgi.activator}</Bundle-Activator>
+ <Fragment-Host>${servicemix.osgi.fragment.host}</Fragment-Host>
<_failok>${servicemix.osgi.failok}</_failok>
<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
<_removeheaders>Ignore-Package,Include-Resource,Private-Package,Embed-Dependency
Modified: servicemix/smx4/bundles/trunk/jung-api-2.0.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jung-api-2.0.1/pom.xml?rev=1290993&r1=1243351&r2=1290993&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jung-api-2.0.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jung-api-2.0.1/pom.xml Sun Feb 19 12:10:17 2012
@@ -24,12 +24,12 @@
<parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
- <version>8</version>
+ <version>10-SNAPSHOT</version>
<relativePath>../bundles-pom/pom.xml</relativePath>
</parent>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.jung</artifactId>
+ <artifactId>org.apache.servicemix.bundles.jung-api</artifactId>
<version>2.0.1_1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
@@ -37,7 +37,7 @@
<properties>
<pkgGroupId>net.sf.jung</pkgGroupId>
- <pkgArtifactId>jung</pkgArtifactId>
+ <pkgArtifactId>jung-api</pkgArtifactId>
<pkgVersion>2.0.1</pkgVersion>
<servicemix.osgi.export.pkg>
edu.uci.ics.jung*;version="${project.version}";-noimport:=true
@@ -51,14 +51,7 @@
<dependencies>
<dependency>
<groupId>${pkgGroupId}</groupId>
- <artifactId>${pkgArtifactId}-api</artifactId>
- <version>${pkgVersion}</version>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>${pkgGroupId}</groupId>
- <artifactId>${pkgArtifactId}-graph-impl</artifactId>
+ <artifactId>${pkgArtifactId}</artifactId>
<version>${pkgVersion}</version>
<optional>true</optional>
</dependency>
@@ -79,19 +72,12 @@
<configuration>
<artifactSet>
<includes>
- <include>${pkgGroupId}:${pkgArtifactId}-api</include>
- <include>${pkgGroupId}:${pkgArtifactId}-graph-impl</include>
+ <include>${pkgGroupId}:${pkgArtifactId}</include>
</includes>
</artifactSet>
<filters>
<filter>
- <artifact>${pkgGroupId}:${pkgArtifactId}-api</artifact>
- <excludes>
- <exclude>**</exclude>
- </excludes>
- </filter>
- <filter>
- <artifact>${pkgGroupId}:${pkgArtifactId}-graph-impl</artifact>
+ <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
<excludes>
<exclude>**</exclude>
</excludes>
Added: servicemix/smx4/bundles/trunk/jung-graph-impl-2.0.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jung-graph-impl-2.0.1/pom.xml?rev=1290993&view=auto
==============================================================================
--- servicemix/smx4/bundles/trunk/jung-graph-impl-2.0.1/pom.xml (added)
+++ servicemix/smx4/bundles/trunk/jung-graph-impl-2.0.1/pom.xml Sun Feb 19 12:10:17 2012
@@ -0,0 +1,95 @@
+<?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.servicemix.bundles</groupId>
+ <artifactId>bundles-pom</artifactId>
+ <version>10-SNAPSHOT</version>
+ <relativePath>../bundles-pom/pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.jung-graph-impl</artifactId>
+ <version>2.0.1_1-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+ <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
+ <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
+
+ <properties>
+ <pkgGroupId>net.sf.jung</pkgGroupId>
+ <pkgArtifactId>jung-graph-impl</pkgArtifactId>
+ <pkgVersion>2.0.1</pkgVersion>
+ <servicemix.osgi.export.pkg>
+ edu.uci.ics.jung*;version="${project.version}";-noimport:=true
+ </servicemix.osgi.export.pkg>
+ <servicemix.osgi.import.pkg>
+ org.apache.commons.collections15;version:="[4,5)",
+ *
+ </servicemix.osgi.import.pkg>
+ <servicemix.osgi.fragment.host>org.apache.servicemix.bundles.jung-api;bundle-version="[2,3)"</servicemix.osgi.fragment.host>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}</version>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>1.4</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <artifactSet>
+ <includes>
+ <include>${pkgGroupId}:${pkgArtifactId}</include>
+ </includes>
+ </artifactSet>
+ <filters>
+ <filter>
+ <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
+ <excludes>
+ <exclude>**</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+ <createDependencyReducedPom>true</createDependencyReducedPom>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Added: servicemix/smx4/bundles/trunk/jung-graph-impl-2.0.1/src/main/resources/OSGI-INF/bundle.info
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jung-graph-impl-2.0.1/src/main/resources/OSGI-INF/bundle.info?rev=1290993&view=auto
==============================================================================
--- servicemix/smx4/bundles/trunk/jung-graph-impl-2.0.1/src/main/resources/OSGI-INF/bundle.info (added)
+++ servicemix/smx4/bundles/trunk/jung-graph-impl-2.0.1/src/main/resources/OSGI-INF/bundle.info Sun Feb 19 12:10:17 2012
@@ -0,0 +1,14 @@
+\u001B[1mSYNOPSIS\u001B[0m
+ ${project.description}
+
+ Original Maven URL:
+ \u001B[33mmvn:${pkgGroupId}/${pkgArtifactId}-core/${pkgVersion}\u001B[0m
+
+\u001B[1mDESCRIPTION\u001B[0m
+ JUNG â the Java Universal Network/Graph Framework--is a software library that provides a common and extendible language
+ for the modeling, analysis, and visualization of data that can be represented as a graph or network. It is written
+ in Java, which allows JUNG-based applications to make use of the extensive built-in capabilities of the Java API, as
+ well as those of other existing third-party Java libraries.
+
+\u001B[1mSEE ALSO\u001B[0m
+ \u001B[36mhttp://jung.sourceforge.net/\u001B[0m
Modified: servicemix/smx4/bundles/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/pom.xml?rev=1290993&r1=1290992&r2=1290993&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/pom.xml Sun Feb 19 12:10:17 2012
@@ -47,7 +47,8 @@
<module>jdiff-1.0.9</module>
<module>beanio-1.2.2</module>
<module>netty-3.2.7.Final</module>
- <module>jung-2.0.1</module>
+ <module>jung-api-2.0.1</module>
+ <module>jung-graph-impl-2.0.1</module>
<module>collections-generic-4.01</module>
<module>colt-1.2.0</module>
<module>commons-beanutils-1.8.3</module>