Skip to content

Commit 4beaf29

Browse files
hauptmediakthoms
authored andcommitted
chore(distro/run): Remove Swagger from Camunda Run
Related-to: camunda/camunda-bpm-platform#4467 Backported commit 8fe087b1ee from the camunda-bpm-platform repository. Original author: psavidis <69160690+psavidis@users.noreply.github.com>
1 parent 9fcbf09 commit 4beaf29

24 files changed

+14
-9100
lines changed

distro/run/assembly/assembly.xml

-11
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,6 @@
1919
</includes>
2020
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
2121
</dependencySet>
22-
<dependencySet>
23-
<outputDirectory>internal/swaggerui/</outputDirectory>
24-
<includes>
25-
<include>org.operaton.bpm.run:operaton-bpm-run-modules-swaggerui</include>
26-
</includes>
27-
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
28-
</dependencySet>
2922
<dependencySet>
3023
<outputDirectory>internal/example/</outputDirectory>
3124
<includes>
@@ -127,10 +120,6 @@
127120
<directory>../modules/rest/target/dependency/</directory>
128121
<outputDirectory>internal/rest/</outputDirectory>
129122
</fileSet>
130-
<fileSet>
131-
<directory>../modules/swaggerui/target/dependency/</directory>
132-
<outputDirectory>internal/swaggerui/</outputDirectory>
133-
</fileSet>
134123
<!-- create empty resource folder -->
135124
<fileSet>
136125
<directory>resources/dummyResource</directory>

distro/run/assembly/pom.xml

-14
Original file line numberDiff line numberDiff line change
@@ -49,20 +49,6 @@
4949
</exclusions>
5050
</dependency>
5151

52-
<dependency>
53-
<groupId>org.operaton.bpm.run</groupId>
54-
<artifactId>operaton-bpm-run-modules-swaggerui</artifactId>
55-
<version>${project.version}</version>
56-
<type>jar</type>
57-
<exclusions>
58-
<!-- do not add transitive dependencies to generated dependency list -->
59-
<exclusion>
60-
<groupId>*</groupId>
61-
<artifactId>*</artifactId>
62-
</exclusion>
63-
</exclusions>
64-
</dependency>
65-
6652
<dependency>
6753
<groupId>org.operaton.bpm.run</groupId>
6854
<artifactId>operaton-bpm-run-modules-example-invoice</artifactId>

distro/run/assembly/resources/README.txt

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ Contents:
3131

3232
webapps: http://localhost:8080/
3333
rest: http://localhost:8080/engine-rest/
34-
swaggerui: http://localhost:8080/swaggerui/
3534

3635
internal/
3736
This directory contains the Java application and optional components

distro/run/assembly/resources/run.bat

+2-14
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ SET PARENTDIR=%BASEDIR%..\
66
SET DEPLOYMENTDIR=%PARENTDIR%configuration/resources
77
SET WEBAPPS_PATH=%BASEDIR%webapps
88
SET REST_PATH=%BASEDIR%rest
9-
SET SWAGGER_PATH=%BASEDIR%swaggerui
109
SET EXAMPLE_PATH=%BASEDIR%example
1110
SET APPNAME=Operaton Run
1211

@@ -64,7 +63,6 @@ IF NOT "x%JAVA_OPTS%" == "x" (
6463
REM set environment parameters
6564
SET optionalComponentChosen=false
6665
SET restChosen=false
67-
SET swaggeruiChosen=false
6866
SET productionChosen=false
6967
SET detachProcess=false
7068
SET classPath=%PARENTDIR%configuration\userlib,%PARENTDIR%configuration\keystore
@@ -88,13 +86,6 @@ IF [%~1]==[--rest] (
8886
ECHO REST API enabled
8987
)
9088

91-
IF [%~1]==[--swaggerui] (
92-
SET optionalComponentChosen=true
93-
SET swaggeruiChosen=true
94-
SET classPath=%SWAGGER_PATH%,%classPath%
95-
ECHO Swagger UI enabled
96-
)
97-
9889
IF [%~1]==[--example] (
9990
SET optionalComponentChosen=true
10091
SET classPath=%EXAMPLE_PATH%,%classPath%
@@ -119,17 +110,15 @@ GOTO Loop
119110
:Continue
120111

121112
REM If no optional component is chosen, enable REST and Webapps.
122-
REM If production mode is not chosen, also enable Swagger UI and the example application.
113+
REM If production mode is not chosen, also enable the example application.
123114
setlocal enabledelayedexpansion
124115
IF [%optionalComponentChosen%]==[false] (
125116
SET restChosen=true
126117
ECHO REST API enabled
127118
ECHO WebApps enabled
128119
IF [%productionChosen%]==[false] (
129-
SET swaggeruiChosen=true
130-
ECHO Swagger UI enabled
131120
ECHO Invoice Example included - needs to be enabled in application configuration as well
132-
SET classPath=%SWAGGER_PATH%,%EXAMPLE_PATH%,%classPath%
121+
SET classPath=%EXAMPLE_PATH%,%classPath%
133122
)
134123
SET classPath=%WEBAPPS_PATH%,%REST_PATH%,!classPath!
135124
)
@@ -171,7 +160,6 @@ ECHO Usage: run.bat [start^|stop] (options...)
171160
ECHO Options:
172161
ECHO --webapps - Enables the Operaton Webapps
173162
ECHO --rest - Enables the REST API
174-
ECHO --swaggerui - Enables the Swagger UI
175163
ECHO --example - Enables the example application
176164
ECHO --production - Applies the production.yaml configuration file
177165
ECHO --detached - Starts Operaton Run as a detached process

distro/run/assembly/resources/run.sh

+2-12
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,11 @@ PARENTDIR=$(builtin cd "$BASEDIR/.."; pwd)
66
DEPLOYMENT_DIR=$PARENTDIR/configuration/resources
77
WEBAPPS_PATH=$BASEDIR/webapps/
88
REST_PATH=$BASEDIR/rest/
9-
SWAGGER_PATH=$BASEDIR/swaggerui
109
EXAMPLE_PATH=$BASEDIR/example
1110
PID_PATH=$BASEDIR/run.pid
1211
OPTIONS_HELP="Options:
1312
--webapps - Enables the Operaton Webapps
1413
--rest - Enables the REST API
15-
--swaggerui - Enables the Swagger UI
1614
--example - Enables the example application
1715
--production - Applies the production.yaml configuration file
1816
--detached - Starts Operaton Run as a detached process
@@ -21,7 +19,6 @@ OPTIONS_HELP="Options:
2119
# set environment parameters
2220
optionalComponentChosen=false
2321
restChosen=false
24-
swaggeruiChosen=false
2522
productionChosen=false
2623
detachProcess=false
2724
classPath=$PARENTDIR/configuration/userlib/,$PARENTDIR/configuration/keystore/
@@ -65,11 +62,6 @@ if [ "$1" = "start" ] ; then
6562
classPath=$REST_PATH,$classPath
6663
echo REST API enabled
6764
;;
68-
--swaggerui ) optionalComponentChosen=true
69-
swaggeruiChosen=true
70-
classPath=$SWAGGER_PATH,$classPath
71-
echo Swagger UI enabled
72-
;;
7365
--example ) optionalComponentChosen=true
7466
classPath=$EXAMPLE_PATH,$classPath
7567
echo Invoice Example included - needs to be enabled in application configuration as well
@@ -90,16 +82,14 @@ if [ "$1" = "start" ] ; then
9082
done
9183

9284
# If no optional component is chosen, enable REST and Webapps.
93-
# If production mode is not chosen, also enable Swagger UI and the example application.
85+
# If production mode is not chosen, also enable the example application.
9486
if [ "$optionalComponentChosen" = "false" ]; then
9587
restChosen=true
9688
echo REST API enabled
9789
echo WebApps enabled
9890
if [ "$productionChosen" = "false" ]; then
99-
swaggeruiChosen=true
100-
echo Swagger UI enabled
10191
echo Invoice Example included - needs to be enabled in application configuration as well
102-
classPath=$SWAGGER_PATH,$EXAMPLE_PATH,$classPath
92+
classPath=$EXAMPLE_PATH,$classPath
10393
fi
10494
classPath=$WEBAPPS_PATH,$REST_PATH,$classPath
10595
fi

distro/run/core/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
</exclusions>
7373
</dependency>
7474

75-
<!-- spring-webmvc is not a direct requirement of run-core, but is required by modules/swaggerui and modules/webapps.
75+
<!-- spring-webmvc is not a direct requirement of run-core, but is required by modules/webapps.
7676
To avoid having it on the classpath twice, it is included here and becomes part of the uberjar.-->
7777
<dependency>
7878
<groupId>org.springframework</groupId>

distro/run/modules/swaggerui/pom.xml

-109
This file was deleted.

distro/run/modules/swaggerui/src/main/java/org/operaton/bpm/run/swaggerui/OperatonSwaggerUIConfiguration.java

-39
This file was deleted.

distro/run/modules/swaggerui/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

-1
This file was deleted.

distro/run/modules/swaggerui/ui/.gitignore

-2
This file was deleted.

0 commit comments

Comments
 (0)