Repository: stratos Updated Branches: refs/heads/docker-integration d789aa66c -> 12ed2dc7e
Including Carbon Kernal patch 0005-0008 Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/12ed2dc7 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/12ed2dc7 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/12ed2dc7 Branch: refs/heads/docker-integration Commit: 12ed2dc7eafb1e204a9fc6b01f437aaa79abc01e Parents: de34582 Author: lasinducharith <[email protected]> Authored: Tue Sep 23 12:30:46 2014 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Wed Sep 24 17:00:43 2014 +0530 ---------------------------------------------------------------------- .../modules/distribution/src/assembly/bin.xml | 31 ++++++++ products/stratos/modules/p2-profile-gen/pom.xml | 76 ++++++++++++++++++++ products/stratos/pom.xml | 4 ++ 3 files changed, 111 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/12ed2dc7/products/stratos/modules/distribution/src/assembly/bin.xml ---------------------------------------------------------------------- diff --git a/products/stratos/modules/distribution/src/assembly/bin.xml b/products/stratos/modules/distribution/src/assembly/bin.xml index b7b91d2..e244ea4 100755 --- a/products/stratos/modules/distribution/src/assembly/bin.xml +++ b/products/stratos/modules/distribution/src/assembly/bin.xml @@ -417,6 +417,37 @@ <include>**/patch0004/*.*</include> </includes> </fileSet> + <fileSet> + <directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0005</directory> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/components/patches</outputDirectory> + <includes> + <include>**/patch0005/*.*</include> + </includes> + </fileSet> + <fileSet> + <directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0006</directory> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/components/patches</outputDirectory> + <includes> + <include>**/patch0006/*.*</include> + </includes> + </fileSet> + <fileSet> + <directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0007</directory> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/components/patches</outputDirectory> + <excludes> + <exclude>**/org.wso2.carbon.ui_4.2.0.jar</exclude> + </excludes> + <includes> + <include>**/patch0007/*.*</include> + </includes> + </fileSet> + <fileSet> + <directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0008</directory> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/components/patches</outputDirectory> + <includes> + <include>**/patch0008/*.*</include> + </includes> + </fileSet> <fileSet> <directory>../../dbscripts/</directory> <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts</outputDirectory> http://git-wip-us.apache.org/repos/asf/stratos/blob/12ed2dc7/products/stratos/modules/p2-profile-gen/pom.xml ---------------------------------------------------------------------- diff --git a/products/stratos/modules/p2-profile-gen/pom.xml b/products/stratos/modules/p2-profile-gen/pom.xml index 4c19f7b..54c20e6 100644 --- a/products/stratos/modules/p2-profile-gen/pom.xml +++ b/products/stratos/modules/p2-profile-gen/pom.xml @@ -135,7 +135,83 @@ </artifactItems> </configuration> </execution> + <execution> + <id>unpack-kernel-patch-0005</id> + <phase>test</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>WSO2-CARBON-PATCH-4.2.0</artifactId> + <version>0005</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + <execution> + <id>unpack-kernel-patch-0006</id> + <phase>test</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>WSO2-CARBON-PATCH-4.2.0</artifactId> + <version>0006</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> <execution> + <id>unpack-kernel-patch-0007</id> + <phase>test</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>WSO2-CARBON-PATCH-4.2.0</artifactId> + <version>0007</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + <execution> + <id>unpack-kernel-patch-0008</id> + <phase>test</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>WSO2-CARBON-PATCH-4.2.0</artifactId> + <version>0008</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + <execution> <id>unpack-equinox-executable</id> <phase>test</phase> <goals> http://git-wip-us.apache.org/repos/asf/stratos/blob/12ed2dc7/products/stratos/pom.xml ---------------------------------------------------------------------- diff --git a/products/stratos/pom.xml b/products/stratos/pom.xml index c13eb9e..842c480 100755 --- a/products/stratos/pom.xml +++ b/products/stratos/pom.xml @@ -303,6 +303,10 @@ <carbon.platform.patch.version.4.2.2>4.2.2</carbon.platform.patch.version.4.2.2> <carbon.platform.patch.version.4.2.3>4.2.3</carbon.platform.patch.version.4.2.3> <carbon.platform.patch.version.4.2.4>4.2.4</carbon.platform.patch.version.4.2.4> + <carbon.platform.patch.version.4.2.5>4.2.5</carbon.platform.patch.version.4.2.5> + <carbon.platform.patch.version.4.2.6>4.2.6</carbon.platform.patch.version.4.2.6> + <carbon.platform.patch.version.4.2.7>4.2.7</carbon.platform.patch.version.4.2.7> + <carbon.platform.patch.version.4.2.8>4.2.8</carbon.platform.patch.version.4.2.8> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <opencsv.version>1.8</opencsv.version> <poi.version>3.0-FINAL</poi.version>
