Skip to content

Commit

Permalink
Update to latest (#5)
Browse files Browse the repository at this point in the history
* fix circleci (#2)

Add circleci

* Jenkins (#3)

* Adding Jenkinsfile

* Pull from fork (#4)

* Upgrade to Spring Boot 2.2.0.RELEASE

* Migrate tests to JUnit 5

See spring-projectsgh-360

* Polish "Migrate tests to JUnit 5"

See spring-projectsgh-360

* Fix compatibility with Java 13

This commit upgrades jacoco to 0.8.5 as this version provides Java 13
support.

Closes spring-projectsgh-458

* Update to Spring Boot 2.2.1

* Uncomment sql initialization for mysql

* Add proxyBeanMethods = false

It's slightly faster, and we don't need proxies in this app.

* Spring Boot 2.2.2

* Re-organise mysql scripts so the app runs without root access

It works better that way with test containers and in k8s.

* Fix MySQL docker command line in readme

* Apply spring-format plugin

* Upgrade to Spring Boot 2.2.4

* Upgrade to spring javaformat 0.0.19

* Use https for Maven XSD

See spring-projectsgh-522

* Polish "Use https for Maven XSD"

See spring-projectsgh-522

* Add nohttp check

* Update checkstyle plugin for security scan warning

* Wrong name for user.sql  script

* Add m2e profile for well-known plugins

See spring-projectsgh-519

* Upgrade to Spring Boot 2.2.5

* Upgrade to spring javaformat 0.0.20

* Add support for H2

Closes spring-projectsgh-584

* Disable open-in-view explicitly to remove warning on startup

* Fix typo in readme

See spring-projectsgh-586

* Upgrade to Spring Boot 2.3.0.RC1

* Switch actuator to standard path

* Upgrade to spring javaformat 0.0.21

* Upgrade to maven checkstyle plugin 3.1.1

Co-authored-by: Stephane Nicoll <[email protected]>
Co-authored-by: Antoine Rey <[email protected]>
Co-authored-by: Dave Syer <[email protected]>
Co-authored-by: Dave Syer <[email protected]>
Co-authored-by: vbadipat <[email protected]>
Co-authored-by: James Artz <[email protected]>

* Enable HTTPS

* updated gradle

Co-authored-by: Stephane Nicoll <[email protected]>
Co-authored-by: Antoine Rey <[email protected]>
Co-authored-by: Dave Syer <[email protected]>
Co-authored-by: Dave Syer <[email protected]>
Co-authored-by: vbadipat <[email protected]>
Co-authored-by: James Artz <[email protected]>
Co-authored-by: Marcelo Klein <[email protected]>
  • Loading branch information
8 people authored May 25, 2020
1 parent 6c1cad3 commit 328a55c
Show file tree
Hide file tree
Showing 55 changed files with 1,818 additions and 1,419 deletions.
2 changes: 1 addition & 1 deletion .mvn/wrapper/MavenWrapperDownloader.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* https://www.apache.org/licenses/LICENSE-2.0'
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
Expand Down
30 changes: 30 additions & 0 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
pipeline {
agent any

stages {
stage('Build') {
steps {
echo 'Building..'
sh './gradlew build'

}
}
stage('Test') {
steps {
echo 'Testing..'
sh './gradlew test'
sh './gradlew check'
}
}
stage('Deploy') {
steps {
echo 'Deploying....'
}
}
}
post {
always {
archiveArtifacts artifacts: 'build/libs/**/*.jar', fingerprint: true
}
}
}
43 changes: 22 additions & 21 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,40 +11,41 @@ plugins {
repositories {
mavenLocal()
maven {
url = 'https://repo.spring.io/snapshot'
url = uri('https://repo.spring.io/snapshot')
}

maven {
url = 'https://repo.spring.io/milestone'
url = uri('https://repo.spring.io/milestone')
}

maven {
url = 'http://repo.maven.apache.org/maven2'
url = uri('https://repo.maven.apache.org/maven2')
}
}

dependencies {
compile 'org.springframework.boot:spring-boot-starter-actuator:2.1.9.RELEASE'
compile 'org.springframework.boot:spring-boot-starter-cache:2.1.9.RELEASE'
compile 'org.springframework.boot:spring-boot-starter-data-jpa:2.1.9.RELEASE'
compile 'org.springframework.boot:spring-boot-starter-web:2.1.9.RELEASE'
compile 'org.springframework.boot:spring-boot-starter-thymeleaf:2.1.9.RELEASE'
compile 'javax.cache:cache-api:1.1.1'
compile 'org.ehcache:ehcache:3.6.3'
compile 'org.webjars:webjars-locator-core:0.35'
compile 'org.webjars:jquery:2.2.4'
compile 'org.webjars:jquery-ui:1.11.4'
compile 'org.webjars:bootstrap:3.3.6'
compile 'org.springframework.boot:spring-boot-devtools:2.1.9.RELEASE'
runtime 'org.hsqldb:hsqldb:2.4.1'
runtime 'mysql:mysql-connector-java:8.0.17'
testCompile 'org.springframework.boot:spring-boot-starter-test:2.1.9.RELEASE'
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
implementation 'org.springframework.boot:spring-boot-starter-actuator:2.3.0.RC1'
implementation 'org.springframework.boot:spring-boot-starter-cache:2.3.0.RC1'
implementation 'org.springframework.boot:spring-boot-starter-data-jpa:2.3.0.RC1'
implementation 'org.springframework.boot:spring-boot-starter-web:2.3.0.RC1'
implementation 'org.springframework.boot:spring-boot-starter-validation:2.3.0.RC1'
implementation 'org.springframework.boot:spring-boot-starter-thymeleaf:2.3.0.RC1'
implementation 'javax.cache:cache-api:1.1.1'
implementation 'org.ehcache:ehcache:3.8.1'
implementation 'org.webjars:webjars-locator-core:0.45'
implementation 'org.webjars:jquery:2.2.4'
implementation 'org.webjars:jquery-ui:1.11.4'
implementation 'org.webjars:bootstrap:3.3.6'
implementation 'org.springframework.boot:spring-boot-devtools:2.3.0.RC1'
runtimeOnly 'com.h2database:h2:1.4.200'
runtimeOnly 'mysql:mysql-connector-java:8.0.20'
testImplementation 'org.springframework.boot:spring-boot-starter-test:2.3.0.RC1'
testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.6.2'
testImplementation 'org.mockito:mockito-junit-jupiter:3.3.3'
}

group = 'org.springframework.samples'
version = '2.1.0.BUILD-SNAPSHOT'
version = '2.3.0.BUILD-SNAPSHOT'
description = 'petclinic'
sourceCompatibility = '1.8'

Expand Down
5 changes: 4 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ mysql:
ports:
- "3306:3306"
environment:
- MYSQL_ROOT_PASSWORD=petclinic
- MYSQL_ROOT_PASSWORD=
- MYSQL_ALLOW_EMPTY_PASSWORD=true
- MYSQL_USER=petclinic
- MYSQL_PASSWORD=petclinic
- MYSQL_DATABASE=petclinic
volumes:
- "./conf.d:/etc/mysql/conf.d:ro"
Binary file added gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
5 changes: 5 additions & 0 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
185 changes: 185 additions & 0 deletions gradlew
Original file line number Diff line number Diff line change
@@ -0,0 +1,185 @@
#!/usr/bin/env sh

#
# Copyright 2015 the original author or authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

##############################################################################
##
## Gradle start up script for UN*X
##
##############################################################################

# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null

APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"

warn () {
echo "$*"
}

die () {
echo
echo "$*"
echo
exit 1
}

# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
case "`uname`" in
CYGWIN* )
cygwin=true
;;
Darwin* )
darwin=true
;;
MINGW* )
msys=true
;;
NONSTOP* )
nonstop=true
;;
esac

CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar


# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java"
else
JAVACMD="$JAVA_HOME/bin/java"
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD="java"
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi

# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
MAX_FD="$MAX_FD_LIMIT"
fi
ulimit -n $MAX_FD
if [ $? -ne 0 ] ; then
warn "Could not set maximum file descriptor limit: $MAX_FD"
fi
else
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi

# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi

# For Cygwin or MSYS, switch paths to Windows format before running java
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`

JAVACMD=`cygpath --unix "$JAVACMD"`

# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
SEP=""
for dir in $ROOTDIRSRAW ; do
ROOTDIRS="$ROOTDIRS$SEP$dir"
SEP="|"
done
OURCYGPATTERN="(^($ROOTDIRS))"
# Add a user-defined pattern to the cygpath arguments
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
i=0
for arg in "$@" ; do
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option

if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
else
eval `echo args$i`="\"$arg\""
fi
i=`expr $i + 1`
done
case $i in
0) set -- ;;
1) set -- "$args0" ;;
2) set -- "$args0" "$args1" ;;
3) set -- "$args0" "$args1" "$args2" ;;
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac
fi

# Escape application args
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
APP_ARGS=`save "$@"`

# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"

exec "$JAVACMD" "$@"
2 changes: 1 addition & 1 deletion mvnw
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
# https://www.apache.org/licenses/LICENSE-2.0'
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
Expand Down
2 changes: 1 addition & 1 deletion mvnw.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
@REM "License"); you may not use this file except in compliance
@REM with the License. You may obtain a copy of the License at
@REM
@REM http://www.apache.org/licenses/LICENSE-2.0
@REM https://www.apache.org/licenses/LICENSE-2.0'
@REM
@REM Unless required by applicable law or agreed to in writing,
@REM software distributed under the License is distributed on an
Expand Down
Loading

0 comments on commit 328a55c

Please sign in to comment.