SpringCloud/spring-cloud-function
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added missing dep for jdk11

Browse Source
This commit is contained in:
Marcin Grzejszczak
2018-10-08 11:59:58 +02:00
parent c20433e05f
commit 4d853d072b
3 changed files with 153 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

152
docs/pom.xml
View File

@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<!-- <groupId>org.springframework.cloud</groupId> --> <!-- <groupId>org.springframework.cloud</groupId> -->
<artifactId>spring-cloud-function-docs</artifactId> <artifactId>spring-cloud-function-docs</artifactId>
<parent> <parent>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
@@ -12,86 +14,90 @@
<name>Spring Cloud Function Docs</name> <name>Spring Cloud Function Docs</name>
<description>Spring Cloud Function Docs</description> <description>Spring Cloud Function Docs</description>
<properties> <properties>
<docs.main>spring-cloud-function</docs.main> <docs.main>spring-cloud-function</docs.main>
<main.basedir>${basedir}/..</main.basedir> <main.basedir>${basedir}/..</main.basedir>
<docs.whitelisted.branches>1.0.x</docs.whitelisted.branches> <docs.whitelisted.branches>1.0.x</docs.whitelisted.branches>
</properties> </properties>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<!--skip deploy --> <!--skip deploy -->
<artifactId>maven-deploy-plugin</artifactId> <artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version> <version>2.8.2</version>
<configuration> <configuration>
<skip>true</skip> <skip>true</skip>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<profiles> <profiles>
<profile> <profile>
<id>docs</id> <id>docs</id>
<properties> <properties>
<adapters.path>${main.basedir}/spring-cloud-function-adapters</adapters.path> <adapters.path>${main.basedir}/spring-cloud-function-adapters
</adapters.path>
</properties> </properties>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId> <artifactId>maven-dependency-plugin</artifactId>
<inherited>false</inherited> <inherited>false</inherited>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.asciidoctor</groupId> <groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-maven-plugin</artifactId> <artifactId>asciidoctor-maven-plugin</artifactId>
<inherited>false</inherited> <inherited>false</inherited>
</plugin> </plugin>
<plugin> <plugin>
<groupId>com.agilejava.docbkx</groupId> <groupId>com.agilejava.docbkx</groupId>
<artifactId>docbkx-maven-plugin</artifactId> <artifactId>docbkx-maven-plugin</artifactId>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId> <artifactId>maven-antrun-plugin</artifactId>
<executions> <executions>
<execution> <execution>
<id>adapters</id> <id>adapters</id>
<phase>process-resources</phase> <phase>process-resources</phase>
<goals> <goals>
<goal>run</goal> <goal>run</goal>
</goals> </goals>
<configuration> <configuration>
<target> <target>
<java classname="org.jruby.Main" failonerror="yes"> <java classname="org.jruby.Main"
<arg value="${docs.resources.dir}/ruby/generate_readme.sh"/> failonerror="yes">
<arg value="-o"/> <arg value="${docs.resources.dir}/ruby/generate_readme.sh"/>
<arg value="${adapters.path}/spring-cloud-function-adapter-aws/README.adoc"/> <arg value="-o"/>
<arg value="${basedir}/src/main/asciidoc/adapters/aws-readme.adoc"/> <arg value="${adapters.path}/spring-cloud-function-adapter-aws/README.adoc"/>
</java> <arg value="${basedir}/src/main/asciidoc/adapters/aws-readme.adoc"/>
<java classname="org.jruby.Main" failonerror="yes"> </java>
<arg value="${docs.resources.dir}/ruby/generate_readme.sh"/> <java classname="org.jruby.Main"
<arg value="-o"/> failonerror="yes">
<arg value="${adapters.path}/spring-cloud-function-adapter-azure/README.adoc"/> <arg value="${docs.resources.dir}/ruby/generate_readme.sh"/>
<arg value="${basedir}/src/main/asciidoc/adapters/azure-readme.adoc"/> <arg value="-o"/>
</java> <arg value="${adapters.path}/spring-cloud-function-adapter-azure/README.adoc"/>
<java classname="org.jruby.Main" failonerror="yes"> <arg value="${basedir}/src/main/asciidoc/adapters/azure-readme.adoc"/>
<arg value="${docs.resources.dir}/ruby/generate_readme.sh"/> </java>
<arg value="-o"/> <java classname="org.jruby.Main"
<arg value="${adapters.path}/spring-cloud-function-adapter-openwhisk/README.adoc"/> failonerror="yes">
<arg value="${basedir}/src/main/asciidoc/adapters/openwhisk-readme.adoc"/> <arg value="${docs.resources.dir}/ruby/generate_readme.sh"/>
</java> <arg value="-o"/>
</target> <arg value="${adapters.path}/spring-cloud-function-adapter-openwhisk/README.adoc"/>
</configuration> <arg value="${basedir}/src/main/asciidoc/adapters/openwhisk-readme.adoc"/>
</execution> </java>
</executions> </target>
</plugin> </configuration>
<plugin> </execution>
<groupId>org.codehaus.mojo</groupId> </executions>
<artifactId>build-helper-maven-plugin</artifactId> </plugin>
<inherited>false</inherited> <plugin>
</plugin> <groupId>org.codehaus.mojo</groupId>
</plugins> <artifactId>build-helper-maven-plugin</artifactId>
</build> <inherited>false</inherited>
</plugin>
</plugins>
</build>
</profile> </profile>
</profiles> </profiles>
</project> </project>

15
pom.xml
View File

@@ -211,4 +211,19 @@
</pluginRepository> </pluginRepository>
</pluginRepositories> </pluginRepositories>
<profiles>
<profile>
<id>java11+</id>
<activation>
<jdk>[11,)</jdk>
</activation>
<dependencies>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</dependency>
</dependencies>
</profile>
</profiles>
</project> </project>

117
spring-cloud-function-dependencies/pom.xml
View File

@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
@@ -81,61 +82,61 @@
</profile> </profile>
</profiles> </profiles>
<repositories> <repositories>
<repository> <repository>
<id>spring-snapshots</id> <id>spring-snapshots</id>
<name>Spring Snapshots</name> <name>Spring Snapshots</name>
<url>https://repo.spring.io/libs-snapshot-local</url> <url>https://repo.spring.io/libs-snapshot-local</url>
<snapshots> <snapshots>
<enabled>true</enabled> <enabled>true</enabled>
</snapshots> </snapshots>
<releases> <releases>
<enabled>false</enabled> <enabled>false</enabled>
</releases> </releases>
</repository> </repository>
<repository> <repository>
<id>spring-milestones</id> <id>spring-milestones</id>
<name>Spring Milestones</name> <name>Spring Milestones</name>
<url>https://repo.spring.io/libs-milestone-local</url> <url>https://repo.spring.io/libs-milestone-local</url>
<snapshots> <snapshots>
<enabled>false</enabled> <enabled>false</enabled>
</snapshots> </snapshots>
</repository> </repository>
<repository> <repository>
<id>spring-releases</id> <id>spring-releases</id>
<name>Spring Releases</name> <name>Spring Releases</name>
<url>https://repo.spring.io/release</url> <url>https://repo.spring.io/release</url>
<snapshots> <snapshots>
<enabled>false</enabled> <enabled>false</enabled>
</snapshots> </snapshots>
</repository> </repository>
</repositories> </repositories>
<pluginRepositories> <pluginRepositories>
<pluginRepository> <pluginRepository>
<id>spring-snapshots</id> <id>spring-snapshots</id>
<name>Spring Snapshots</name> <name>Spring Snapshots</name>
<url>https://repo.spring.io/libs-snapshot-local</url> <url>https://repo.spring.io/libs-snapshot-local</url>
<snapshots> <snapshots>
<enabled>true</enabled> <enabled>true</enabled>
</snapshots> </snapshots>
<releases> <releases>
<enabled>false</enabled> <enabled>false</enabled>
</releases> </releases>
</pluginRepository> </pluginRepository>
<pluginRepository> <pluginRepository>
<id>spring-milestones</id> <id>spring-milestones</id>
<name>Spring Milestones</name> <name>Spring Milestones</name>
<url>https://repo.spring.io/libs-milestone-local</url> <url>https://repo.spring.io/libs-milestone-local</url>
<snapshots> <snapshots>
<enabled>false</enabled> <enabled>false</enabled>
</snapshots> </snapshots>
</pluginRepository> </pluginRepository>
<pluginRepository> <pluginRepository>
<id>spring-releases</id> <id>spring-releases</id>
<name>Spring Releases</name> <name>Spring Releases</name>
<url>https://repo.spring.io/libs-release-local</url> <url>https://repo.spring.io/libs-release-local</url>
<snapshots> <snapshots>
<enabled>false</enabled> <enabled>false</enabled>
</snapshots> </snapshots>
</pluginRepository> </pluginRepository>
</pluginRepositories> </pluginRepositories>
</project> </project>