[java-idp-plugin-totp] branch master updated: Rebase plugin POM on parent instead of idp-parent.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository java-idp-plugin-totp.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-totp.git;a=commit;h=cc017ded4e683201fb2a43421aec7e98eb2fc296

The following commit(s) were added to refs/heads/master by this push:
       new  cc017de   Rebase plugin POM on parent instead of idp-parent.
cc017de is described below

commit cc017ded4e683201fb2a43421aec7e98eb2fc296
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Jul 23 13:51:11 2020 -0400

    Rebase plugin POM on parent instead of idp-parent.
---
 pom.xml                                        | 16 ++++++++++++----
 totp-dist/pom.xml                              |  6 +++---
 totp-impl/.project                             |  4 ++--
 totp-impl/.settings/org.eclipse.jdt.core.prefs |  2 +-
 totp-impl/pom.xml                              |  2 +-
 5 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index d348dd0..ed3a1b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,9 +5,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>net.shibboleth.idp</groupId>
-        <artifactId>idp-parent</artifactId>
-        <version>4.1.0-SNAPSHOT</version>
+        <groupId>net.shibboleth</groupId>
+        <artifactId>parent</artifactId>
+        <version>11.1.0-SNAPSHOT</version>
     </parent>
 
     <name>Shibboleth IdP :: Plugins :: TOTP Login Flow</name>
@@ -18,9 +18,10 @@
     <packaging>pom</packaging>
 
     <properties>
-        <plugin.base>totp</plugin.base>
         <idp.groupId>net.shibboleth.idp</idp.groupId>
         <idp.version>4.1.0-SNAPSHOT</idp.version>
+        <opensaml.groupId>org.opensaml</opensaml.groupId>
+        <opensaml.version>4.1.0-SNAPSHOT</opensaml.version>
         <checkstyle.configLocation>${project.basedir}/checkstyle.xml</checkstyle.configLocation>
     </properties>
     
@@ -70,6 +71,13 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>${opensaml.groupId}</groupId>
+                <artifactId>opensaml-bom</artifactId>
+                <version>${opensaml.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/totp-dist/pom.xml b/totp-dist/pom.xml
index 3241ed0..c2788d1 100644
--- a/totp-dist/pom.xml
+++ b/totp-dist/pom.xml
@@ -12,12 +12,12 @@
 
     <name>Shibboleth IdP :: Plugins :: TOTP Login Flow Distribution</name>
     <description>IdP TOTP plugin packaging.</description>
-    <artifactId>idp-plugin-${plugin.base}-dist</artifactId>
+    <artifactId>idp-plugin-totp-dist</artifactId>
     <packaging>pom</packaging>
 
     <properties>
         <checkstyle.configLocation>${project.basedir}/../checkstyle.xml</checkstyle.configLocation>
-        <dist.finalName>shibboleth-idp-plugin-${plugin.base}-${project.version}</dist.finalName>
+        <dist.finalName>shibboleth-idp-plugin-totp-${project.version}</dist.finalName>
     </properties>
 
     <build>
@@ -37,7 +37,7 @@
                 <configuration>
                     <appendAssemblyId>false</appendAssemblyId>
                     <descriptors>
-                        <descriptor>src/main/assembly/${plugin.base}-assembly.xml</descriptor>
+                        <descriptor>src/main/assembly/totp-assembly.xml</descriptor>
                     </descriptors>
                     <finalName>${dist.finalName}</finalName>
                     <tarLongFileMode>gnu</tarLongFileMode>
diff --git a/totp-impl/.project b/totp-impl/.project
index 8200b02..ee14e29 100644
--- a/totp-impl/.project
+++ b/totp-impl/.project
@@ -11,12 +11,12 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
diff --git a/totp-impl/.settings/org.eclipse.jdt.core.prefs b/totp-impl/.settings/org.eclipse.jdt.core.prefs
index 7fa508c..af08edf 100644
--- a/totp-impl/.settings/org.eclipse.jdt.core.prefs
+++ b/totp-impl/.settings/org.eclipse.jdt.core.prefs
@@ -132,7 +132,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.release=enabled
 org.eclipse.jdt.core.compiler.source=11
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
diff --git a/totp-impl/pom.xml b/totp-impl/pom.xml
index 3a4b2f3..28110da 100644
--- a/totp-impl/pom.xml
+++ b/totp-impl/pom.xml
@@ -12,7 +12,7 @@
     
     <name>Shibboleth IdP :: Plugins :: TOTP Login Flow Impl</name>
     <description>IdP TOTP plugin implementation.</description>
-    <artifactId>idp-plugin-${plugin.base}-impl</artifactId>
+    <artifactId>idp-plugin-top-impl</artifactId>
     <packaging>jar</packaging>
     
     <properties>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.