You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2014/12/23 12:52:52 UTC
[6/6] camel git commit: CAMEL-7781: Added to kit
CAMEL-7781: Added to kit
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/720a3e28
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/720a3e28
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/720a3e28
Branch: refs/heads/master
Commit: 720a3e2873397fa535c4a98aa2aedee4ce416753
Parents: 3c6d3b1
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Dec 23 12:52:35 2014 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Dec 23 12:52:35 2014 +0100
----------------------------------------------------------------------
apache-camel/pom.xml | 4 +
.../src/main/descriptors/common-bin.xml | 1 +
components/camel-pgevent/pom.xml | 183 ++++++-------------
parent/pom.xml | 6 +
4 files changed, 62 insertions(+), 132 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/720a3e28/apache-camel/pom.xml
----------------------------------------------------------------------
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index 0e4dcfb..bf1b666 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -532,6 +532,10 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-pgevent</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-printer</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/720a3e28/apache-camel/src/main/descriptors/common-bin.xml
----------------------------------------------------------------------
diff --git a/apache-camel/src/main/descriptors/common-bin.xml b/apache-camel/src/main/descriptors/common-bin.xml
index ee5bcbf..8a4417c 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -144,6 +144,7 @@
<include>org.apache.camel:camel-openshift</include>
<include>org.apache.camel:camel-optaplanner</include>
<include>org.apache.camel:camel-paxlogging</include>
+ <include>org.apache.camel:camel-pgevent</include>
<include>org.apache.camel:camel-printer</include>
<include>org.apache.camel:camel-protobuf</include>
<include>org.apache.camel:camel-quartz</include>
http://git-wip-us.apache.org/repos/asf/camel/blob/720a3e28/components/camel-pgevent/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-pgevent/pom.xml b/components/camel-pgevent/pom.xml
index 987ff36..5f17ee1 100644
--- a/components/camel-pgevent/pom.xml
+++ b/components/camel-pgevent/pom.xml
@@ -1,5 +1,4 @@
<?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">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -10,144 +9,64 @@
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>
+ 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.
+-->
+<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>org.apache.camel</groupId>
- <artifactId>components</artifactId>
- <version>2.15-SNAPSHOT</version>
- </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-pgevent</artifactId>
- <packaging>bundle</packaging>
+ <artifactId>components</artifactId>
+ <version>2.15-SNAPSHOT</version>
+ </parent>
- <name>Camel :: PgEvent</name>
- <url>http://camel.apache.org/</url>
- <inceptionYear>2014</inceptionYear>
- <organization>
- <name>Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <description>
- A Camel component capable of sending/receiving notifications
- in PostgreSQL version 9.2 and higher via the use of the pgjdbc-ng
- driver.
- </description>
+ <artifactId>camel-pgevent</artifactId>
+ <packaging>bundle</packaging>
+ <name>Camel :: PgEvent</name>
+ <description>Component for sending/receiving notifications in PostgreSQL via the pgjdbc-ng driver</description>
- <properties>
- <camel.osgi.export.pkg>org.apache.camel.component.pgevent.*</camel.osgi.export.pkg>
- <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=pgevent</camel.osgi.export.service>
- <camel.osgi.import.additional>com.impossibl.pgjdbc-ng.*;version="[0.4]"</camel.osgi.import.additional>
-
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- </properties>
+ <properties>
+ <camel.osgi.export.pkg>org.apache.camel.component.pgevent.*</camel.osgi.export.pkg>
+ <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=pgevent</camel.osgi.export.service>
+ <camel.osgi.import.additional>com.impossibl.pgjdbc-ng.*;version="(0.4,1]"</camel.osgi.import.additional>
+ </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- </dependency>
- <dependency>
- <groupId>com.impossibl.pgjdbc-ng</groupId>
- <artifactId>pgjdbc-ng</artifactId>
- <version>0.4</version>
- <classifier>complete</classifier>
- </dependency>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.impossibl.pgjdbc-ng</groupId>
+ <artifactId>pgjdbc-ng</artifactId>
+ <version>${pgjdbc-ng-driver-version}</version>
+ <scope>provided</scope>
+ </dependency>
- <!-- testing -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
- <scope>test</scope>
- </dependency>
+ <!-- testing -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test</artifactId>
+ <scope>test</scope>
+ </dependency>
- <!-- logging -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.7.7</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.7.7</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.17</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <!-- logging -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
- <build>
- <defaultGoal>install</defaultGoal>
-
- <plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.5.1</version>
- <configuration>
- <source>1.7</source>
- <target>1.7</target>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.6</version>
- <configuration>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
-
- <!-- to generate the MANIFEST-FILE of the bundle -->
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>org.apache.camel.camel-pgevent</Bundle-SymbolicName>
- <Export-Service>org.apache.camel.spi.ComponentResolver;component=pgevent</Export-Service>
- </instructions>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
-
- <scm>
- <url>https://github.com/InfoSec812/pgevent.git</url>
- <connection>scm:git:git@github.com:InfoSec812/pgevent.git</connection>
- <developerConnection>scm:git:git@github.com:InfoSec812/pgevent.git</developerConnection>
- </scm>
-
- <developers>
- <developer>
- <id>dphillips</id>
- <name>Deven Phillips</name>
- </developer>
- </developers>
- <licenses>
- <license>
- <name>Apache License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- <comments>A business-friendly OSS license</comments>
- </license>
- </licenses>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/720a3e28/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 23e02b2..2c229d9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -363,6 +363,7 @@
<pax-tiny-bundle-version>1.3.1</pax-tiny-bundle-version>
<pax-logging-version>1.8.1</pax-logging-version>
<pdfbox-version>1.6.0</pdfbox-version>
+ <pgjdbc-ng-driver-version>0.4</pgjdbc-ng-driver-version>
<plexus-container-default-version>1.0-alpha-48</plexus-container-default-version>
<plexus-utils-version>1.5.6</plexus-utils-version>
<pojosr-version>0.2.1</pojosr-version>
@@ -1165,6 +1166,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-pgevent</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-printer</artifactId>
<version>${project.version}</version>
</dependency>