Skip to content

Commit 9db1fb3

Browse files
jschroeder-avijschroeder-avi
committed
Fix dependencies. Refactor swagger client into project. Update instructions. Cleanup pom.xml.
1 parent 78e4bb9 commit 9db1fb3

284 files changed

Lines changed: 93 additions & 10298 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎README.md‎

Lines changed: 2 additions & 59 deletions

‎SwaggerSetup.md‎

Lines changed: 72 additions & 0 deletions

‎pom.xml‎

Lines changed: 19 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -19,35 +19,39 @@
1919
<packaging>atlassian-plugin</packaging>
2020

2121
<properties>
22+
2223
<bamboo.version>6.3.2</bamboo.version>
2324
<bamboo.data.version>6.3.2</bamboo.data.version>
2425
<amps.version>6.3.15</amps.version>
2526
<plugin.testrunner.version>1.2.3</plugin.testrunner.version>
2627
<atlassian.spring.scanner.version>1.2.13</atlassian.spring.scanner.version>
2728
<jersey-version>2.25.1</jersey-version>
2829
<jackson-version>2.9.8</jackson-version>
29-
<!--<atlassian.spring.scanner.version>1.2.13</atlassian.spring.scanner.version>-->
3030
<!-- This key is used to keep the consistency between the key in atlassian-plugin.xml and the key to generate bundle. -->
3131
<atlassian.plugin.key>${project.groupId}.${project.artifactId}</atlassian.plugin.key>
3232
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3333
<maven.compiler.source>1.8</maven.compiler.source>
3434
<maven.compiler.target>1.8</maven.compiler.target>
35+
<junit-version>4.12</junit-version>
36+
<swagger-core-version>1.5.15</swagger-core-version>
37+
3538
</properties>
3639

3740
<dependencies>
41+
3842
<dependency>
39-
<groupId>com.codedx</groupId>
40-
<artifactId>swagger-codegen-codedx-api-client</artifactId>
41-
<version>1.0.0</version>
42-
<scope>compile</scope>
43+
<groupId>io.swagger</groupId>
44+
<artifactId>swagger-annotations</artifactId>
45+
<version>${swagger-core-version}</version>
4346
</dependency>
4447

45-
<!--<dependency>-->
46-
<!--<groupId>com.google.code.gson</groupId>-->
47-
<!--<artifactId>gson</artifactId>-->
48-
<!--<version>2.8.1</version>-->
49-
<!--<scope>compile</scope>-->
50-
<!--</dependency>-->
48+
<!-- test dependencies -->
49+
<dependency>
50+
<groupId>junit</groupId>
51+
<artifactId>junit</artifactId>
52+
<version>${junit-version}</version>
53+
<scope>test</scope>
54+
</dependency>
5155

5256
<dependency>
5357
<groupId>com.atlassian.bamboo</groupId>
@@ -63,55 +67,12 @@
6367
<version>1.8.2</version>
6468
</dependency>
6569

66-
67-
<!--<dependency>
68-
<groupId>com.atlassian.plugin</groupId>
69-
<artifactId>atlassian-spring-scanner-annotation</artifactId>
70-
<version>${atlassian.spring.scanner.version}</version>
71-
<scope>compile</scope>
72-
</dependency>
73-
74-
<dependency>
75-
<groupId>com.atlassian.plugin</groupId>
76-
<artifactId>atlassian-spring-scanner-runtime</artifactId>
77-
<version>${atlassian.spring.scanner.version}</version>
78-
<scope>runtime</scope>
79-
</dependency>-->
80-
81-
<!--<dependency>
82-
<groupId>javax.inject</groupId>
83-
<artifactId>javax.inject</artifactId>
84-
<version>1</version>
85-
<scope>provided</scope>
86-
</dependency>
87-
88-
<dependency>
89-
<groupId>junit</groupId>
90-
<artifactId>junit</artifactId>
91-
<version>4.10</version>
92-
<scope>test</scope>
93-
</dependency>-->
94-
95-
<!-- WIRED TEST RUNNER DEPENDENCIES -->
96-
<!--<dependency>
97-
<groupId>com.atlassian.plugins</groupId>
98-
<artifactId>atlassian-plugins-osgi-testrunner</artifactId>
99-
<version>${plugin.testrunner.version}</version>
100-
<scope>test</scope>
101-
</dependency>-->
102-
<dependency>
103-
<groupId>javax.ws.rs</groupId>
104-
<artifactId>jsr311-api</artifactId>
105-
<version>1.1.1</version>
106-
<scope>provided</scope>
107-
</dependency>
10870
<dependency>
10971
<groupId>com.google.code.gson</groupId>
11072
<artifactId>gson</artifactId>
11173
<version>2.2.2-atlassian-1</version>
11274
</dependency>
11375

114-
11576
<!-- HTTP client: jersey-client -->
11677
<dependency>
11778
<groupId>org.glassfish.jersey.core</groupId>
@@ -148,14 +109,16 @@
148109
<dependency>
149110
<groupId>com.github.joschi.jackson</groupId>
150111
<artifactId>jackson-datatype-threetenbp</artifactId>
151-
<version>${jackson-version}</version>
112+
<version>2.6.4</version>
152113
</dependency>
114+
153115
<!-- Base64 encoding that works in both JVM and Android -->
154116
<dependency>
155117
<groupId>com.brsanthu</groupId>
156118
<artifactId>migbase64</artifactId>
157119
<version>2.2</version>
158120
</dependency>
121+
159122
</dependencies>
160123

161124
<build>
@@ -170,53 +133,9 @@
170133
<productDataVersion>${bamboo.data.version}</productDataVersion>
171134
<enableQuickReload>true</enableQuickReload>
172135
<enableFastdev>false</enableFastdev>
173-
174-
<!-- See here for an explanation of default instructions: -->
175-
<!-- https://developer.atlassian.com/docs/advanced-topics/configuration-of-instructions-in-atlassian-plugins -->
176-
<!--<instructions>-->
177-
<!--<Atlassian-Plugin-Key>${atlassian.plugin.key}</Atlassian-Plugin-Key>-->
178-
179-
<!--&lt;!&ndash; Add package to export here &ndash;&gt;-->
180-
<!--<Export-Package>-->
181-
<!--com.avi.codedx.bambooplugin.api,-->
182-
<!--</Export-Package>-->
183-
184-
<!--&lt;!&ndash; Add package import here &ndash;&gt;-->
185-
<!--<Import-Package>-->
186-
<!--org.springframework.osgi.*;resolution:="optional",-->
187-
<!--org.eclipse.gemini.blueprint.*;resolution:="optional",-->
188-
<!--com.atlassian.plugins.osgi.*;resolution:="optional",-->
189-
<!--*-->
190-
<!--</Import-Package>-->
191-
192-
<!--&lt;!&ndash; Ensure plugin is spring powered &ndash;&gt;-->
193-
<!--&lt;!&ndash;<Spring-Context>*</Spring-Context>&ndash;&gt;-->
194-
<!--</instructions>-->
195136
</configuration>
196137
</plugin>
197-
198-
<!--<plugin>-->
199-
<!--<groupId>com.atlassian.plugin</groupId>-->
200-
<!--<artifactId>atlassian-spring-scanner-maven-plugin</artifactId>-->
201-
<!--<version>${atlassian.spring.scanner.version}</version>-->
202-
<!--<executions>-->
203-
<!--<execution>-->
204-
<!--<goals>-->
205-
<!--<goal>atlassian-spring-scanner</goal>-->
206-
<!--</goals>-->
207-
<!--<phase>process-classes</phase>-->
208-
<!--</execution>-->
209-
<!--</executions>-->
210-
<!--<configuration>-->
211-
<!--<scannedDependencies>-->
212-
<!--<dependency>-->
213-
<!--<groupId>com.atlassian.plugin</groupId>-->
214-
<!--<artifactId>atlassian-spring-scanner-external-jar</artifactId>-->
215-
<!--</dependency>-->
216-
<!--</scannedDependencies>-->
217-
<!--<verbose>false</verbose>-->
218-
<!--</configuration>-->
219-
<!--</plugin>-->
220138
</plugins>
221139
</build>
140+
222141
</project>

swagger-codegen-codedx-api/src/main/java/com/codedx/client/ApiClient.java renamed to src/main/java/com/codedx/client/ApiClient.java

File renamed without changes.

swagger-codegen-codedx-api/src/main/java/com/codedx/client/ApiException.java renamed to src/main/java/com/codedx/client/ApiException.java

File renamed without changes.

swagger-codegen-codedx-api/src/main/java/com/codedx/client/Configuration.java renamed to src/main/java/com/codedx/client/Configuration.java

File renamed without changes.

swagger-codegen-codedx-api/src/main/java/com/codedx/client/CustomInstantDeserializer.java renamed to src/main/java/com/codedx/client/CustomInstantDeserializer.java

File renamed without changes.

swagger-codegen-codedx-api/src/main/java/com/codedx/client/JSON.java renamed to src/main/java/com/codedx/client/JSON.java

File renamed without changes.

swagger-codegen-codedx-api/src/main/java/com/codedx/client/Pair.java renamed to src/main/java/com/codedx/client/Pair.java

File renamed without changes.

swagger-codegen-codedx-api/src/main/java/com/codedx/client/RFC3339DateFormat.java renamed to src/main/java/com/codedx/client/RFC3339DateFormat.java

File renamed without changes.

0 commit comments

Comments
 (0)