Skip to content

Commit

Permalink
deploy fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
pcalouche committed Aug 3, 2024
1 parent 34ba3ea commit 6abe9a8
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 19 deletions.
3 changes: 2 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ registries:
updates:
- package-ecosystem: "maven"
directory: "/"
registries: "*"
registries:
- central
schedule:
interval: "monthly"
target-branch: "main"
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/continuous-delivery.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches:
- main
- temp

permissions:
contents: read
Expand All @@ -28,6 +29,7 @@ jobs:
distribution: 'temurin'
cache: maven
- name: Run Maven
run: mvn -T 4 -B clean deploy
run: mvn -B -s ./.mvn/settings.xml clean deploy
env:
GITHUB_ACTOR: ${{ github.actor }}
GITHUB_TOKEN: ${{ github.token }}
2 changes: 1 addition & 1 deletion .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ jobs:
distribution: 'temurin'
cache: maven
- name: Run Maven
run: mvn -T 4 -B clean verify
run: mvn -B -s ./.mvn/settings.xml clean verify
3 changes: 2 additions & 1 deletion .mvn/maven.config
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
-T4
-Pspring-forge-flatten
-Pspring-forge-flatten
--fail-at-end
15 changes: 15 additions & 0 deletions .mvn/settings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<settings
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.1.0 http://maven.apache.org/xsd/settings-1.1.0.xsd"
xmlns="http://maven.apache.org/SETTINGS/1.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

<servers>
<server>
<id>github-pcalouche-spring-forge</id>
<username>${env.GITHUB_ACTOR}</username>
<password>${env.GITHUB_TOKEN}</password>
</server>
</servers>

</settings>
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ mvn-install-skip-tests: format
# Check if version is a SNAPSHOT
.PHONY: check-if-snapshot-version
check-if-snapshot-version:
version="$(shell mvn help:evaluate -Dexpression=spring-enzymes.version -q -DforceStdout)" ; \
version="$(shell mvn help:evaluate -Dexpression=spring-forge.version -q -DforceStdout)" ; \
echo "version is $$version" ; \
if [[ $$version == *-SNAPSHOT ]]; then \
echo "Release version is a SNAPSHOT, so manual deploy can proceed." ; \
Expand Down
14 changes: 0 additions & 14 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -105,20 +105,6 @@
</dependencies>
</dependencyManagement>

<repositories>
<repository>
<id>central</id>
<url>https://repo.maven.apache.org/maven2</url>
</repository>
<repository>
<snapshots>
<enabled>true</enabled>
</snapshots>
<id>github-pcalouche-spring-forge</id>
<url>https://maven.pkg.github.com/pcalouche/spring-forge</url>
</repository>
</repositories>

<build>
<!--
Plugin management will not apply the plugin to a child POM. Rather it serves as a place to
Expand Down

0 comments on commit 6abe9a8

Please sign in to comment.