[java-shib-shared] branch main updated: Factor out CLI classes.
Scott Cantor
cantor.2 at osu.edu
Tue Sep 13 19:45:13 UTC 2022
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-shib-shared.
View the commit online:
http://git.shibboleth.net/view/?p=java-shib-shared.git;a=commit;h=eb56102124b8fa4f509b8c8799a22afaaae843fb
The following commit(s) were added to refs/heads/main by this push:
new eb561021 Factor out CLI classes.
eb561021 is described below
commit eb56102124b8fa4f509b8c8799a22afaaae843fb
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Sep 13 15:45:10 2022 -0400
Factor out CLI classes.
---
pom.xml | 26 +++++++++++++
shib-cli/.check-m2 | 1 +
shib-cli/.checkstyle | 15 ++++++++
shib-cli/.gitignore | 21 ++++++++++
{shib-security-spring => shib-cli}/pom.xml | 34 ++++++++--------
.../ext/spring/cli/AbstractCommandLine.java | 0
.../spring/cli/AbstractCommandLineArguments.java | 0
.../ext/spring/cli/CommandLineArguments.java | 0
.../shibboleth/ext/spring/cli/package-info.java | 0
shib-cli/src/test/resources/logback-test.xml | 17 ++++++++
shib-networking-spring/pom.xml | 24 ++++++++----
shib-networking/pom.xml | 21 ----------
shib-security-spring/pom.xml | 15 ++++----
shib-security/pom.xml | 27 +++----------
shib-service/pom.xml | 14 ++++---
shib-shared-bom/pom.xml | 5 +++
shib-spring/pom.xml | 45 +---------------------
shib-support/pom.xml | 21 ----------
18 files changed, 144 insertions(+), 142 deletions(-)
diff --git a/pom.xml b/pom.xml
index 83765a9e..a12838ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,8 +25,13 @@
<modules>
<module>shib-shared-bom</module>
+
+ <!-- Old grab-bags. -->
<module>shib-support</module>
<module>shib-spring</module>
+
+ <!-- Refactored modules. -->
+ <module>shib-cli</module>
<module>shib-networking</module>
<module>shib-networking-spring</module>
<module>shib-security</module>
@@ -129,5 +134,26 @@
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <!--
+ Pull in a Javascript engine for testing in Java
+ versions where the JDK doesn't provide one.
+ -->
+ <profile>
+ <id>get-nashorn</id>
+ <activation>
+ <jdk>[15,</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.openjdk.nashorn</groupId>
+ <artifactId>nashorn-core</artifactId>
+ <version>${nashorn.jdk.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
diff --git a/shib-cli/.check-m2 b/shib-cli/.check-m2
new file mode 100644
index 00000000..048849a0
--- /dev/null
+++ b/shib-cli/.check-m2
@@ -0,0 +1 @@
+This file provokes a signature check of the maven repository unless overridden by the no-check-m2 property.
\ No newline at end of file
diff --git a/shib-cli/.checkstyle b/shib-cli/.checkstyle
new file mode 100644
index 00000000..186d7f35
--- /dev/null
+++ b/shib-cli/.checkstyle
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
+
+ <local-check-config name="Shibboleth Checkstyle" location="/java-shib-shared/resources/checkstyle/checkstyle.xml" type="project" description="">
+ <additional-data name="cache-file" value="true"/>
+ <additional-data name="cache-props-file-location" value="null_1312636288299_cache.properties"/>
+ <additional-data name="cache-file-location" value="null_1312636288299_cache.xml"/>
+ </local-check-config>
+
+ <fileset name="main source" enabled="true" check-config-name="Shibboleth Checkstyle" local="true">
+ <file-match-pattern match-pattern="src/main/java/.*\.java$" include-pattern="true"/>
+ </fileset>
+
+</fileset-config>
diff --git a/shib-cli/.gitignore b/shib-cli/.gitignore
new file mode 100644
index 00000000..d8e6f876
--- /dev/null
+++ b/shib-cli/.gitignore
@@ -0,0 +1,21 @@
+# A simulation of Subversion default ignores, generated by reposurgeon.
+*.o
+*.lo
+*.la
+*.al
+*.libs
+*.so
+*.so.[0-9]*
+*.a
+*.pyc
+*.pyo
+*.rej
+*.iml
+*~
+*.#*
+.*.swp
+.DS_store
+# Simulated Subversion default ignores end here
+# The contents of the svn:ignore property on the branch root.
+/test-output
+/target
diff --git a/shib-security-spring/pom.xml b/shib-cli/pom.xml
similarity index 76%
copy from shib-security-spring/pom.xml
copy to shib-cli/pom.xml
index 0ac13932..d8671ab9 100644
--- a/shib-security-spring/pom.xml
+++ b/shib-cli/pom.xml
@@ -10,12 +10,12 @@
<version>9.0.0-SNAPSHOT</version>
</parent>
- <name>Shibboleth Shared :: Security Spring Support</name>
- <artifactId>shib-security-spring</artifactId>
+ <name>Shibboleth Shared :: CLI Support</name>
+ <artifactId>shib-cli</artifactId>
<packaging>jar</packaging>
<properties>
- <automatic.module.name>net.shibboleth.shared.spring.security</automatic.module.name>
+ <automatic.module.name>net.shibboleth.shared.cli</automatic.module.name>
<checkstyle.configLocation>${project.basedir}/../resources/checkstyle/checkstyle.xml</checkstyle.configLocation>
</properties>
@@ -28,33 +28,36 @@
</dependency>
<dependency>
- <groupId>org.cryptacular</groupId>
- <artifactId>cryptacular</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shib-spring</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${spring.groupId}</groupId>
- <artifactId>spring-core</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
+
<dependency>
- <groupId>${spring.groupId}</groupId>
- <artifactId>spring-beans</artifactId>
+ <groupId>com.beust</groupId>
+ <artifactId>jcommander</artifactId>
</dependency>
+
<dependency>
<groupId>${spring.groupId}</groupId>
<artifactId>spring-context</artifactId>
</dependency>
- <!-- Provided dependencies -->
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-core</artifactId>
+ </dependency>
+
+ <!-- Provided Dependencies -->
<!-- Runtime Dependencies -->
<!-- Test Dependencies -->
- <dependency>
- <groupId>${spring.groupId}</groupId>
- <artifactId>spring-test</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<scm>
@@ -70,4 +73,5 @@
</site>
</distributionManagement>
+
</project>
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/cli/AbstractCommandLine.java b/shib-cli/src/main/java/net/shibboleth/ext/spring/cli/AbstractCommandLine.java
similarity index 100%
rename from shib-spring/src/main/java/net/shibboleth/ext/spring/cli/AbstractCommandLine.java
rename to shib-cli/src/main/java/net/shibboleth/ext/spring/cli/AbstractCommandLine.java
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/cli/AbstractCommandLineArguments.java b/shib-cli/src/main/java/net/shibboleth/ext/spring/cli/AbstractCommandLineArguments.java
similarity index 100%
rename from shib-spring/src/main/java/net/shibboleth/ext/spring/cli/AbstractCommandLineArguments.java
rename to shib-cli/src/main/java/net/shibboleth/ext/spring/cli/AbstractCommandLineArguments.java
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/cli/CommandLineArguments.java b/shib-cli/src/main/java/net/shibboleth/ext/spring/cli/CommandLineArguments.java
similarity index 100%
rename from shib-spring/src/main/java/net/shibboleth/ext/spring/cli/CommandLineArguments.java
rename to shib-cli/src/main/java/net/shibboleth/ext/spring/cli/CommandLineArguments.java
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/cli/package-info.java b/shib-cli/src/main/java/net/shibboleth/ext/spring/cli/package-info.java
similarity index 100%
rename from shib-spring/src/main/java/net/shibboleth/ext/spring/cli/package-info.java
rename to shib-cli/src/main/java/net/shibboleth/ext/spring/cli/package-info.java
diff --git a/shib-cli/src/test/resources/logback-test.xml b/shib-cli/src/test/resources/logback-test.xml
new file mode 100644
index 00000000..f3280e56
--- /dev/null
+++ b/shib-cli/src/test/resources/logback-test.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<configuration>
+
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+ <pattern>%level [%logger:%line] - %msg%n</pattern>
+ <charset>UTF-8</charset>
+ </encoder>
+ </appender>
+
+ <root>
+ <level value="warn" />
+ <appender-ref ref="STDOUT" />
+ </root>
+
+</configuration>
\ No newline at end of file
diff --git a/shib-networking-spring/pom.xml b/shib-networking-spring/pom.xml
index 103b49cd..05da921d 100644
--- a/shib-networking-spring/pom.xml
+++ b/shib-networking-spring/pom.xml
@@ -28,13 +28,13 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>shib-spring</artifactId>
+ <artifactId>shib-support</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>shib-support</artifactId>
- <version>${project.version}</version>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
<dependency>
@@ -58,16 +58,24 @@
<groupId>${spring.groupId}</groupId>
<artifactId>spring-beans</artifactId>
</dependency>
- <dependency>
- <groupId>${spring.groupId}</groupId>
- <artifactId>spring-context</artifactId>
- </dependency>
<!-- Provided dependencies -->
<!-- Runtime Dependencies -->
<!-- Test Dependencies -->
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shib-spring</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-context</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>${spring.groupId}</groupId>
<artifactId>spring-test</artifactId>
diff --git a/shib-networking/pom.xml b/shib-networking/pom.xml
index 7d013684..7285fb35 100644
--- a/shib-networking/pom.xml
+++ b/shib-networking/pom.xml
@@ -68,27 +68,6 @@
</dependency>
</dependencies>
- <profiles>
- <!--
- Pull in a Javascript engine for testing in Java
- versions where the JDK doesn't provide one.
- -->
- <profile>
- <id>get-nashorn</id>
- <activation>
- <jdk>[15,</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.openjdk.nashorn</groupId>
- <artifactId>nashorn-core</artifactId>
- <version>${nashorn.jdk.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
<scm>
<connection>${shibboleth.scm.connection}java-shib-shared</connection>
<developerConnection>${shibboleth.scm.developerConnection}java-shib-shared</developerConnection>
diff --git a/shib-security-spring/pom.xml b/shib-security-spring/pom.xml
index 0ac13932..28764da8 100644
--- a/shib-security-spring/pom.xml
+++ b/shib-security-spring/pom.xml
@@ -40,10 +40,6 @@
<groupId>${spring.groupId}</groupId>
<artifactId>spring-beans</artifactId>
</dependency>
- <dependency>
- <groupId>${spring.groupId}</groupId>
- <artifactId>spring-context</artifactId>
- </dependency>
<!-- Provided dependencies -->
@@ -51,9 +47,14 @@
<!-- Test Dependencies -->
<dependency>
- <groupId>${spring.groupId}</groupId>
- <artifactId>spring-test</artifactId>
- <scope>test</scope>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-context</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-test</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
diff --git a/shib-security/pom.xml b/shib-security/pom.xml
index 0c34c2ad..03f6a9d6 100644
--- a/shib-security/pom.xml
+++ b/shib-security/pom.xml
@@ -42,6 +42,12 @@
<groupId>com.beust</groupId>
<artifactId>jcommander</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
@@ -68,27 +74,6 @@
</dependency>
</dependencies>
- <profiles>
- <!--
- Pull in a Javascript engine for testing in Java
- versions where the JDK doesn't provide one.
- -->
- <profile>
- <id>get-nashorn</id>
- <activation>
- <jdk>[15,</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.openjdk.nashorn</groupId>
- <artifactId>nashorn-core</artifactId>
- <version>${nashorn.jdk.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
<scm>
<connection>${shibboleth.scm.connection}java-shib-shared</connection>
<developerConnection>${shibboleth.scm.developerConnection}java-shib-shared</developerConnection>
diff --git a/shib-service/pom.xml b/shib-service/pom.xml
index cf024276..b7678c8e 100644
--- a/shib-service/pom.xml
+++ b/shib-service/pom.xml
@@ -38,6 +38,11 @@
<artifactId>shib-security</artifactId>
<version>${project.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
@@ -55,6 +60,10 @@
<artifactId>metrics-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-beans</artifactId>
+ </dependency>
<dependency>
<groupId>${spring.groupId}</groupId>
<artifactId>spring-context</artifactId>
@@ -74,11 +83,6 @@
<!-- Runtime Dependencies -->
<!-- Test Dependencies -->
- <dependency>
- <groupId>${spring.groupId}</groupId>
- <artifactId>spring-test</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
diff --git a/shib-shared-bom/pom.xml b/shib-shared-bom/pom.xml
index c6c83da8..12913117 100644
--- a/shib-shared-bom/pom.xml
+++ b/shib-shared-bom/pom.xml
@@ -17,6 +17,11 @@
<dependencyManagement>
<dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shib-cli</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>shib-networking</artifactId>
diff --git a/shib-spring/pom.xml b/shib-spring/pom.xml
index 1698b3fb..337dfa84 100644
--- a/shib-spring/pom.xml
+++ b/shib-spring/pom.xml
@@ -42,54 +42,34 @@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
-
- <dependency>
- <groupId>com.beust</groupId>
- <artifactId>jcommander</artifactId>
- <!-- Required for command line classes. -->
- <optional>true</optional>
- </dependency>
+
<dependency>
<groupId>${spring.groupId}</groupId>
<artifactId>spring-context</artifactId>
- <!-- Required for ApplicationContext classes. -->
- <optional>true</optional>
</dependency>
<dependency>
<groupId>${spring.groupId}</groupId>
<artifactId>spring-core</artifactId>
- <!-- Required for Duration conversion classes. -->
- <optional>true</optional>
</dependency>
<dependency>
<groupId>${spring.groupId}</groupId>
<artifactId>spring-beans</artifactId>
- <!-- Required for factory classes. -->
- <optional>true</optional>
</dependency>
<dependency>
<groupId>${spring.groupId}</groupId>
<artifactId>spring-expression</artifactId>
- <!-- Required for error handling classes. -->
- <optional>true</optional>
</dependency>
<dependency>
<groupId>${spring.groupId}</groupId>
<artifactId>spring-jcl</artifactId>
- <!-- Required for error handling classes. -->
- <optional>true</optional>
</dependency>
<dependency>
<groupId>${spring.groupId}</groupId>
<artifactId>spring-web</artifactId>
- <!-- Required for error handling classes. -->
- <optional>true</optional>
</dependency>
<dependency>
<groupId>${spring.groupId}</groupId>
<artifactId>spring-webmvc</artifactId>
- <!-- Required for error handling classes. -->
- <optional>true</optional>
</dependency>
<!-- Provided dependencies -->
@@ -97,8 +77,6 @@
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
- <!-- Required for error handling classes. -->
- <optional>true</optional>
</dependency>
<!-- Runtime dependencies -->
@@ -112,27 +90,6 @@
</dependencies>
- <profiles>
- <!--
- Pull in a Javascript engine for testing in Java
- versions where the JDK doesn't provide one.
- -->
- <profile>
- <id>get-nashorn</id>
- <activation>
- <jdk>[15,</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.openjdk.nashorn</groupId>
- <artifactId>nashorn-core</artifactId>
- <version>${nashorn.jdk.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
<scm>
<connection>scm:git:https://git.shibboleth.net/git/${project.artifactId}</connection>
<developerConnection>scm:git:git at git.shibboleth.net:${project.artifactId}</developerConnection>
diff --git a/shib-support/pom.xml b/shib-support/pom.xml
index 3e46d7a1..61c8a24f 100644
--- a/shib-support/pom.xml
+++ b/shib-support/pom.xml
@@ -47,27 +47,6 @@
</dependency>
</dependencies>
- <profiles>
- <!--
- Pull in a Javascript engine for testing in Java
- versions where the JDK doesn't provide one.
- -->
- <profile>
- <id>get-nashorn</id>
- <activation>
- <jdk>[15,</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.openjdk.nashorn</groupId>
- <artifactId>nashorn-core</artifactId>
- <version>${nashorn.jdk.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
<scm>
<connection>scm:git:https://git.shibboleth.net/git/${project.artifactId}</connection>
<developerConnection>scm:git:git at git.shibboleth.net:${project.artifactId}</developerConnection>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list