Skip to content

Commit

Permalink
OTPL-7882 Updated to SBT3
Browse files Browse the repository at this point in the history
  • Loading branch information
@dkaukov
dkaukov committed Oct 5, 2023
1 parent 8a77a4b commit 19bb7c9
Show file tree
Hide file tree
Showing 13 changed files with 19 additions and 19 deletions.
4 changes: 2 additions & 2 deletions component/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
<artifactId>spring-beans</artifactId>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
Expand Down
4 changes: 2 additions & 2 deletions component/src/main/resources/archetype-resources/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
</dependency>

<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion ...nent/src/main/resources/archetype-resources/src/test/java/ComponentConfigurationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import static org.assertj.core.api.Assertions.assertThat;
import javax.inject.Inject;
import jakarta.inject.Inject;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand Down
2 changes: 1 addition & 1 deletion component/src/test/resources/projects/test-component/archetype.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ groupId=com.opentable.it
artifactId=component-it
version=0.1.2-SNAPSHOT
package=com.opentable.it
otj-parent-version=378
otj-parent-version=0.1-SBT3-SNAPSHOT
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>com.opentable</groupId>
<artifactId>otj-parent-spring</artifactId>
<version>378</version>
<version>0.1-SBT3-SNAPSHOT</version>
</parent>

<scm>
Expand Down
4 changes: 2 additions & 2 deletions service-mvc/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@

<dependencies>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
Expand Down
4 changes: 2 additions & 2 deletions service-mvc/src/main/resources/archetype-resources/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@
</dependency>

<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion service-mvc/src/main/resources/archetype-resources/src/test/java/MainTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import static org.assertj.core.api.Assertions.assertThat;
import javax.inject.Inject;
import jakarta.inject.Inject;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand Down
2 changes: 1 addition & 1 deletion service-mvc/src/test/resources/projects/test-service/archetype.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ groupId=com.opentable.its
artifactId=service-it
version=0.1.2-SNAPSHOT
package=com.opentable.its.mvc
otj-parent-version=378
otj-parent-version=0.1-SBT3-SNAPSHOT
4 changes: 2 additions & 2 deletions service-reactive/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@

<dependencies>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
Expand Down
4 changes: 2 additions & 2 deletions service-reactive/src/main/resources/archetype-resources/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@
</dependency>

<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion service-reactive/src/main/resources/archetype-resources/src/test/java/MainTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import static org.assertj.core.api.Assertions.assertThat;
import javax.inject.Inject;
import jakarta.inject.Inject;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand Down
2 changes: 1 addition & 1 deletion service-reactive/src/test/resources/projects/test-service/archetype.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ groupId=com.opentable.its
artifactId=service-it
version=0.1.2-SNAPSHOT
package=com.opentable.its.mvc
otj-parent-version=378
otj-parent-version=0.1-SBT3-SNAPSHOT

4 comments on commit 19bb7c9

@opentable-devops
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TeamCity Architecture Team / Java TC Platform / otj-spring-archetypes / PR Build Build ???.15/merge.38 is now running

@opentable-devops
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TeamCity Architecture Team / Java TC Platform / otj-spring-archetypes / PR Build Build 0.0.10-SNAPSHOT.15/merge.38 outcome was FAILURE
Summary: Exit code 1 (Step: Run tests (Maven)) (new) Build time: 00:00:22

@opentable-devops
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TeamCity Architecture Team / Java TC Platform / otj-spring-archetypes / PR Build Build ???.15/merge.39 is now running

@opentable-devops
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TeamCity Architecture Team / Java TC Platform / otj-spring-archetypes / PR Build Build 0.0.10-SNAPSHOT.15/merge.39 outcome was FAILURE
Summary: Exit code 1 (Step: Run tests (Maven)) Build time: 00:00:18

Please sign in to comment.