Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

prepare for 2.2.0 release #142

Merged
merged 3 commits into from
Aug 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>com.solace.spring.boot</groupId>
<artifactId>solace-spring-boot-build</artifactId>
<version>2.1.2-SNAPSHOT</version>
<version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Solace Spring Boot Build</name>
Expand All @@ -17,10 +17,10 @@
<!-- This is the version of Spring Boot we have targeted for this build -->
<spring.boot.version>3.3.3</spring.boot.version>

<solace.spring.boot.java-starter.version>5.1.2-SNAPSHOT
<solace.spring.boot.java-starter.version>5.2.0-SNAPSHOT
</solace.spring.boot.java-starter.version>
<solace.spring.boot.jms-starter.version>5.1.2-SNAPSHOT</solace.spring.boot.jms-starter.version>
<solace.spring.boot.starter.version>2.1.2-SNAPSHOT</solace.spring.boot.starter.version>
<solace.spring.boot.jms-starter.version>5.2.0-SNAPSHOT</solace.spring.boot.jms-starter.version>
<solace.spring.boot.starter.version>2.2.0-SNAPSHOT</solace.spring.boot.starter.version>
<testcontainers.version>1.19.8</testcontainers.version>
<solace.integration.test.support.version>1.1.2</solace.integration.test.support.version>
</properties>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<parent>
<groupId>com.solace.spring.boot</groupId>
<artifactId>solace-spring-boot-parent</artifactId>
<version>2.1.2-SNAPSHOT</version>
<version>2.2.0-SNAPSHOT</version>
<relativePath>../../solace-spring-boot-parent/pom.xml</relativePath>
</parent>

<artifactId>solace-java-spring-boot-autoconfigure</artifactId>
<version>5.1.2-SNAPSHOT</version>
<version>5.2.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>Solace Spring Boot Autoconfiguration - Java</name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<parent>
<groupId>com.solace.spring.boot</groupId>
<artifactId>solace-spring-boot-parent</artifactId>
<version>2.1.2-SNAPSHOT</version>
<version>2.2.0-SNAPSHOT</version>
<relativePath>../../solace-spring-boot-parent/pom.xml</relativePath>
</parent>

<artifactId>solace-jms-spring-boot-autoconfigure</artifactId>
<version>5.1.2-SNAPSHOT</version>
<version>5.2.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>Solace Spring Boot Autoconfiguration - JMS</name>
Expand Down
31 changes: 5 additions & 26 deletions solace-spring-boot-bom/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ Consult the table below to determine which version of the BOM you need to use:
| 2.6.4 | 1.2.x |
| 2.7.7 | 1.3.0 |
| 3.0.6 | 2.0.0 |
| 3.3.1 | 2.1.0 |
| 3.3.1 | 2.1.x |
| 3.3.3 | 2.2.0 |

## Including the BOM

Expand All @@ -34,7 +35,7 @@ In addition to showing how to include the BOM, the following snippets also shows
<dependency>
<groupId>com.solace.spring.boot</groupId>
<artifactId>solace-spring-boot-bom</artifactId>
<version>2.1.0</version>
<version>2.2.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand All @@ -49,32 +50,10 @@ In addition to showing how to include the BOM, the following snippets also shows
</dependencies>
```

### Using it with Gradle 4
```groovy
buildscript {
dependencies {
classpath 'io.spring.gradle:dependency-management-plugin:1.0.8.RELEASE'
}
}

/* Gradle 4 isn't natively compatible with Maven BOMs. Need to use the Spring's dependency management plugin. */
apply plugin: 'io.spring.dependency-management'

dependencyManagement {
imports {
mavenBom "com.solace.spring.boot:solace-spring-boot-bom:2.1.0"
}
}

dependencies {
compile("com.solace.spring.boot:solace-spring-boot-starter")
}
```

### Using it with Gradle 5
### Using it with Gradle
```groovy
dependencies {
implementation(platform("com.solace.spring.boot:solace-spring-boot-bom:2.1.0"))
implementation(platform("com.solace.spring.boot:solace-spring-boot-bom:2.2.0"))
implementation("com.solace.spring.boot:solace-spring-boot-starter")
}
```
Expand Down
4 changes: 2 additions & 2 deletions solace-spring-boot-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<parent>
<groupId>com.solace.spring.boot</groupId>
<artifactId>solace-spring-boot-build</artifactId>
<version>2.1.2-SNAPSHOT</version>
<version>2.2.0-SNAPSHOT</version>
</parent>

<artifactId>solace-spring-boot-bom</artifactId>
<version>2.1.2-SNAPSHOT</version>
<version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Solace Spring Boot BOM</name>
Expand Down
8 changes: 4 additions & 4 deletions solace-spring-boot-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<parent>
<groupId>com.solace.spring.boot</groupId>
<artifactId>solace-spring-boot-build</artifactId>
<version>2.1.2-SNAPSHOT</version>
<version>2.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>solace-spring-boot-parent</artifactId>
<version>2.1.2-SNAPSHOT</version>
<version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Solace Spring Boot Parent</name>
Expand All @@ -24,8 +24,8 @@
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>

<solace.spring.boot.java-autoconf.version>5.1.2-SNAPSHOT</solace.spring.boot.java-autoconf.version>
<solace.spring.boot.jms-autoconf.version>5.1.2-SNAPSHOT</solace.spring.boot.jms-autoconf.version>
<solace.spring.boot.java-autoconf.version>5.2.0-SNAPSHOT</solace.spring.boot.java-autoconf.version>
<solace.spring.boot.jms-autoconf.version>5.2.0-SNAPSHOT</solace.spring.boot.jms-autoconf.version>

<solace.jcsmp.version>10.24.1</solace.jcsmp.version>
<solace.jms-jakarta.version>10.24.1</solace.jms-jakarta.version>
Expand Down
2 changes: 1 addition & 1 deletion solace-spring-boot-samples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>com.solace.spring.boot</groupId>
<artifactId>solace-spring-boot-samples</artifactId>
<version>2.1.2-SNAPSHOT</version>
<version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Solace Spring Boot Samples Parent</name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<parent>
<groupId>com.solace.spring.boot</groupId>
<artifactId>solace-spring-boot-samples</artifactId>
<version>2.1.2-SNAPSHOT</version>
<version>2.2.0-SNAPSHOT</version>
</parent>

<artifactId>solace-java-oauth2-sample-app</artifactId>
<version>2.1.2-SNAPSHOT</version>
<version>2.2.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>Solace Spring Boot Sample - Java</name>
Expand All @@ -21,7 +21,7 @@
<start-class>demo.DemoApplication</start-class>
<java.version>17</java.version>
<spring.boot.version>3.3.3</spring.boot.version>
<solace.spring.boot.version>2.1.2-SNAPSHOT</solace.spring.boot.version>
<solace.spring.boot.version>2.2.0-SNAPSHOT</solace.spring.boot.version>
</properties>

<dependencyManagement>
Expand Down
6 changes: 3 additions & 3 deletions solace-spring-boot-samples/solace-java-sample-app/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<parent>
<groupId>com.solace.spring.boot</groupId>
<artifactId>solace-spring-boot-samples</artifactId>
<version>2.1.2-SNAPSHOT</version>
<version>2.2.0-SNAPSHOT</version>
</parent>

<artifactId>solace-java-sample-app</artifactId>
<version>2.1.2-SNAPSHOT</version>
<version>2.2.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>Solace Spring Boot Sample - Java</name>
Expand All @@ -21,7 +21,7 @@
<start-class>demo.DemoApplication</start-class>
<java.version>17</java.version>
<spring.boot.version>3.3.3</spring.boot.version>
<solace.spring.boot.version>2.1.2-SNAPSHOT</solace.spring.boot.version>
<solace.spring.boot.version>2.2.0-SNAPSHOT</solace.spring.boot.version>
</properties>

<dependencyManagement>
Expand Down
6 changes: 3 additions & 3 deletions solace-spring-boot-samples/solace-jms-sample-app-jndi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<parent>
<groupId>com.solace.spring.boot</groupId>
<artifactId>solace-spring-boot-samples</artifactId>
<version>2.1.2-SNAPSHOT</version>
<version>2.2.0-SNAPSHOT</version>
</parent>

<artifactId>solace-jms-sample-app-jndi</artifactId>
<version>2.1.2-SNAPSHOT</version>
<version>2.2.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>Solace Spring Boot Sample - JMS (JNDI)</name>
Expand All @@ -21,7 +21,7 @@
<start-class>jndidemo.JndiDemoApplication</start-class>
<java.version>17</java.version>
<spring.boot.version>3.3.3</spring.boot.version>
<solace.spring.boot.bom.version>2.1.2-SNAPSHOT</solace.spring.boot.bom.version>
<solace.spring.boot.bom.version>2.2.0-SNAPSHOT</solace.spring.boot.bom.version>
</properties>

<dependencyManagement>
Expand Down
6 changes: 3 additions & 3 deletions solace-spring-boot-samples/solace-jms-sample-app/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<parent>
<groupId>com.solace.spring.boot</groupId>
<artifactId>solace-spring-boot-samples</artifactId>
<version>2.1.2-SNAPSHOT</version>
<version>2.2.0-SNAPSHOT</version>
</parent>

<artifactId>solace-jms-sample-app</artifactId>
<version>2.1.2-SNAPSHOT</version>
<version>2.2.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>Solace Spring Boot Sample - JMS</name>
Expand All @@ -21,7 +21,7 @@
<start-class>jmsdemo.DemoApplication</start-class>
<java.version>17</java.version>
<spring.boot.version>3.3.3</spring.boot.version>
<solace.spring.boot.version>2.1.2-SNAPSHOT</solace.spring.boot.version>
<solace.spring.boot.version>2.2.0-SNAPSHOT</solace.spring.boot.version>
</properties>

<dependencyManagement>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Note that you'll need to include version 3.1.0 or later to use Spring Boot relea

```groovy
// Solace Java API & auto-configuration
compile("com.solace.spring.boot:solace-java-spring-boot-starter:5.1.0")
compile("com.solace.spring.boot:solace-java-spring-boot-starter:5.2.0")
```

#### Using it with Maven
Expand All @@ -50,7 +50,7 @@ compile("com.solace.spring.boot:solace-java-spring-boot-starter:5.1.0")
<dependency>
<groupId>com.solace.spring.boot</groupId>
<artifactId>solace-java-spring-boot-starter</artifactId>
<version>5.1.0</version>
<version>5.2.0</version>
</dependency>
```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<parent>
<groupId>com.solace.spring.boot</groupId>
<artifactId>solace-spring-boot-parent</artifactId>
<version>2.1.2-SNAPSHOT</version>
<version>2.2.0-SNAPSHOT</version>
<relativePath>../../solace-spring-boot-parent/pom.xml</relativePath>
</parent>

<artifactId>solace-java-spring-boot-starter</artifactId>
<version>5.1.2-SNAPSHOT</version>
<version>5.2.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>Solace Spring Boot Starter - Java</name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Note that you'll need to include version 3.1.0 or later to use Spring Boot relea
#### Using it with Gradle

```groovy
compile("com.solace.spring.boot:solace-jms-spring-boot-starter:5.1.0")
compile("com.solace.spring.boot:solace-jms-spring-boot-starter:5.2.0")
```

#### Using it with Maven
Expand All @@ -61,7 +61,7 @@ compile("com.solace.spring.boot:solace-jms-spring-boot-starter:5.1.0")
<dependency>
<groupId>com.solace.spring.boot</groupId>
<artifactId>solace-jms-spring-boot-starter</artifactId>
<version>5.1.0</version>
<version>5.2.0</version>
</dependency>
```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<parent>
<groupId>com.solace.spring.boot</groupId>
<artifactId>solace-spring-boot-parent</artifactId>
<version>2.1.2-SNAPSHOT</version>
<version>2.2.0-SNAPSHOT</version>
<relativePath>../../solace-spring-boot-parent/pom.xml</relativePath>
</parent>

<artifactId>solace-jms-spring-boot-starter</artifactId>
<version>5.1.2-SNAPSHOT</version>
<version>5.2.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>Solace Spring Boot Starter - JMS</name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<parent>
<groupId>com.solace.spring.boot</groupId>
<artifactId>solace-spring-boot-parent</artifactId>
<version>2.1.2-SNAPSHOT</version>
<version>2.2.0-SNAPSHOT</version>
<relativePath>../../solace-spring-boot-parent/pom.xml</relativePath>
</parent>

<artifactId>solace-spring-boot-starter</artifactId>
<version>2.1.2-SNAPSHOT</version>
<version>2.2.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>Solace Spring Boot Starter</name>
Expand Down