diff --git a/pom.xml b/pom.xml index 69ac2b4..f906923 100644 --- a/pom.xml +++ b/pom.xml @@ -74,13 +74,6 @@ 17 17 - - 6.1.14 - 4.1.113.Final - 1.63.2 - 3.25.5 - 2.46.0 - 3.3.4 2.17.2 @@ -97,6 +90,7 @@ 3.11.0 3.1.2 3.1.2 + 1.6.0 3.5.0 3.3.0 0.8.10 @@ -185,6 +179,31 @@ maven-deploy-plugin ${maven-deploy-plugin.version} + + org.codehaus.mojo + flatten-maven-plugin + ${maven-flatten-plugin.version} + true + + + + flatten + process-resources + + flatten + + + true + oss + + expand + remove + remove + + + + + @@ -380,38 +399,12 @@ - org.springframework - spring-framework-bom - ${spring-framework.version} + org.springframework.grpc + spring-grpc-dependencies + ${project.version} pom import - - io.netty - netty-bom - ${netty.version} - pom - import - - - com.google.protobuf - protobuf-bom - ${protobuf-java.version} - pom - import - - - io.grpc - grpc-bom - ${grpc.version} - pom - import - - - com.google.api.grpc - proto-google-common-protos - ${google-common-protos.version} - diff --git a/spring-grpc-dependencies/pom.xml b/spring-grpc-dependencies/pom.xml index ff6468c..f0006d0 100644 --- a/spring-grpc-dependencies/pom.xml +++ b/spring-grpc-dependencies/pom.xml @@ -4,13 +4,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - org.springframework.grpc - spring-grpc - 0.1.0-SNAPSHOT - - + org.springframework.grpc spring-grpc-dependencies + 0.1.0-SNAPSHOT pom Spring gRPC dependencies @@ -24,6 +20,34 @@ git@github.com:spring-projects-experimental/spring-grpc.git + + https://github.com/spring-projects-experimental/spring-grpc + + spring-docs + scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-grpc/docs/${project.artifactId}/${project.version} + + + sonatype-nexus-staging + Nexus Release Repository + https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ + + + repo.spring.io + https://repo.spring.io/libs-snapshot-local + + false + + + + + + 6.1.14 + 4.1.113.Final + 1.63.2 + 3.25.5 + 2.46.0 + + @@ -47,7 +71,67 @@ spring-grpc-test ${project.version} + + org.springframework + spring-framework-bom + ${spring-framework.version} + pom + import + + + io.netty + netty-bom + ${netty.version} + pom + import + + + com.google.protobuf + protobuf-bom + ${protobuf-java.version} + pom + import + + + io.grpc + grpc-bom + ${grpc.version} + pom + import + + + com.google.api.grpc + proto-google-common-protos + ${google-common-protos.version} + - + + + staging + + + repo.spring.io + https://repo.spring.io/libs-staging-local + + false + + + + + + milestone + + + repo.spring.io + https://repo.spring.io/libs-milestone-local + + false + + + + + + + \ No newline at end of file diff --git a/spring-grpc-docs/.gitignore b/spring-grpc-docs/.gitignore index 803352e..a895da4 100644 --- a/spring-grpc-docs/.gitignore +++ b/spring-grpc-docs/.gitignore @@ -1 +1 @@ -!package.json +!package.json \ No newline at end of file diff --git a/spring-grpc-docs/pom.xml b/spring-grpc-docs/pom.xml index dab7f32..84eae73 100644 --- a/spring-grpc-docs/pom.xml +++ b/spring-grpc-docs/pom.xml @@ -48,25 +48,6 @@ - - com.github.eirslett - frontend-maven-plugin - ${maven-frontend-plugin.version} - - - install node and npm - - install-node-and-npm - npm - - generate-resources - - - - - v18.17.1 - - io.spring.maven.antora antora-maven-plugin @@ -139,36 +120,6 @@ - - generate-readme - package - - exec - - - ${basedir}/node_modules/.bin/downdoc - - ${project.build.directory}/README.adoc - -o - ${project.parent.basedir}/README.md - - - - - generate-contributing - package - - exec - - - ${basedir}/node_modules/.bin/downdoc - - ${project.build.directory}/CONTRIBUTING.adoc - -o - ${project.parent.basedir}/CONTRIBUTING.md - - - @@ -212,6 +163,48 @@ + + com.github.eirslett + frontend-maven-plugin + ${maven-frontend-plugin.version} + + + + install node and npm + + install-node-and-npm + npm + + generate-resources + + + + generate-readme + + npx + + package + + downdoc ${project.build.directory}/README.adoc -o ${project.parent.basedir}/README.md + + + + + generate-contributing + + npx + + package + + downdoc ${project.build.directory}/CONTRIBUTING.adoc -o ${project.parent.basedir}/CONTRIBUTING.md + + + + + + v18.17.1 + +