Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Missed source folder #48

Open
wants to merge 20 commits into
base: main
Choose a base branch
from
Open

Missed source folder #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
9040d37
Missed source folder
Dec 27, 2022
9686a8e
Remove dead code
Dec 27, 2022
8ac1a95
More moves
Dec 27, 2022
46b331a
Move code
Dec 27, 2022
2d804d3
Move
Dec 27, 2022
685803a
Move
Dec 27, 2022
dbad389
Dead code
Dec 27, 2022
1dd124b
Move code
Dec 27, 2022
a29994b
Dead code
Dec 27, 2022
9d3c8e5
Move
Dec 27, 2022
09fae25
Move
Dec 27, 2022
0947b40
Move
Dec 27, 2022
e08cda7
Use swagger gens for bamboo communication
Jan 2, 2023
2488070
New version 4.3.1
Jan 2, 2023
592ddf6
New version 4.3.1
Jan 2, 2023
0e4d668
Start using swagger generated code for Bamboo
Jan 7, 2023
289e286
Bamboo cleanup
Jan 9, 2023
56e2be6
Revert "Bamboo cleanup"
Jan 9, 2023
705a10f
Update info
Jan 9, 2023
6f09ef5
Save swagger work
Feb 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bamboo-feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="me.glindholm.connector.eclipse.bamboo"
label="%featureName"
version="4.3.0.qualifier"
version="4.3.1.qualifier"
provider-name="%providerName"
plugin="me.glindholm.connector.eclipse.branding.ui">

Expand Down
2 changes: 1 addition & 1 deletion bamboo-feature/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>me.glindholm.connector.eclipse</groupId>
<artifactId>JiraConnector</artifactId>
<version>4.3.0-SNAPSHOT</version>
<version>4.3.1-SNAPSHOT</version>
</parent>
<artifactId>me.glindholm.connector.eclipse.bamboo</artifactId>
<packaging>eclipse-feature</packaging>
Expand Down
45 changes: 37 additions & 8 deletions bamboo.core/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,60 @@ Bundle-ManifestVersion: 2
Bundle-Name: JiraConnector for Eclipse Bamboo Core
Automatic-Module-Name: JiraConnector for Eclipse Bamboo Core
Bundle-SymbolicName: me.glindholm.connector.eclipse.bamboo.core;singleton:=true
Bundle-Version: 4.3.0.qualifier
Bundle-Version: 4.3.1.qualifier
Bundle-Activator: me.glindholm.connector.eclipse.internal.bamboo.core.BambooCorePlugin
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.mylyn.tasks.core;bundle-version="[3.2.0,4.0.0)",
org.eclipse.mylyn.commons.core;bundle-version="[3.2.0,4.0.0)",
org.eclipse.mylyn.commons.net;bundle-version="[3.2.0,4.0.0)",
org.eclipse.mylyn.tasks.core;bundle-version="3.25.2",
org.eclipse.mylyn.commons.core;bundle-version="3.25.2",
org.eclipse.mylyn.commons.net;bundle-version="3.25.2",
me.glindholm.connector.eclipse.commons.core,
me.glindholm.connector.eclipse.core,
me.glindholm.connector.eclipse.commons.core;visibility:=reexport
Export-Package: me.glindholm.connector.eclipse.internal.bamboo.core;x-friends:="me.glindholm.connector.eclipse.bamboo.tests,me.glindholm.connector.eclipse.bamboo.ui",
org.apache.commons.io,
me.glindholm.connector.eclipse.commons.core;visibility:=reexport,
org.eclipse.jdt.annotation,
me.glindholm.connector.eclipse.bamboo.core,
org.apache.commons.lang3,
org.eclipse.ui.workbench,
org.eclipse.jface;bundle-version="3.28.0",
org.eclipse.mylyn.commons.workbench;bundle-version="3.25.2"
Export-Package: me.glindholm.bamboo.invoker,
me.glindholm.bamboo.model,
me.glindholm.connector.commons.api,
me.glindholm.connector.commons.misc,
me.glindholm.connector.eclipse.internal.bamboo.core;x-friends:="me.glindholm.connector.eclipse.bamboo.tests,me.glindholm.connector.eclipse.bamboo.ui",
me.glindholm.connector.eclipse.internal.bamboo.core.client;x-friends:="me.glindholm.connector.eclipse.bamboo.tests,me.glindholm.connector.eclipse.bamboo.ui",
me.glindholm.connector.eclipse.internal.bamboo.core.service,
me.glindholm.connector.eclipse.internal.core.client;x-friends:="me.glindholm.connector.eclipse.bamboo.core,me.glindholm.connector.eclipse.bamboo.ui,me.glindholm.connector.eclipse.ui",
me.glindholm.theplugin.commons,
me.glindholm.theplugin.commons.bamboo,
me.glindholm.theplugin.commons.bamboo.api,
me.glindholm.theplugin.commons.cfg,
me.glindholm.theplugin.commons.configuration,
me.glindholm.theplugin.commons.exception,
me.glindholm.theplugin.commons.remoteapi,
me.glindholm.theplugin.commons.remoteapi.rest,
me.glindholm.theplugin.commons.util,
org.codehaus.jettison,
org.codehaus.jettison.json,
org.codehaus.jettison.util,
org.jaxen
Bundle-Vendor: George Lindholm
Eclipse-RegisterBuddy: me.glindholm.connector.eclipse.core
Import-Package: org.eclipse.mylyn.commons.core,
Import-Package: me.glindholm.theplugin.commons.bamboo,
org.eclipse.mylyn.commons.core,
org.eclipse.mylyn.tasks.core,
org.eclipse.mylyn.tasks.core.data,
org.eclipse.mylyn.tasks.core.sync
Bundle-ClassPath: .,
target/lib/jaxen.jar,
target/lib/jettison.jar
target/lib/jettison.jar,
target/lib/jackson-annotations.jar,
target/lib/jackson-databind.jar,
target/lib/swagger-annotations.jar,
target/lib/jackson-core.jar,
target/lib/jackson-datatype-jsr310.jar,
target/lib/jackson-databind-nullable.jar,
target/lib/jdom.jar,
target/lib/jsr305.jar
12 changes: 10 additions & 2 deletions bamboo.core/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,15 @@ bin.includes = META-INF/,\
about.html,\
LICENSE.txt,\
target/lib/jaxen.jar,\
target/lib/jettison.jar
target/lib/jettison.jar,\
target/lib/jackson-annotations.jar,\
target/lib/jackson-databind.jar,\
target/lib/swagger-annotations.jar,\
target/lib/jackson-core.jar,\
target/lib/jackson-datatype-jsr310.jar,\
target/lib/jackson-databind-nullable.jar,\
target/lib/jdom.jar,\
target/lib/jsr305.jar
jars.compile.order = .
source.. = src/
source.. = src/main/java/,target/src/main/java
output.. = target/classes/
204 changes: 157 additions & 47 deletions bamboo.core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,55 +1,165 @@
<?xml version="1.0" encoding="UTF-8"?>
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>me.glindholm.connector.eclipse</groupId>
<artifactId>JiraConnector</artifactId>
<version>4.3.0-SNAPSHOT</version>
</parent>
<artifactId>me.glindholm.connector.eclipse.bamboo.core</artifactId>
<packaging>eclipse-plugin</packaging>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>copy-dependencies</id>
<phase>initialize</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeArtifactIds>jettison,jdom,jaxen</includeArtifactIds>
<outputDirectory>target/lib</outputDirectory>
<stripVersion>true</stripVersion>
<overWriteReleases>true</overWriteReleases>
<overWriteSnapshots>true</overWriteSnapshots>
</configuration>
</execution>
</executions>
</plugin>

</plugins>
</build>
<dependencies>
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>me.glindholm.connector.eclipse</groupId>
<artifactId>JiraConnector</artifactId>
<version>4.3.1-SNAPSHOT</version>
</parent>
<artifactId>me.glindholm.connector.eclipse.bamboo.core</artifactId>
<packaging>eclipse-plugin</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<swagger-annotations-version>1.6.9</swagger-annotations-version>
<jersey-version>2.35</jersey-version>
<jackson-version>2.14.1</jackson-version>
<jackson-databind-version>2.14.1</jackson-databind-version>
<jackson-databind-nullable-version>0.2.2</jackson-databind-nullable-version>
<jakarta-annotation-version>2.1.1</jakarta-annotation-version>
<junit-version>4.13.2</junit-version>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>add-source</id>
<phase>generate-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>${project.build.directory}/src/java/main</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.openapitools</groupId>
<artifactId>openapi-generator-maven-plugin</artifactId>
<version>6.2.1</version>
<configuration>
<generatorName>java</generatorName>
<logToStderr>false</logToStderr>
<verbose>false</verbose>
<output>${project.build.directory}</output>
<sourceFolder>src/java/main</sourceFolder>
<configOptions>
<generateApiDocumentation>false</generateApiDocumentation>
<generateModelDocumentation>false</generateModelDocumentation>
<openApiNullable>false</openApiNullable>
<asyncNative>true</asyncNative>
<dateLibrary>java11</dateLibrary>
<developerName>George Lindholm</developerName>
<developerEmail>[email protected]</developerEmail>
<developerOrganization>self</developerOrganization>
<serializableModel>false</serializableModel>
</configOptions>
<httpUserAgent>Atlassian Jira/Bamboo Client ${project.version}</httpUserAgent>
<generateModelTests>false</generateModelTests>
<generateApiTests>false</generateApiTests>
<library>native</library>
<groupId>${project.groupId}</groupId>
<artifactId>${project.artifactId}</artifactId>
<artifactVersion>${project.version}</artifactVersion>
<skipValidateSpec>false</skipValidateSpec>
<withXml>false</withXml>
<generateModelDocumentation>false</generateModelDocumentation>
<addCompileSourceRoot>true</addCompileSourceRoot>
</configuration>
<executions>
<execution>
<id>bamboo</id>
<goals>
<goal>generate</goal>
</goals>
<configuration>
<inputSpec>${basedir}/src/main/resources/json/bamboo.json</inputSpec>
<apiPackage>me.glindholm.bamboo.api</apiPackage>
<invokerPackage>me.glindholm.bamboo.invoker</invokerPackage>
<modelPackage>me.glindholm.bamboo.model</modelPackage>
<modelNamePrefix></modelNamePrefix>
<skip>false</skip>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>copy-dependencies</id>
<phase>initialize</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeArtifactIds>jettison,jdom,jaxen,
jackson-core,jackson-databind,jackson-annotations,
jackson-datatype-jsr310,jackson-databind-nullable,
swagger-annotations,jsr305
</includeArtifactIds>
<outputDirectory>target/lib</outputDirectory>
<stripVersion>true</stripVersion>
<overWriteReleases>true</overWriteReleases>
<overWriteSnapshots>true</overWriteSnapshots>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
<version>1.1</version>
</dependency>
<dependency>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
</dependency>
<dependency>
<groupId>org.jdom</groupId>
<artifactId>jdom</artifactId>
</dependency>
</dependencies>

<dependency>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
</dependency>
<dependency>
<groupId>org.jdom</groupId>
<artifactId>jdom</artifactId>
</dependency>
<!-- Swagger -->
<dependency>
<groupId>org.openapitools</groupId>
<artifactId>jackson-databind-nullable</artifactId>
<version>0.2.4</version>
</dependency>
<!-- dependencies are needed for the client being generated -->
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<version>${swagger-annotations-version}</version>
</dependency>
<!-- @Nullable annotation -->
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>3.0.2</version>
</dependency>
<!-- JSON processing: jackson -->
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>${jakarta-annotation-version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>
Loading