[java-idp-plugin-duo] branch master updated: Minor Javadoc improvements. Add second 'bare' distribution.
Phil Smart
philip.smart at jisc.ac.uk
Thu Jul 16 19:45:18 UTC 2020
This is an automated email from the git hooks/post-receive script.
philsmart pushed a commit to branch master
in repository java-idp-plugin-duo.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-duo.git;a=commit;h=1cb62a301bf3a734a7ca346c15397f2ecf26d226
The following commit(s) were added to refs/heads/master by this push:
new 1cb62a3 Minor Javadoc improvements. Add second 'bare' distribution.
1cb62a3 is described below
commit 1cb62a301bf3a734a7ca346c15397f2ecf26d226
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Thu Jul 16 20:45:16 2020 +0100
Minor Javadoc improvements. Add second 'bare' distribution.
Bare distribution does not contain the Duo SDK runtime.
---
.../idp/plugin/authn/duo/DuoOIDCClientFactory.java | 3 +-
idp-duo-distribution/pom.xml | 44 +++++++++++++++-------
.../{duo-assembly.xml => duo-bare-assembly.xml} | 30 ---------------
...uo-assembly.xml => duo-native-sdk-assembly.xml} | 32 +++++++---------
idp-duo-native-client-impl/pom.xml | 28 ++++++++++++--
.../authn/duo/sdk/impl/DuoSDKClientFactory.java | 4 +-
6 files changed, 74 insertions(+), 67 deletions(-)
diff --git a/idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/DuoOIDCClientFactory.java b/idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/DuoOIDCClientFactory.java
index d33791e..313c68d 100644
--- a/idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/DuoOIDCClientFactory.java
+++ b/idp-duo-api/src/main/java/net/shbboleth/idp/plugin/authn/duo/DuoOIDCClientFactory.java
@@ -33,6 +33,7 @@ public interface DuoOIDCClientFactory {
*
* @throws DuoClientException if there is an error creating the Duo client.
*/
- @Nonnull DuoOIDCClient createInstance(@Nonnull final DuoOIDCIntegration integration) throws DuoClientException;
+ @Nonnull DuoOIDCClient createInstance(@Nonnull final DuoOIDCIntegration integration)
+ throws DuoClientException;
}
diff --git a/idp-duo-distribution/pom.xml b/idp-duo-distribution/pom.xml
index 2221a81..3cb3eb5 100644
--- a/idp-duo-distribution/pom.xml
+++ b/idp-duo-distribution/pom.xml
@@ -1,14 +1,14 @@
<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>net.shibboleth.idp.plugin</groupId>
<artifactId>idp-plugin-duo-parent</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
-
+
<artifactId>idp-plugin-${plugin.base}-dist</artifactId>
<name>Shibboleth IdP :: Plugins :: Duo 2FA Login Flow Distribution</name>
<description>IdP Duo OIDC 2FA plugin packaging.</description>
@@ -16,7 +16,8 @@
<properties>
<checkstyle.configLocation>${project.basedir}/../checkstyle.xml</checkstyle.configLocation>
- <dist.finalName>shibboleth-idp-plugin-${plugin.base}-${project.version}</dist.finalName>
+ <dist.duosdk.finalName>shibboleth-idp-plugin-${plugin.base}-native-sdk-${project.version}</dist.duosdk.finalName>
+ <dist.bare.finalName>shibboleth-idp-plugin-${plugin.base}-bare-${project.version}</dist.bare.finalName>
</properties>
<build>
@@ -26,21 +27,38 @@
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
- <id>make-assembly</id>
+ <id>make-assembly-duo-sdk</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
+ <configuration>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>src/main/assembly/${plugin.base}-native-sdk-assembly.xml</descriptor>
+ </descriptors>
+ <finalName>${dist.duosdk.finalName}</finalName>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </execution>
+ <execution>
+ <!-- This could become a native Nimbus client etc. -->
+ <id>make-assembly-bare</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>src/main/assembly/${plugin.base}-bare-assembly.xml</descriptor>
+ </descriptors>
+ <finalName>${dist.bare.finalName}</finalName>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
</execution>
</executions>
- <configuration>
- <appendAssemblyId>false</appendAssemblyId>
- <descriptors>
- <descriptor>src/main/assembly/${plugin.base}-assembly.xml</descriptor>
- </descriptors>
- <finalName>${dist.finalName}</finalName>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
+
</plugin>
</plugins>
diff --git a/idp-duo-distribution/src/main/assembly/duo-assembly.xml b/idp-duo-distribution/src/main/assembly/duo-bare-assembly.xml
similarity index 60%
copy from idp-duo-distribution/src/main/assembly/duo-assembly.xml
copy to idp-duo-distribution/src/main/assembly/duo-bare-assembly.xml
index a5a2a14..d8129fc 100644
--- a/idp-duo-distribution/src/main/assembly/duo-assembly.xml
+++ b/idp-duo-distribution/src/main/assembly/duo-bare-assembly.xml
@@ -15,24 +15,6 @@
<include>**/*</include>
</includes>
</fileSet>
- <fileSet>
- <directory>../idp-duo-impl/target/dependency</directory>
- <outputDirectory>edit-webapp/WEB-INF/lib</outputDirectory>
- <includes>
- <include>duo-*.jar</include>
- <include>idp-plugin-duo-*.jar</include>
- <include>java-jwt-*.jar</include>
- <include>lombook-*.jar</include>
- <include>okhttp-*.jar</include>
- <include>okio-*.jar</include>
- <include>retrofit-*.jar</include>
- <include>jackson-*.jar</include>
- <include>converter-jackson-*.jar</include>
- </includes>
- <excludes>
- <exclude>*test*.jar</exclude>
- </excludes>
- </fileSet>
<fileSet>
<directory>../idp-duo-impl/target</directory>
<outputDirectory>edit-webapp/WEB-INF/lib</outputDirectory>
@@ -57,18 +39,6 @@
<exclude>*sources.jar</exclude>
</excludes>
</fileSet>
- <fileSet>
- <directory>../idp-duo-native-client-impl/target</directory>
- <outputDirectory>edit-webapp/WEB-INF/lib</outputDirectory>
- <includes>
- <include>idp-plugin-duo-native-client-impl-*.jar</include>
- </includes>
- <excludes>
- <exclude>*test*.jar</exclude>
- <exclude>*javadoc.jar</exclude>
- <exclude>*sources.jar</exclude>
- </excludes>
- </fileSet>
<fileSet>
<directory>src/main/resources/</directory>
<outputDirectory></outputDirectory>
diff --git a/idp-duo-distribution/src/main/assembly/duo-assembly.xml b/idp-duo-distribution/src/main/assembly/duo-native-sdk-assembly.xml
similarity index 93%
rename from idp-duo-distribution/src/main/assembly/duo-assembly.xml
rename to idp-duo-distribution/src/main/assembly/duo-native-sdk-assembly.xml
index a5a2a14..b1b9843 100644
--- a/idp-duo-distribution/src/main/assembly/duo-assembly.xml
+++ b/idp-duo-distribution/src/main/assembly/duo-native-sdk-assembly.xml
@@ -15,24 +15,6 @@
<include>**/*</include>
</includes>
</fileSet>
- <fileSet>
- <directory>../idp-duo-impl/target/dependency</directory>
- <outputDirectory>edit-webapp/WEB-INF/lib</outputDirectory>
- <includes>
- <include>duo-*.jar</include>
- <include>idp-plugin-duo-*.jar</include>
- <include>java-jwt-*.jar</include>
- <include>lombook-*.jar</include>
- <include>okhttp-*.jar</include>
- <include>okio-*.jar</include>
- <include>retrofit-*.jar</include>
- <include>jackson-*.jar</include>
- <include>converter-jackson-*.jar</include>
- </includes>
- <excludes>
- <exclude>*test*.jar</exclude>
- </excludes>
- </fileSet>
<fileSet>
<directory>../idp-duo-impl/target</directory>
<outputDirectory>edit-webapp/WEB-INF/lib</outputDirectory>
@@ -69,6 +51,20 @@
<exclude>*sources.jar</exclude>
</excludes>
</fileSet>
+ <fileSet>
+ <directory>../idp-duo-native-client-impl/target/dependency</directory>
+ <outputDirectory>edit-webapp/WEB-INF/lib</outputDirectory>
+ <includes>
+ <include>duo-*.jar</include>
+ <include>java-jwt-*.jar</include>
+ <include>lombook-*.jar</include>
+ <include>okhttp-*.jar</include>
+ <include>okio-*.jar</include>
+ <include>retrofit-*.jar</include>
+ <include>jackson-*.jar</include>
+ <include>converter-jackson-*.jar</include>
+ </includes>
+ </fileSet>
<fileSet>
<directory>src/main/resources/</directory>
<outputDirectory></outputDirectory>
diff --git a/idp-duo-native-client-impl/pom.xml b/idp-duo-native-client-impl/pom.xml
index fec26f8..83a8e3e 100644
--- a/idp-duo-native-client-impl/pom.xml
+++ b/idp-duo-native-client-impl/pom.xml
@@ -1,14 +1,14 @@
<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>net.shibboleth.idp.plugin</groupId>
<artifactId>idp-plugin-duo-parent</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
-
+
<artifactId>idp-plugin-${plugin.base}-native-client-impl</artifactId>
<name>Shibboleth IdP :: Plugins :: Native Duo SDK implementation</name>
<description>IdP Duo OIDC 2FA native Duo SDK implementation.</description>
@@ -48,4 +48,26 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies-test</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.target.directory}</outputDirectory>
+ <includeScope>runtime</includeScope>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
\ No newline at end of file
diff --git a/idp-duo-native-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/sdk/impl/DuoSDKClientFactory.java b/idp-duo-native-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/sdk/impl/DuoSDKClientFactory.java
index ff6ded5..7df20b9 100644
--- a/idp-duo-native-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/sdk/impl/DuoSDKClientFactory.java
+++ b/idp-duo-native-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/sdk/impl/DuoSDKClientFactory.java
@@ -28,12 +28,12 @@ public class DuoSDKClientFactory implements DuoOIDCClientFactory{
*
* @param certs the list of certificate pins.
*/
- public void setCaCerts(@Nullable List<String> certs) {
+ public void setCaCerts(@Nullable final List<String> certs) {
caCerts = certs;
}
@Override
- public DuoOIDCClient createInstance(@Nonnull final DuoOIDCIntegration integration) throws DuoClientException {
+ @Nonnull public DuoOIDCClient createInstance(@Nonnull final DuoOIDCIntegration integration) throws DuoClientException {
//every integration shares the same list of caCert pins.
return new DuoSDKClientAdaptor(integration, caCerts);
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list