You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by sm...@apache.org on 2016/10/21 19:28:45 UTC
incubator-streams git commit: STREAMS-410: Delete Provision and Poms
modules, this closes apache/incubator-streams#309
Repository: incubator-streams
Updated Branches:
refs/heads/master cd3d5d41e -> 7aaba1e9b
STREAMS-410: Delete Provision and Poms modules, this closes apache/incubator-streams#309
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/7aaba1e9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/7aaba1e9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/7aaba1e9
Branch: refs/heads/master
Commit: 7aaba1e9b9e6995a7dd5e9b499dba0a2bf699659
Parents: cd3d5d4
Author: smarthi <sm...@apache.org>
Authored: Fri Oct 21 15:28:15 2016 -0400
Committer: smarthi <sm...@apache.org>
Committed: Fri Oct 21 15:28:42 2016 -0400
----------------------------------------------------------------------
poms/compiled/pom.xml | 80 ---------------------------------------
poms/pom.xml | 94 ----------------------------------------------
poms/wrappers/pom.xml | 72 -----------------------------------
provision/pom.xml | 42 ---------------------
4 files changed, 288 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/7aaba1e9/poms/compiled/pom.xml
----------------------------------------------------------------------
diff --git a/poms/compiled/pom.xml b/poms/compiled/pom.xml
deleted file mode 100644
index 9a07a5c..0000000
--- a/poms/compiled/pom.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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="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">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.streams.build</groupId>
- <artifactId>shared-plugin-settings</artifactId>
- <version>0.1-SNAPSHOT</version>
- </parent>
-
- <artifactId>compiled-bundle-settings</artifactId>
-
- <name>${project.artifactId}</name>
-
- <packaging>pom</packaging>
-
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- <!--
- | example additional resource entries, useful when building Eclipse RCP applications
- -->
- <resource>
- <directory>.</directory>
- <includes>
- <include>plugin.xml</include>
- <include>plugin.properties</include>
- <include>icons/**</include>
- </includes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <!--
- | the following instructions build a simple set of public/private classes into an OSGi bundle
- -->
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${bundle.symbolicName}</Bundle-SymbolicName>
- <Bundle-Version>${project.version}</Bundle-Version>
- <!--
- | assume public classes are in the top package, and private classes are under ".impl"
- -->
- <Export-Package>!${bundle.namespace}.internal.*,${bundle.namespace}.*;version="${project.version}"</Export-Package>
- <Private-Package>${bundle.namespace}.internal.*</Private-Package>
- <!--
- | each module can override these defaults in their osgi.bnd file
- -->
- <_include>-osgi.bnd</_include>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/7aaba1e9/poms/pom.xml
----------------------------------------------------------------------
diff --git a/poms/pom.xml b/poms/pom.xml
deleted file mode 100644
index 7ebe61d..0000000
--- a/poms/pom.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ 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
- ~
- ~ 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="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">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.streams</groupId>
- <artifactId>streams-project</artifactId>
- <version>0.1-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.streams.build</groupId>
- <artifactId>shared-plugin-settings</artifactId>
-
- <name>${project.artifactId}</name>
-
- <packaging>pom</packaging>
-
- <modules>
- <module>wrappers</module>
- <module>compiled</module>
- </modules>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.ops4j</groupId>
- <artifactId>maven-pax-plugin</artifactId>
- <!--
- | enable improved OSGi compilation support for the bundle life-cycle.
- | to switch back to the standard bundle life-cycle, move this setting
- | down to the maven-bundle-plugin section
- -->
- <extensions>true</extensions>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.3</version>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <!--
- | dependency pom representing the global classpath of imported bundles
- -->
- <type>pom</type>
- <groupId>org.apache.streams.build</groupId>
- <artifactId>provision</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_core</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_compendium</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/7aaba1e9/poms/wrappers/pom.xml
----------------------------------------------------------------------
diff --git a/poms/wrappers/pom.xml b/poms/wrappers/pom.xml
deleted file mode 100644
index ec9488f..0000000
--- a/poms/wrappers/pom.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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="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">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.streams.build</groupId>
- <artifactId>shared-plugin-settings</artifactId>
- <version>0.1-SNAPSHOT</version>
- </parent>
-
- <artifactId>wrapper-bundle-settings</artifactId>
-
- <name>${project.artifactId}</name>
-
- <!--
- | don't apply project details to wrapped jars
- -->
- <organization/>
- <description>
- Simple OSGi wrapper around third-party jar(s)
- </description>
-
- <packaging>pom</packaging>
-
- <build>
- <plugins>
- <plugin>
- <!--
- | the following instructions are optimized for wrapping third-party libraries as OSGi bundles
- -->
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${bundle.symbolicName}</Bundle-SymbolicName>
- <Bundle-Version>${wrapped.version}</Bundle-Version>
- <!--
- | export wrapped contents: don't use Export-Package:* as this bundles everything on the classpath
- -->
- <_exportcontents>*</_exportcontents>
- <Private-Package>!*</Private-Package>
- <!--
- | each module can override these defaults in their osgi.bnd file
- -->
- <_include>-osgi.bnd</_include>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/7aaba1e9/provision/pom.xml
----------------------------------------------------------------------
diff --git a/provision/pom.xml b/provision/pom.xml
deleted file mode 100644
index bc8ca76..0000000
--- a/provision/pom.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ 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
- ~
- ~ 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="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">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.streams</groupId>
- <artifactId>streams-project</artifactId>
- <version>0.1-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.streams.build</groupId>
- <artifactId>provision</artifactId>
- <name>${project.artifactId}</name>
-
- <packaging>pom</packaging>
-
- <!--
- | imported (non-local) bundles are listed here as dependencies
- | and will be deployed by pax:provision unless they are marked
- | with <optional>true</optional>
- -->
-
-</project>