Skip to content

Commit 73af381

Browse files
mp911demp911de
committed
Fix artifactory deployment.
1 parent 780b864 commit 73af381

File tree

3 files changed

+205
-21
lines changed

3 files changed

+205
-21
lines changed

‎pom.xml‎

Lines changed: 78 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -587,6 +587,12 @@
587587
<version>1.1.0</version>
588588
</plugin>
589589

590+
<plugin>
591+
<groupId>org.jfrog.buildinfo</groupId>
592+
<artifactId>artifactory-maven-plugin</artifactId>
593+
<version>3.4.0</version>
594+
</plugin>
595+
590596
</plugins>
591597
</pluginManagement>
592598
</build>
@@ -611,13 +617,27 @@
611617
</repositories>
612618
</profile>
613619

620+
<profile>
621+
622+
<id>snapshot</id>
623+
624+
<distributionManagement>
625+
<repository>
626+
<id>spring-libs-snapshot</id>
627+
<name>Spring Snapshot Repository</name>
628+
<url>https://repo.spring.io/libs-snapshot-local</url>
629+
</repository>
630+
</distributionManagement>
631+
632+
</profile>
633+
614634
<profile>
615635

616636
<id>milestone</id>
617637

618638
<distributionManagement>
619639
<repository>
620-
<id>repo.spring.io</id>
640+
<id>spring-libs-milestone</id>
621641
<name>Spring Milestone Repository</name>
622642
<url>https://repo.spring.io/libs-milestone-local</url>
623643
</repository>
@@ -802,6 +822,63 @@
802822
</plugins>
803823
</build>
804824
</profile>
825+
826+
<profile>
827+
828+
<id>artifactory</id>
829+
830+
<build>
831+
832+
<pluginManagement>
833+
<plugins>
834+
835+
<!-- Deploy to Artifactory -->
836+
837+
<plugin>
838+
<groupId>org.jfrog.buildinfo</groupId>
839+
<artifactId>artifactory-maven-plugin</artifactId>
840+
<version>3.4.0</version>
841+
<executions>
842+
<execution>
843+
<id>build-info</id>
844+
<goals>
845+
<goal>publish</goal>
846+
</goals>
847+
<configuration>
848+
<artifactory>
849+
<includeEnvVars>false</includeEnvVars>
850+
</artifactory>
851+
<publisher>
852+
<contextUrl>{{artifactory.server}}</contextUrl>
853+
<username>{{artifactory.username}}</username>
854+
<password>{{artifactory.password}}</password>
855+
<repoKey>{{artifactory.staging-repository}}</repoKey>
856+
<snapshotRepoKey>{{artifactory.staging-repository}}</snapshotRepoKey>
857+
</publisher>
858+
<buildInfo>
859+
<buildName>{{artifactory.build-name}}</buildName>
860+
<buildNumber>{{artifactory.build-number}}</buildNumber>
861+
<buildUrl>{{BUILD_URL}}</buildUrl>
862+
</buildInfo>
863+
</configuration>
864+
</execution>
865+
</executions>
866+
</plugin>
867+
868+
</plugins>
869+
</pluginManagement>
870+
871+
<plugins>
872+
873+
<plugin>
874+
<groupId>org.jfrog.buildinfo</groupId>
875+
<artifactId>artifactory-maven-plugin</artifactId>
876+
</plugin>
877+
878+
</plugins>
879+
880+
</build>
881+
</profile>
805882
</profiles>
806883

807884
<pluginRepositories>

‎spring-vault-dependencies/pom.xml‎

Lines changed: 107 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,13 +221,27 @@
221221
</build>
222222

223223
<profiles>
224+
<profile>
225+
226+
<id>snapshot</id>
227+
228+
<distributionManagement>
229+
<repository>
230+
<id>spring-libs-snapshot</id>
231+
<name>Spring Snapshot Repository</name>
232+
<url>https://repo.spring.io/libs-snapshot-local</url>
233+
</repository>
234+
</distributionManagement>
235+
236+
</profile>
237+
224238
<profile>
225239

226240
<id>milestone</id>
227241

228242
<distributionManagement>
229243
<repository>
230-
<id>repo.spring.io</id>
244+
<id>spring-libs-milestone</id>
231245
<name>Spring Milestone Repository</name>
232246
<url>https://repo.spring.io/libs-milestone-local</url>
233247
</repository>
@@ -283,6 +297,98 @@
283297
</build>
284298

285299
</profile>
300+
301+
<profile>
302+
303+
<id>artifactory</id>
304+
305+
<build>
306+
307+
<pluginManagement>
308+
<plugins>
309+
310+
<!-- Deploy to Artifactory -->
311+
312+
<plugin>
313+
<groupId>org.jfrog.buildinfo</groupId>
314+
<artifactId>artifactory-maven-plugin</artifactId>
315+
<version>3.4.0</version>
316+
<executions>
317+
<execution>
318+
<id>build-info</id>
319+
<goals>
320+
<goal>publish</goal>
321+
</goals>
322+
<configuration>
323+
<artifactory>
324+
<includeEnvVars>false</includeEnvVars>
325+
</artifactory>
326+
<publisher>
327+
<contextUrl>{{artifactory.server}}</contextUrl>
328+
<username>{{artifactory.username}}</username>
329+
<password>{{artifactory.password}}</password>
330+
<repoKey>{{artifactory.staging-repository}}</repoKey>
331+
<snapshotRepoKey>{{artifactory.staging-repository}}</snapshotRepoKey>
332+
</publisher>
333+
<buildInfo>
334+
<buildName>{{artifactory.build-name}}</buildName>
335+
<buildNumber>{{artifactory.build-number}}</buildNumber>
336+
<buildUrl>{{BUILD_URL}}</buildUrl>
337+
</buildInfo>
338+
</configuration>
339+
</execution>
340+
</executions>
341+
</plugin>
342+
343+
</plugins>
344+
</pluginManagement>
345+
346+
<plugins>
347+
348+
<plugin>
349+
<groupId>org.jfrog.buildinfo</groupId>
350+
<artifactId>artifactory-maven-plugin</artifactId>
351+
</plugin>
352+
353+
</plugins>
354+
355+
</build>
356+
</profile>
357+
<profile>
358+
<id>release</id>
359+
<build>
360+
<plugins>
361+
<plugin>
362+
<groupId>org.apache.maven.plugins</groupId>
363+
<artifactId>maven-enforcer-plugin</artifactId>
364+
<version>3.1.0</version>
365+
<executions>
366+
<execution>
367+
<id>enforce-no-third-party-snapshots</id>
368+
<goals>
369+
<goal>enforce</goal>
370+
</goals>
371+
<configuration>
372+
<rules>
373+
<requireReleaseDeps />
374+
<NoSnapshotDependenciesInDependencyManagementRule implementation="de.smartics.maven.enforcer.rule.NoSnapshotsInDependencyManagementRule">
375+
<onlyWhenRelease>true</onlyWhenRelease>
376+
</NoSnapshotDependenciesInDependencyManagementRule>
377+
</rules>
378+
</configuration>
379+
</execution>
380+
</executions>
381+
<dependencies>
382+
<dependency>
383+
<groupId>de.smartics.rules</groupId>
384+
<artifactId>smartics-enforcer-rules</artifactId>
385+
<version>1.0.2</version>
386+
</dependency>
387+
</dependencies>
388+
</plugin>
389+
</plugins>
390+
</build>
391+
</profile>
286392
</profiles>
287393

288394
</project>

‎spring-vault-distribution/pom.xml‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@
406406
<plugin>
407407
<groupId>org.jfrog.buildinfo</groupId>
408408
<artifactId>artifactory-maven-plugin</artifactId>
409-
<version>2.7.0</version>
409+
<version>3.4.0</version>
410410
<executions>
411411
<execution>
412412
<id>deploy-docs</id>
@@ -428,13 +428,14 @@
428428
<!-- Retain only a single build -->
429429
<buildName>Spring Vault Docs ${project.version}</buildName>
430430
<buildRetentionCount>1</buildRetentionCount>
431+
<buildUrl>{{BUILD_URL}}</buildUrl>
431432
</buildInfo>
432433
<publisher>
433-
<contextUrl>https://repo.spring.io</contextUrl>
434-
<username>${artifactory.username}</username>
435-
<password>${artifactory.password}</password>
436-
<repoKey>temp-private-local</repoKey>
437-
<snapshotRepoKey>temp-private-local</snapshotRepoKey>
434+
<contextUrl>{{artifactory.server}}</contextUrl>
435+
<username>{{artifactory.username}}</username>
436+
<password>{{artifactory.password}}</password>
437+
<repoKey>{{artifactory.staging-repository}}</repoKey>
438+
<snapshotRepoKey>{{artifactory.staging-repository}}</snapshotRepoKey>
438439
<includePatterns>*.zip</includePatterns>
439440
</publisher>
440441
</configuration>
@@ -444,20 +445,20 @@
444445
</plugins>
445446
</pluginManagement>
446447
</build>
448+
449+
<pluginRepositories>
450+
<pluginRepository>
451+
<id>bintray-plugins</id>
452+
<name>bintray-plugins</name>
453+
<url>https://jcenter.bintray.com</url>
454+
</pluginRepository>
455+
456+
<pluginRepository>
457+
<id>spring-plugins-release</id>
458+
<url>https://repo.spring.io/plugins-release</url>
459+
</pluginRepository>
460+
</pluginRepositories>
447461
</profile>
448462
</profiles>
449463

450-
<pluginRepositories>
451-
<pluginRepository>
452-
<id>bintray-plugins</id>
453-
<name>bintray-plugins</name>
454-
<url>https://jcenter.bintray.com</url>
455-
</pluginRepository>
456-
457-
<pluginRepository>
458-
<id>spring-plugins-release</id>
459-
<url>https://repo.spring.io/plugins-release</url>
460-
</pluginRepository>
461-
</pluginRepositories>
462-
463464
</project>

0 commit comments

Comments
 (0)