Skip to content

Commit

Permalink
Merge pull request #110 from SolaceDev/prep-2.1.0
Browse files Browse the repository at this point in the history
upversion to 2.1.0
  • Loading branch information
Nephery authored Oct 16, 2023
2 parents bd2bf2a + 2797780 commit cb2ae87
Show file tree
Hide file tree
Showing 15 changed files with 38 additions and 37 deletions.
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.0.1-SNAPSHOT</version>
<version>2.1.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.1.4</spring.boot.version>

<solace.spring.boot.java-starter.version>5.0.1-SNAPSHOT
<solace.spring.boot.java-starter.version>5.1.0-SNAPSHOT
</solace.spring.boot.java-starter.version>
<solace.spring.boot.jms-starter.version>5.0.1-SNAPSHOT</solace.spring.boot.jms-starter.version>
<solace.spring.boot.starter.version>2.0.1-SNAPSHOT</solace.spring.boot.starter.version>
<solace.spring.boot.jms-starter.version>5.1.0-SNAPSHOT</solace.spring.boot.jms-starter.version>
<solace.spring.boot.starter.version>2.1.0-SNAPSHOT</solace.spring.boot.starter.version>
</properties>

<licenses>
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.0.1-SNAPSHOT</version>
<version>2.1.0-SNAPSHOT</version>
<relativePath>../../solace-spring-boot-parent/pom.xml</relativePath>
</parent>

<artifactId>solace-java-spring-boot-autoconfigure</artifactId>
<version>5.0.1-SNAPSHOT</version>
<version>5.1.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.0.1-SNAPSHOT</version>
<version>2.1.0-SNAPSHOT</version>
<relativePath>../../solace-spring-boot-parent/pom.xml</relativePath>
</parent>

<artifactId>solace-jms-spring-boot-autoconfigure</artifactId>
<version>5.0.1-SNAPSHOT</version>
<version>5.1.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>Solace Spring Boot Autoconfiguration - JMS</name>
Expand Down
7 changes: 4 additions & 3 deletions solace-spring-boot-bom/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ 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.1.4 | 2.1.0 |

## Including the BOM

Expand All @@ -33,7 +34,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.0.0</version>
<version>2.1.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -61,7 +62,7 @@ apply plugin: 'io.spring.dependency-management'
dependencyManagement {
imports {
mavenBom "com.solace.spring.boot:solace-spring-boot-bom:2.0.0"
mavenBom "com.solace.spring.boot:solace-spring-boot-bom:2.1.0"
}
}
Expand All @@ -73,7 +74,7 @@ dependencies {
### Using it with Gradle 5
```groovy
dependencies {
implementation(platform("com.solace.spring.boot:solace-spring-boot-bom:2.0.0"))
implementation(platform("com.solace.spring.boot:solace-spring-boot-bom:2.1.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.0.1-SNAPSHOT</version>
<version>2.1.0-SNAPSHOT</version>
</parent>

<artifactId>solace-spring-boot-bom</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.1.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.0.1-SNAPSHOT</version>
<version>2.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>solace-spring-boot-parent</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.1.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.0.1-SNAPSHOT</solace.spring.boot.java-autoconf.version>
<solace.spring.boot.jms-autoconf.version>5.0.1-SNAPSHOT</solace.spring.boot.jms-autoconf.version>
<solace.spring.boot.java-autoconf.version>5.1.0-SNAPSHOT</solace.spring.boot.java-autoconf.version>
<solace.spring.boot.jms-autoconf.version>5.1.0-SNAPSHOT</solace.spring.boot.jms-autoconf.version>

<solace.jcsmp.version>10.21.0</solace.jcsmp.version>
<solace.jms-jakarta.version>10.21.0</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.0.1-SNAPSHOT</version>
<version>2.1.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Solace Spring Boot Samples Parent</name>
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.0.1-SNAPSHOT</version>
<version>2.1.0-SNAPSHOT</version>
</parent>

<artifactId>solace-java-sample-app</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.1.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.1.4</spring.boot.version>
<solace.spring.boot.version>2.0.1-SNAPSHOT</solace.spring.boot.version>
<solace.spring.boot.version>2.1.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.0.1-SNAPSHOT</version>
<version>2.1.0-SNAPSHOT</version>
</parent>

<artifactId>solace-jms-sample-app-jndi</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.1.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.1.4</spring.boot.version>
<solace.spring.boot.bom.version>2.0.1-SNAPSHOT</solace.spring.boot.bom.version>
<solace.spring.boot.bom.version>2.1.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.0.1-SNAPSHOT</version>
<version>2.1.0-SNAPSHOT</version>
</parent>

<artifactId>solace-jms-sample-app</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.1.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.1.4</spring.boot.version>
<solace.spring.boot.version>2.0.1-SNAPSHOT</solace.spring.boot.version>
<solace.spring.boot.version>2.1.0-SNAPSHOT</solace.spring.boot.version>
</properties>

<dependencyManagement>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,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.0.0")
compile("com.solace.spring.boot:solace-java-spring-boot-starter:5.1.0")
```

#### Using it with Maven
Expand All @@ -49,7 +49,7 @@ compile("com.solace.spring.boot:solace-java-spring-boot-starter:5.0.0")
<dependency>
<groupId>com.solace.spring.boot</groupId>
<artifactId>solace-java-spring-boot-starter</artifactId>
<version>5.0.0</version>
<version>5.1.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.0.1-SNAPSHOT</version>
<version>2.1.0-SNAPSHOT</version>
<relativePath>../../solace-spring-boot-parent/pom.xml</relativePath>
</parent>

<artifactId>solace-java-spring-boot-starter</artifactId>
<version>5.0.1-SNAPSHOT</version>
<version>5.1.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.0.0")
compile("com.solace.spring.boot:solace-jms-spring-boot-starter:5.1.0")
```

#### Using it with Maven
Expand All @@ -61,7 +61,7 @@ compile("com.solace.spring.boot:solace-jms-spring-boot-starter:5.0.0")
<dependency>
<groupId>com.solace.spring.boot</groupId>
<artifactId>solace-jms-spring-boot-starter</artifactId>
<version>5.0.0</version>
<version>5.1.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.0.1-SNAPSHOT</version>
<version>2.1.0-SNAPSHOT</version>
<relativePath>../../solace-spring-boot-parent/pom.xml</relativePath>
</parent>

<artifactId>solace-jms-spring-boot-starter</artifactId>
<version>5.0.1-SNAPSHOT</version>
<version>5.1.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.0.1-SNAPSHOT</version>
<version>2.1.0-SNAPSHOT</version>
<relativePath>../../solace-spring-boot-parent/pom.xml</relativePath>
</parent>

<artifactId>solace-spring-boot-starter</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.1.0-SNAPSHOT</version>
<packaging>jar</packaging>

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

0 comments on commit cb2ae87

Please sign in to comment.