[java-idp-plugin-duo] branch main updated: Improve plugin properties, make native Duo SDK trans deps explicit
Phil Smart
philip.smart at jisc.ac.uk
Wed Nov 18 14:38:21 UTC 2020
This is an automated email from the git hooks/post-receive script.
philsmart pushed a commit to branch main
in repository java-idp-plugin-duo.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-duo.git;a=commit;h=337d3b4a347466e92fbc3200045cd87fe3cd290d
The following commit(s) were added to refs/heads/main by this push:
new 337d3b4 Improve plugin properties, make native Duo SDK trans deps explicit
337d3b4 is described below
commit 337d3b4a347466e92fbc3200045cd87fe3cd290d
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Wed Nov 18 14:38:15 2020 +0000
Improve plugin properties, make native Duo SDK trans deps explicit
---
idp-duo-distribution/pom.xml | 15 -----
.../src/main/assembly/duo-bare-assembly.xml | 48 ---------------
.../src/main/assembly/duo-native-sdk-assembly.xml | 43 +++++++-------
.../src/main/assembly/duo-nimbus-assembly.xml | 34 ++++++-----
.../src/main/resources/bootstrap/id.property | 2 +-
.../main/resources/META-INF/plugins/plugin.props | 10 ----
.../idp/plugin/authn/duo/plugin.properties | 8 +++
idp-duo-native-client-impl/pom.xml | 68 +++++++++++++++++++++-
idp-duo-nimbus-client-impl/pom.xml | 1 +
9 files changed, 118 insertions(+), 111 deletions(-)
diff --git a/idp-duo-distribution/pom.xml b/idp-duo-distribution/pom.xml
index 683783c..f563a35 100644
--- a/idp-duo-distribution/pom.xml
+++ b/idp-duo-distribution/pom.xml
@@ -27,21 +27,6 @@
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
- <execution>
- <id>make-assembly-bare</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <appendAssemblyId>false</appendAssemblyId>
- <descriptors>
- <descriptor>src/main/assembly/duo-bare-assembly.xml</descriptor>
- </descriptors>
- <finalName>${dist.bare.finalName}</finalName>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- </execution>
<execution>
<!-- Duo SDK version -->
<id>make-assembly-duo-sdk</id>
diff --git a/idp-duo-distribution/src/main/assembly/duo-bare-assembly.xml b/idp-duo-distribution/src/main/assembly/duo-bare-assembly.xml
deleted file mode 100644
index a17a4cd..0000000
--- a/idp-duo-distribution/src/main/assembly/duo-bare-assembly.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
- <id>bin-bare</id>
- <formats>
- <format>tar.gz</format>
- <format>tar.bz2</format>
- <format>zip</format>
- </formats>
- <fileSets>
- <!-- Is this first one needed? -->
- <fileSet>
- <directory>../idp-duo-impl/src/main/resources/flows</directory>
- <outputDirectory>flows</outputDirectory>
- <includes>
- <include>**/*</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../idp-duo-impl/target</directory>
- <outputDirectory>edit-webapp/WEB-INF/lib</outputDirectory>
- <includes>
- <include>idp-plugin-duo-impl-*.jar</include>
- </includes>
- <excludes>
- <exclude>*test*.jar</exclude>
- <exclude>*javadoc.jar</exclude>
- <exclude>*sources.jar</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>../idp-duo-api/target</directory>
- <outputDirectory>edit-webapp/WEB-INF/lib</outputDirectory>
- <includes>
- <include>idp-plugin-duo-api-*.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>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/idp-duo-distribution/src/main/assembly/duo-native-sdk-assembly.xml b/idp-duo-distribution/src/main/assembly/duo-native-sdk-assembly.xml
index f980dff..623299a 100644
--- a/idp-duo-distribution/src/main/assembly/duo-native-sdk-assembly.xml
+++ b/idp-duo-distribution/src/main/assembly/duo-native-sdk-assembly.xml
@@ -8,17 +8,10 @@
<format>zip</format>
</formats>
<fileSets>
- <fileSet>
- <!-- What is this one for? -->
- <directory>../idp-duo-impl/src/main/resources/flows</directory>
- <outputDirectory>flows</outputDirectory>
- <includes>
- <include>**/*</include>
- </includes>
- </fileSet>
+ <!-- Our impl -->
<fileSet>
<directory>../idp-duo-impl/target</directory>
- <outputDirectory>edit-webapp/WEB-INF/lib</outputDirectory>
+ <outputDirectory>webapp/WEB-INF/lib</outputDirectory>
<includes>
<include>idp-plugin-duo-impl-*.jar</include>
</includes>
@@ -28,9 +21,10 @@
<exclude>*sources.jar</exclude>
</excludes>
</fileSet>
+ <!-- Our dependencies -->
<fileSet>
<directory>../idp-duo-api/target</directory>
- <outputDirectory>edit-webapp/WEB-INF/lib</outputDirectory>
+ <outputDirectory>webapp/WEB-INF/lib</outputDirectory>
<includes>
<include>idp-plugin-duo-api-*.jar</include>
</includes>
@@ -42,7 +36,7 @@
</fileSet>
<fileSet>
<directory>../idp-duo-native-client-impl/target</directory>
- <outputDirectory>edit-webapp/WEB-INF/lib</outputDirectory>
+ <outputDirectory>webapp/WEB-INF/lib</outputDirectory>
<includes>
<include>idp-plugin-duo-native-client-impl-*.jar</include>
</includes>
@@ -54,21 +48,26 @@
</fileSet>
<fileSet>
<directory>../idp-duo-native-client-impl/target/dependency</directory>
- <outputDirectory>edit-webapp/WEB-INF/lib</outputDirectory>
+ <outputDirectory>webapp/WEB-INF/lib</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <!-- The shared property file -->
+ <directory>../idp-duo-impl/target/classes/net/shibboleth/idp/plugin/authn/duo</directory>
+ <outputDirectory>bootstrap</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>
+ <include>plugin.properties</include>
</includes>
</fileSet>
<fileSet>
- <directory>src/main/resources/</directory>
- <outputDirectory></outputDirectory>
+ <!-- The signing certificates -->
+ <directory>src/main/resources/bootstrap</directory>
+ <outputDirectory>bootstrap</outputDirectory>
+ <includes>
+ <include>keys.txt</include>
+ </includes>
</fileSet>
</fileSets>
</assembly>
diff --git a/idp-duo-distribution/src/main/assembly/duo-nimbus-assembly.xml b/idp-duo-distribution/src/main/assembly/duo-nimbus-assembly.xml
index 8004f2d..41dc43a 100644
--- a/idp-duo-distribution/src/main/assembly/duo-nimbus-assembly.xml
+++ b/idp-duo-distribution/src/main/assembly/duo-nimbus-assembly.xml
@@ -8,17 +8,10 @@
<format>zip</format>
</formats>
<fileSets>
- <fileSet>
- <!-- What is this one for? -->
- <directory>../idp-duo-impl/src/main/resources/flows</directory>
- <outputDirectory>flows</outputDirectory>
- <includes>
- <include>**/*</include>
- </includes>
- </fileSet>
+ <!-- Our impl -->
<fileSet>
<directory>../idp-duo-impl/target</directory>
- <outputDirectory>edit-webapp/WEB-INF/lib</outputDirectory>
+ <outputDirectory>webapp/WEB-INF/lib</outputDirectory>
<includes>
<include>idp-plugin-duo-impl-*.jar</include>
</includes>
@@ -28,9 +21,10 @@
<exclude>*sources.jar</exclude>
</excludes>
</fileSet>
+ <!-- Our dependencies -->
<fileSet>
<directory>../idp-duo-api/target</directory>
- <outputDirectory>edit-webapp/WEB-INF/lib</outputDirectory>
+ <outputDirectory>webapp/WEB-INF/lib</outputDirectory>
<includes>
<include>idp-plugin-duo-api-*.jar</include>
</includes>
@@ -42,7 +36,7 @@
</fileSet>
<fileSet>
<directory>../idp-duo-nimbus-client-impl/target</directory>
- <outputDirectory>edit-webapp/WEB-INF/lib</outputDirectory>
+ <outputDirectory>webapp/WEB-INF/lib</outputDirectory>
<includes>
<include>idp-plugin-duo-nimbus-client-impl-*.jar</include>
</includes>
@@ -54,14 +48,26 @@
</fileSet>
<fileSet>
<directory>../idp-duo-nimbus-client-impl/target/dependency</directory>
- <outputDirectory>edit-webapp/WEB-INF/lib</outputDirectory>
+ <outputDirectory>webapp/WEB-INF/lib</outputDirectory>
<includes>
<include>nimbus-jose-jwt-*.jar</include>
</includes>
</fileSet>
<fileSet>
- <directory>src/main/resources/</directory>
- <outputDirectory></outputDirectory>
+ <!-- The shared property file -->
+ <directory>../idp-duo-impl/target/classes/net/shibboleth/idp/plugin/authn/duo</directory>
+ <outputDirectory>bootstrap</outputDirectory>
+ <includes>
+ <include>plugin.properties</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <!-- The signing certificates -->
+ <directory>src/main/resources/bootstrap</directory>
+ <outputDirectory>bootstrap</outputDirectory>
+ <includes>
+ <include>keys.txt</include>
+ </includes>
</fileSet>
</fileSets>
</assembly>
diff --git a/idp-duo-distribution/src/main/resources/bootstrap/id.property b/idp-duo-distribution/src/main/resources/bootstrap/id.property
index cca0bf6..c84995f 100644
--- a/idp-duo-distribution/src/main/resources/bootstrap/id.property
+++ b/idp-duo-distribution/src/main/resources/bootstrap/id.property
@@ -1 +1 @@
-pluginid=net.shibboleth.idp.plugin.duo
+plugin.id=net.shibboleth.idp.plugin.authn.duo
diff --git a/idp-duo-impl/src/main/resources/META-INF/plugins/plugin.props b/idp-duo-impl/src/main/resources/META-INF/plugins/plugin.props
deleted file mode 100644
index 37110e8..0000000
--- a/idp-duo-impl/src/main/resources/META-INF/plugins/plugin.props
+++ /dev/null
@@ -1,10 +0,0 @@
-net.shibboleth.idp.plugin.duo.versions=0.0.1
-#
-# Duo
-# 0.0.1
-#
-net.shibboleth.idp.plugin.duo.idpVersionMax.0.0.1=5.0.0
-net.shibboleth.idp.plugin.duo.idpVersionMin.0.0.1=4.1.0
-net.shibboleth.idp.plugin.duo.supportLevel.0.0.1 = Current
-net.shibboleth.idp.plugin.duo.downloadURL.0.0.1 = https://build.shibboleth.net/nexus/service/local/repositories/releases/<FINISH>
-net.shibboleth.idp.plugin.duo.baseName.0.0.1 = idp-plugin-duo-0.1.0
\ No newline at end of file
diff --git a/idp-duo-impl/src/main/resources/net/shibboleth/idp/plugin/authn/duo/plugin.properties b/idp-duo-impl/src/main/resources/net/shibboleth/idp/plugin/authn/duo/plugin.properties
new file mode 100644
index 0000000..ccd69b4
--- /dev/null
+++ b/idp-duo-impl/src/main/resources/net/shibboleth/idp/plugin/authn/duo/plugin.properties
@@ -0,0 +1,8 @@
+# Properties defining this plugin
+
+plugin.id = net.shibboleth.idp.plugin.authn.duo
+# Only used when package manifest is not available
+plugin.version = 1.0.0
+
+# No prereqs
+#plugin.modules.required =
diff --git a/idp-duo-native-client-impl/pom.xml b/idp-duo-native-client-impl/pom.xml
index f0367ce..74209a1 100644
--- a/idp-duo-native-client-impl/pom.xml
+++ b/idp-duo-native-client-impl/pom.xml
@@ -20,7 +20,7 @@
</properties>
<dependencies>
- <!-- compile dependencies -->
+ <!-- directly referenced compile dependencies -->
<dependency>
<groupId>com.duosecurity</groupId>
<artifactId>duo-universal-sdk</artifactId>
@@ -29,6 +29,71 @@
<groupId>net.shibboleth.idp.plugin</groupId>
<artifactId>idp-plugin-duo-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <!-- indirectly referenced (transitive) dependencies -->
+ <dependency>
+ <groupId>com.squareup.retrofit2</groupId>
+ <artifactId>retrofit</artifactId>
+ <version>2.5.0</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.squareup.retrofit2</groupId>
+ <artifactId>converter-jackson</artifactId>
+ <version>2.1.0</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>1.18.10</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.auth0</groupId>
+ <artifactId>java-jwt</artifactId>
+ <version>3.3.0</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.squareup.okhttp3</groupId>
+ <artifactId>logging-interceptor</artifactId>
+ <version>3.3.1</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.squareup.okhttp3</groupId>
+ <artifactId>okhttp</artifactId>
+ <version>3.12.0</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.squareup.okio</groupId>
+ <artifactId>okio</artifactId>
+ <version>1.15.0</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>2.7.0</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.11</version>
+ <scope>runtime</scope>
+ </dependency>
<!-- provided dependencies -->
<dependency>
@@ -63,6 +128,7 @@
<configuration>
<outputDirectory>${project.target.directory}</outputDirectory>
<includeScope>runtime</includeScope>
+ <excludeTransitive>true</excludeTransitive>
</configuration>
</execution>
</executions>
diff --git a/idp-duo-nimbus-client-impl/pom.xml b/idp-duo-nimbus-client-impl/pom.xml
index 121a1e0..39eb311 100644
--- a/idp-duo-nimbus-client-impl/pom.xml
+++ b/idp-duo-nimbus-client-impl/pom.xml
@@ -95,6 +95,7 @@
<configuration>
<outputDirectory>${project.target.directory}</outputDirectory>
<includeScope>runtime</includeScope>
+ <excludeTransitive>true</excludeTransitive>
</configuration>
</execution>
</executions>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list