#2 📝 add version badge to readme for easier viewing; 🔧 fix release sc…

…ript and pom structure for release
boozallen · Apr 19, 2024 · fa9a9c8 · fa9a9c8
1 parent 8b5e6e1
commit fa9a9c8
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 16 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -28,13 +28,21 @@ jobs:
               uses: actions/setup-python@v5
               with:
                   python-version: '3.11.4'
+            - name: Load cached Poetry installation
+              id: cached-poetry
+              uses: actions/cache@v4
+              with:
+                  path: ~/.local
+                  key: poetry-0  # increment to reset cache
             - name: Install Poetry
+              if: steps.cached-poetry.outputs.cache-hit != 'true'
               uses: snok/install-poetry@v1
             - name: Set up JDK 11
               uses: actions/setup-java@v4
               with:
                   java-version: '11'
                   distribution: 'temurin'
+                  cache: maven
                   server-id: 'ossrh'
                   server-username: MAVEN_USERNAME
                   server-password: MAVEN_PASSWORD
@@ -44,13 +52,12 @@ jobs:
               run: |
                   git config --local user.email "aissemble-noreply@bah.com"
                   git config --local user.name "Github Actions"
-                  git checkout -b $1-release
-                  mvn -B release:clean release:prepare release:perform -DreleaseVersion=$1 -DdevelopmentVersion=$2
-                  mvn versions:set -DnewVersion=$2 -DgenerateBackupPoms=false
-                  mvn clean install
-                  mvn scm:checkin -Dmessage=":arrow_up: push example modules to version $2"
+                  git checkout -b ${{ inputs.releaseVersion }}-release
+                  mvn -B release:clean release:prepare release:perform -Possrh-release -DreleaseVersion=${{ inputs.releaseVersion }} -DdevelopmentVersion=${{ inputs.developmentVersion }} -Darguments="-Dhabushu.usePyenv=false"
+                  mvn versions:set -DnewVersion=${{ inputs.developmentVersion }} -DgenerateBackupPoms=false
+                  mvn clean install -Dhabushu.usePyenv=false
+                  mvn scm:checkin -Dmessage=":arrow_up: push example modules to version ${{ inputs.developmentVersion }}"
               env:
                   MAVEN_USERNAME: ${{ secrets.SONATYPE_CENTRAL_REPO_TOKEN_USER }}
                   MAVEN_PASSWORD: ${{ secrets.SONATYPE_CENTRAL_REPO_TOKEN_KEY }}
                   GPG_PASSPHRASE: ${{ secrets.GPG_PRIVATE_KEY_PASSPHRASE }}
-                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/README.md b/README.md
@@ -1,3 +1,4 @@
+[![Maven Central](https://img.shields.io/maven-central/v/com.boozallen.aissemble/booz-allen-maven-licenses.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.boozallen.aissemble%22%20AND%20a%3A%22booz-allen-maven-licenses%22)
 [![Build](https://github.com/boozallen/booz-allen-maven-licenses/actions/workflows/build.yaml/badge.svg)](https://github.com/boozallen/booz-allen-maven-licenses/actions/workflows/build.yaml)
 
 # license-maven-plugin

diff --git a/booz-allen-licenses/src/license/com/boozallen/booz-allen-public-license/license.txt.ftl b/booz-allen-licenses/src/license/com/boozallen/booz-allen-public-license/license.txt.ftl
@@ -2,7 +2,7 @@ Booz Allen Public License v1.0
 ------------------------------
 
 INTRODUCTION
-The Booz Allen Public License allows government, non-profit academic, other non-profit, and commercial entities access to distinctive, disruptive, and robust code with the goal of Empowering People to Change the World&#8480;. Products licensed under the Booz Allen Public License are founded on the basis that collective ingenuity can make the largest impact in the community. 
+The Booz Allen Public License allows government, non-profit academic, other non-profit, and commercial entities access to distinctive, disruptive, and robust code with the goal of Empowering People to Change the World(SM). Products licensed under the Booz Allen Public License are founded on the basis that collective ingenuity can make the largest impact in the community.
 
 DEFINITIONS
 * **Commercial Entity.** “Commercial Entity” means any individual or entity other than a government, non-profit academic, or other non-profit entity.

diff --git a/license-example-projects/public-license-examples/booz-allen-public-license-java/LICENSE.txt b/license-example-projects/public-license-examples/booz-allen-public-license-java/LICENSE.txt
@@ -2,7 +2,7 @@ Booz Allen Public License v1.0
 ------------------------------
 
 INTRODUCTION
-The Booz Allen Public License allows government, non-profit academic, other non-profit, and commercial entities access to distinctive, disruptive, and robust code with the goal of Empowering People to Change the World&#8480;. Products licensed under the Booz Allen Public License are founded on the basis that collective ingenuity can make the largest impact in the community. 
+The Booz Allen Public License allows government, non-profit academic, other non-profit, and commercial entities access to distinctive, disruptive, and robust code with the goal of Empowering People to Change the World(SM). Products licensed under the Booz Allen Public License are founded on the basis that collective ingenuity can make the largest impact in the community.
 
 DEFINITIONS
 * **Commercial Entity.** “Commercial Entity” means any individual or entity other than a government, non-profit academic, or other non-profit entity.

diff --git a/license-example-projects/public-license-examples/booz-allen-public-license-python/LICENSE b/license-example-projects/public-license-examples/booz-allen-public-license-python/LICENSE
@@ -2,7 +2,7 @@ Booz Allen Public License v1.0
 ------------------------------
 
 INTRODUCTION
-The Booz Allen Public License allows government, non-profit academic, other non-profit, and commercial entities access to distinctive, disruptive, and robust code with the goal of Empowering People to Change the World&#8480;. Products licensed under the Booz Allen Public License are founded on the basis that collective ingenuity can make the largest impact in the community. 
+The Booz Allen Public License allows government, non-profit academic, other non-profit, and commercial entities access to distinctive, disruptive, and robust code with the goal of Empowering People to Change the World(SM). Products licensed under the Booz Allen Public License are founded on the basis that collective ingenuity can make the largest impact in the community.
 
 DEFINITIONS
 * **Commercial Entity.** “Commercial Entity” means any individual or entity other than a government, non-profit academic, or other non-profit entity.

diff --git a/pom.xml b/pom.xml
@@ -12,6 +12,7 @@
     <description>Provides Booz Allen-specific Licensing Best Practices and Custom Licenses for use with the
         license-maven-plugin
     </description>
+    <url>https://github.com/boozallen/booz-allen-maven-licenses</url>
     <inceptionYear>2021</inceptionYear>
 
     <issueManagement>
@@ -27,6 +28,10 @@
     </scm>
 
     <distributionManagement>
+        <snapshotRepository>
+            <id>ossrh</id>
+            <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
+        </snapshotRepository>
         <repository>
             <id>ossrh</id>
             <url>https://s01.oss.sonatype.org/content/repositories/releases/</url>
@@ -64,13 +69,13 @@
         <version.habushu.plugin>2.13.0</version.habushu.plugin>
     </properties>
 
-    <modules>
-        <module>booz-allen-licenses</module>
-        <module>license-example-projects</module>
-    </modules>
-
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.sonatype.plugins</groupId>
+                <artifactId>nexus-staging-maven-plugin</artifactId>
+                <extensions>true</extensions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
@@ -125,15 +130,16 @@
                     <version>3.0.1</version>
                     <configuration>
                         <releaseProfiles>ossrh-release</releaseProfiles>
+                        <autoVersionSubmodules>true</autoVersionSubmodules>
                     </configuration>
                 </plugin>
                 <plugin>
                     <groupId>org.sonatype.plugins</groupId>
                     <artifactId>nexus-staging-maven-plugin</artifactId>
-                    <version>${version.nexus.staging.plugin}</version>
+                    <version>1.6.13</version>
                     <configuration>
                         <serverId>ossrh</serverId>
-                        <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
+                        <nexusUrl>https://oss.sonatype.org/</nexusUrl>
                         <!-- Automatically release staging repository and make deployed artifacts available on
                              Maven Central. This mitigates the need to manually log into the OSSRH Nexus instance
                              and release the staging repository -->
@@ -145,6 +151,16 @@
     </build>
 
     <profiles>
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>booz-allen-licenses</module>
+                <module>license-example-projects</module>
+            </modules>
+        </profile>
         <profile>
             <id>ossrh-release</id>
             <modules>