Skip to content

Commit

Permalink
Update Maven wrapper to pull latest Maven (3.8.7) (#1926)
Browse files Browse the repository at this point in the history
Also, use mvnw on CI instead of default mvn provided.
Apply -ntp flag to reduce noise in logs
  • Loading branch information
aalmiray authored Feb 6, 2023
1 parent 399f547 commit 42c3a09
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 13 deletions.
10 changes: 5 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ commands:
- run:
name: 'Resolving Dependencies'
command: |
mvn dependency:resolve-plugins go-offline:resolve-dependencies -DskipTests=true -B
./mvnw -ntp dependency:resolve-plugins go-offline:resolve-dependencies -DskipTests=true -B
verify-formatting:
steps:
- run:
Expand All @@ -59,17 +59,17 @@ commands:
- run:
name: 'Deploy Core Modules Sonatype'
command: |
mvn -nsu -s .circleci/settings.xml -P release -pl -:feign-benchmark -DskipTests=true deploy
./mvnw -ntp -nsu -s .circleci/settings.xml -P release -pl -:feign-benchmark -DskipTests=true deploy
nexus-deploy-jdk11:
steps:
- run:
name: 'Build JDK 11 Release modules locally'
command: |
mvn -B -nsu -s .circleci/settings.xml -P java11 -pl :feign-java11,:feign-jakarta -am -DskipTests=true install
./mvnw -ntp -B -nsu -s .circleci/settings.xml -P java11 -pl :feign-java11,:feign-jakarta -am -DskipTests=true install
- run:
name: 'Deploy JDK 11 Modules to Sonatype'
command: |
mvn -B -nsu -s .circleci/settings.xml -P release,java11 -pl :feign-java11,:feign-jakarta -DskipTests=true deploy
./mvnw -ntp -B -nsu -s .circleci/settings.xml -P release,java11 -pl :feign-java11,:feign-jakarta -DskipTests=true deploy
# our job defaults
defaults: &defaults
working_directory: ~/feign
Expand Down Expand Up @@ -121,7 +121,7 @@ jobs:
- run:
name: 'Test'
command: |
mvn -B test
./mvnw -ntp -B test
- verify-formatting
android-test:
# These next lines define the Android machine image executor: https://circleci.com/docs/2.0/executor-types/
Expand Down
Binary file modified .mvn/wrapper/maven-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.4/apache-maven-3.5.4-bin.zip
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.7/apache-maven-3.8.7-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar
7 changes: 0 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -422,13 +422,6 @@
<build>
<pluginManagement>
<plugins>
<!-- mvn -N io.takari:maven:wrapper -Dmaven=3.5.0 -->
<plugin>
<groupId>io.takari</groupId>
<artifactId>maven</artifactId>
<version>0.7.7</version>
</plugin>

<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
Expand Down

0 comments on commit 42c3a09

Please sign in to comment.