WIP: maven clean succeeds

sam-glendenning · Nov 5, 2021 · acd7e4f · acd7e4f
1 parent 2b9835e
commit acd7e4f
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 82 deletions.
diff --git a/iam-login-service/pom.xml b/iam-login-service/pom.xml
@@ -113,7 +113,7 @@
 
     <dependency>
       <groupId>org.webjars</groupId>
-      <artifactId>webjars-locator</artifactId>
+      <artifactId>webjars-locator-core</artifactId>
     </dependency>
 
     <dependency>
@@ -123,7 +123,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.hibernate</groupId>
+      <groupId>org.hibernate.validator</groupId>
       <artifactId>hibernate-validator</artifactId>
     </dependency>
 
@@ -178,20 +178,11 @@
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.springframework.security</groupId>
-      <artifactId>spring-security-jwt</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>org.bouncycastle</groupId>
-          <artifactId>bcpkix-jdk15on</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-devtools</artifactId>
+      <scope>runtime</scope>
+      <optional>true</optional>
     </dependency>
 
     <!-- JSP dependencies -->

diff --git a/iam-persistence/pom.xml b/iam-persistence/pom.xml
@@ -31,10 +31,6 @@
   <name>IAM Persistence Module</name>
   <description>The INDIGO IAM persistence classes</description>
 
-  <properties>
-    <hibernate.version></hibernate.version>
-  </properties>
-
   <dependencies>
 
     <dependency>
@@ -59,7 +55,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.hibernate</groupId>
+      <groupId>org.hibernate.validator</groupId>
       <artifactId>hibernate-validator</artifactId>
     </dependency>
 

diff --git a/iam-test-client/pom.xml b/iam-test-client/pom.xml
@@ -34,7 +34,7 @@
 
     <dependency>
       <groupId>org.webjars</groupId>
-      <artifactId>webjars-locator</artifactId>
+      <artifactId>webjars-locator-core</artifactId>
     </dependency>
 
     <dependency>
@@ -62,17 +62,6 @@
       <artifactId>spring-security-oauth2</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.springframework.security</groupId>
-      <artifactId>spring-security-jwt</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>org.bouncycastle</groupId>
-          <artifactId>bcpkix-jdk15on</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
     <dependency>
       <groupId>org.mitre</groupId>
       <artifactId>openid-connect-client</artifactId>

diff --git a/iam-test-protected-resource/pom.xml b/iam-test-protected-resource/pom.xml
@@ -48,17 +48,6 @@
       <artifactId>spring-security-oauth2</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.springframework.security</groupId>
-      <artifactId>spring-security-jwt</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>org.bouncycastle</groupId>
-          <artifactId>bcpkix-jdk15on</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-security</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -4,12 +4,18 @@
   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>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>2.5.6</version>
+		<relativePath/> <!-- lookup parent from repository -->
+	</parent>
 
   <groupId>it.infn.mw</groupId>
   <artifactId>iam-parent</artifactId>
   <version>1.8.0-spring-update-SNAPSHOT</version>
   <packaging>pom</packaging>
-  <name>INDIGO Identity and Access Manager (IAM)</name>
+  <name>INDIGO Identity and Access Manager (IAM) - Parent POM</name>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -24,7 +30,6 @@
 
     <spring-boot.version>2.5.6</spring-boot.version>
 
-    <webjars-locator-core.version>0.32</webjars-locator-core.version>
     <angularjs.version>1.6.1</angularjs.version>
     <angular-ui-bootstrap.version>2.5.0</angular-ui-bootstrap.version>
     <angular-ui-router.version>1.0.20</angular-ui-router.version>
@@ -41,10 +46,12 @@
     <license-maven-plugin.version>3.0</license-maven-plugin.version>
     <jacoco-plugin.version>0.8.3</jacoco-plugin.version>
 
-    <maven-enforcer-plugin.version>3.0.0-M2</maven-enforcer-plugin.version>
     <jsr250-api.version>1.0</jsr250-api.version>
     <jakarta.xml.bind-api.version>2.3.2</jakarta.xml.bind-api.version>
     <jaxb-runtime.version>2.3.2</jaxb-runtime.version>
+
+    <spring-security-oauth2.version>2.5.1.RELEASE</spring-security-oauth2.version>
+
     <resource.delimiter>@</resource.delimiter>
     <sonar.coverage.exclusions>iam-persistence/**/*,iam-test-client/**/*,iam-test-protected-resource/**/*</sonar.coverage.exclusions>
   </properties>
@@ -61,18 +68,11 @@
     <dependencies>
 
       <dependency>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-dependencies</artifactId>
-        <version>${spring-boot.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-
-      <dependency>
-        <groupId>org.webjars</groupId>
-        <artifactId>webjars-locator-core</artifactId>
-        <version>${webjars-locator-core.version}</version>
+        <groupId>org.springframework.security.oauth</groupId>
+        <artifactId>spring-security-oauth2</artifactId>
+        <version>${spring-security-oauth2.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.webjars</groupId>
         <artifactId>angularjs</artifactId>
@@ -158,6 +158,8 @@
         <version>${mitreid.version}</version>
       </dependency>
 
+
+
       <!-- SAML -->
 
       <dependency>
@@ -232,24 +234,13 @@
           <artifactId>license-maven-plugin</artifactId>
           <version>${license-maven-plugin.version}</version>
         </plugin>
-        <plugin>
-          <groupId>org.springframework.boot</groupId>
-          <artifactId>spring-boot-maven-plugin</artifactId>
-          <version>${spring-boot.version}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <version>3.0.0-M5</version>
-        </plugin>
       </plugins>
     </pluginManagement>
 
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>${maven-enforcer-plugin.version}</version>
         <executions>
           <execution>
             <id>enforce-maven</id>
@@ -262,7 +253,7 @@
                   <version>1.8.0</version>
                 </requireJavaVersion>
                 <requireMavenVersion>
-                  <version>3.3.0</version>
+                  <version>3.6.0</version>
                 </requireMavenVersion>
               </rules>
             </configuration>
@@ -272,8 +263,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
-        <version>2.2.1</version>
-
         <executions>
           <execution>
             <id>attach-sources</id>
@@ -295,21 +284,10 @@
         </configuration>
       </plugin>
 
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.1</version>
-        <configuration>
-          <source>${java.version}</source>
-          <target>${java.version}</target>
-          <encoding>UTF-8</encoding>
-        </configuration>
-      </plugin>
 
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
-        <version>2.5</version>
         <configuration>
           <failOnMissingWebXml>false</failOnMissingWebXml>
           <archive>
@@ -341,10 +319,10 @@
         </configuration>
       </plugin>
 
+      <!--
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>2.5</version>
         <configuration>
           <archive>
             <manifest>
@@ -354,11 +332,11 @@
           </archive>
         </configuration>
       </plugin>
+      -->
 
       <plugin>
         <groupId>pl.project13.maven</groupId>
         <artifactId>git-commit-id-plugin</artifactId>
-        <version>2.1.11</version>
         <executions>
           <execution>
             <goals>