Skip to content

Add pom metadata and script for central #10

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.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 19, 2023
Merged

Add pom metadata and script for central #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e3b9876
Add pom metadata and script for central
anthonydahanne Dec 13, 2023
2ab9ae8
v2.0.1-SNAPSHOT Development
anthonydahanne Dec 14, 2023
07678ce
Revert Generics Addition to support Spring Boot 1.5 a little longer.
nebhale Aug 20, 2019
ab7a3c1
Disable Java compiler warning for javax module
anthonydahanne Dec 18, 2023
dc1ed6c
v2.0.2-SNAPSHOT Development
anthonydahanne Dec 19, 2023
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 ci/create-release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ SNAPSHOT=$2
./mvnw versions:set -DnewVersion=$RELEASE -DgenerateBackupPoms=false
git add .
git commit --message "v$RELEASE Release"
git tag -s v$RELEASE -m "v$RELEASE"
git tag v$RELEASE

git reset --hard HEAD^1
./mvnw versions:set -DnewVersion=$SNAPSHOT -DgenerateBackupPoms=false
Expand Down
5 changes: 4 additions & 1 deletion ci/deploy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,8 @@ set -euo pipefail

[[ -d $PWD/maven && ! -d $HOME/.m2 ]] && ln -s $PWD/maven $HOME/.m2

export REPOSITORY="${PWD}"/repository

cd java-buildpack-client-certificate-mapper
./mvnw -q -Dmaven.test.skip=true deploy
./mvnw -Dmaven.test.skip=true deploy -DcreateChecksum=true -DaltDeploymentRepository="local::default::file://${REPOSITORY}"

21 changes: 0 additions & 21 deletions ci/deploy.yml
View file
Open in desktop

This file was deleted.

9 changes: 9 additions & 0 deletions ci/promote-to-maven-central.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/usr/bin/env bash

set -euo pipefail

export BUILD_INFO_LOCATION=$(pwd)/repository/build-info.json

java -jar /concourse-release-scripts.jar publishToCentral 'RELEASE' "$BUILD_INFO_LOCATION" repository

echo "Sync complete"
17 changes: 0 additions & 17 deletions ci/unit-test.yml
View file
Open in desktop

This file was deleted.

14 changes: 11 additions & 3 deletions java-buildpack-client-certificate-mapper-jakarta/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>org.cloudfoundry</groupId>
<artifactId>java-buildpack-client-certificate-mapper-parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.2-SNAPSHOT</version>
</parent>

<artifactId>java-buildpack-client-certificate-mapper-jakarta</artifactId>
Expand Down Expand Up @@ -82,8 +82,12 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>8</source>
<target>8</target>
<compilerArgs>
<arg>-Werror</arg>
<arg>-Xlint:all</arg>
<arg>-Xlint:-options</arg>
<arg>-Xlint:-processing</arg>
</compilerArgs>
</configuration>
</plugin>
<plugin>
Expand All @@ -94,6 +98,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
</plugins>
</build>

Expand Down
10 changes: 5 additions & 5 deletions java-buildpack-client-certificate-mapper-javax/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>org.cloudfoundry</groupId>
<artifactId>java-buildpack-client-certificate-mapper-parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.2-SNAPSHOT</version>
</parent>

<artifactId>java-buildpack-client-certificate-mapper-javax</artifactId>
Expand Down Expand Up @@ -81,10 +81,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -94,6 +90,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
</plugins>
</build>

Expand Down
4 changes: 2 additions & 2 deletions ...src/main/java/org/cloudfoundry/router/javax/ClientCertificateMapperAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ ClientCertificateMapper clientCertificateMapper() throws CertificateException {
}

@Bean
FilterRegistrationBean<ClientCertificateMapper> clientCertificateMapperFilterRegistrationBean(ClientCertificateMapper mapper) {
FilterRegistrationBean<ClientCertificateMapper> result = new FilterRegistrationBean<>(mapper);
FilterRegistrationBean clientCertificateMapperFilterRegistrationBean(ClientCertificateMapper mapper) {
FilterRegistrationBean result = new FilterRegistrationBean(mapper);
result.setOrder(Ordered.HIGHEST_PRECEDENCE);
return result;
}
Expand Down
63 changes: 62 additions & 1 deletion java-buildpack-client-certificate-mapper/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>org.cloudfoundry</groupId>
<artifactId>java-buildpack-client-certificate-mapper-parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.2-SNAPSHOT</version>
</parent>

<artifactId>java-buildpack-client-certificate-mapper</artifactId>
Expand Down Expand Up @@ -61,6 +61,67 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<!--
Not ideal to merge 2 jars blindly with this plugin, but... after dropping all transitive dependencies from the 2 jars, we found ourselves in a situation where javadoc could not
resolve spring and other libraries and hence failed running. Adding manually additional libraries to the Javadoc plugin could work but is not maintainable.
-->
<version>3.1.0</version>
<executions>
<execution>
<phase>package</phase>
<configuration>
<target>
<zip destfile="target/${project.artifactId}-${version}-javadoc.jar">
<zipgroupfileset dir="../${project.artifactId}-jakarta/target/" includes="*javadoc.jar"/>
<zipgroupfileset dir="../${project.artifactId}-javax/target/" includes="*javadoc.jar"/>
</zip>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>3.1.1</version>
<executions>
<!-- the default execution is normally first; but I want to force javadoc first, since it will publish an invalid pom, that will be overwritten -->
<execution>
<id>default-deploy</id>
<phase>none</phase>
<goals>
<goal>deploy</goal>
</goals>
</execution>
<execution>
<id>deploy-javadoc</id>
<phase>deploy</phase>
<goals>
<goal>deploy-file</goal>
</goals>
<configuration>
<file>target/${project.artifactId}-${version}-javadoc.jar</file>
<url>file://${env.REPOSITORY}</url>
<groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId>
<version>${version}</version>
<packaging>javadoc</packaging>
</configuration>
</execution>
<execution>
<id>other-default-deploy</id>
<phase>deploy</phase>
<goals>
<goal>deploy</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
Expand Down
72 changes: 39 additions & 33 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,34 @@

<groupId>org.cloudfoundry</groupId>
<artifactId>java-buildpack-client-certificate-mapper-parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Cloud Foundry Client Certificate Mapper</name>
<description>Cloud Foundry Client Certificate Mapper</description>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<developers>
<developer>
<name>VMware</name>
<email>[email protected]</email>
<organization>VMware, Inc.</organization>
<organizationUrl>https://www.cloudfoundry.org</organizationUrl>
</developer>
</developers>
<licenses>
<license>
<name>The Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
</license>
</licenses>
<url>https://github.com/cloudfoundry/java-buildpack-client-certificate-mapper</url>
<scm>
<url>https://github.com/cloudfoundry/java-buildpack-client-certificate-mapper</url>
</scm>

<modules>
<module>java-buildpack-client-certificate-mapper</module>
<module>java-buildpack-client-certificate-mapper-jakarta</module>
Expand All @@ -46,12 +67,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<configuration>
<compilerArgs>
<arg>-Werror</arg>
<arg>-Xlint:all</arg>
<arg>-Xlint:-options</arg>
<arg>-Xlint:-processing</arg>
</compilerArgs>
<source>8</source>
<target>8</target>
<showWarnings>true</showWarnings>
</configuration>
</plugin>
Expand Down Expand Up @@ -87,41 +104,30 @@
</configuration>
</plugin>
<plugin>
<groupId>org.jfrog.buildinfo</groupId>
<artifactId>artifactory-maven-plugin</artifactId>
<version>3.6.2</version>
<inherited>false</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.6.3</version>
<configuration>
<links>
<link>https://projectreactor.io/docs/core/release/api/</link>
</links>
<!-- <quiet>true</quiet>-->
<source>8</source>
<additionalOptions>
<additionalOption>-Xdoclint:none</additionalOption>
</additionalOptions>
</configuration>
<executions>
<execution>
<id>build-info</id>
<id>attach-javadocs</id>
<goals>
<goal>publish</goal>
<goal>jar</goal>
</goals>
<configuration>
<publisher>
<contextUrl>https://repo.spring.io</contextUrl>
<username>{{ARTIFACTORY_USERNAME}}</username>
<password>{{ARTIFACTORY_PASSWORD}}</password>
<repoKey>{{ARTIFACTORY_REPO_KEY|"libs-release-local"}}</repoKey>
<snapshotRepoKey>{{ARTIFACTORY_SNAPSHOT_REPO_KEY|"libs-snapshot-local"}}</snapshotRepoKey>
</publisher>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
</build>

<pluginRepositories>
<pluginRepository>
<snapshots>
<enabled>false</enabled>
</snapshots>
<id>central</id>
<name>bintray-plugins</name>
<url>https://jcenter.bintray.com</url>
</pluginRepository>
</pluginRepositories>

</project>