Skip to content

Commit 87b2fd7

Browse files
committed
GH-760 - Fix integration builds.
Update integration versions and reference to commercial repositories.
1 parent 0f84de8 commit 87b2fd7

File tree

3 files changed

+35
-25
lines changed

3 files changed

+35
-25
lines changed

.github/workflows/integration.yaml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,15 @@ jobs:
1010
strategy:
1111
matrix:
1212
version:
13+
- '3.0.16'
14+
- '3.0.17-SNAPSHOT'
1315
- '3.1.12'
1416
- '3.1.13-SNAPSHOT'
15-
- '3.2.6'
16-
- '3.2.7-SNAPSHOT'
17-
- '3.3.1-SNAPSHOT'
17+
- '3.2.8'
18+
- '3.2.9-SNAPSHOT'
19+
- '3.3.2'
20+
- '3.3.3-SNAPSHOT'
21+
- '3.4.0-SNAPSHOT'
1822
name: Build against Boot ${{ matrix.version }}
1923
runs-on: ubuntu-latest
2024

@@ -37,5 +41,5 @@ jobs:
3741
DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
3842
run: |
3943
cd spring-modulith-examples
40-
../mvnw -B versions:update-parent -s ../settings.xml -Pwith-preview-repos,with-commercial-repos -DskipResolution=true -DparentVersion=${{ matrix.version }}
41-
../mvnw -B clean verify -s ../settings.xml -Pwith-preview-repos,with-commercial-repos -Dspring-boot.version=${{ matrix.version }}
44+
../mvnw -B versions:update-parent -s ../settings.xml -Pspring-enterprise,with-preview-repos -DskipResolution=true -DparentVersion=${{ matrix.version }}
45+
../mvnw -B clean verify -s ../settings.xml -Pspring-enterprise,with-preview-repos -Dspring-boot.version=${{ matrix.version }}

pom.xml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -122,26 +122,6 @@ limitations under the License.
122122
</repositories>
123123
</profile>
124124

125-
<profile>
126-
<id>with-commercial-repos</id>
127-
<repositories>
128-
<repository>
129-
<id>spring-commercial-releases</id>
130-
<url>https://repo.spring.vmware.com/artifactory/spring-commercial-release-local</url>
131-
<snapshots>
132-
<enabled>false</enabled>
133-
</snapshots>
134-
</repository>
135-
<repository>
136-
<id>spring-commercial-snapshots</id>
137-
<url>https://repo.spring.vmware.com/artifactory/spring-commercial-snapshot-local</url>
138-
<releases>
139-
<enabled>false</enabled>
140-
</releases>
141-
</repository>
142-
</repositories>
143-
</profile>
144-
145125
<profile>
146126

147127
<id>prepare-release</id>

settings.xml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,30 @@
99
<password>${env.SONATYPE_PASSWORD}</password>
1010
</server>
1111
</servers>
12+
13+
<profiles>
14+
<profile>
15+
<id>spring-enterprise</id>
16+
<activation>
17+
<activeByDefault>true</activeByDefault>
18+
</activation>
19+
<repositories>
20+
<repository>
21+
<id>spring-enterprise-snapshot</id>
22+
<url>https://usw1.packages.broadcom.com/artifactory/spring-enterprise-maven-dev-local</url>
23+
<releases>
24+
<enabled>false</enabled>
25+
</releases>
26+
</repository>
27+
<repository>
28+
<id>spring-enterprise-release</id>
29+
<url>https://usw1.packages.broadcom.com/artifactory/spring-enterprise-maven-prod-local</url>
30+
<snapshots>
31+
<enabled>false</enabled>
32+
</snapshots>
33+
</repository>
34+
</repositories>
35+
</profile>
36+
</profiles>
37+
1238
</settings>

0 commit comments

Comments
 (0)