You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2013/07/15 18:01:14 UTC
[1/2] git commit: correcting adc instanceinfo dependency
Updated Branches:
refs/heads/master a7f1343eb -> 77eb0844f
correcting adc instanceinfo dependency
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/088b7496
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/088b7496
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/088b7496
Branch: refs/heads/master
Commit: 088b7496f61f5d88c0591de6f2d74db3e60d5f64
Parents: 33b78e1
Author: Isuru <is...@wso2.com>
Authored: Mon Jul 15 21:30:09 2013 +0530
Committer: Isuru <is...@wso2.com>
Committed: Mon Jul 15 21:30:09 2013 +0530
----------------------------------------------------------------------
.../pom.xml | 43 +++++++++++---------
1 file changed, 23 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/088b7496/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/pom.xml b/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/pom.xml
index b643c2c..b8e5fea 100644
--- a/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/pom.xml
+++ b/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/pom.xml
@@ -1,18 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ Licensed 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.
+ 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"
@@ -49,9 +52,9 @@
<version>${axiom.wso2.version}</version>
</dependency>
<dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.adc.instanceinfo.mgt.stub</artifactId>
- <version>4.1.1</version>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.adc.instanceinfo.mgt.stub</artifactId>
+ <version>${apache.stratos.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.osgi</groupId>
@@ -134,11 +137,11 @@
</properties>
</adviceFile>
<bundles>
- <bundleDef>org.apache.stratos:org.apache.stratos.cartridge.agent</bundleDef>
- <bundleDef>org.wso2.carbon:org.wso2.carbon.utils:4.1.0</bundleDef>
+ <bundleDef>org.apache.stratos:org.apache.stratos.cartridge.agent:${apache.stratos.version}</bundleDef>
+ <bundleDef>org.wso2.carbon:org.wso2.carbon.utils:${wso2carbon.version}</bundleDef>
<bundleDef>org.eclipse.osgi:org.eclipse.osgi.services</bundleDef>
- <bundleDef>org.wso2.carbon:org.wso2.carbon.adc.instanceinfo.mgt.stub</bundleDef>
- <bundleDef>org.apache.axis2.wso2:axis2</bundleDef>
+ <bundleDef>org.apache.stratos:org.apache.stratos.adc.instanceinfo.mgt.stub:${apache.stratos.version}</bundleDef>
+ <bundleDef>org.apache.axis2.wso2:axis2:${axis2.wso2.version}</bundleDef>
<bundleDef>org.apache.rampart.wso2:rampart-policy</bundleDef>
<bundleDef>org.apache.rampart.wso2:rampart-core</bundleDef>
<bundleDef>org.apache.rampart.wso2:rampart-trust</bundleDef>
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos into features
Posted by is...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos into features
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/77eb0844
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/77eb0844
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/77eb0844
Branch: refs/heads/master
Commit: 77eb0844fff54b43577c1d2d9c10a1f5936f5334
Parents: 088b749 a7f1343
Author: Isuru <is...@wso2.com>
Authored: Mon Jul 15 21:30:29 2013 +0530
Committer: Isuru <is...@wso2.com>
Committed: Mon Jul 15 21:30:29 2013 +0530
----------------------------------------------------------------------
.../pom.xml | 138 +++++++++++++++++++
.../InstanceInformationManagementService.wsdl | 65 +++++++++
.../org.apache.stratos.theme.mgt.stub/pom.xml | 20 +++
.../4.1.1/pom.xml | 119 ----------------
.../InstanceInformationManagementService.wsdl | 65 ---------
service-stubs/pom.xml | 1 +
6 files changed, 224 insertions(+), 184 deletions(-)
----------------------------------------------------------------------