Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@profhenry
profhenry committed Dec 21, 2023
1 parent 644dca6 commit 31fd670
Show file tree
Hide file tree
Showing 5 changed files with 60 additions and 47 deletions.
11 changes: 8 additions & 3 deletions bcprov/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,27 @@
</parent>

<artifactId>sshsig-bcprov</artifactId>
<name>SSHSIG :: Tests for org.bouncycastle:bcprov</name>

<properties>
<maven.source.skip>true</maven.source.skip>
<maven.javadoc.skip>true</maven.javadoc.skip>
<maven.install.skip>true</maven.install.skip>
<maven.deploy.skip>true</maven.deploy.skip>
</properties>

<dependencies>
<!-- TESTING =============================================================================================== -->
<dependency>
<groupId>de.profhenry.sshsig</groupId>
<artifactId>sshsig-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
<artifactId>bcprov-debug-jdk18on</artifactId>
<scope>test</scope>
</dependency>

<!-- TESTING =============================================================================================== -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
Expand Down
37 changes: 0 additions & 37 deletions core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,41 +43,4 @@
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<executions>
<!--
<execution>
<id>test-jdk8</id>
<phase>test</phase>
<goals>
<goal>test</goal>
</goals>
<configuration>
<jdkToolchain>
<version>1.8</version>
</jdkToolchain>
</configuration>
</execution>
-->
<execution>
<id>test-jdk17</id>
<phase>test</phase>
<goals>
<goal>test</goal>
</goals>
<configuration>
<jdkToolchain>
<version>17</version>
</jdkToolchain>
<reportsDirectory>${project.build.directory}/surefire-reports/jkd17</reportsDirectory>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

</project>
9 changes: 7 additions & 2 deletions i2pcrypto/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,27 @@
</parent>

<artifactId>sshsig.i2pcrypto</artifactId>
<name>SSHSIG :: Tests for net.i2p.crypto:eddsa</name>

<properties>
<maven.source.skip>true</maven.source.skip>
<maven.javadoc.skip>true</maven.javadoc.skip>
<maven.install.skip>true</maven.install.skip>
<maven.deploy.skip>true</maven.deploy.skip>
</properties>

<dependencies>
<!-- TESTING =============================================================================================== -->
<dependency>
<groupId>de.profhenry.sshsig</groupId>
<artifactId>sshsig-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.i2p.crypto</groupId>
<artifactId>eddsa</artifactId>
<scope>test</scope>
</dependency>

<!-- TESTING =============================================================================================== -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion mina/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</parent>

<artifactId>sshsig-mina</artifactId>
<name>SSHSIG :: (Apache Mina SSH-Agent Support)</name>
<name>SSHSIG :: Apache Mina SSH-Agent Support</name>

<dependencies>
<dependency>
Expand Down
48 changes: 44 additions & 4 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>SSHSIG :: Parent</name>
<description>
Java implementation of the OpenSSH lightweight signature (and verification) ability.
</description>
Expand Down Expand Up @@ -85,15 +86,14 @@
<artifactId>slf4j-api</artifactId>
<version>${version.slf4j}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/net.i2p.crypto/eddsa -->
<dependency>
<groupId>net.i2p.crypto</groupId>
<artifactId>eddsa</artifactId>
<version>0.3.0</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
<artifactId>bcprov-debug-jdk18on</artifactId>
<version>1.76</version>
</dependency>
<dependency>
Expand Down Expand Up @@ -129,10 +129,10 @@
</dependencyManagement>

<modules>
<module>bcprov</module>
<module>core</module>
<module>i2pcrypto</module>
<module>mina</module>
<module>bcprov</module>
<module>i2pcrypto</module>
</modules>

<build>
Expand All @@ -142,12 +142,52 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.2.2</version>
<executions>
<execution>
<id>default-test</id>
<phase>never</phase>
</execution>
<execution>
<id>junit-jdk8</id>
<phase>test</phase>
<goals>
<goal>test</goal>
</goals>
<configuration>
<jdkToolchain>
<version>8</version>
</jdkToolchain>
<reportsDirectory>${project.build.directory}/surefire-reports/jdk8</reportsDirectory>
</configuration>
</execution>
<execution>
<id>junit-jdk17</id>
<phase>test</phase>
<goals>
<goal>test</goal>
</goals>
<configuration>
<jdkToolchain>
<version>17</version>
</jdkToolchain>
<reportsDirectory>${project.build.directory}/surefire-reports/jdk17</reportsDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-toolchains-plugin</artifactId>
<version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.3.0</version>
<configuration>
<skipIfEmpty>true</skipIfEmpty>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
Expand Down

0 comments on commit 31fd670

Please sign in to comment.