You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2014/06/03 14:33:32 UTC

svn commit: r1599510 - in /servicemix/smx4/bundles/trunk: ./ derby-10.10.2.0/ derby-10.10.2.0/src/ derby-10.10.2.0/src/main/ derby-10.10.2.0/src/main/resources/ derby-10.10.2.0/src/main/resources/OSGI-INF/ derbynet-10.10.2.0/ derbynet-10.10.2.0/src/ de...

Author: jbonofre
Date: Tue Jun  3 12:33:32 2014
New Revision: 1599510

URL: http://svn.apache.org/r1599510
Log:
[SMX4-1773] Create OSGi bundles for derby 10.10.2.0

Added:
    servicemix/smx4/bundles/trunk/derby-10.10.2.0/
    servicemix/smx4/bundles/trunk/derby-10.10.2.0/pom.xml
    servicemix/smx4/bundles/trunk/derby-10.10.2.0/src/
    servicemix/smx4/bundles/trunk/derby-10.10.2.0/src/main/
    servicemix/smx4/bundles/trunk/derby-10.10.2.0/src/main/resources/
    servicemix/smx4/bundles/trunk/derby-10.10.2.0/src/main/resources/OSGI-INF/
    servicemix/smx4/bundles/trunk/derby-10.10.2.0/src/main/resources/OSGI-INF/bundle.info
    servicemix/smx4/bundles/trunk/derbynet-10.10.2.0/
    servicemix/smx4/bundles/trunk/derbynet-10.10.2.0/pom.xml
    servicemix/smx4/bundles/trunk/derbynet-10.10.2.0/src/
    servicemix/smx4/bundles/trunk/derbynet-10.10.2.0/src/main/
    servicemix/smx4/bundles/trunk/derbynet-10.10.2.0/src/main/resources/
    servicemix/smx4/bundles/trunk/derbynet-10.10.2.0/src/main/resources/OSGI-INF/
    servicemix/smx4/bundles/trunk/derbynet-10.10.2.0/src/main/resources/OSGI-INF/bundle.info
Modified:
    servicemix/smx4/bundles/trunk/pom.xml

Added: servicemix/smx4/bundles/trunk/derby-10.10.2.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/derby-10.10.2.0/pom.xml?rev=1599510&view=auto
==============================================================================
--- servicemix/smx4/bundles/trunk/derby-10.10.2.0/pom.xml (added)
+++ servicemix/smx4/bundles/trunk/derby-10.10.2.0/pom.xml Tue Jun  3 12:33:32 2014
@@ -0,0 +1,153 @@
+<?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 u'nder 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>11</version>
+        <relativePath>../bundles-pom/pom.xml</relativePath>
+    </parent>
+
+    <groupId>org.apache.servicemix.bundles</groupId>
+    <artifactId>org.apache.servicemix.bundles.derby</artifactId>
+    <version>10.10.2.0_1-SNAPSHOT</version>
+    <packaging>bundle</packaging>
+    <name>Apache ServiceMix :: Bundles :: derby</name>
+    <description>This OSGi bundle wraps derby, derbyclient, and derbynet ${pkgVersion} jar files.</description>
+
+    <properties>
+        <pkgGroupId>org.apache.derby</pkgGroupId>
+        <pkgVersion>10.10.2.0</pkgVersion>
+        <servicemix.osgi.export.pkg>
+            org.apache.derby
+        </servicemix.osgi.export.pkg>
+        <servicemix.osgi.import.pkg>
+            javax.crypto*,
+            javax.management,
+            javax.naming*,
+            javax.naming,
+            javax.net*,
+            javax.security.auth,
+            javax.sql,
+            javax.transaction.xa,
+            javax.xml.parsers,
+            javax.xml.transform,
+            javax.xml.transform.dom,
+            javax.xml.transform.stream,
+            org.osgi.framework,
+            org.w3c.dom,
+            org.w3c.dom.xpath,
+            org.xml.sax,
+            org.apache.derby.iapi.services.sanity;resolution:=optional,
+            org.apache.derby.shared.common.sanity;resolution:=optional,
+            com.ibm.jvm;resolution:=optional,
+            javax.servlet*;resolution:=optional
+        </servicemix.osgi.import.pkg>
+        <servicemix.osgi.dynamicimport.pkg>*</servicemix.osgi.dynamicimport.pkg>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>derby</artifactId>
+            <version>${pkgVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>derbyclient</artifactId>
+            <version>${pkgVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>derbynet</artifactId>
+            <version>${pkgVersion}</version>
+        </dependency>
+
+        <!-- sources
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>derby</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>derbynet</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        -->
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <artifactSet>
+                                <includes>
+                                    <include>${pkgGroupId}:derby</include>
+                                    <include>${pkgGroupId}:derbyclient</include>
+                                    <include>${pkgGroupId}:derbynet</include>
+                                </includes>
+                            </artifactSet>
+                            <filters>
+                                <filter>
+                                    <artifact>${pkgGroupId}:derby</artifact>
+                                    <includes>
+                                        <include>**/*.properties</include>
+                                    </includes>
+                                </filter>
+                                <filter>
+                                    <artifact>${pkgGroupId}:derbyclient</artifact>
+                                    <includes>
+                                        <include>**/*.properties</include>
+                                        <include>META-INF/services/**</include>
+                                    </includes>
+                                </filter>
+                                <filter>
+                                    <artifact>${pkgGroupId}:derbynet</artifact>
+                                    <includes>
+                                        <include>**/*.properties</include>
+                                        <include>**/*.policy</include>
+                                    </includes>
+                                </filter>
+                            </filters>
+                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+                            <createDependencyReducedPom>true</createDependencyReducedPom>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Added: servicemix/smx4/bundles/trunk/derby-10.10.2.0/src/main/resources/OSGI-INF/bundle.info
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/derby-10.10.2.0/src/main/resources/OSGI-INF/bundle.info?rev=1599510&view=auto
==============================================================================
--- servicemix/smx4/bundles/trunk/derby-10.10.2.0/src/main/resources/OSGI-INF/bundle.info (added)
+++ servicemix/smx4/bundles/trunk/derby-10.10.2.0/src/main/resources/OSGI-INF/bundle.info Tue Jun  3 12:33:32 2014
@@ -0,0 +1,12 @@
+\u001B[1mSYNOPSIS\u001B[0m
+    ${project.description}
+
+    Original Maven URL:
+        \u001B[33mmvn:${pkgGroupId}/derby/${pkgVersion}\u001B[0m
+        \u001B[33mmvn:${pkgGroupId}/derbynet/${pkgVersion}\u001B[0m
+
+\u001B[1mDESCRIPTION\u001B[0m
+    Apache Derby is an open source relational database implemented entirely in Java.
+
+\u001B[1mSEE ALSO\u001B[0m
+    \u001B[36mhttp://db.apache.org/derby/\u001B[0m

Added: servicemix/smx4/bundles/trunk/derbynet-10.10.2.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/derbynet-10.10.2.0/pom.xml?rev=1599510&view=auto
==============================================================================
--- servicemix/smx4/bundles/trunk/derbynet-10.10.2.0/pom.xml (added)
+++ servicemix/smx4/bundles/trunk/derbynet-10.10.2.0/pom.xml Tue Jun  3 12:33:32 2014
@@ -0,0 +1,144 @@
+<?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>11</version>
+        <relativePath>../bundles-pom/pom.xml</relativePath>
+    </parent>
+
+    <groupId>org.apache.servicemix.bundles</groupId>
+    <artifactId>org.apache.servicemix.bundles.derbynet</artifactId>
+    <version>10.10.2.0_1-SNAPSHOT</version>
+    <packaging>bundle</packaging>
+    <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
+    <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
+
+    <properties>
+        <pkgGroupId>org.apache.derby</pkgGroupId>
+        <pkgArtifactId>derbynet</pkgArtifactId>
+        <pkgVersion>10.10.2.0</pkgVersion>
+        <servicemix.osgi.export>
+            org.apache.derby.drda;version=${pkgVersion};-split-package:=merge-first,
+            org.apache.derby.impl.drda;version=${pkgVersion};-split-package:=merge-first,
+            org.apache.derby.impl.tools.sysinfo;version=${pkgVersion};-split-package:=merge-first,
+            org.apache.derby.mbeans.drda;version=${pkgVersion};-split-package:=merge-first
+        </servicemix.osgi.export>
+        <servicemix.osgi.import.pkg>
+            javax.crypto*,
+            javax.management,
+            javax.net*,
+            javax.security.auth,
+            javax.servlet*,
+            javax.sql,
+            javax.transaction.xa,
+            org.xml.sax,
+            org.apache.derby.catalog,
+            org.apache.derby.iapi.db,
+            org.apache.derby.iapi.error,
+            org.apache.derby.iapi.jdbc,
+            org.apache.derby.iapi.services.i18n,
+            org.apache.derby.iapi.services.info,
+            org.apache.derby.iapi.services.io,
+            org.apache.derby.iapi.services.jmx,
+            org.apache.derby.iapi.services.monitor,
+            org.apache.derby.iapi.services.property,
+            org.apache.derby.iapi.services.stream,
+            org.apache.derby.iapi.store.access.xa,
+            org.apache.derby.iapi.tools.i18n,
+            org.apache.derby.iapi.util,
+            org.apache.derby.impl.jdbc,
+            org.apache.derby.jdbc,
+            org.apache.derby.mbeans,
+            org.apache.derby.security,
+            org.osgi.framework,
+            org.apache.derby.iapi.reference;resolution:=optional,
+            org.apache.derby.iapi.services.sanity;resolution:=optional,
+            org.apache.derby.iapi.sql.execute;resolution:=optional,
+            org.apache.derby.shared.common.reference;resolution:=optional,
+            org.apache.derby.tools;resolution:=optional,
+            com.ibm.jvm;resolution:=optional
+        </servicemix.osgi.import.pkg>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>${pkgGroupId}</groupId>
+                    <artifactId>derby</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <!-- sources -->
+        <!-- Not available on Central
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        -->
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <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>
+                                    <includes>
+                                        <include>**/*.properties</include>
+                                        <include>**/*.policy</include>
+                                    </includes>
+                                </filter>
+                            </filters>
+                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+                            <createDependencyReducedPom>true</createDependencyReducedPom>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Added: servicemix/smx4/bundles/trunk/derbynet-10.10.2.0/src/main/resources/OSGI-INF/bundle.info
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/derbynet-10.10.2.0/src/main/resources/OSGI-INF/bundle.info?rev=1599510&view=auto
==============================================================================
--- servicemix/smx4/bundles/trunk/derbynet-10.10.2.0/src/main/resources/OSGI-INF/bundle.info (added)
+++ servicemix/smx4/bundles/trunk/derbynet-10.10.2.0/src/main/resources/OSGI-INF/bundle.info Tue Jun  3 12:33:32 2014
@@ -0,0 +1,14 @@
+\u001B[1mSYNOPSIS\u001B[0m
+    ${project.description}
+
+    Original Maven URL:
+        \u001B[33mmvn:${pkgGroupId}/${pkgArtifactId}/${pkgVersion}\u001B[0m
+
+\u001B[1mDESCRIPTION\u001B[0m
+    Apache Derby is an open source relational database implemented entirely in Java.
+
+    Derbynet provides support the more familiar client/server mode with the Derby Network Client JDBC driver and
+    Derby Network Server.
+
+\u001B[1mSEE ALSO\u001B[0m
+    \u001B[36mhttp://db.apache.org/derby/\u001B[0m

Modified: servicemix/smx4/bundles/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/pom.xml?rev=1599510&r1=1599509&r2=1599510&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/pom.xml Tue Jun  3 12:33:32 2014
@@ -203,6 +203,8 @@
         <module>aws-java-sdk-1.7.12</module>
         <module>hadoop-client-2.4.0</module>
         <module>qpid-0.28</module>
+        <module>derby-10.10.2.0</module>
+        <module>derbynet-10.10.2.0</module>
     </modules>
 
 </project>