Attempt to simplify build process using maven toolchains (#1952)

* Attempt to simplify build process using maven toolchains * Introduce property to hold latest jdk version --------- Co-authored-by: Marvin Froeder <[email protected]>
OpenFeign · Feb 25, 2023 · 7015a27 · 7015a27
1 parent 3eeb58b
commit 7015a27
Show file tree

Hide file tree

Showing 9 changed files with 90 additions and 236 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -12,27 +12,12 @@
 # the License.
 #
 
-orbs:
-  android: circleci/[email protected]
-
 # common executors
 executors:
   java:
-    parameters:
-      version:
-        description: 'jdk version to use'
-        default: '8.0'
-        type: string
-    docker:
-      - image: cimg/openjdk:<<parameters.version>>
-  android:
-    parameters:
-      version:
-        description: 'jdk version to use'
-        default: '8.0'
-        type: string
     docker:
-      - image: cimg/openjdk:<<parameters.version>>
+      - image: velo/toolchains-4-ci-builds
+
 # common commands
 commands:
   resolve-dependencies:
@@ -60,16 +45,7 @@ commands:
           name: 'Deploy Core Modules Sonatype'
           command: |
             ./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: |
-            ./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: |
-            ./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
@@ -98,14 +74,8 @@ version: 2.1
 
 jobs:
   test:
-    parameters:
-      jdk:
-        description: 'jdk version to use'
-        default: '8.0'
-        type: string
     executor:
       name: java
-      version: <<parameters.jdk>>
     <<: *defaults
     steps:
       - checkout
@@ -123,28 +93,10 @@ jobs:
           command: |
             ./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/
-    executor:
-      name: android/android-machine
-
-    steps:
-      # Checkout the code as the first step.
-      - checkout
-
-      # The next step will run the unit tests
-      - android/run-tests:
-          test-command: ./gradlew lint testDebug --continue
 
   deploy:
-    parameters:
-      jdk:
-        description: 'jdk version to use'
-        default: '8.0'
-        type: string
     executor:
       name: java
-      version: <<parameters.jdk>>
     <<: *defaults
     steps:
       - checkout
@@ -156,100 +108,33 @@ jobs:
       - configure-gpg
       - nexus-deploy
 
-  deploy-jdk11:
-    parameters:
-      jdk:
-        description: 'jdk version to use'
-        default: '11.0'
-        type: string
-    executor:
-      name: java
-      version: <<parameters.jdk>>
-    <<: *defaults
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-            - feign-dependencies-{{ checksum "pom.xml" }}
-            - feign-dependencies-
-      - resolve-dependencies
-      - configure-gpg
-      - nexus-deploy-jdk11
-
 workflows:
   version: 2
   build:
     jobs:
       - test:
-          jdk: '8.0'
-          name: 'jdk 8'
-          filters:
-            <<: *all-branches
-      - test:
-          jdk: '11.0'
-          name: 'jdk 11'
-          filters:
-            <<: *all-branches
-      - test:
-          jdk: '17.0'
-          name: 'jdk 17'
+          name: 'pr-build'
           filters:
             <<: *all-branches
-      - test:
-          name: 'android test'
-
 
   snapshot:
     jobs:
       - test:
-          jdk: '8.0'
-          name: 'jdk 8'
-          filters:
-            <<: *master-only
-      - test:
-          jdk: '11.0'
-          name: 'jdk 11'
-          filters:
-            <<: *master-only
-      - test:
-          jdk: '17.0'
-          name: 'jdk 17'
+          name: 'snapshot'
           filters:
             <<: *master-only
       - deploy:
-          jdk: '8.0'
           name: 'deploy snapshot'
           requires:
-            - 'jdk 8'
-            - 'jdk 11'
-            - 'jdk 17'
-          context: Sonatype
-          filters:
-            <<: *master-only
-      - deploy-jdk11:
-          jdk: '11.0'
-          name: 'deploy jdk11 snapshot modules'
-          requires:
-            - 'jdk 11'
-            - 'deploy snapshot'
+            - 'snapshot'
           context: Sonatype
           filters:
             <<: *master-only
 
   release:
     jobs:
       - deploy:
-          jdk: '8.0'
           name: 'release to maven central'
           context: Sonatype
           filters:
             <<: *tags-only
-      - deploy-jdk11:
-          jdk: '11.0'
-          name: 'release jdk11 artifacts to maven central'
-          requires:
-            - 'release to maven central'
-          context: Sonatype
-          filters:
-            <<: *tags-only
-
diff --git a/apt-test-generator/pom.xml b/apt-test-generator/pom.xml
@@ -132,7 +132,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>${maven-surefire-plugin.version}</version>
         <executions>
           <execution>
             <goals>

diff --git a/example-github-with-coroutine/pom.xml b/example-github-with-coroutine/pom.xml
@@ -95,7 +95,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>${maven-surefire-plugin.version}</version>
         <configuration>
           <!--
               Travis does not inject GITHUB_TOKEN when building PRs, which will make module fail

diff --git a/example-github/pom.xml b/example-github/pom.xml
@@ -91,7 +91,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>${maven-surefire-plugin.version}</version>
         <configuration>
           <!--
               Travis does not inject GITHUB_TOKEN when building PRs, which will make module fail

diff --git a/example-wikipedia-with-springboot/pom.xml b/example-wikipedia-with-springboot/pom.xml
@@ -103,7 +103,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>${maven-surefire-plugin.version}</version>
         <executions>
           <execution>
             <goals>

diff --git a/example-wikipedia/pom.xml b/example-wikipedia/pom.xml
@@ -92,7 +92,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>${maven-surefire-plugin.version}</version>
         <executions>
           <execution>
             <goals>

diff --git a/jakarta/pom.xml b/jakarta/pom.xml
@@ -28,6 +28,7 @@
   <description>Feign Jakarta</description>
 
   <properties>
+    <main.java.version>11</main.java.version>
     <main.basedir>${project.basedir}/..</main.basedir>
   </properties>
 

diff --git a/jaxb/pom.xml b/jaxb/pom.xml
@@ -43,57 +43,28 @@
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
+      <version>2.3.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jaxb</groupId>
+      <artifactId>jaxb-runtime</artifactId>
+      <version>2.4.0-b180830.0438</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
+      <version>4.0.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jaxb</groupId>
+      <artifactId>jaxb-core</artifactId>
+      <version>4.0.2</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
-  <profiles>
-    <profile>
-      <id>java11</id>
-      <activation>
-        <jdk>[11,]</jdk>
-      </activation>
-
-      <!--
-        JAXB was removed from java SDK on JEP 320
-        http://openjdk.java.net/jeps/320
-       -->
-      <dependencies>
-        <dependency>
-          <groupId>javax.xml.bind</groupId>
-          <artifactId>jaxb-api</artifactId>
-          <version>2.3.1</version>
-        </dependency>
-        <dependency>
-          <groupId>org.glassfish.jaxb</groupId>
-          <artifactId>jaxb-runtime</artifactId>
-          <version>2.4.0-b180830.0438</version>
-          <scope>test</scope>
-        </dependency>
-      </dependencies>
-    </profile>
-    <profile>
-      <id>java17</id>
-      <activation>
-        <jdk>[17,]</jdk>
-      </activation>
-
-      <!--
-        JAXB was removed from java SDK on JEP 320
-        http://openjdk.java.net/jeps/320
-       -->
-      <dependencies>
-        <dependency>
-          <groupId>jakarta.xml.bind</groupId>
-          <artifactId>jakarta.xml.bind-api</artifactId>
-          <version>4.0.0</version>
-        </dependency>
-        <dependency>
-          <groupId>org.glassfish.jaxb</groupId>
-          <artifactId>jaxb-core</artifactId>
-          <version>4.0.2</version>
-          <scope>test</scope>
-        </dependency>
-      </dependencies>
-    </profile>
-  </profiles>
-
 </project>