Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/janotav/ali-idea-plugin i…
Browse files Browse the repository at this point in the history
…nto encodingIssue
  • Loading branch information
Vojtech Janota committed Sep 14, 2015
2 parents e8cea33 + 4ab7fb8 commit 9bcab3a
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 9 deletions.
2 changes: 1 addition & 1 deletion ali-lang/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<artifactId>ali-parent</artifactId>
<groupId>com.hp.alm.ali</groupId>
<version>3.14</version>
<version>3.15</version>
<relativePath>../ali-parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion ali-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<name>${project.artifactId}:${project.version}</name>
<description>Common HP ALI parent</description>
<packaging>pom</packaging>
<version>3.14</version>
<version>3.15</version>

<properties>
<spring.version>3.2.4.RELEASE</spring.version>
Expand Down
2 changes: 1 addition & 1 deletion ali-plugin-main/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.hp.alm.ali</groupId>
<artifactId>ali-parent</artifactId>
<version>3.14</version>
<version>3.15</version>
<relativePath>../ali-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
7 changes: 6 additions & 1 deletion ali-plugin-main/src/main/resources/META-INF/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,18 @@
<id>com.hp.alm.ali</id>
<name>HP ALI</name>
<description>Application Lifecycle Intelligence for HP ALM</description>
<version>3.14.@{idea.build}</version>
<version>3.15.@{idea.build}</version>
<vendor logo="/ali_icon.png" url="https://hpln.hp.com/group/application-lifecycle-intelligence">HP</vendor>

<idea-version since-build="@{idea.build}"/>

<change-notes>
<![CDATA[
<h3>Changes in 3.15</h3>
<ul>
<li>[enhancement] support "agmlink" attachments
</ul>
<h3>Changes in 3.14</h3>
<ul>
<li>[compatibility] support Intellij 14.1</li>
Expand Down
2 changes: 1 addition & 1 deletion ali-rest-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.hp.alm.ali</groupId>
<artifactId>ali-parent</artifactId>
<version>3.14</version>
<version>3.15</version>
<relativePath>../ali-parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion ali-test-support/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.hp.alm.ali</groupId>
<artifactId>ali-parent</artifactId>
<version>3.14</version>
<version>3.15</version>
<relativePath>../ali-parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion extract-sdk.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ cat << POM_HEADER >> idea-sdk-$version/pom.xml
<parent>
<artifactId>ali-parent</artifactId>
<groupId>com.hp.alm.ali</groupId>
<version>3.14</version>
<version>3.15</version>
<relativePath>../ali-parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion idea-sdk-IC-141.177.4/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<parent>
<artifactId>ali-parent</artifactId>
<groupId>com.hp.alm.ali</groupId>
<version>3.14</version>
<version>3.15</version>
<relativePath>../ali-parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<name>${project.artifactId}:${project.version}</name>
<description>HP ALI Intellij Plugin</description>
<packaging>pom</packaging>
<version>3.14</version>
<version>3.15</version>

<modules>
<module>ali-parent</module>
Expand Down

0 comments on commit 9bcab3a

Please sign in to comment.