Changing the SSH key converter to BUCK
Since we're a BUCK shop, convert the SSH key converter accordingly. This requires we mark Bouncy Castle as unsign, even though we do not include this in our normal Gerrit builds. Also, we had to add slf4j-nop, since this app doesn't require logging. Change-Id: I85031192f9172a90512d5f28cf1621c10ad6ebf4
This commit is contained in:
20
contrib/convertkey/BUCK
Normal file
20
contrib/convertkey/BUCK
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
include_defs('//lib/maven.defs')
|
||||||
|
|
||||||
|
java_library(
|
||||||
|
name = 'convertkey__lib',
|
||||||
|
srcs = glob(['src/main/java/**/*.java']),
|
||||||
|
deps = [
|
||||||
|
'//lib:jsch',
|
||||||
|
'//lib/bouncycastle:bcprov',
|
||||||
|
'//lib/bouncycastle:bcpkix',
|
||||||
|
'//lib/log:nop',
|
||||||
|
'//lib/mina:sshd',
|
||||||
|
],
|
||||||
|
)
|
||||||
|
|
||||||
|
java_binary(
|
||||||
|
name = 'convertkey',
|
||||||
|
deps = [':convertkey__lib'],
|
||||||
|
main_class = 'com.googlesource.gerrit.convertkey.ConvertKey',
|
||||||
|
)
|
||||||
|
|
@@ -1,89 +0,0 @@
|
|||||||
<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>
|
|
||||||
|
|
||||||
<groupId>com.googlesource.gerrit</groupId>
|
|
||||||
<artifactId>convertkey</artifactId>
|
|
||||||
<version>0.0.1-SNAPSHOT</version>
|
|
||||||
<packaging>jar</packaging>
|
|
||||||
|
|
||||||
<name>convertkey</name>
|
|
||||||
<url>http://maven.apache.org</url>
|
|
||||||
|
|
||||||
<build>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-dependency-plugin</artifactId>
|
|
||||||
<version>2.8</version>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>copy-dependencies</id>
|
|
||||||
<phase>prepare-package</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>copy-dependencies</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<outputDirectory>${project.build.directory}/lib</outputDirectory>
|
|
||||||
<overWriteReleases>false</overWriteReleases>
|
|
||||||
<overWriteSnapshots>false</overWriteSnapshots>
|
|
||||||
<overWriteIfNewer>true</overWriteIfNewer>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-jar-plugin</artifactId>
|
|
||||||
<version>2.4</version>
|
|
||||||
<configuration>
|
|
||||||
<archive>
|
|
||||||
<manifest>
|
|
||||||
<addClasspath>true</addClasspath>
|
|
||||||
<classpathPrefix>lib/</classpathPrefix>
|
|
||||||
<mainClass>com.googlesource.gerrit.convertkey.ConvertKey</mainClass>
|
|
||||||
</manifest>
|
|
||||||
</archive>
|
|
||||||
</configuration>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
|
|
||||||
<properties>
|
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
|
||||||
</properties>
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>junit</groupId>
|
|
||||||
<artifactId>junit</artifactId>
|
|
||||||
<version>3.8.1</version>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.sshd</groupId>
|
|
||||||
<artifactId>sshd-core</artifactId>
|
|
||||||
<version>0.14.0</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.bouncycastle</groupId>
|
|
||||||
<artifactId>bcprov-jdk15on</artifactId>
|
|
||||||
<version>1.52</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.bouncycastle</groupId>
|
|
||||||
<artifactId>bcpkix-jdk15on</artifactId>
|
|
||||||
<version>1.52</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.jcraft</groupId>
|
|
||||||
<artifactId>jsch</artifactId>
|
|
||||||
<version>0.1.53</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.slf4j</groupId>
|
|
||||||
<artifactId>slf4j-nop</artifactId>
|
|
||||||
<version>1.7.12</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
</project>
|
|
@@ -8,6 +8,7 @@ maven_jar(
|
|||||||
name = 'bcprov',
|
name = 'bcprov',
|
||||||
id = 'org.bouncycastle:bcprov-jdk15on:' + VERSION,
|
id = 'org.bouncycastle:bcprov-jdk15on:' + VERSION,
|
||||||
sha1 = '88a941faf9819d371e3174b5ed56a3f3f7d73269',
|
sha1 = '88a941faf9819d371e3174b5ed56a3f3f7d73269',
|
||||||
|
unsign = True,
|
||||||
license = 'DO_NOT_DISTRIBUTE', #'bouncycastle'
|
license = 'DO_NOT_DISTRIBUTE', #'bouncycastle'
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -23,6 +24,7 @@ maven_jar(
|
|||||||
name = 'bcpkix',
|
name = 'bcpkix',
|
||||||
id = 'org.bouncycastle:bcpkix-jdk15on:' + VERSION,
|
id = 'org.bouncycastle:bcpkix-jdk15on:' + VERSION,
|
||||||
sha1 = 'b8ffac2bbc6626f86909589c8cc63637cc936504',
|
sha1 = 'b8ffac2bbc6626f86909589c8cc63637cc936504',
|
||||||
|
unsign = True,
|
||||||
license = 'DO_NOT_DISTRIBUTE', #'bouncycastle'
|
license = 'DO_NOT_DISTRIBUTE', #'bouncycastle'
|
||||||
deps = [':bcprov'],
|
deps = [':bcprov'],
|
||||||
)
|
)
|
||||||
|
@@ -9,6 +9,14 @@ maven_jar(
|
|||||||
license = 'slf4j',
|
license = 'slf4j',
|
||||||
)
|
)
|
||||||
|
|
||||||
|
maven_jar(
|
||||||
|
name = 'nop',
|
||||||
|
id = 'org.slf4j:slf4j-nop:' + VER,
|
||||||
|
sha1 = '6cca9a3b999ff28b7a35ca762b3197cd7e4c2ad1',
|
||||||
|
license = 'slf4j',
|
||||||
|
deps = [':api'],
|
||||||
|
)
|
||||||
|
|
||||||
maven_jar(
|
maven_jar(
|
||||||
name = 'impl_log4j',
|
name = 'impl_log4j',
|
||||||
id = 'org.slf4j:slf4j-log4j12:' + VER,
|
id = 'org.slf4j:slf4j-log4j12:' + VER,
|
||||||
|
Reference in New Issue
Block a user