Repository: karaf Updated Branches: refs/heads/karaf-3.0.x 025c45f69 -> 100161d4e
[KARAF-3621]lit bit clean up Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/100161d4 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/100161d4 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/100161d4 Branch: refs/heads/karaf-3.0.x Commit: 100161d4e6cda3f60860b73b698e974bb12d9de1 Parents: 025c45f Author: Freeman Fang <[email protected]> Authored: Wed May 13 14:47:27 2015 +0800 Committer: Freeman Fang <[email protected]> Committed: Wed May 13 14:47:27 2015 +0800 ---------------------------------------------------------------------- .../resources/OSGI-INF/metatype/metatype.xml | 4 +- tooling/karaf-maven-plugin/pom.xml | 41 ++++++++++++++++++++ 2 files changed, 43 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/100161d4/shell/ssh/src/main/resources/OSGI-INF/metatype/metatype.xml ---------------------------------------------------------------------- diff --git a/shell/ssh/src/main/resources/OSGI-INF/metatype/metatype.xml b/shell/ssh/src/main/resources/OSGI-INF/metatype/metatype.xml index 79b2f63..d8b46fb 100644 --- a/shell/ssh/src/main/resources/OSGI-INF/metatype/metatype.xml +++ b/shell/ssh/src/main/resources/OSGI-INF/metatype/metatype.xml @@ -23,8 +23,8 @@ <AD id="sshHost" type="String" default="0.0.0.0" name="%sshHost.name" description="%sshHost.description"/> <AD id="sshRealm" type="String" default="karaf" name="%sshRealm.name" description="%sshRealm.description"/> <AD id="hostKey" type="String" default="${karaf.etc}/host.key" name="%hostKey.name" description="%hostKey.description"/> - <AD id="keySize" type="Integer" default="1024" name="%keySize.name" description="%keySize.description"/> - <AD id="algorithm" type="String" default="DSA" name="%algorithm.name" description="%algorithm.description"/> + <AD id="keySize" type="Integer" default="4096" name="%keySize.name" description="%keySize.description"/> + <AD id="algorithm" type="String" default="RSA" name="%algorithm.name" description="%algorithm.description"/> </OCD> <Designate pid="org.apache.karaf.shell"> <Object ocdref="org.apache.karaf.shell"/> http://git-wip-us.apache.org/repos/asf/karaf/blob/100161d4/tooling/karaf-maven-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/karaf-maven-plugin/pom.xml b/tooling/karaf-maven-plugin/pom.xml index d9db29f..f74171e 100644 --- a/tooling/karaf-maven-plugin/pom.xml +++ b/tooling/karaf-maven-plugin/pom.xml @@ -178,6 +178,47 @@ <build> <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-invoker-plugin</artifactId> + <version>1.6</version> + <configuration> + <debug>true</debug> + <projectsDirectory>src/it</projectsDirectory> + <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo> + <pomExcludes> + <pomExclude>test-check-dependencies-failure/pom.xml</pomExclude> + </pomExcludes> + <pomIncludes> + <pomInclude>*/pom.xml</pomInclude> + </pomIncludes> + <postBuildHookScript>verify</postBuildHookScript> + <localRepositoryPath>${project.build.directory}/system</localRepositoryPath> + <!--<settingsFile>src/it/settings.xml</settingsFile>--> + <mavenOpts>-Djava.io.tmpdir=${project.build.directory}</mavenOpts> + <skipInstallation>${skipTests}</skipInstallation> + <skipInvocation>${skipTests}</skipInvocation> + <goals> + <goal>install</goal> + </goals> + </configuration> + <executions> + <execution> + <id>integration-test</id> + <goals> + <goal>install</goal> + <goal>run</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>xmlunit</groupId> + <artifactId>xmlunit</artifactId> + <version>1.3</version> + </dependency> + </dependencies> + </plugin> </plugins> </build>
