Skip to content

Commit

Permalink
Merge pull request #28 from jhanders34/jhanders34-branch
Browse files Browse the repository at this point in the history
Update dependencies for arquillian, liberty and liberty plugins
  • Loading branch information
cherylking committed Jun 10, 2023
2 parents 70e7d37 + 0a2200d commit a8f7585
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 19 deletions.
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ The Liberty dependency bundles for Arquillian make it easy for you to manage ver

## Dependencies

In this repository, you'll find 6 artifacts that you can use in your Maven and Gradle projects with Jakarta EE 9. They are:
In this repository, you'll find 6 artifacts that you can use in your Maven and Gradle projects with Jakarta EE 9 and 10. They are:

- `io.openliberty.arquillian:arquillian-liberty-managed-jakarta-junit` for using the Arquillian Liberty Managed container with JUnit
- `io.openliberty.arquillian:arquillian-liberty-managed-jakarta-junit5` for using the Arquillian Liberty Managed container with JUnit5
Expand All @@ -28,14 +28,14 @@ For Java EE 8 or below, the following 4 artifacts are available:

In order to prevent dependency conflicts, you'll need to use the `arquillian-bom` in conjunction with a dependency bundle. While the `arquillian-liberty-dependencies` parent POM already contains the `arquillian-bom`, this is used only to build the dependency bundle artifacts and will not be applied to your project when you include them. The version of the `arquillian-bom` that you specify will apply to transitive dependencies of your project.

**Jakarta EE 9 example:**
**Jakarta EE 9 and 10 example:**
```
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-bom</artifactId>
<version>1.7.0.Alpha14</version>
<version>1.7.0.Final</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Expand All @@ -47,7 +47,7 @@ In order to prevent dependency conflicts, you'll need to use the `arquillian-bom
<dependency>
<groupId>io.openliberty.arquillian</groupId>
<artifactId>arquillian-liberty-managed-jakarta-junit</artifactId>
<version>2.1.2</version>
<version>2.1.4</version>
<type>pom</type>
<scope>test</scope>
</dependency>
Expand Down Expand Up @@ -119,11 +119,11 @@ Step 3: Add a `dependencyManagement` block that contains the `arquillian-bom`:
```
dependencyManagement {
imports {
mavenBom "org.jboss.arquillian:arquillian-bom:1.7.0.Alpha14"
mavenBom "org.jboss.arquillian:arquillian-bom:1.7.0.Final"
}
}
```

You can use the command `gradle dependencies` to view transitive dependencies and their versions.

The previous example uses version `1.7.0.Alpha14` of the `arquillian-bom` for Jakarta EE 9 projects. If using Java EE 8 or below, use version `1.1.13.Final` of the `arquillian-bom`. A full Gradle example with Jakarta EE 9 is available in the `gradle-tests` folder.
The previous example uses version `1.7.0.Final` of the `arquillian-bom` for Jakarta EE 9 and 10 projects. If using Java EE 8 or below, use version `1.1.13.Final` of the `arquillian-bom`. A full Gradle example with Jakarta EE 9 is available in the `gradle-tests` folder.
6 changes: 3 additions & 3 deletions gradle-tests/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath group: 'io.openliberty.tools', name: 'liberty-gradle-plugin', version: '3.5.1'
classpath group: 'io.openliberty.tools', name: 'liberty-gradle-plugin', version: '3.6.1'
classpath "io.spring.gradle:dependency-management-plugin:1.0.4.RELEASE"
}
}
Expand All @@ -23,7 +23,7 @@ subprojects {
mavenCentral()
}
dependencies {
classpath group: 'io.openliberty.tools', name: 'liberty-gradle-plugin', version: '3.5.1'
classpath group: 'io.openliberty.tools', name: 'liberty-gradle-plugin', version: '3.6.1'
classpath "io.spring.gradle:dependency-management-plugin:1.0.4.RELEASE"
}
}
Expand Down Expand Up @@ -66,7 +66,7 @@ subprojects {

dependencyManagement {
imports {
mavenBom "org.jboss.arquillian:arquillian-bom:1.7.0.Alpha14"
mavenBom "org.jboss.arquillian:arquillian-bom:1.7.0.Final"
}
}

Expand Down
2 changes: 1 addition & 1 deletion gradle-tests/gradle.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
dependencyBundleVersion=2.1.3-SNAPSHOT
dependencyBundleVersion=2.1.4-SNAPSHOT
2 changes: 1 addition & 1 deletion gradle-tests/olTest/build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
dependencies {
libertyRuntime group: 'io.openliberty', name: 'openliberty-runtime', version: '22.0.0.12'
libertyRuntime group: 'io.openliberty', name: 'openliberty-runtime', version: '23.0.0.3'
}
2 changes: 1 addition & 1 deletion gradle-tests/wlpTest/build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
dependencies {
libertyRuntime group: 'com.ibm.websphere.appserver.runtime', name: 'wlp-webProfile9', version: '22.0.0.12'
libertyRuntime group: 'com.ibm.websphere.appserver.runtime', name: 'wlp-webProfile9', version: '23.0.0.2'
}
10 changes: 5 additions & 5 deletions it/managed-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>io.openliberty.tools</groupId>
<artifactId>liberty-maven-app-parent</artifactId>
<version>3.7.1</version>
<version>3.8.1</version>
</parent>

<licenses>
Expand Down Expand Up @@ -62,7 +62,7 @@
<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-bom</artifactId>
<version>1.7.0.Alpha14</version>
<version>1.7.0.Final</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Expand Down Expand Up @@ -145,7 +145,7 @@
<plugin>
<groupId>io.openliberty.tools</groupId>
<artifactId>liberty-maven-plugin</artifactId>
<version>3.7.1</version>
<version>3.8.1</version>
<extensions>true</extensions>
<!-- Specify configuration, executions for liberty-maven-plugin -->
<configuration>
Expand Down Expand Up @@ -255,15 +255,15 @@
<properties>
<runtimeGroupId>com.ibm.websphere.appserver.runtime</runtimeGroupId>
<runtimeArtifactId>wlp-webProfile9</runtimeArtifactId>
<runtimeVersion>22.0.0.9</runtimeVersion>
<runtimeVersion>23.0.0.2</runtimeVersion>
</properties>
</profile>
<profile>
<id>ol</id>
<properties>
<runtimeGroupId>io.openliberty</runtimeGroupId>
<runtimeArtifactId>openliberty-runtime</runtimeArtifactId>
<runtimeVersion>22.0.0.9</runtimeVersion>
<runtimeVersion>23.0.0.3</runtimeVersion>
</properties>
</profile>
</profiles>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-bom</artifactId>
<version>1.7.0.Alpha14</version>
<version>1.7.0.Final</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Expand All @@ -59,7 +59,7 @@
<maven.compiler.target>1.8</maven.compiler.target>

<liberty.arquillian.groupId>io.openliberty.arquillian</liberty.arquillian.groupId>
<liberty.arquillian.version>2.1.2</liberty.arquillian.version>
<liberty.arquillian.version>2.1.3</liberty.arquillian.version>
<liberty.managed.artifactId>arquillian-liberty-managed-jakarta</liberty.managed.artifactId>
<liberty.remote.artifactId>arquillian-liberty-remote-jakarta</liberty.remote.artifactId>

Expand Down

0 comments on commit a8f7585

Please sign in to comment.