streams-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sblack...@apache.org
Subject [31/32] incubator-streams git commit: resolves STREAMS-256
Date Wed, 17 Dec 2014 19:12:04 GMT
resolves STREAMS-256


Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/4f82494c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/4f82494c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/4f82494c

Branch: refs/heads/0.1-rc1
Commit: 4f82494c7e336f34d03149d9943ba884f28b0017
Parents: b595a9d
Author: sblackmon <sblackmon@w2odigital.com>
Authored: Wed Dec 17 11:49:06 2014 -0600
Committer: sblackmon <sblackmon@w2odigital.com>
Committed: Wed Dec 17 11:49:20 2014 -0600

----------------------------------------------------------------------
 pom.xml                                         |  4 -
 streams-osgi-components/pom.xml                 |  1 -
 .../streams-components-all/pom.xml              | 86 --------------------
 streams-web/pom.xml                             | 14 +++-
 4 files changed, 13 insertions(+), 92 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f82494c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ba9655c..e32e985 100644
--- a/pom.xml
+++ b/pom.xml
@@ -195,10 +195,6 @@
         <jaxb2-basics.version>0.8.4</jaxb2-basics.version>
         <jaxbutil.version>1.2.6</jaxbutil.version>
         <junit.version>4.11</junit.version>
-        <surefire.plugin.version>2.17</surefire.plugin.version>
-        <failsafe.plugin.version>2.17</failsafe.plugin.version>
-        <war.plugin.version>2.5</war.plugin.version>
-        <resources.plugin.version>2.7</resources.plugin.version>
         <slf4j.version>1.7.6</slf4j.version>
         <log4j.version>1.2.16</log4j.version>
         <logback.version>1.1.1</logback.version>

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f82494c/streams-osgi-components/pom.xml
----------------------------------------------------------------------
diff --git a/streams-osgi-components/pom.xml b/streams-osgi-components/pom.xml
index d7f68cd..672d890 100644
--- a/streams-osgi-components/pom.xml
+++ b/streams-osgi-components/pom.xml
@@ -40,7 +40,6 @@
     <module>activity-registration</module>
     <module>activity-consumer</module>
     <module>activity-subscriber</module>
-    <module>streams-components-all</module>
   </modules>
 
 </project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f82494c/streams-osgi-components/streams-components-all/pom.xml
----------------------------------------------------------------------
diff --git a/streams-osgi-components/streams-components-all/pom.xml b/streams-osgi-components/streams-components-all/pom.xml
deleted file mode 100644
index 448f1a4..0000000
--- a/streams-osgi-components/streams-components-all/pom.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="MACROMAN"?>
-<!--
-  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.
--->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.streams.osgi.components</groupId>
-    <artifactId>streams-osgi-components</artifactId>
-    <version>0.1-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>streams-components-all</artifactId>
-
-  <name>Apache Streams Components All</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.streams.osgi.components</groupId>
-            <artifactId>activity-registration</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.streams.osgi.components</groupId>
-            <artifactId>activity-subscriber</artifactId>
-          <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.streams.osgi.components</groupId>
-            <artifactId>activity-consumer</artifactId>
-          <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.streams</groupId>
-            <artifactId>streams-runtime-webapp</artifactId>
-          <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.streams</groupId>
-            <artifactId>streams-persist-cassandra</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-
-  <packaging>jar</packaging>
-
-    <build>
-     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>1.7</version>
-        <executions>
-            <execution>
-                <phase>package</phase>
-                <goals>
-                    <goal>shade</goal>
-                </goals>
-            </execution>
-        </executions>
-      </plugin>
-     </plugins>
-    </build>
-
-</project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f82494c/streams-web/pom.xml
----------------------------------------------------------------------
diff --git a/streams-web/pom.xml b/streams-web/pom.xml
index 2ef864c..8061ff8 100644
--- a/streams-web/pom.xml
+++ b/streams-web/pom.xml
@@ -53,11 +53,23 @@
 
       <dependency>
           <groupId>org.apache.streams.osgi.components</groupId>
-          <artifactId>streams-components-all</artifactId>
+          <artifactId>activity-consumer</artifactId>
         <version>${project.version}</version>
       </dependency>
 
       <dependency>
+          <groupId>org.apache.streams.osgi.components</groupId>
+          <artifactId>activity-subscriber</artifactId>
+          <version>${project.version}</version>
+      </dependency>
+
+      <dependency>
+          <groupId>org.apache.streams.osgi.components</groupId>
+          <artifactId>activity-registration</artifactId>
+          <version>${project.version}</version>
+      </dependency>
+
+      <dependency>
           <groupId>org.apache.streams</groupId>
           <artifactId>streams-persist-cassandra</artifactId>
           <version>${project.version}</version>


Mime
View raw message