Skip to content

Commit

Permalink
Merge pull request #87 from camunda-community-hub/feature/move-to-apa…
Browse files Browse the repository at this point in the history 
…che-http-client

move to apache http client
  • Loading branch information
@berndruecker
berndruecker authored Oct 27, 2023
2 parents 2942783 + 2d7784e commit 2ecbfb0
Show file tree
Hide file tree
Showing 7 changed files with 120 additions and 45 deletions.
2 changes: 0 additions & 2 deletions camunda-engine-rest-client-complete-springboot-starter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,11 @@
<dependency>
<groupId>org.camunda.community</groupId>
<artifactId>camunda-engine-rest-client-openapi-springboot</artifactId>
<version>${project.version}</version>
</dependency>
<!-- Open API client -->
<dependency>
<groupId>org.camunda.bpm.springboot</groupId>
<artifactId>camunda-bpm-spring-boot-starter-external-task-client</artifactId>
<version>${camunda.version}</version>
</dependency>
</dependencies>
</project>
66 changes: 29 additions & 37 deletions camunda-engine-rest-client-openapi-java/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,63 +10,55 @@

<artifactId>camunda-engine-rest-client-openapi-java</artifactId>

<dependencies>

<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.9.0</version>
</dependency>
<dependencies>

<!-- @Nullable annotation -->
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>3.0.2</version>
</dependency>


<!-- HTTP client: apache client -->
<dependency>
<groupId>org.threeten</groupId>
<artifactId>threetenbp</artifactId>
<version>1.6.0</version>
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5</artifactId>
</dependency>

<!-- JSON processing: jackson -->
<dependency>
<groupId>com.squareup.okio</groupId>
<artifactId>okio</artifactId>
<version>2.10.0</version>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>4.9.3</version>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>logging-interceptor</artifactId>
<version>4.9.3</version>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>

<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>1.3.2</version>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
</dependency>

<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<version>1.6.6</version>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
</dependency>

<dependency>
<groupId>io.gsonfire</groupId>
<artifactId>gson-fire</artifactId>
<version>1.8.5</version>
<groupId>org.openapitools</groupId>
<artifactId>jackson-databind-nullable</artifactId>
</dependency>

<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<scope>provided</scope>
</dependency>
<!-- test dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -76,7 +68,6 @@
<plugin>
<groupId>org.openapitools</groupId>
<artifactId>openapi-generator-maven-plugin</artifactId>
<version>5.1.0</version>
<executions>
<execution>
<goals>
Expand All @@ -90,8 +81,9 @@
<apiPackage>org.camunda.community.rest.client.api</apiPackage>
<invokerPackage>org.camunda.community.rest.client.invoker</invokerPackage>
<modelPackage>org.camunda.community.rest.client.dto</modelPackage>
<dateLibrary>legacy</dateLibrary>
<sourceFolder>src/gen/java/main</sourceFolder>
<library>apache-httpclient</library>
<dateLibrary>java8</dateLibrary>
<testOutput>${project.build.directory}/generated-test-sources/openapi</testOutput>
</configOptions>
</configuration>
</execution>
Expand Down
9 changes: 5 additions & 4 deletions camunda-engine-rest-client-openapi-springboot/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,23 @@
<dependency>
<groupId>org.camunda.community</groupId>
<artifactId>camunda-engine-rest-client-openapi-java</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
<version>${springboot.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.11.0</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.1</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>
2 changes: 1 addition & 1 deletion ...api-springboot/src/main/java/org/camunda/community/rest/client/springboot/CamundaApi.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public BatchApi batchApi() {

@Bean
public ConditionApi conditionApi() {
return new ConditionApi();
return new ConditionApi(apiClient);
}

@Bean
Expand Down
13 changes: 13 additions & 0 deletions ...penapi-springboot/src/test/java/org/camunda/community/rest/client/springboot/AppTest.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package org.camunda.community.rest.client.springboot;

import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;

@SpringBootTest
public class AppTest {

@Test
void shouldRun() {

}
}
11 changes: 11 additions & 0 deletions ...penapi-springboot/src/test/java/org/camunda/community/rest/client/springboot/TestApp.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package org.camunda.community.rest.client.springboot;

import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;

@SpringBootApplication
public class TestApp {
public static void main(String[] args) {
SpringApplication.run(TestApp.class, args);
}
}
62 changes: 61 additions & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.camunda.community</groupId>
<artifactId>community-hub-release-parent</artifactId>
<version>1.4.2</version>
<version>1.4.3</version>
</parent>

<groupId>org.camunda.community</groupId>
Expand All @@ -29,6 +29,66 @@
<springboot.version>2.7.4</springboot.version>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${springboot.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.camunda.bpm</groupId>
<artifactId>camunda-bom</artifactId>
<version>${camunda.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.openapitools</groupId>
<artifactId>jackson-databind-nullable</artifactId>
<version>0.2.6</version>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>3.0.2</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.14.0</version>
</dependency>
<dependency>
<groupId>org.camunda.community</groupId>
<artifactId>camunda-engine-rest-client-openapi-java</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.camunda.community</groupId>
<artifactId>camunda-engine-rest-client-openapi-springboot</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.openapitools</groupId>
<artifactId>openapi-generator-maven-plugin</artifactId>
<version>7.0.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.2.1</version>
</plugin>
</plugins>
</pluginManagement>
</build>

<modules>
<module>camunda-engine-rest-client-openapi-java</module>
<module>camunda-engine-rest-client-openapi-springboot</module>
Expand Down

0 comments on commit 2ecbfb0

Please sign in to comment.