Repository: jclouds-karaf Updated Branches: refs/heads/fix-script-engine 6c0c7e6e8 -> 31190dabc (forced update)
JCLOUDS-1156: Shade the jsch-agentproxy-jsch bundle Create a shaded bundle from the jsch-agentproxy-jsch to remove the export that exposes core classes already exported by other bundles. Project: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/commit/00ff5d21 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/tree/00ff5d21 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/diff/00ff5d21 Branch: refs/heads/fix-script-engine Commit: 00ff5d211a3f1b41ee2853ee527818ffd7beba2d Parents: 960a9c7 Author: Ignasi Barrera <[email protected]> Authored: Thu Sep 1 16:07:03 2016 +0200 Committer: Ignasi Barrera <[email protected]> Committed: Thu Sep 8 10:32:23 2016 +0200 ---------------------------------------------------------------------- bundles/jsch-agentproxy-jsch/pom.xml | 94 +++++++++++++++++++++++++++++ bundles/pom.xml | 36 +++++++++++ feature/src/main/resources/feature.xml | 2 +- pom.xml | 6 +- 4 files changed, 132 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/00ff5d21/bundles/jsch-agentproxy-jsch/pom.xml ---------------------------------------------------------------------- diff --git a/bundles/jsch-agentproxy-jsch/pom.xml b/bundles/jsch-agentproxy-jsch/pom.xml new file mode 100644 index 0000000..7a858cb --- /dev/null +++ b/bundles/jsch-agentproxy-jsch/pom.xml @@ -0,0 +1,94 @@ +<?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/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.jclouds.karaf</groupId> + <artifactId>bundles</artifactId> + <version>2.0.0-SNAPSHOT</version> + </parent> + + <groupId>org.apache.jclouds.karaf.bundles</groupId> + <artifactId>jsch-agentproxy-jsch</artifactId> + <name>jclouds :: Karaf :: JSch Agentproxy for JSch (shaded bundle)</name> + <packaging>bundle</packaging> + + <dependencies> + <dependency> + <groupId>org.apache.servicemix.bundles</groupId> + <artifactId>org.apache.servicemix.bundles.jsch-agentproxy-jsch</artifactId> + <version>${jsch.agentproxy.bundle.version}</version> + </dependency> + </dependencies> + + <properties> + <import.packages> + ft.jzlib;resolution:=optional;version="[1.1,2)", + keypairgen;resolution:=optional, + signature;resolution:=optional, + userauth;resolution:=optional, + org.ietf.jgss;resolution:=optional, + javax.crypto, + javax.crypto.interfaces, + javax.crypto.spec, + javax.naming, + javax.naming.directory, + javax.net, + javax.security.auth.x500 + </import.packages> + </properties> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <configuration> + <instructions> + <Import-Package>${import.packages}</Import-Package> + </instructions> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <version>2.4.3</version> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <!-- the RAT plugin complains if we use the default location and we don't want it in the SCM --> + <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation> + <artifactSet> + <includes> + <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jsch-agentproxy-jsch</include> + </includes> + </artifactSet> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/00ff5d21/bundles/pom.xml ---------------------------------------------------------------------- diff --git a/bundles/pom.xml b/bundles/pom.xml new file mode 100644 index 0000000..087d08b --- /dev/null +++ b/bundles/pom.xml @@ -0,0 +1,36 @@ +<?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/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.jclouds</groupId> + <artifactId>jclouds-karaf</artifactId> + <version>2.0.0-SNAPSHOT</version> + </parent> + + <groupId>org.apache.jclouds.karaf</groupId> + <artifactId>bundles</artifactId> + <name>jclouds :: Karaf :: Bundles</name> + <packaging>pom</packaging> + + <modules> + <module>jsch-agentproxy-jsch</module> + </modules> + +</project> http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/00ff5d21/feature/src/main/resources/feature.xml ---------------------------------------------------------------------- diff --git a/feature/src/main/resources/feature.xml b/feature/src/main/resources/feature.xml index 44c536d..fb361a6 100644 --- a/feature/src/main/resources/feature.xml +++ b/feature/src/main/resources/feature.xml @@ -398,7 +398,7 @@ limitations under the License. <feature version='${project.version}'>jclouds-compute</feature> <feature version='${project.version}'>jclouds-blobstore</feature> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsch/${jsch.bundle.version}</bundle> - <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsch-agentproxy-jsch/${jsch.agentproxy.bundle.version}</bundle> + <bundle dependency='true'>mvn:org.apache.jclouds.karaf.bundles/jsch-agentproxy-jsch/${project.version}</bundle> <bundle dependency='true'>mvn:com.jcraft/jsch.agentproxy.connector-factory/${jsch.agentproxy.version}</bundle> <bundle dependency='true'>mvn:com.jcraft/jsch.agentproxy.usocket-nc/${jsch.agentproxy.version}</bundle> <bundle dependency='true'>mvn:com.jcraft/jsch.agentproxy.sshagent/${jsch.agentproxy.version}</bundle> http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/00ff5d21/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index feeb07c..e207e52 100644 --- a/pom.xml +++ b/pom.xml @@ -169,6 +169,7 @@ limitations under the License. <modules> <module>core</module> + <module>bundles</module> <module>utils</module> <module>cache</module> <module>commands</module> @@ -468,11 +469,6 @@ limitations under the License. <!-- JSch agentproxy --> <dependency> - <groupId>org.apache.servicemix.bundles</groupId> - <artifactId>org.apache.servicemix.bundles.jsch-agentproxy-jsch</artifactId> - <version>${jsch.agentproxy.bundle.version}</version> - </dependency> - <dependency> <groupId>com.jcraft</groupId> <artifactId>jsch.agentproxy.connector-factory</artifactId> <version>${jsch.agentproxy.version}</version>
