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

Small polish and performance improvements #64

Open
wants to merge 29 commits into
base: master
Choose a base branch
from
Open

Small polish and performance improvements #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
0382d04
Prepare for Jira 7.x version and hide panel if it is not needed got c…
Dec 16, 2018
5a8e39f
to Java 8 changes
Dec 16, 2018
bc7a7cf
to Java 8 changes
Dec 16, 2018
13e25c0
Deprecated API fixes
Dec 16, 2018
02a047e
DOT-1933: Use more variables
Jan 14, 2019
f6dce07
Fix deprecated methods
Jan 19, 2019
b6b7133
Fix deprecated methods and simplify configuration condition
Jan 19, 2019
b4583b6
Prepare for ssh timeout and latest gerrit event API module
Jan 19, 2019
5f37605
Updated for latest Gerrit events and ssh timeouts and refactoring
Jan 19, 2019
6d5f323
Velocity typo fix and optimize css
Jan 19, 2019
8c02c22
Duplicate code of method isGerrit moved into Impl class to interface.…
Jan 19, 2019
5da1459
Remove atlassian spring scanner dependency for 1 version. If it is ne…
Jan 19, 2019
eed222f
Replace easyList by Lists, fix deprecate method
Jan 19, 2019
29e9451
Prepare the cache expiration parameter
Jan 19, 2019
d6cccc7
Prepare the cache expiration parameter
Jan 19, 2019
6f869be
Polish
Jan 19, 2019
0bb782e
Invert condition for easier read
Jan 19, 2019
7b3d041
Prepare clear cache methods
Jan 19, 2019
f5b1992
Remove redundant type cast and bump dependecies and amps
Feb 8, 2019
752e00e
Persist SSH connection
Mar 11, 2019
14fc08f
Prepare cache methods
Mar 17, 2019
38de9c3
Replace deprecated tag font into span wrap
Mar 17, 2019
a3ef0be
Bugfix to put into map from previous reference
Mar 18, 2019
f2fb675
Remove unneccessary casting
Jul 11, 2019
c006923
Change gitignore
Jul 11, 2019
5f8076c
Merge branch 'master' of https://github.com/gonchik/jira-gerrit-plugin
Jul 11, 2019
d7bb392
Change gitignore
Jul 11, 2019
a0e7b4b
Add codeStyle settings to the project
jhansche Jul 10, 2019
057f4ed
Merge pull request #4 from gonchik/development
gonchik May 11, 2020
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
4 changes: 3 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ target/
bin/

#IDE specific files
projectFilesBackup/
.project
.classpath
.idea
*.iml

.DS_Store
4 changes: 4 additions & 0 deletions .idea/.gitignore
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .idea/codeStyles/.gitignore
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

135 changes: 135 additions & 0 deletions .idea/codeStyles/Project.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions .idea/codeStyles/codeStyleConfig.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

88 changes: 31 additions & 57 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,13 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

<modelVersion>4.0.0</modelVersion>
<groupId>com.meetme.plugins.jira</groupId>
<artifactId>gerrit-plugin</artifactId>
<version>3.5-SNAPSHOT</version>
<version>3.4.1</version>

<organization>
<name>MeetMe, Inc.</name>
Expand Down Expand Up @@ -67,14 +68,7 @@
<version>${jira.version}</version>
<scope>provided</scope>
</dependency>
<!-- Add dependency on jira-core if you want access to JIRA implementation classes as well as the sanctioned API. -->
<!-- This is not normally recommended, but may be required eg when migrating a plugin originally developed against JIRA 4.x -->
<!-- <dependency>
<groupId>com.atlassian.jira</groupId>
<artifactId>jira-core</artifactId>
<version>${jira.version}</version>
<scope>provided</scope>
</dependency> -->

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand All @@ -100,18 +94,11 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.atlassian.plugin</groupId>
<artifactId>atlassian-spring-scanner-annotation</artifactId>
<version>${atlassian.spring.scanner.version}</version>
<scope>compile</scope>
</dependency>

<!-- Project Atlassian requirements -->
<dependency>
<groupId>com.atlassian.sal</groupId>
<artifactId>sal-api</artifactId>
<version>2.0.16</version>
<version>${atlas.sal.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -152,12 +139,26 @@
<scope>provided</scope>
</dependency>

<!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>27.0.1-jre</version>
<scope>provided</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-api -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.25</version>
<scope>provided</scope>
</dependency>
<!-- Project dependencies -->
<dependency>
<!-- Using this for gerrit integration -->
<groupId>com.sonyericsson.hudson.plugins.gerrit</groupId>
<groupId>com.sonymobile.tools.gerrit</groupId>
<artifactId>gerrit-events</artifactId>
<version>1.99.1</version>
<version>2.15.0</version>
<exclusions>
<exclusion>
<groupId>com.jcraft</groupId>
Expand All @@ -169,12 +170,12 @@
<!-- Using this for ssh -->
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
<version>0.1.54</version>
<version>0.1.55</version>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.3</version>
<version>1.4</version>
</dependency>
</dependencies>

Expand Down Expand Up @@ -207,13 +208,6 @@
</products>
</configuration>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
Expand All @@ -222,35 +216,14 @@
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-gitexe</artifactId>
<version>1.9.5</version>
<version>1.11.1</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>com.atlassian.plugin</groupId>
<artifactId>atlassian-spring-scanner-maven-plugin</artifactId>
<version>${atlassian.spring.scanner.version}</version>
<executions>
<execution>
<goals>
<goal>atlassian-spring-scanner</goal>
</goals>
<phase>process-classes</phase>
</execution>
</executions>
<configuration>
<scannedDependencies>
<dependency>
<groupId>com.atlassian.plugin</groupId>
<artifactId>atlassian-spring-scanner-external-jar</artifactId>
</dependency>
</scannedDependencies>
<verbose>false</verbose>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
Expand All @@ -261,19 +234,20 @@

<properties>
<jira.version>7.2.0</jira.version>
<amps.version>6.2.6</amps.version>
<amps.version>6.3.21</amps.version>
<plugin.testrunner.version>1.2.3</plugin.testrunner.version>
<atlassian.spring.scanner.version>1.2.13</atlassian.spring.scanner.version>
<atlassian.plugin.key>${project.groupId}.${project.artifactId}</atlassian.plugin.key>
<testkit.version>6.3.11</testkit.version>
<quick.reload.version>1.30.5</quick.reload.version>

<jira.test.version>7.2.0</jira.test.version>
<jira.data.version>7.2.0</jira.data.version>
<jira.test.version>${jira.version}</jira.test.version>
<jira.data.version>${jira.version}</jira.data.version>
<jira.rest.version>3.0.8</jira.rest.version>
<atlas.template.version>3.0.0</atlas.template.version>
<atlas.concurrent.version>3.0.0</atlas.concurrent.version>
<atlas.sal.version>3.0.5</atlas.sal.version>
<atlas.sal.version>3.1.0</atlas.sal.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>

<profiles>
Expand Down
4 changes: 2 additions & 2 deletions src/aps/resources/log4j.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,8 +442,8 @@ log4j.additivity.com.atlassian.mail.incoming = false
log4j.logger.com.meetme = DEBUG, console, filelog
log4j.additivity.com.meetme = true

log4j.logger.com.sonyericsson.hudson = INFO, console, filelog
log4j.additivity.com.sonyericsson.hudson = false
log4j.logger.com.sonymobile.tools = INFO, console, filelog
log4j.additivity.com.sonymobile.tools = false

log4j.logger.com.jcraft = INFO, console, filelog
log4j.additivity.com.jcraft = false
Loading