Skip to content

Commit

Permalink
[DEPENDENCY CLEANUP] removing the default dependencies from top-level…
Browse files Browse the repository at this point in the history
… LRA pom.xml
  • Loading branch information
ochaloup committed Feb 16, 2021
1 parent f2de252 commit 1eb0b05
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 20 deletions.
14 changes: 10 additions & 4 deletions rts/lra/client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,20 @@
<version>${version.microprofile.lra.api}</version>
</dependency>
<dependency>
<groupId>org.jboss.narayana.rts</groupId>
<artifactId>lra-service-base</artifactId>
<version>${project.version}</version>
<groupId>org.jboss.narayana.rts</groupId>
<artifactId>lra-service-base</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.json</groupId>
<artifactId>jboss-json-api_1.0_spec</artifactId>
<version>1.0.0.Final</version>
<version>${version.jboss.json-api}</version>
</dependency>
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
<version>${version.cdi-api}</version>
<scope>provided</scope>
</dependency>
</dependencies>

Expand Down
11 changes: 11 additions & 0 deletions rts/lra/coordinator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,17 @@
<version>${version.org.jboss.resteasy}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
<version>${version.cdi-api}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.servlet</groupId>
<artifactId>jboss-servlet-api_3.1_spec</artifactId>
<version>${version.org.jboss.servlet.api}</version>
</dependency>
<dependency>
<groupId>org.jboss.narayana.rts</groupId>
<artifactId>lra-client</artifactId>
Expand Down
16 changes: 2 additions & 14 deletions rts/lra/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,14 @@
<packaging>pom</packaging>

<properties>
<version.json.api>1.1</version.json.api>
<version.jackson>2.9.10.1</version.jackson>

<version.jboss-interceptors>1.0.1.Final</version.jboss-interceptors>
<version.cdi-api>2.0</version.cdi-api>
<version.servlet-api>2.5</version.servlet-api>
<version.jboss-modules>1.10.2.Final</version.jboss-modules>
<version.jboss.json-api>1.0.0.Final</version.jboss.json-api>
<version.org.jboss.servlet.api>1.0.0.Final</version.org.jboss.servlet.api>

<version.microprofile.lra.api>1.0</version.microprofile.lra.api>
<version.microprofile.lra.tck>1.0</version.microprofile.lra.tck>
Expand Down Expand Up @@ -78,19 +79,6 @@
</dependencyManagement>

<dependencies>
<!-- for Intellij -->
<dependency>
<groupId>org.jboss.spec</groupId>
<artifactId>jboss-javaee-all-7.0</artifactId>
<version>1.0.3.Final</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.ws.rs</groupId>
<artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
<version>${version.javax.ws.rs-api}</version>
</dependency>

<!-- for testing -->
<dependency>
<groupId>junit</groupId>
Expand Down
5 changes: 5 additions & 0 deletions rts/lra/service-base/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@
<artifactId>microprofile-lra-api</artifactId>
<version>${version.microprofile.lra.api}</version>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.ws.rs</groupId>
<artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
<version>${version.javax.ws.rs-api}</version>
</dependency>

<!-- jboss logging -->
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@
import java.net.URISyntaxException;
import java.net.URL;

import javax.json.JsonObject;

import org.jboss.logging.annotations.Cause;
import org.jboss.logging.annotations.LogMessage;
import org.jboss.logging.annotations.Message;
Expand Down Expand Up @@ -113,9 +111,11 @@ public interface lraI18NLogger {
@Message(id = 25017, value = "Trying to aquire an in use connection for coordinator '%s'")
void error_connectionInUse(URI coordinator);

/*
@LogMessage(level = INFO)
@Message(id = 25018, value = "Error parsing json LRAStatus from JSON '%s'")
void warn_failedParsingStatusFromJson(JsonObject json, @Cause Throwable t);
*/

@LogMessage(level = ERROR)
@Message(id = 25019, value = "Invalid query format '%s' to get lra statuses")
Expand Down

0 comments on commit 1eb0b05

Please sign in to comment.