Skip to content
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.

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

Util 4.1.2 #21

Merged
merged 38 commits into from
Apr 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
6e4e7a8
Update pom.xml
bischoffz Sep 8, 2023
fa96734
Added array indexers
shawnhatch Feb 1, 2024
47cf94f
Addded array indexers
shawnhatch Feb 1, 2024
7c82a29
Merge pull request #7 from HHS/indexer_migration
shawnhatch Feb 1, 2024
a2ac19c
move test resource helper
bischoffz Feb 1, 2024
69eacd1
update method name
bischoffz Feb 1, 2024
6be24bf
Merge pull request #8 from HHS/move-test-resource-helper
shawnhatch Feb 1, 2024
c321609
Added default serialVersionUID to IOExceptionFile
shawnhatch Feb 1, 2024
016daf0
Merge pull request #9 from HHS/resource_helper_correction
shawnhatch Feb 1, 2024
02d068b
Added tuple generator to ms-util
shawnhatch Feb 2, 2024
d6821ac
Merge pull request #10 from HHS/tuplator
shawnhatch Feb 2, 2024
16b7bdc
Bump the standard-plugins group with 3 updates (#11)
dependabot[bot] Feb 4, 2024
8171d75
Bump the test-dependencies group with 3 updates (#12)
dependabot[bot] Feb 4, 2024
424aaef
refactor package structure (#13)
bischoffz Feb 4, 2024
b433120
move path validator (#14)
bischoffz Feb 4, 2024
41cee1c
update workflows
bischoffz Feb 4, 2024
100826b
update workflows
bischoffz Feb 4, 2024
d256ef8
test-commit
bischoffz Feb 4, 2024
0520dc4
Update dev_build.yml
bischoffz Feb 4, 2024
efc5f37
Update pr_build.yml
bischoffz Feb 4, 2024
eda4803
update workflow
bischoffz Feb 4, 2024
c63e1d4
update workflows
bischoffz Feb 4, 2024
fc2eb01
Merge branch 'main' of https://github.com/HHS/ASPR-ms-util into dev
bischoffz Feb 4, 2024
8d6ac63
add text table reader (#17)
bischoffz Feb 7, 2024
8d057ca
Bump the test-dependencies group with 2 updates (#16)
dependabot[bot] Feb 7, 2024
bddd788
Merge branch 'main' of https://github.com/HHS/ASPR-ms-util into dev
bischoffz Feb 7, 2024
a5a2859
Update pom.xml
bischoffz Feb 20, 2024
328989c
Merge branch 'main' of https://github.com/HHS/ASPR-ms-util into dev
bischoffz Apr 1, 2024
69138b9
update pom
bischoffz Apr 1, 2024
b8e889c
Bump org.apache.maven.plugins:maven-source-plugin (#19)
dependabot[bot] Apr 12, 2024
1dfcf99
Bump org.jacoco:jacoco-maven-plugin in the test-dependencies group (#20)
dependabot[bot] Apr 12, 2024
c702bf0
Merge branch 'main' of https://github.com/HHS/ASPR-ms-util into dev
bischoffz Apr 12, 2024
dc89eea
add flatten maven pom
bischoffz Apr 12, 2024
2f5f4f9
add sontatype plugin to dependabot
bischoffz Apr 12, 2024
e9fdf58
update workflows
bischoffz Apr 15, 2024
e74fe4f
update dependabot
bischoffz Apr 15, 2024
3a96222
update README
bischoffz Apr 15, 2024
afc440c
update to 4.1.2 proper
bischoffz Apr 15, 2024
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
6 changes: 5 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,18 @@ updates:
- package-ecosystem: "maven" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
interval: "weekly"
interval: "daily"
target-branch: "dev"
open-pull-requests-limit: 10
groups:
standard-plugins:
patterns:
- "org.codehaus.mojo:flatten-maven-plugin"
- "org.apache.maven.plugins*"
- "org.sonatype.central"
deploy-plugins:
patterns:
- "org.sonatype.central"
dependencies:
patterns:
- "org.apache.commons:commons-math3"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dev_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
branches-ignore: ["main"]

jobs:
build:
dev-build:
runs-on: ubuntu-latest
steps:
- name: Checkout Util
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on:
branches: ["main"]

jobs:
build-deploy:
release:
runs-on: ubuntu-latest
permissions:
contents: write
Expand Down
11 changes: 10 additions & 1 deletion .github/workflows/release_pr_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
branches: ["main"]

jobs:
build:
release-pr-build:
runs-on: ubuntu-latest
steps:
- name: Checkout Util
Expand All @@ -24,7 +24,16 @@ jobs:
with:
java-version: '17'
distribution: 'temurin'
- name: Get Version
run: |
echo "version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout --file pom.xml)" >> "$GITHUB_ENV"

- name: Version Is Snapshot
if: ${{ endsWith(env.version, 'SNAPSHOT') }}
run: |
echo "Version is a SNAPSHOT version. Update version to proper version."
exit 1

- name: Build Util
run: mvn clean install -Pjavadoc,jacoco --file pom.xml

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ To use this project in your project, simply add the following dependency to your
<dependency>
<groupId>gov.hhs.aspr.ms</groupId>
<artifactId>util</artifactId>
<version>4.1.1</version>
<version>4.1.2</version>
</dependency>
```
## Building from Source
Expand Down
50 changes: 39 additions & 11 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<!-- Artifact -->
<groupId>gov.hhs.aspr.ms</groupId>
<artifactId>util</artifactId>
<version>4.1.1</version>
<version>4.1.2</version>
<packaging>jar</packaging>

<name>Modeling Utils</name>
Expand All @@ -21,7 +21,7 @@
<url>https://www.gnu.org/licenses/gpl-3.0.en.html</url>
</license>
<license>
<name>Vulnerability Disclosure Policy</name>
<name>HHS Vulnerability Disclosure Policy</name>
<url>https://www.hhs.gov/vulnerability-disclosure-policy/index.html</url>
</license>
</licenses>
Expand Down Expand Up @@ -55,20 +55,20 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<!-- <gpg.executable>gpg2</gpg.executable> -->
<gpg.useAgent>false</gpg.useAgent>

<!-- plugin versions -->
<flatten-maven-plugin.version>1.6.0</flatten-maven-plugin.version>
<maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
<maven-source-plugin.version>3.3.0</maven-source-plugin.version>
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
<maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
<maven-gpg-plugin.version>3.2.2</maven-gpg-plugin.version>
<central-publishing-maven-plugin.version>0.4.0</central-publishing-maven-plugin.version>

<!-- dependency versions-->
<commons-math3.version>3.6.1</commons-math3.version>
<jcip-annotations.version>1.0</jcip-annotations.version>
<junit-jupiter-engine.version>5.10.2</junit-jupiter-engine.version>
<jacoco-maven-plugin.version>0.8.11</jacoco-maven-plugin.version>
<jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
</properties>

<!-- Dependencies -->
Expand Down Expand Up @@ -106,6 +106,36 @@
<!-- Configure Build -->
<build>
<plugins>
<!-- used with the ${revision} for versioning, creates a pom that has the version replaced with the value of ${revision} -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>${flatten-maven-plugin.version}</version>
<executions>
<!-- enable flattening -->
<execution>
<id>flatten</id>
<phase>process-resources</phase>
<goals>
<goal>flatten</goal>
</goals>
<configuration>
<updatePomFile>true</updatePomFile>
<flattenMode>ossrh</flattenMode>
<flattenDependencyMode>all</flattenDependencyMode>
</configuration>
</execution>
<!-- ensure proper cleanup -->
<execution>
<id>flatten.clean</id>
<phase>clean</phase>
<goals>
<goal>clean</goal>
</goals>
</execution>
</executions>
</plugin>

<!-- Runs unit tests -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -137,11 +167,12 @@
<plugin>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<version>0.4.0</version>
<version>${central-publishing-maven-plugin.version}</version>
<extensions>true</extensions>
<configuration>
<publishingServerId>central</publishingServerId>
<tokenAuth>true</tokenAuth>
<deploymentName>ASPR MS Util</deploymentName>
</configuration>
</plugin>
</plugins>
Expand Down Expand Up @@ -197,9 +228,6 @@
</goals>
</execution>
</executions>
<configuration>
<useAgent>false</useAgent>
</configuration>
</plugin>
</plugins>
</build>
Expand Down Expand Up @@ -263,4 +291,4 @@
</profile>
</profiles>

</project>
</project>