diff --git a/spring-cloud-function-adapters/spring-cloud-function-aws-gradle-parent/org.springframework.cloud.function.aws-lambda.packaging.gradle.plugin/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-aws-gradle-parent/org.springframework.cloud.function.aws-lambda.packaging.gradle.plugin/pom.xml new file mode 100644 index 000000000..7932b994b --- /dev/null +++ b/spring-cloud-function-adapters/spring-cloud-function-aws-gradle-parent/org.springframework.cloud.function.aws-lambda.packaging.gradle.plugin/pom.xml @@ -0,0 +1,26 @@ + + + 4.0.0 + + org.springframework.cloud.function.aws-lambda.packaging.gradle.plugin + pom + Marker Artifact for Gradle Plugin to assist with packaging Spring Cloud Function based AWS Lambda application + + org.springframework.cloud.function.aws-lambda.packaging + spring-cloud-function-aws-gradle-parent + 1.0.0 + + + ${basedir}/../.. + + + + org.springframework.cloud.function.aws-lambda.packaging + spring-cloud-function-aws-packaging-gradle-plugin + 1.0.0 + + + + diff --git a/spring-cloud-function-adapters/spring-cloud-function-aws-gradle-parent/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-aws-gradle-parent/pom.xml new file mode 100644 index 000000000..ca7adcf03 --- /dev/null +++ b/spring-cloud-function-adapters/spring-cloud-function-aws-gradle-parent/pom.xml @@ -0,0 +1,26 @@ + + + 4.0.0 + + org.springframework.cloud.function.aws-lambda.packaging + spring-cloud-function-aws-gradle-parent + pom + 1.0.0 + + spring-cloud-function-aws-gradle-parent + AWS Lambda Adapter for Spring Cloud Function + + + + + + + + + spring-cloud-function-aws-packaging-gradle-plugin + org.springframework.cloud.function.aws-lambda.packaging.gradle.plugin + + + diff --git a/spring-cloud-function-adapters/spring-cloud-function-aws-gradle-parent/spring-cloud-function-aws-packaging-gradle-plugin/build.gradle b/spring-cloud-function-adapters/spring-cloud-function-aws-gradle-parent/spring-cloud-function-aws-packaging-gradle-plugin/build.gradle new file mode 100644 index 000000000..26e114828 --- /dev/null +++ b/spring-cloud-function-adapters/spring-cloud-function-aws-gradle-parent/spring-cloud-function-aws-packaging-gradle-plugin/build.gradle @@ -0,0 +1,70 @@ +plugins { + id 'java-gradle-plugin' + id 'eclipse' +} + +repositories { + mavenCentral() +} + +dependencies { + implementation fileTree(dir: 'target/dependencies/compile', include: '*.jar') + testImplementation gradleTestKit() + testImplementation fileTree(dir: 'target/dependencies/test', include: '*.jar') +} + +jar { + manifest { + attributes 'Implementation-Version': (version ? version : 'unknown') + } +} + +test { + useJUnitPlatform() + testLogging { + events "passed", "skipped", "failed" + } +} + +sourceCompatibility = 1.8 +targetCompatibility = 1.8 + +eclipseJdt { + inputFile = rootProject.file('../../.eclipse/org.eclipse.jdt.core.prefs') + doLast { + project.file('.settings/org.eclipse.jdt.ui.prefs').withWriter { writer -> + writer << file('../../.eclipse/org.eclipse.jdt.ui.prefs').text + } + } +} + +eclipse.classpath.file.whenMerged { classpath -> + classpath.entries.each { entry -> + if (entry.kind == "src" && entry.path.endsWith("/resources")) { + entry.excludes = [ "**" ] + } + } +} + +task sourcesJar(type: Jar) { + //classifier = 'sources' + from sourceSets.main.allSource +} + +task javadocJar(type: Jar) { + //classifier = "javadoc" + from javadoc +} + +artifacts { + archives sourcesJar + archives javadocJar +} + +tasks.withType(JavaCompile) { + options.compilerArgs.add("-Werror") + options.compilerArgs.add("-Xlint:deprecation") + options.compilerArgs.add("-Xlint:rawtypes") + options.compilerArgs.add("-Xlint:unchecked") + options.compilerArgs.add("-Xlint:varargs") +} \ No newline at end of file diff --git a/spring-cloud-function-adapters/spring-cloud-function-aws-gradle-parent/spring-cloud-function-aws-packaging-gradle-plugin/gradle/wrapper/gradle-wrapper.jar b/spring-cloud-function-adapters/spring-cloud-function-aws-gradle-parent/spring-cloud-function-aws-packaging-gradle-plugin/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 000000000..c1962a79e Binary files /dev/null and b/spring-cloud-function-adapters/spring-cloud-function-aws-gradle-parent/spring-cloud-function-aws-packaging-gradle-plugin/gradle/wrapper/gradle-wrapper.jar differ diff --git a/spring-cloud-function-adapters/spring-cloud-function-aws-gradle-parent/spring-cloud-function-aws-packaging-gradle-plugin/gradle/wrapper/gradle-wrapper.properties b/spring-cloud-function-adapters/spring-cloud-function-aws-gradle-parent/spring-cloud-function-aws-packaging-gradle-plugin/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..37aef8d3f --- /dev/null +++ b/spring-cloud-function-adapters/spring-cloud-function-aws-gradle-parent/spring-cloud-function-aws-packaging-gradle-plugin/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +networkTimeout=10000 +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/spring-cloud-function-adapters/spring-cloud-function-aws-gradle-parent/spring-cloud-function-aws-packaging-gradle-plugin/gradlew b/spring-cloud-function-adapters/spring-cloud-function-aws-gradle-parent/spring-cloud-function-aws-packaging-gradle-plugin/gradlew new file mode 100755 index 000000000..aeb74cbb4 --- /dev/null +++ b/spring-cloud-function-adapters/spring-cloud-function-aws-gradle-parent/spring-cloud-function-aws-packaging-gradle-plugin/gradlew @@ -0,0 +1,245 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original 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 POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# 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 ;; #( + MSYS* | 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" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# 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"' + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/spring-cloud-function-adapters/spring-cloud-function-aws-gradle-parent/spring-cloud-function-aws-packaging-gradle-plugin/gradlew.bat b/spring-cloud-function-adapters/spring-cloud-function-aws-gradle-parent/spring-cloud-function-aws-packaging-gradle-plugin/gradlew.bat new file mode 100644 index 000000000..6689b85be --- /dev/null +++ b/spring-cloud-function-adapters/spring-cloud-function-aws-gradle-parent/spring-cloud-function-aws-packaging-gradle-plugin/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +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" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +: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 %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/spring-cloud-function-adapters/spring-cloud-function-aws-gradle-parent/spring-cloud-function-aws-packaging-gradle-plugin/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-aws-gradle-parent/spring-cloud-function-aws-packaging-gradle-plugin/pom.xml new file mode 100644 index 000000000..7028f01b8 --- /dev/null +++ b/spring-cloud-function-adapters/spring-cloud-function-aws-gradle-parent/spring-cloud-function-aws-packaging-gradle-plugin/pom.xml @@ -0,0 +1,86 @@ + + + 4.0.0 + + spring-cloud-function-aws-packaging-gradle-plugin + jar + + spring-cloud-function-aws-packaging-gradle-plugin + Gradle Plugin to assist with packaging Spring Cloud Function based AWS Lambda application + + + org.springframework.cloud.function.aws-lambda.packaging + spring-cloud-function-aws-gradle-parent + 1.0.0 + + + + 17 + 17 + 17 + + + + + + org.codehaus.groovy + groovy + provided + 2.4.21 + + + org.gradle + gradle-tooling-api + 3.0 + + + org.gradle + gradle-core + 3.0 + provided + + + + + org.springframework.boot.experimental + spring-boot-thin-gradle-plugin + 1.0.31.RELEASE + + + + com.github.johnrengelman.shadow + com.github.johnrengelman.shadow.gradle.plugin + 8.1.1 + pom + + + + io.spring.dependency-management + io.spring.dependency-management.gradle.plugin + 1.1.4 + pom + + + + dev.gradleplugins + gradle-api + 8.4 + provided + + + + + + + + repo.gradle.org + https://repo.gradle.org/gradle/libs-releases-local/ + + + plugins.gradle.org + https://plugins.gradle.org/m2/ + + + diff --git a/spring-cloud-function-adapters/spring-cloud-function-aws-gradle-parent/spring-cloud-function-aws-packaging-gradle-plugin/src/main/java/org/springframework/cloud/function/gradle/AwsPackagingPlugin.java b/spring-cloud-function-adapters/spring-cloud-function-aws-gradle-parent/spring-cloud-function-aws-packaging-gradle-plugin/src/main/java/org/springframework/cloud/function/gradle/AwsPackagingPlugin.java new file mode 100644 index 000000000..525940fd7 --- /dev/null +++ b/spring-cloud-function-adapters/spring-cloud-function-aws-gradle-parent/spring-cloud-function-aws-packaging-gradle-plugin/src/main/java/org/springframework/cloud/function/gradle/AwsPackagingPlugin.java @@ -0,0 +1,87 @@ +/* + * Copyright 2012-2019 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. + */ + +package org.springframework.cloud.function.gradle; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.gradle.api.Action; +import org.gradle.api.JavaVersion; +import org.gradle.api.Plugin; +import org.gradle.api.Project; +import org.gradle.api.Task; +import org.gradle.api.java.archives.Manifest; +import org.gradle.api.plugins.JavaPluginExtension; +import org.gradle.api.tasks.TaskContainer; +import org.gradle.jvm.tasks.Jar; +import org.springframework.boot.experimental.gradle.ThinLauncherPlugin; + +import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar; +import com.github.jengelman.gradle.plugins.shadow.transformers.PropertiesFileTransformer; + +public class AwsPackagingPlugin implements Plugin { + @Override + public void apply(Project project) { + System.out.println("=====> Hello Plugin"); + + project.getPlugins().apply("java"); + project.getPlugins().apply(ThinLauncherPlugin.class); + project.getPlugins().apply("com.github.johnrengelman.shadow"); + project.getPlugins().apply("io.spring.dependency-management"); + + + TaskContainer taskContainer = project.getTasks(); + taskContainer.forEach(System.out::println); + JavaPluginExtension javaExtension = (JavaPluginExtension) project.getExtensions().findByName("java"); + javaExtension.setSourceCompatibility("17"); + + //.setProperty("sourceCompatibility", "17") + + List dependentTasks = List.of(taskContainer.findByName("thinJar"), taskContainer.findByName("shadowJar")); + taskContainer.findByName("assemble").dependsOn(dependentTasks); + + //taskContainer.findByName("java").setProperty("sourceCompatibility", "17"); + + this.configureShadowJarTask(project); + } + + private void configureShadowJarTask(Project project) { + ShadowJar shadowJar = (ShadowJar) project.getTasks().findByName("shadowJar"); + shadowJar.setProperty("archiveClassifier", "aws"); + + shadowJar.manifest(new Action() { + @Override + public void execute(Manifest mfst) { + mfst.from(((Jar) project.getTasks().findByName("thinJar")).getManifest()); + } + }); + + shadowJar.mustRunAfter(project.getTasks().findByName("thinJar")); + shadowJar.mergeServiceFiles(); + + shadowJar.append("META-INF/spring.handlers"); + shadowJar.append("META-INF/spring.schemas"); + shadowJar.append("META-INF/spring.tooling"); + shadowJar.append("META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports"); + shadowJar.append("META-INF/spring/org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration.imports"); + PropertiesFileTransformer xfmr = new PropertiesFileTransformer(); + xfmr.setPaths(Collections.singletonList("META-INF/spring.factories")); + xfmr.setMergeStrategy("append"); + shadowJar.transform(xfmr); + } +} diff --git a/spring-cloud-function-adapters/spring-cloud-function-aws-gradle-parent/spring-cloud-function-aws-packaging-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.springframework.cloud.function.aws-lambda.packaging.properties b/spring-cloud-function-adapters/spring-cloud-function-aws-gradle-parent/spring-cloud-function-aws-packaging-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.springframework.cloud.function.aws-lambda.packaging.properties new file mode 100644 index 000000000..789236e1f --- /dev/null +++ b/spring-cloud-function-adapters/spring-cloud-function-aws-gradle-parent/spring-cloud-function-aws-packaging-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.springframework.cloud.function.aws-lambda.packaging.properties @@ -0,0 +1 @@ +implementation-class=org.springframework.cloud.function.gradle.AwsPackagingPlugin diff --git a/spring-cloud-function-samples/function-sample-aws/build.gradle b/spring-cloud-function-samples/function-sample-aws/build.gradle index 36b716630..1eeb5e5a2 100644 --- a/spring-cloud-function-samples/function-sample-aws/build.gradle +++ b/spring-cloud-function-samples/function-sample-aws/build.gradle @@ -1,18 +1,19 @@ plugins { - id 'java' + id 'org.springframework.cloud.function.aws-lambda.packaging' version '1.0.0' + //id 'java' id 'org.springframework.boot' version '3.2.0-M2' - id 'io.spring.dependency-management' version '1.1.3' - id 'com.github.johnrengelman.shadow' version '8.1.1' - id 'maven-publish' - id 'org.springframework.boot.experimental.thin-launcher' version "1.0.31.RELEASE" + //id 'io.spring.dependency-management' version '1.1.3' + //id 'com.github.johnrengelman.shadow' version '8.1.1' + //id 'maven-publish' + // id 'org.springframework.boot.experimental.thin-launcher' version "1.0.31.RELEASE" } group = 'com.example' version = '0.0.1-SNAPSHOT' -java { - sourceCompatibility = '17' -} +//java { +// sourceCompatibility = '17' +//} repositories { mavenCentral() @@ -24,51 +25,50 @@ ext { set('springCloudVersion', "2023.0.0-M1") } -assemble.dependsOn = [thinJar, shadowJar] +//assemble.dependsOn = [thinJar, shadowJar] -publishing { - publications { - maven(MavenPublication) { - from components.java - versionMapping { - usage('java-api') { - fromResolutionOf('runtimeClasspath') - } - usage('java-runtime') { - fromResolutionResult() - } - } - } - } -} +//publishing { +// publications { +// maven(MavenPublication) { +// from components.java +// versionMapping { +// usage('java-api') { +// fromResolutionOf('runtimeClasspath') +// } +// usage('java-runtime') { +// fromResolutionResult() +// } +// } +// } +// } +//} -shadowJar.mustRunAfter thinJar +//shadowJar.mustRunAfter thinJar -import com.github.jengelman.gradle.plugins.shadow.transformers.* +//import com.github.jengelman.gradle.plugins.shadow.transformers.* -shadowJar { - archiveClassifier = 'aws' - manifest { - inheritFrom(project.tasks.thinJar.manifest) - } +//shadowJar { + //archiveClassifier = 'aws' + //manifest { + // inheritFrom(project.tasks.thinJar.manifest) + //} // Required for Spring - mergeServiceFiles() - append 'META-INF/spring.handlers' - append 'META-INF/spring.schemas' - append 'META-INF/spring.tooling' - append 'META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports' - append 'META-INF/spring/org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration.imports' - transform(PropertiesFileTransformer) { - paths = ['META-INF/spring.factories'] - mergeStrategy = "append" - } -} + //mergeServiceFiles() + //append 'META-INF/spring.handlers' + //append 'META-INF/spring.schemas' + //append 'META-INF/spring.tooling' + //append 'META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports' + //append 'META-INF/spring/org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration.imports' + //transform(PropertiesFileTransformer) { + // paths = ['META-INF/spring.factories'] + // mergeStrategy = "append" + //} +//} dependencies { implementation 'org.springframework.boot:spring-boot-starter' - implementation 'org.springframework.cloud:spring-cloud-function-adapter-aws' - implementation 'org.springframework.cloud:spring-cloud-function-context' + implementation 'org.springframework.cloud:spring-cloud-function-adapter-aws:4.1.0-SNAPSHOT' testImplementation 'org.springframework.boot:spring-boot-starter-test' } diff --git a/spring-cloud-function-samples/function-sample-aws/settings.gradle b/spring-cloud-function-samples/function-sample-aws/settings.gradle index 74052dbba..27cb275ce 100644 --- a/spring-cloud-function-samples/function-sample-aws/settings.gradle +++ b/spring-cloud-function-samples/function-sample-aws/settings.gradle @@ -1,5 +1,6 @@ pluginManagement { repositories { + mavenLocal() maven { url 'https://repo.spring.io/milestone' } gradlePluginPortal() }