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 2.0.0 Release #28

Merged
merged 3 commits into from
Jul 1, 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
6 changes: 3 additions & 3 deletions README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,14 @@ with Maven:
<dependency>
<groupId>net.rgielen</groupId>
<artifactId>javafx-weaver-spring-boot-starter</artifactId>
<version>1.3.0</version>
<version>2.0.0</version>
</dependency>
----

with Gradle:
[source,groovy]
----
implementation 'net.rgielen:javafx-weaver-spring-boot-starter:1.3.0'
implementation 'net.rgielen:javafx-weaver-spring-boot-starter:2.0.0'
----

==== Manual Setup
Expand All @@ -54,7 +54,7 @@ with Maven:
<dependency>
<groupId>net.rgielen</groupId>
<artifactId>javafx-weaver-core</artifactId>
<version>1.3.0</version>
<version>2.0.0</version>
</dependency>
----

Expand Down
82 changes: 75 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,18 @@
<character.encoding>UTF-8</character.encoding>
<java.level>11</java.level>
<project.build.sourceEncoding>${character.encoding}</project.build.sourceEncoding>
<slf4j.version>2.0.10</slf4j.version>
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
<maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
<maven-javadoc-plugin.version>3.7.0</maven-javadoc-plugin.version>
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
<maven-release-plugin.version>3.1.0</maven-release-plugin.version>
<maven-gpg-plugin.version>3.2.4</maven-gpg-plugin.version>
<slf4j.version>2.0.13</slf4j.version>
<spring-framework.version>5.3.31</spring-framework.version>
<javafx.version>17.0.8</javafx.version>
<javafx.version>17.0.11</javafx.version>
<spring-boot.version>2.7.18</spring-boot.version>
<assertj-core.version>3.21.0</assertj-core.version>
<mockito.version>4.2.0</mockito.version>
<assertj-core.version>3.26.0</assertj-core.version>
<mockito.version>4.11.0</mockito.version>
</properties>

<modules>
Expand Down Expand Up @@ -102,24 +108,86 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.6.3</version>
<version>${maven-javadoc-plugin.version}</version>
<configuration>
<source>${java.level}</source>
</configuration>
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
<version>${maven-source-plugin.version}</version>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>3.3.0</version>
<version>${maven-jar-plugin.version}</version>
</plugin>
<plugin>
<artifactId>maven-release-plugin</artifactId>
<version>${maven-release-plugin.version}</version>
<configuration>
<autoVersionSubmodules>true</autoVersionSubmodules>
<useReleaseProfile>false</useReleaseProfile>
<releaseProfiles>release</releaseProfiles>
<goals>deploy</goals>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>

<profiles>
<profile>
<id>release</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>${maven-gpg-plugin.version}</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

</project>
12 changes: 7 additions & 5 deletions samples/springboot-sample/README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -33,37 +33,39 @@ For Maven:
<dependency>
<groupId>net.rgielen</groupId>
<artifactId>javafx-weaver-spring</artifactId>
<version>1.3.0</version>
<version>2.0.0</version>
</dependency>
----

For Gradle:
[source,groovy]
----
implementation 'net.rgielen:javafx-weaver-spring:1.3.0'
implementation 'net.rgielen:javafx-weaver-spring:2.0.0'
----

[#spring-boot-starter]
=== Spring Boot Starter

Since version 1.3.0, a Spring Boot Starter is available.
It introduces the ```javafx-weaver-spring``` dependency as well as an autoconfiguration module.
It introduces the ```javafx-weaver-spring``` dependency as well as an auto-configuration module.
To use it, include the ```javafx-weaver-spring-boot-starter``` dependency.

Since version 2.0.0, the auto-configuration module adapts to new https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-2.7-Release-Notes#changes-to-auto-configuration[auto-configuration registration mechanism introduced with Spring Boot 2.7].

For Maven:
[source,xml]
----
<dependency>
<groupId>net.rgielen</groupId>
<artifactId>javafx-weaver-spring-boot-starter</artifactId>
<version>1.3.0</version>
<version>2.0.0</version>
</dependency>
----

For Gradle:
[source,groovy]
----
implementation 'javafx-weaver-spring-boot-starter:1.3.0'
implementation 'javafx-weaver-spring-boot-starter:2.0.0'
----

If using the the starter, it is not necessary to provide a ```FxWeaver``` bean as described in <<fxweaver-provisioning, the FxWeaver bean provisioning example>>, unless you want to customize it further.
Expand Down