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 2015/10/29 07:07:23 UTC
[2/2] servicemix-bundles git commit: Merge branch 'libthrift-upgrade'
of https://github.com/oscerd/servicemix-bundles
Merge branch 'libthrift-upgrade' of https://github.com/oscerd/servicemix-bundles
Add missing scm sections
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/commit/0962f192
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/0962f192
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/0962f192
Branch: refs/heads/master
Commit: 0962f1925b55e12d362871ad6da888f91aaef6ef
Parents: 802f56d 96af89a
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Thu Oct 29 07:06:21 2015 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Thu Oct 29 07:06:21 2015 +0100
----------------------------------------------------------------------
libthrift-0.9.3/pom.xml | 112 +++++++++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 14 +++
mustache-compiler-0.8.18/pom.xml | 6 +
mustache-compiler-0.9.1/pom.xml | 6 +
pom.xml | 1 +
5 files changed, 139 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/0962f192/libthrift-0.9.3/pom.xml
----------------------------------------------------------------------
diff --cc libthrift-0.9.3/pom.xml
index 0000000,b15deef..234236c
mode 000000,100644..100644
--- a/libthrift-0.9.3/pom.xml
+++ b/libthrift-0.9.3/pom.xml
@@@ -1,0 -1,106 +1,112 @@@
+ <?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>12</version>
+ <relativePath>../bundles-pom/pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.libthrift</artifactId>
+ <version>0.9.3_1-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+ <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
+ <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
+
++ <scm>
++ <connection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-bundles.git</connection>
++ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-bundles.git</developerConnection>
++ <url>https://git-wip-us.apache.org/repos/asf?p=servicemix-bundles.git</url>
++ </scm>
++
+ <properties>
+ <pkgGroupId>org.apache.thrift</pkgGroupId>
+ <pkgArtifactId>libthrift</pkgArtifactId>
+ <pkgVersion>0.9.3</pkgVersion>
+ <servicemix.osgi.export.pkg>
+ org.apache.thrift
+ </servicemix.osgi.export.pkg>
+ <servicemix.osgi.import.pkg>
+ org.apache.http*;version="[4,5)",
+ org.slf4j*;version="[1.4,2)";resolution:=optional,
+ org.apache.log4j;resolution:=optional,
+ javax.net*,
+ javax.security*,
+ javax.servlet*;resolution:=optional
+ </servicemix.osgi.import.pkg>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}</version>
+ <optional>false</optional>
+ </dependency>
+
+ <!-- sources -->
+ <!-- Not available
+ <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>
+ <excludes>
+ <exclude>**</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </project>
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/0962f192/mustache-compiler-0.8.18/pom.xml
----------------------------------------------------------------------
diff --cc mustache-compiler-0.8.18/pom.xml
index 07798fc,0000000..28ccb6d
mode 100644,000000..100644
--- a/mustache-compiler-0.8.18/pom.xml
+++ b/mustache-compiler-0.8.18/pom.xml
@@@ -1,104 -1,0 +1,110 @@@
+<?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>12</version>
+ <relativePath>../bundles-pom/pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.mustache-compiler</artifactId>
+ <version>0.8.18_1-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+ <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
+ <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
+
++ <scm>
++ <connection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-bundles.git</connection>
++ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-bundles.git</developerConnection>
++ <url>https://git-wip-us.apache.org/repos/asf?p=servicemix-bundles.git</url>
++ </scm>
++
+ <properties>
+ <pkgGroupId>com.github.spullara.mustache.java</pkgGroupId>
+ <pkgArtifactId>compiler</pkgArtifactId>
+ <pkgVersion>0.8.18</pkgVersion>
+ <servicemix.osgi.export>
+ com.github.mustachejava*;version=0.8.18;-split-package:=merge-first
+ </servicemix.osgi.export>
+ <servicemix.osgi.import.pkg>
+ com.google.common.base;version="[13.0,17.0)",
+ com.google.common.cache;version="[13.0,17.0)",
+ com.google.common.io;version="[13.0,17.0)",
+ com.google.common.util.concurrent;version="[13.0,17.0)",
+ com.twitter.util;resolution:=optional,
+ org.jruby.*;resolution:=optional,
+ </servicemix.osgi.import.pkg>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}</version>
+ </dependency>
+
+ <!-- sources -->
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}</version>
+ <classifier>sources</classifier>
+ </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>
+ <excludes>
+ <exclude>**/*</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+ <createDependencyReducedPom>true</createDependencyReducedPom>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/0962f192/mustache-compiler-0.9.1/pom.xml
----------------------------------------------------------------------
diff --cc mustache-compiler-0.9.1/pom.xml
index 30a4651,0000000..fc741a8
mode 100644,000000..100644
--- a/mustache-compiler-0.9.1/pom.xml
+++ b/mustache-compiler-0.9.1/pom.xml
@@@ -1,118 -1,0 +1,124 @@@
+<?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>12</version>
+ <relativePath>../bundles-pom/pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.mustache-compiler</artifactId>
+ <version>0.9.1_1-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+ <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
+ <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
+
++ <scm>
++ <connection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-bundles.git</connection>
++ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-bundles.git</developerConnection>
++ <url>https://git-wip-us.apache.org/repos/asf?p=servicemix-bundles.git</url>
++ </scm>
++
+ <properties>
+ <pkgGroupId>com.github.spullara.mustache.java</pkgGroupId>
+ <pkgArtifactId>compiler</pkgArtifactId>
+ <pkgVersion>0.9.1</pkgVersion>
+ <servicemix.osgi.export>
+ com.twitter.mustache;version=0.9.1;-split-package:=merge-first,
+ com.github.mustachejava*;version=0.9.1;-split-package:=merge-first
+ </servicemix.osgi.export>
+ <servicemix.osgi.import.pkg>
+ com.google.common.base;version="[13.0,17.0)",
+ com.google.common.cache;version="[13.0,17.0)",
+ com.google.common.io;version="[13.0,17.0)",
+ com.google.common.util.concurrent;version="[13.0,17.0)",
+ com.twitter.util;resolution:=optional
+ </servicemix.osgi.import.pkg>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}</version>
+ </dependency>
+
+ <!-- sources -->
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}</version>
+ <classifier>sources</classifier>
+ </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>
+ <excludes>
+ <exclude>**/*</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+ <createDependencyReducedPom>true</createDependencyReducedPom>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.5.3</version>
+ <extensions>true</extensions>
+ <inherited>false</inherited>
+ <configuration>
+ <instructions>
+ <Export-Package>${servicemix.osgi.export.pkg}</Export-Package>
+ <Import-Package>${servicemix.osgi.import.pkg}</Import-Package>
+ <Bundle-NativeCode>*</Bundle-NativeCode>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/0962f192/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 9807129,a7f6e04..3b622f3
--- a/pom.xml
+++ b/pom.xml
@@@ -98,10 -96,8 +98,11 @@@
<module>aspectj-1.8.7</module>
<module>gae-1.9.27</module>
<module>elasticsearch-1.7.2</module>
+ <module>elasticsearch-1.7.3</module>
<module>c3p0-0.9.5.1</module>
+ <module>mustache-compiler-0.8.18</module>
+ <module>mustache-compiler-0.9.1</module>
+ <module>libthrift-0.9.3</module>
</modules>
</project>