Skip to content

Commit

Permalink
Maven dependency normalization
Browse files Browse the repository at this point in the history
  • Loading branch information
@acoburn
acoburn committed Oct 12, 2023
1 parent e6d93c8 commit f00ed20
Show file tree
Hide file tree
Showing 24 changed files with 421 additions and 102 deletions.
26 changes: 13 additions & 13 deletions apps/openliberty/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,23 +32,17 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.eclipse.microprofile</groupId>
<artifactId>microprofile</artifactId>
<version>${microprofile.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-api</artifactId>
<version>${jakarta.platform.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.microprofile</groupId>
<artifactId>microprofile</artifactId>
<type>pom</type>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.trellisldp</groupId>
<artifactId>trellis-api</artifactId>
Expand Down Expand Up @@ -134,6 +128,12 @@
<artifactId>trellis-triplestore</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-api</artifactId>
<version>${jakarta.platform.version}</version>
<scope>provided</scope>
</dependency>

<!-- testing -->
<dependency>
Expand Down
14 changes: 7 additions & 7 deletions apps/quarkus/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,13 +201,13 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemProperties>
<com.arjuna.ats.arjuna.objectstore.objectStoreDir>${project.build.directory}</com.arjuna.ats.arjuna.objectstore.objectStoreDir>
<trellis.file.binary-path>${project.build.directory}/data/binaries</trellis.file.binary-path>
<trellis.file.memento-path>${project.build.directory}/data/mementos</trellis.file.memento-path>
<mp.jwt.verify.publickey.location>https://www.trellisldp.org/tests/jwks.json</mp.jwt.verify.publickey.location>
<trellis.triplestore.rdf-location>${project.build.directory}/data/rdf</trellis.triplestore.rdf-location>
</systemProperties>
<systemPropertyVariables>
<com.arjuna.ats.arjuna.objectstore.objectStoreDir>${project.build.directory}</com.arjuna.ats.arjuna.objectstore.objectStoreDir>
<trellis.file.binary-path>${project.build.directory}/data/binaries</trellis.file.binary-path>
<trellis.file.memento-path>${project.build.directory}/data/mementos</trellis.file.memento-path>
<mp.jwt.verify.publickey.location>https://www.trellisldp.org/tests/jwks.json</mp.jwt.verify.publickey.location>
<trellis.triplestore.rdf-location>${project.build.directory}/data/rdf</trellis.triplestore.rdf-location>
</systemPropertyVariables>
</configuration>
</plugin>
</plugins>
Expand Down
17 changes: 14 additions & 3 deletions trellis-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,22 @@
</description>
<packaging>jar</packaging>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.eclipse.microprofile</groupId>
<artifactId>microprofile</artifactId>
<version>${microprofile.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.eclipse.microprofile</groupId>
<artifactId>microprofile</artifactId>
<type>pom</type>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-core-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
21 changes: 16 additions & 5 deletions trellis-app/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,18 @@
</description>
<packaging>jar</packaging>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.eclipse.microprofile</groupId>
<artifactId>microprofile</artifactId>
<version>${microprofile.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.trellisldp</groupId>
Expand All @@ -36,14 +48,13 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-core-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.microprofile</groupId>
<artifactId>microprofile</artifactId>
<type>pom</type>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
17 changes: 14 additions & 3 deletions trellis-audit/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,18 @@
</description>
<packaging>jar</packaging>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.eclipse.microprofile</groupId>
<artifactId>microprofile</artifactId>
<version>${microprofile.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.trellisldp</groupId>
Expand All @@ -31,9 +43,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.microprofile</groupId>
<artifactId>microprofile</artifactId>
<type>pom</type>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-core-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
17 changes: 14 additions & 3 deletions trellis-cache/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,27 @@
</description>
<packaging>jar</packaging>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.eclipse.microprofile</groupId>
<artifactId>microprofile</artifactId>
<version>${microprofile.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.trellisldp</groupId>
<artifactId>trellis-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.microprofile</groupId>
<artifactId>microprofile</artifactId>
<type>pom</type>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-core-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
17 changes: 14 additions & 3 deletions trellis-cdi/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,18 @@
</description>
<packaging>jar</packaging>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.eclipse.microprofile</groupId>
<artifactId>microprofile</artifactId>
<version>${microprofile.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.trellisldp</groupId>
Expand All @@ -31,9 +43,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.microprofile</groupId>
<artifactId>microprofile</artifactId>
<type>pom</type>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-core-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
22 changes: 19 additions & 3 deletions trellis-common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,18 @@
</description>
<packaging>jar</packaging>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.eclipse.microprofile</groupId>
<artifactId>microprofile</artifactId>
<version>${microprofile.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.trellisldp</groupId>
Expand All @@ -31,16 +43,20 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.microprofile</groupId>
<artifactId>microprofile</artifactId>
<type>pom</type>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-core-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.microprofile.config</groupId>
<artifactId>microprofile-config-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-rdf-api</artifactId>
Expand Down
17 changes: 14 additions & 3 deletions trellis-constraint/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,18 @@
</description>
<packaging>jar</packaging>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.eclipse.microprofile</groupId>
<artifactId>microprofile</artifactId>
<version>${microprofile.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.trellisldp</groupId>
Expand All @@ -31,9 +43,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.microprofile</groupId>
<artifactId>microprofile</artifactId>
<type>pom</type>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-core-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
22 changes: 19 additions & 3 deletions trellis-file/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,18 @@
</description>
<packaging>jar</packaging>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.eclipse.microprofile</groupId>
<artifactId>microprofile</artifactId>
<version>${microprofile.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.trellisldp</groupId>
Expand All @@ -31,9 +43,13 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.microprofile</groupId>
<artifactId>microprofile</artifactId>
<type>pom</type>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-core-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.microprofile.config</groupId>
<artifactId>microprofile-config-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
32 changes: 29 additions & 3 deletions trellis-http/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,18 @@
</description>
<packaging>jar</packaging>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.eclipse.microprofile</groupId>
<artifactId>microprofile</artifactId>
<version>${microprofile.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.trellisldp</groupId>
Expand All @@ -36,16 +48,30 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.microprofile</groupId>
<artifactId>microprofile</artifactId>
<type>pom</type>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-core-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.microprofile.config</groupId>
<artifactId>microprofile-config-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.microprofile.openapi</groupId>
<artifactId>microprofile-openapi-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.microprofile.metrics</groupId>
<artifactId>microprofile-metrics-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-rdf-api</artifactId>
Expand Down
Loading

0 comments on commit f00ed20

Please sign in to comment.