Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

F/upgrade java#174

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
billoneil merged 7 commits intomasterfromf/upgrade-java
Dec 19, 2020
Merged
Show file tree
Hide file tree
Changes fromall 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
2 changes: 1 addition & 1 deletion.github/workflows/build-stubbornjava-web.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v1
with:
java-version:1.8
java-version:15

# https://github.com/actions/cache/blob/master/examples.md#java---gradle
- name: save / load Gradle caches
Expand Down
8 changes: 4 additions & 4 deletionsbuild.gradle
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ apply from: "gradle/dependencies.gradle"

allprojects {
// Apply the java plugin to add support for Java
apply plugin: 'java'
apply plugin: 'java-library'
apply plugin: 'idea'
apply plugin: 'eclipse'
apply plugin: 'maven-publish'
Expand All@@ -23,8 +23,8 @@ allprojects {
group = 'com.stubbornjava.StubbornJava'
version = '0.0.0-SNAPSHOT'

sourceCompatibility =1.8
targetCompatibility =1.8
sourceCompatibility =15
targetCompatibility =15

sourceSets {
main {
Expand All@@ -45,7 +45,7 @@ allprojects {

task copyRuntimeLibs(type: Copy) {
into "build/libs"
from configurations.runtime
from configurations.runtimeClasspath
}

build.finalizedBy(copyRuntimeLibs)
Expand Down
Binary file modifiedgradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletiongradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 2 additions & 0 deletionsgradlew
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -82,6 +82,7 @@ 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
Expand DownExpand Up@@ -129,6 +130,7 @@ fi
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
Expand Down
25 changes: 7 additions & 18 deletionsgradlew.bat
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi

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

Expand All@@ -37,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome

set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" gotoinit
if "%ERRORLEVEL%" == "0" gotoexecute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Expand All@@ -51,7 +54,7 @@ goto fail
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" gotoinit
if exist "%JAVA_EXE%" gotoexecute

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
Expand All@@ -61,28 +64,14 @@ echo location of your Java installation.

goto fail

:init
@rem Get command-line arguments, handling Windows variants

if not "%OS%" == "Windows_NT" goto win9xME_args

:win9xME_args
@rem Slurp the command line arguments.
set CMD_LINE_ARGS=
set _SKIP=2

:win9xME_args_slurp
if "x%~1" == "x" goto execute

set CMD_LINE_ARGS=%*

:execute
@rem Setup the command line

set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar


@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*

:end
@rem End local scope for the variables with windows NT shell
Expand Down
10 changes: 5 additions & 5 deletionsstubbornjava-cms-server/build.gradle
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
dependencies {
// Project reference
compile project(':stubbornjava-undertow')
compile project(':stubbornjava-common')
api project(':stubbornjava-undertow')
api project(':stubbornjava-common')

compileOnly libs.lombok
annotationProcessor libs.lombok
testCompile libs.junit

testImplementation libs.junit
}
86 changes: 43 additions & 43 deletionsstubbornjava-common/build.gradle
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,50 @@
// {{start:dependencies}}
dependencies {
// Project reference
compile project(':stubbornjava-undertow')
compile libs.slf4j
compile libs.logback
compile libs.jacksonCore
compile libs.jacksonDatabind
compile libs.jacksonDatabind
compile libs.jacksonAnnotations
compile libs.jacksonDatatypeJdk8
compile libs.jacksonDatatypeJsr310
compile libs.jacksonDataformatCsv
compile libs.metricsCore
compile libs.metricsJvm
compile libs.metricsJson
compile libs.metricsLogback
compile libs.metricsHealthchecks
compile libs.metricsGraphite
compile libs.guava
compile libs.typesafeConfig
compile libs.handlebars
compile libs.handlebarsJackson
compile libs.handlebarsMarkdown
compile libs.handlebarsHelpers
compile libs.handlebarsHumanize
compile libs.htmlCompressor
compile libs.hikaricp
compile libs.jool
compile libs.okhttp
compile libs.okhttpUrlConnection
compile libs.loggingInterceptor
compile libs.s3
compile libs.failsafe
compile libs.jsoup
compile libs.sitemapgen4j
compile libs.jbcrypt
compile libs.jooq
compile libs.jooqCodegen
compile libs.flyway
compile libs.connectorj
compile libs.javaxAnnotation
api project(':stubbornjava-undertow')
api libs.slf4j
api libs.logback
api libs.jacksonCore
api libs.jacksonDatabind
api libs.jacksonDatabind
api libs.jacksonAnnotations
api libs.jacksonDatatypeJdk8
api libs.jacksonDatatypeJsr310
api libs.jacksonDataformatCsv
api libs.metricsCore
api libs.metricsJvm
api libs.metricsJson
api libs.metricsLogback
api libs.metricsHealthchecks
api libs.metricsGraphite
api libs.guava
api libs.typesafeConfig
api libs.handlebars
api libs.handlebarsJackson
api libs.handlebarsMarkdown
api libs.handlebarsHelpers
api libs.handlebarsHumanize
api libs.htmlCompressor
api libs.hikaricp
api libs.jool
api libs.okhttp
api libs.okhttpUrlConnection
api libs.loggingInterceptor
api libs.s3
api libs.failsafe
api libs.jsoup
api libs.sitemapgen4j
api libs.jbcrypt
api libs.jooq
api libs.jooqCodegen
api libs.flyway
api libs.connectorj
api libs.javaxAnnotation

compileOnly libs.lombok
annotationProcessor libs.lombok
testCompile libs.junit
testCompile libs.hsqldb

testImplementation libs.junit
testImplementation libs.hsqldb
}
// {{end:dependencies}}
10 changes: 5 additions & 5 deletionsstubbornjava-examples/build.gradle
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
// {{start:dependencies}}
dependencies {
compile project(':stubbornjava-undertow')
compile project(':stubbornjava-common')
compile libs.hsqldb
compile libs.hashids
testCompile libs.junit
implementation project(':stubbornjava-undertow')
implementation project(':stubbornjava-common')
implementation libs.hsqldb
implementation libs.hashids
testImplementation libs.junit
}
// {{end:dependencies}}
8 changes: 4 additions & 4 deletionsstubbornjava-undertow/build.gradle
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
// {{start:dependencies}}
dependencies {
compile libs.undertowCore
compile libs.slf4j
compile libs.logback
api libs.undertowCore
api libs.slf4j
api libs.logback

testCompile libs.junit
testImplementation libs.junit
}
// {{end:dependencies}}
10 changes: 5 additions & 5 deletionsstubbornjava-webapp/build.gradle
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,16 +3,16 @@ apply plugin: 'com.github.johnrengelman.shadow'

dependencies {
// Project reference
compile project(':stubbornjava-undertow')
compile project(':stubbornjava-common')
compile project(':stubbornjava-cms-server')
api project(':stubbornjava-undertow')
api project(':stubbornjava-common')
api project(':stubbornjava-cms-server')

compile libs.romeRss
api libs.romeRss

compileOnly libs.lombok
annotationProcessor libs.lombok

testCompile libs.junit
testImplementation libs.junit
}

shadowJar {
Expand Down
11 changes: 6 additions & 5 deletionsstubbornjava-webapp/docker/Dockerfile
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
FROM openjdk:8-jdk-alpine AS builder
# Use adoptopenjdk/openjdk15:alpine-jre because its ~60MB
# and the openjdk alpine container is ~190MB
FROM adoptopenjdk/openjdk15:alpine-jre AS builder

# ----
# Install Maven
# We will eventually need more things here
RUN apk add --no-cache curl tar bash

RUN mkdir -p /app
Expand All@@ -11,9 +12,9 @@ COPY build/libs/ /app/libs

# Using multi build steps here to keep container as small as possible
# Eventually we may add more tooling above
FROMopenjdk:8-jre-alpine
FROMadoptopenjdk/openjdk15:alpine-jre
RUN mkdir -p /app
WORKDIR /app
COPY --from=builder /app/libs /app/libs
COPY docker/entrypoint.sh /app/entrypoint.sh
CMD ["/usr/bin/java", "-XX:+UnlockExperimentalVMOptions", "-XX:+UseCGroupMemoryLimitForHeap", "-cp", "libs/*", "com.stubbornjava.webapp.StubbornJavaWebApp"]
CMD ["java", "-cp", "libs/*", "com.stubbornjava.webapp.StubbornJavaWebApp"]
[8]ページ先頭
©2009-2025 Movatter.jp