aboutsummaryrefslogtreecommitdiffstats
path: root/appc-adapters/appc-ssh-adapter
diff options
context:
space:
mode:
authorPatrick Brady <pb071s@att.com>2018-08-09 12:05:53 -0700
committerPatrick Brady <pb071s@att.com>2018-08-13 16:50:30 -0700
commit3222908ff0b148698d23f5cb3e9402d7f1a662a2 (patch)
treee6166b00be5282ea9741dc10858de7d40499eff3 /appc-adapters/appc-ssh-adapter
parent606d4e7599bb9df1c4d13b4f8ff2c8df1e151c94 (diff)
Karaf 4 for appc-dg features
Including appc-dg-util, appc-dg-shared, and appc-ssh-adapter Change-Id: Ia137a87c560438d23f7858e0f4068717891be076 Signed-off-by: Patrick Brady <pb071s@att.com> Issue-ID: APPC-1137
Diffstat (limited to 'appc-adapters/appc-ssh-adapter')
-rw-r--r--appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/pom.xml12
-rw-r--r--appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/features-appc-ssh-adapter/.gitignore1
-rw-r--r--appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/features-appc-ssh-adapter/pom.xml48
-rw-r--r--appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/onap-appc-ssh-adapter/.gitignore1
-rw-r--r--appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/onap-appc-ssh-adapter/pom.xml94
-rw-r--r--appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/pom.xml118
-rw-r--r--appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/pom.xml18
-rw-r--r--appc-adapters/appc-ssh-adapter/appc-ssh-adapter-tests/pom.xml14
-rw-r--r--appc-adapters/appc-ssh-adapter/pom.xml14
9 files changed, 213 insertions, 107 deletions
diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/pom.xml b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/pom.xml
index 632d1415e..fdba33fcd 100644
--- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/pom.xml
+++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/pom.xml
@@ -21,11 +21,13 @@
-->
<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.onap.appc</groupId>
- <artifactId>appc-ssh-adapter</artifactId>
- <version>1.4.0-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.onap.appc.parent</groupId>
+ <artifactId>binding-parent</artifactId>
+ <version>1.4.0-SNAPSHOT</version>
+ <relativePath />
+ </parent>
+ <groupId>org.onap.appc</groupId>
<artifactId>appc-ssh-adapter-api</artifactId>
<packaging>bundle</packaging>
diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/features-appc-ssh-adapter/.gitignore b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/features-appc-ssh-adapter/.gitignore
new file mode 100644
index 000000000..eacf31a67
--- /dev/null
+++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/features-appc-ssh-adapter/.gitignore
@@ -0,0 +1 @@
+/target-ide/
diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/features-appc-ssh-adapter/pom.xml b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/features-appc-ssh-adapter/pom.xml
new file mode 100644
index 000000000..858655228
--- /dev/null
+++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/features-appc-ssh-adapter/pom.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+============LICENSE_START=======================================================
+ONAP : APPC
+================================================================================
+Copyright (C) 2018 AT&T Intellectual Property. 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.
+============LICENSE_END=========================================================
+-->
+<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.onap.appc.parent</groupId>
+ <artifactId>feature-repo-parent</artifactId>
+ <version>1.4.0-SNAPSHOT</version>
+ <relativePath />
+ </parent>
+
+ <groupId>org.onap.appc</groupId>
+ <artifactId>features-appc-ssh-adapter</artifactId>
+ <version>1.4.0-SNAPSHOT</version>
+ <packaging>feature</packaging>
+
+ <name></name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.onap.appc</groupId>
+ <artifactId>onap-appc-ssh-adapter</artifactId>
+ <version>${project.version}</version>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </dependency>
+
+ </dependencies>
+</project>
diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/onap-appc-ssh-adapter/.gitignore b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/onap-appc-ssh-adapter/.gitignore
new file mode 100644
index 000000000..eacf31a67
--- /dev/null
+++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/onap-appc-ssh-adapter/.gitignore
@@ -0,0 +1 @@
+/target-ide/
diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/onap-appc-ssh-adapter/pom.xml b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/onap-appc-ssh-adapter/pom.xml
new file mode 100644
index 000000000..9967cfb69
--- /dev/null
+++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/onap-appc-ssh-adapter/pom.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+============LICENSE_START=======================================================
+ONAP : APPC
+================================================================================
+Copyright (C) 2018 AT&T Intellectual Property. 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.
+============LICENSE_END=========================================================
+-->
+<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.onap.appc.parent</groupId>
+ <artifactId>single-feature-parent</artifactId>
+ <version>1.4.0-SNAPSHOT</version>
+ <relativePath />
+ </parent>
+
+ <groupId>org.onap.appc</groupId>
+ <artifactId>onap-appc-ssh-adapter</artifactId>
+ <version>1.4.0-SNAPSHOT</version>
+ <packaging>feature</packaging>
+
+ <name></name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.onap.appc</groupId>
+ <artifactId>onap-appc-core</artifactId>
+ <version>${project.version}</version>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.onap.appc</groupId>
+ <artifactId>appc-ssh-adapter-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.onap.appc</groupId>
+ <artifactId>appc-ssh-adapter-sshd</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sshd</groupId>
+ <artifactId>sshd-core</artifactId>
+ <version>2.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sshd</groupId>
+ <artifactId>sshd-sftp</artifactId>
+ <version>2.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sshd</groupId>
+ <artifactId>sshd-scp</artifactId>
+ <version>2.0.0</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>karaf-maven-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <includeTransitiveDependency>false</includeTransitiveDependency>
+ <excludedArtifactIds>
+ <excludedArtifactId>slf4j-api</excludedArtifactId>
+ <excludedArtifactId>tomcat-jdbc</excludedArtifactId>
+ <excludedArtifactId>tomcat-juli</excludedArtifactId>
+ <excludedArtifactId>httpcore</excludedArtifactId>
+ <excludedArtifactId>httpclient</excludedArtifactId>
+ <excludedArtifactId>org.eclipse.osgi</excludedArtifactId>
+
+ </excludedArtifactIds>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/pom.xml b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/pom.xml
index 3f38bd1df..840cb4469 100644
--- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/pom.xml
+++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/pom.xml
@@ -1,92 +1,42 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ============LICENSE_START=======================================================
- ONAP : APPC
- ================================================================================
- Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
- Copyright (C) 2017 Amdocs
- ================================================================================
- 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.
- ============LICENSE_END=========================================================
- -->
+============LICENSE_START=======================================================
+ONAP : APPC
+================================================================================
+Copyright (C) 2018 AT&T Intellectual Property. 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.
+============LICENSE_END=========================================================
+-->
<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">
- <parent>
- <artifactId>appc-ssh-adapter</artifactId>
- <groupId>org.onap.appc</groupId>
- <version>1.4.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <artifactId>appc-ssh-adapter-features</artifactId>
- <packaging>jar</packaging>
+ <parent>
+ <groupId>org.onap.appc.parent</groupId>
+ <artifactId>odlparent-lite</artifactId>
+ <version>1.4.0-SNAPSHOT</version>
+ <relativePath />
+ </parent>
- <dependencies>
- <dependency>
- <groupId>org.onap.appc</groupId>
- <artifactId>appc-ssh-adapter-api</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <groupId>org.onap.appc</groupId>
+ <artifactId>appc-ssh-adapter-feature-aggregator</artifactId>
+ <version>1.4.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
- <dependency>
- <groupId>org.onap.appc</groupId>
- <artifactId>appc-ssh-adapter-sshd</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
+ <name></name>
- <build>
- <resources>
- <resource>
- <filtering>true</filtering>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>filter</id>
- <goals>
- <goal>resources</goal>
- </goals>
- <phase>generate-resources</phase>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-artifacts</id>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <artifacts>
- <artifact>
- <file>${project.build.directory}/classes/${features.file}</file>
- <type>xml</type>
- <classifier>features</classifier>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <modules>
+ <module>onap-appc-ssh-adapter</module>
+ <module>features-appc-ssh-adapter</module>
+ </modules>
</project>
diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/pom.xml b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/pom.xml
index 854e2d4ef..4d00b5763 100644
--- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/pom.xml
+++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/pom.xml
@@ -22,11 +22,13 @@
<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.onap.appc</groupId>
- <artifactId>appc-ssh-adapter</artifactId>
- <version>1.4.0-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.onap.appc.parent</groupId>
+ <artifactId>binding-parent</artifactId>
+ <version>1.4.0-SNAPSHOT</version>
+ <relativePath />
+ </parent>
+ <groupId>org.onap.appc</groupId>
<artifactId>appc-ssh-adapter-sshd</artifactId>
<packaging>bundle</packaging>
@@ -42,16 +44,19 @@
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-core</artifactId>
<scope>provided</scope>
+ <version>2.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-sftp</artifactId>
<scope>provided</scope>
+ <version>2.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-scp</artifactId>
<scope>provided</scope>
+ <version>2.0.0</version>
</dependency>
<dependency>
<groupId>com.att.eelf</groupId>
@@ -64,7 +69,7 @@
</dependency>
<dependency>
<groupId>org.onap.appc</groupId>
- <artifactId>appc-common</artifactId>
+ <artifactId>appc-common-bundle</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -86,6 +91,7 @@
<Import-Package>!org.apache.log,!org.apache.commons.logging,!groovy.lang,!javax.jms,!org.codehaus.commons.compiler,!org.codehaus.groovy.*,!org.codehaus.janino,!com.ibm.icu.*,!com.sun.faces.*,!org.jasypt.*,*</Import-Package>
<Embed-Dependency>!dblib-provider,jasypt,eelf-core,logback-core,logback-classic;scope=compile|runtime;inline=false</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
+ <_removeheaders>Import-Service</_removeheaders>
</instructions>
</configuration>
</plugin>
diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-tests/pom.xml b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-tests/pom.xml
index 7d23bafe5..e2cc2025f 100644
--- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-tests/pom.xml
+++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-tests/pom.xml
@@ -21,11 +21,13 @@
-->
<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.onap.appc</groupId>
- <artifactId>appc-ssh-adapter</artifactId>
- <version>1.4.0-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.onap.appc.parent</groupId>
+ <artifactId>binding-parent</artifactId>
+ <version>1.4.0-SNAPSHOT</version>
+ <relativePath />
+ </parent>
+ <groupId>org.onap.appc</groupId>
<artifactId>appc-ssh-adapter-tests</artifactId>
<dependencies>
@@ -41,4 +43,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-</project> \ No newline at end of file
+</project>
diff --git a/appc-adapters/appc-ssh-adapter/pom.xml b/appc-adapters/appc-ssh-adapter/pom.xml
index 87f479ad8..092d99e52 100644
--- a/appc-adapters/appc-ssh-adapter/pom.xml
+++ b/appc-adapters/appc-ssh-adapter/pom.xml
@@ -20,11 +20,13 @@
============LICENSE_END=========================================================
-->
<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">
- <parent>
- <artifactId>appc-adapters</artifactId>
- <groupId>org.onap.appc</groupId>
- <version>1.4.0-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.onap.appc.parent</groupId>
+ <artifactId>odlparent-lite</artifactId>
+ <version>1.4.0-SNAPSHOT</version>
+ <relativePath />
+ </parent>
+ <groupId>org.onap.appc</groupId>
<modelVersion>4.0.0</modelVersion>
<artifactId>appc-ssh-adapter</artifactId>
@@ -36,4 +38,4 @@
<module>appc-ssh-adapter-sshd</module>
<module>appc-ssh-adapter-features</module>
</modules>
-</project> \ No newline at end of file
+</project>