Skip to content

Commit c6ac0f5

Browse files
authoredMar 10, 2023
Add support for Spring 6.x and Spring Boot 3.x. (#302)
This introduces 3 new artifacts: rollbar-jakarta-web: replaces rollbar-web, using the `jakarta` package instead of `javax` rollbar-spring6-webmvc: replaces rollbar-spring-webmvc, using Spring 6 and `jakarta` packages rollbar-spring-boot3-webmvc: replaces rollbar-spring-boot-webmvc, using Spring Boot 3.x While the artifact IDs are different, the package names are not modified, the integration classes are still under the `com.rollbar.spring` package. So upgrading to Spring Boot 3 only requires a change in dependenciees, not user code.
1 parent b1f7cf8 commit c6ac0f5

File tree

34 files changed

+1560
-119
lines changed

34 files changed

+1560
-119
lines changed
 

‎.github/workflows/ci.yml

+10-2
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
java: [8, 11]
1515
steps:
1616
- uses: actions/checkout@v2
17-
17+
1818
- name: Fetch git tags
1919
run: ./.github/fetch_to_tag.sh
20-
20+
2121
# Our build uses JDK7's rt.jar to make sure the artifact is fully
2222
# compatible with Java 7, so we let this action set Java 7 up for us
2323
# and we store its JAVA_HOME
@@ -29,6 +29,14 @@ jobs:
2929
- name: Capture JDK7_HOME
3030
run: echo "export JDK7_HOME=\"$JAVA_HOME\"" > ~/.jdk7_home
3131

32+
- name: Set up Java 17 (needed for Spring Boot 3)
33+
uses: actions/setup-java@v1
34+
with:
35+
java-version: 17
36+
37+
- name: Capture JDK17_HOME
38+
run: echo "export JDK17_HOME=\"$JAVA_HOME\"" > ~/.jdk17_home
39+
3240
# This is the JDK that'll run the build
3341
- name: Set up Java ${{ matrix.java }}
3442
uses: actions/setup-java@v1

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -73,3 +73,5 @@ atlassian-ide-plugin.xml
7373

7474
# Local gradle properties
7575
local.properties
76+
77+
bin/

‎build.gradle

+3-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
dependencies {
88
classpath "de.marcphilipp.gradle:nexus-publish-plugin:0.4.0"
99
classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.21.2"
10-
classpath "gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:4.2.4"
10+
classpath "com.github.spotbugs.snom:spotbugs-gradle-plugin:4.8.0"
1111
classpath "com.palantir.gradle.revapi:gradle-revapi:1.4.4"
1212
}
1313
}
@@ -40,7 +40,7 @@ subprojects { project ->
4040
apply from: "$rootDir/gradle/release.gradle"
4141

4242
apply from: "$rootDir/gradle/quality.gradle"
43-
43+
4444
apply from: "$rootDir/gradle/compatibility.gradle"
4545

4646
repositories {
@@ -87,9 +87,8 @@ subprojects { project ->
8787
}
8888
}
8989
}
90-
9190
}
9291

9392
wrapper {
94-
gradleVersion = '6.6'
93+
gradleVersion = '6.9.4'
9594
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
plugins {
2+
id 'java'
3+
id 'org.springframework.boot' version '3.0.3'
4+
id 'io.spring.dependency-management' version '1.1.0'
5+
}
6+
7+
group = 'com.rollbar.example'
8+
version = VERSION_NAME
9+
sourceCompatibility = '17'
10+
11+
repositories {
12+
mavenLocal()
13+
maven {
14+
url 'https://oss.sonatype.org/content/repositories/snapshots/'
15+
}
16+
mavenCentral()
17+
}
18+
19+
dependencies {
20+
implementation group: 'com.rollbar', name: 'rollbar-spring-boot3-webmvc', version: VERSION_NAME, changing: true
21+
implementation 'org.springframework.boot:spring-boot-starter-web'
22+
testImplementation 'org.springframework.boot:spring-boot-starter-test'
23+
}
24+
25+
tasks.named('test') {
26+
useJUnitPlatform()
27+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../gradle.properties
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
distributionBase=GRADLE_USER_HOME
2+
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
4+
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,240 @@
1+
#!/bin/sh
2+
3+
#
4+
# Copyright © 2015-2021 the original authors.
5+
#
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
9+
#
10+
# https://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
#
18+
19+
##############################################################################
20+
#
21+
# Gradle start up script for POSIX generated by Gradle.
22+
#
23+
# Important for running:
24+
#
25+
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
26+
# noncompliant, but you have some other compliant shell such as ksh or
27+
# bash, then to run this script, type that shell name before the whole
28+
# command line, like:
29+
#
30+
# ksh Gradle
31+
#
32+
# Busybox and similar reduced shells will NOT work, because this script
33+
# requires all of these POSIX shell features:
34+
# * functions;
35+
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
36+
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
37+
# * compound commands having a testable exit status, especially «case»;
38+
# * various built-in commands including «command», «set», and «ulimit».
39+
#
40+
# Important for patching:
41+
#
42+
# (2) This script targets any POSIX shell, so it avoids extensions provided
43+
# by Bash, Ksh, etc; in particular arrays are avoided.
44+
#
45+
# The "traditional" practice of packing multiple parameters into a
46+
# space-separated string is a well documented source of bugs and security
47+
# problems, so this is (mostly) avoided, by progressively accumulating
48+
# options in "$@", and eventually passing that to Java.
49+
#
50+
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
51+
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
52+
# see the in-line comments for details.
53+
#
54+
# There are tweaks for specific operating systems such as AIX, CygWin,
55+
# Darwin, MinGW, and NonStop.
56+
#
57+
# (3) This script is generated from the Groovy template
58+
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
59+
# within the Gradle project.
60+
#
61+
# You can find Gradle at https://github.com/gradle/gradle/.
62+
#
63+
##############################################################################
64+
65+
# Attempt to set APP_HOME
66+
67+
# Resolve links: $0 may be a link
68+
app_path=$0
69+
70+
# Need this for daisy-chained symlinks.
71+
while
72+
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
73+
[ -h "$app_path" ]
74+
do
75+
ls=$( ls -ld "$app_path" )
76+
link=${ls#*' -> '}
77+
case $link in #(
78+
/*) app_path=$link ;; #(
79+
*) app_path=$APP_HOME$link ;;
80+
esac
81+
done
82+
83+
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
84+
85+
APP_NAME="Gradle"
86+
APP_BASE_NAME=${0##*/}
87+
88+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
89+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
90+
91+
# Use the maximum available, or set MAX_FD != -1 to use that value.
92+
MAX_FD=maximum
93+
94+
warn () {
95+
echo "$*"
96+
} >&2
97+
98+
die () {
99+
echo
100+
echo "$*"
101+
echo
102+
exit 1
103+
} >&2
104+
105+
# OS specific support (must be 'true' or 'false').
106+
cygwin=false
107+
msys=false
108+
darwin=false
109+
nonstop=false
110+
case "$( uname )" in #(
111+
CYGWIN* ) cygwin=true ;; #(
112+
Darwin* ) darwin=true ;; #(
113+
MSYS* | MINGW* ) msys=true ;; #(
114+
NONSTOP* ) nonstop=true ;;
115+
esac
116+
117+
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
118+
119+
120+
# Determine the Java command to use to start the JVM.
121+
if [ -n "$JAVA_HOME" ] ; then
122+
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
123+
# IBM's JDK on AIX uses strange locations for the executables
124+
JAVACMD=$JAVA_HOME/jre/sh/java
125+
else
126+
JAVACMD=$JAVA_HOME/bin/java
127+
fi
128+
if [ ! -x "$JAVACMD" ] ; then
129+
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
130+
131+
Please set the JAVA_HOME variable in your environment to match the
132+
location of your Java installation."
133+
fi
134+
else
135+
JAVACMD=java
136+
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
137+
138+
Please set the JAVA_HOME variable in your environment to match the
139+
location of your Java installation."
140+
fi
141+
142+
# Increase the maximum file descriptors if we can.
143+
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
144+
case $MAX_FD in #(
145+
max*)
146+
MAX_FD=$( ulimit -H -n ) ||
147+
warn "Could not query maximum file descriptor limit"
148+
esac
149+
case $MAX_FD in #(
150+
'' | soft) :;; #(
151+
*)
152+
ulimit -n "$MAX_FD" ||
153+
warn "Could not set maximum file descriptor limit to $MAX_FD"
154+
esac
155+
fi
156+
157+
# Collect all arguments for the java command, stacking in reverse order:
158+
# * args from the command line
159+
# * the main class name
160+
# * -classpath
161+
# * -D...appname settings
162+
# * --module-path (only if needed)
163+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
164+
165+
# For Cygwin or MSYS, switch paths to Windows format before running java
166+
if "$cygwin" || "$msys" ; then
167+
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
168+
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
169+
170+
JAVACMD=$( cygpath --unix "$JAVACMD" )
171+
172+
# Now convert the arguments - kludge to limit ourselves to /bin/sh
173+
for arg do
174+
if
175+
case $arg in #(
176+
-*) false ;; # don't mess with options #(
177+
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
178+
[ -e "$t" ] ;; #(
179+
*) false ;;
180+
esac
181+
then
182+
arg=$( cygpath --path --ignore --mixed "$arg" )
183+
fi
184+
# Roll the args list around exactly as many times as the number of
185+
# args, so each arg winds up back in the position where it started, but
186+
# possibly modified.
187+
#
188+
# NB: a `for` loop captures its iteration list before it begins, so
189+
# changing the positional parameters here affects neither the number of
190+
# iterations, nor the values presented in `arg`.
191+
shift # remove old arg
192+
set -- "$@" "$arg" # push replacement arg
193+
done
194+
fi
195+
196+
# Collect all arguments for the java command;
197+
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
198+
# shell script including quotes and variable substitutions, so put them in
199+
# double quotes to make sure that they get re-expanded; and
200+
# * put everything else in single quotes, so that it's not re-expanded.
201+
202+
set -- \
203+
"-Dorg.gradle.appname=$APP_BASE_NAME" \
204+
-classpath "$CLASSPATH" \
205+
org.gradle.wrapper.GradleWrapperMain \
206+
"$@"
207+
208+
# Stop when "xargs" is not available.
209+
if ! command -v xargs >/dev/null 2>&1
210+
then
211+
die "xargs is not available"
212+
fi
213+
214+
# Use "xargs" to parse quoted args.
215+
#
216+
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
217+
#
218+
# In Bash we could simply go:
219+
#
220+
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
221+
# set -- "${ARGS[@]}" "$@"
222+
#
223+
# but POSIX shell has neither arrays nor command substitution, so instead we
224+
# post-process each arg (as a line of input to sed) to backslash-escape any
225+
# character that might be a shell metacharacter, then use eval to reverse
226+
# that process (while maintaining the separation between arguments), and wrap
227+
# the whole thing up as a single "set" statement.
228+
#
229+
# This will of course break if any of these variables contains a newline or
230+
# an unmatched quote.
231+
#
232+
233+
eval "set -- $(
234+
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
235+
xargs -n1 |
236+
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
237+
tr '\n' ' '
238+
)" '"$@"'
239+
240+
exec "$JAVACMD" "$@"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
rootProject.name = "rollbar-rollbar-spring-boot3-webmvc-example"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package com.example.springbootwebmvc;
2+
3+
import org.springframework.boot.SpringApplication;
4+
import org.springframework.boot.autoconfigure.SpringBootApplication;
5+
6+
@SpringBootApplication
7+
public class ExampleApplication {
8+
/**
9+
* Starts the Spring boot application.
10+
*/
11+
public static void main(String[] args) {
12+
SpringApplication.run(ExampleApplication.class, args);
13+
}
14+
}

0 commit comments

Comments
 (0)
Please sign in to comment.