The pom.xml from the public and member api should have almost the sam…

…e dependencies
iamzoltan · Feb 28, 2023 · 4298145 · 4298145
1 parent 8b29731
commit 4298145
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 43 deletions.
diff --git a/orcid-api-common/pom.xml b/orcid-api-common/pom.xml
@@ -103,8 +103,7 @@
         <!-- https://mvnrepository.com/artifact/jakarta.servlet/jakarta.servlet-api -->
 		<dependency>
            <groupId>javax.servlet</groupId>
-           <artifactId>javax.servlet-api</artifactId>
-           <version>${servlets.version}</version>
+           <artifactId>javax.servlet-api</artifactId>           
            <scope>provided</scope>
        </dependency>
 
@@ -116,11 +115,7 @@
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjweaver</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-        </dependency>
+
         <dependency>
             <groupId>javax.validation</groupId>
             <artifactId>validation-api</artifactId>

diff --git a/orcid-api-web/pom.xml b/orcid-api-web/pom.xml
@@ -17,19 +17,7 @@
 	</properties>
 
     <dependencies>
-        <!-- Internal dependencies -->
-        <dependency>
-            <groupId>${project.parent.groupId}</groupId>
-            <artifactId>orcid-core</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>orcid-api-common</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
-
-        <!-- External dependencies -->
+        <!-- Spring security -->
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-core</artifactId>
@@ -54,38 +42,39 @@
             <groupId>org.springframework.security.oauth</groupId>
             <artifactId>spring-security-oauth2</artifactId>
         </dependency>
-
+
+        <!-- Internal dependencies -->
         <dependency>
-            <groupId>com.google.guava</groupId>
-		    <artifactId>guava</artifactId>		    
+            <groupId>${project.groupId}</groupId>
+            <artifactId>orcid-core</artifactId>
+            <version>${project.parent.version}</version>
         </dependency>
-
-        <!-- Provided -->
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>orcid-api-common</artifactId>
+            <version>${project.parent.version}</version>
         </dependency>
 
+        <!-- External dependencies -->        
+        <dependency>
+            <groupId>com.google.guava</groupId>
+		    <artifactId>guava</artifactId>		    
+        </dependency>       
+
         <!-- Test dependencies -->
+        <!-- Togglz testing support -->
         <dependency>
-            <groupId>org.orcid</groupId>
-            <artifactId>orcid-test</artifactId>
-            <scope>test</scope>
-            <version>${project.version}</version>
+          <groupId>org.togglz</groupId>
+          <artifactId>togglz-junit</artifactId>
+          <version>2.4.1.Final</version>
+          <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.seleniumhq.selenium</groupId>
-            <artifactId>selenium-java</artifactId>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>orcid-test</artifactId>
+            <version>${project.parent.version}</version>
             <scope>test</scope>
         </dependency>
-	<!-- Togglz testing support -->
-	<dependency>
-		<groupId>org.togglz</groupId>
-		<artifactId>togglz-junit</artifactId>
-		<version>2.4.1.Final</version>
-		<scope>test</scope>
-	</dependency>
-
     </dependencies>
     <build>
         <finalName>${project.artifactId}</finalName>

diff --git a/orcid-core/pom.xml b/orcid-core/pom.xml
@@ -316,8 +316,7 @@
 		<!-- https://mvnrepository.com/artifact/javax.ws.rs/javax.ws.rs-api -->
 		<dependency>
 		    <groupId>javax.ws.rs</groupId>
-		    <artifactId>javax.ws.rs-api</artifactId>
-		    <version>2.1</version>
+		    <artifactId>javax.ws.rs-api</artifactId>		    
 		</dependency>
 
     </dependencies>