Skip to content

Commit

Permalink
Clean up odl-aaa-shiro dependencies
Browse files Browse the repository at this point in the history 
Do not use project.version, picking the declarations from artifacts.

Change-Id: Ie6e2f0bd8a5b269e9f7403686d93b48e230b6103
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
  • Loading branch information
@rovarga
rovarga committed Nov 21, 2024
1 parent 77ca3f4 commit 6ef12dd
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 12 deletions.
31 changes: 26 additions & 5 deletions artifacts/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,22 +88,36 @@

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>aaa-shiro</artifactId>
<artifactId>aaa-shiro-api</artifactId>
<version>${project.version}</version>
<type>xml</type>
<classifier>aaa-app-config</classifier>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>aaa-shiro-api</artifactId>
<artifactId>aaa-shiro</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.opendaylight.aaa</groupId>
<artifactId>aaa-shiro</artifactId>
<version>${project.version}</version>
<type>py</type>
<classifier>idmtool</classifier>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>aaa-shiro</artifactId>
<version>${project.version}</version>
<type>xml</type>
<classifier>aaa-app-config</classifier>
</dependency>
<dependency>
<groupId>org.opendaylight.aaa</groupId>
<artifactId>aaa-shiro</artifactId>
<version>${project.version}</version>
<type>xml</type>
<classifier>aaa-datastore-config</classifier>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>aaa-tokenauthrealm</artifactId>
Expand Down Expand Up @@ -199,6 +213,13 @@
<classifier>features</classifier>
<type>xml</type>
</dependency>
<dependency>
<groupId>org.opendaylight.aaa</groupId>
<artifactId>odl-aaa-password-service</artifactId>
<version>${project.version}</version>
<classifier>features</classifier>
<type>xml</type>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>odl-aaa-shiro</artifactId>
Expand Down
7 changes: 0 additions & 7 deletions features/odl-aaa-shiro/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
<dependency>
<groupId>org.opendaylight.aaa</groupId>
<artifactId>odl-aaa-password-service</artifactId>
<version>${project.version}</version>
<classifier>features</classifier>
<type>xml</type>
</dependency>
Expand Down Expand Up @@ -70,7 +69,6 @@
<dependency>
<groupId>org.opendaylight.aaa</groupId>
<artifactId>odl-aaa-encryption-service</artifactId>
<version>${project.version}</version>
<type>xml</type>
<classifier>features</classifier>
</dependency>
Expand All @@ -81,28 +79,24 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>odl-aaa-api</artifactId>
<version>${project.version}</version>
<type>xml</type>
<classifier>features</classifier>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>odl-aaa-cert</artifactId>
<version>${project.version}</version>
<type>xml</type>
<classifier>features</classifier>
</dependency>
<dependency>
<groupId>org.opendaylight.aaa</groupId>
<artifactId>aaa-shiro</artifactId>
<version>${project.version}</version>
<type>xml</type>
<classifier>aaa-app-config</classifier>
</dependency>
<dependency>
<groupId>org.opendaylight.aaa</groupId>
<artifactId>aaa-shiro</artifactId>
<version>${project.version}</version>
<type>xml</type>
<classifier>aaa-datastore-config</classifier>
</dependency>
Expand All @@ -125,7 +119,6 @@
<!-- finalname="bin/idmtool" -->
<groupId>org.opendaylight.aaa</groupId>
<artifactId>aaa-shiro</artifactId>
<version>${project.version}</version>
<type>py</type>
<classifier>idmtool</classifier>
</dependency>
Expand Down

0 comments on commit 6ef12dd

Please sign in to comment.