Skip to content

Commit 7470723

Browse files
committed
Some further adjustments to the maven build
1 parent b7e531f commit 7470723

1 file changed

Lines changed: 12 additions & 20 deletions

File tree

pom.xml

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,15 @@
5555
<artifactId>maven-release-plugin</artifactId>
5656
<configuration>
5757
<autoVersionSubmodules>true</autoVersionSubmodules>
58-
<!--<tagNameFormat>v@{project.version}</tagNameFormat>-->
5958
</configuration>
6059
</plugin>
6160
<plugin>
6261
<groupId>org.apache.maven.plugins</groupId>
6362
<artifactId>maven-antrun-plugin</artifactId>
6463
<version>1.7</version>
6564
<executions>
65+
<!-- We need to download and unpack the IntelliJ IDEA Community Edition to -->
66+
<!-- compile the plugin on travis. The first execution just downloads the tar.gz -->
6667
<execution>
6768
<id>download-files</id>
6869
<phase>validate</phase>
@@ -72,7 +73,7 @@
7273
<configuration>
7374
<target>
7475
<!-- Download IDEA sources which are required to build the plugin-->
75-
<!-- For local testing, I included a copy target below -->
76+
<!-- For local testing, I included a copy target below and comment our the "get" -->
7677
<echo message="Downloading ${idea.ic.source} to ${project.build.directory}"/>
7778
<get src="http://download.jetbrains.com/idea/${idea.ic.source}"
7879
dest="${project.build.directory}"
@@ -91,9 +92,11 @@
9192
<phase>validate</phase>
9293
<configuration>
9394
<target>
94-
<echo message="unpacking ${idea.version}"/>
95+
<echo message="unpacking ${idea.ic.source}"/>
9596
<untar compression="gzip" src="${project.build.directory}/${idea.ic.source}"
9697
dest="${project.build.directory}"/>
98+
99+
<echo message="moving idea sources to ${idea.ic.dir}"/>
97100
<exec executable="sh">
98101
<arg value="-c"/>
99102
<arg value="mv ${project.build.directory}/idea-IC-* ${idea.ic.dir}"/>
@@ -142,7 +145,7 @@
142145
<!--suppress MavenModelInspection -->
143146
<artifactId>tools</artifactId>
144147
<!--suppress MavenModelInspection -->
145-
<version>1.6.0</version>
148+
<version>1.8</version>
146149
<scope>system</scope>
147150
<!--suppress MavenModelInspection -->
148151
<systemPath>${env.JAVA_HOME}/lib/tools.jar</systemPath>
@@ -173,13 +176,15 @@
173176
<plugin>
174177
<groupId>org.apache.maven.plugins</groupId>
175178
<artifactId>maven-compiler-plugin</artifactId>
176-
<version>2.5.1</version>
179+
<version>3.5.1</version>
177180
<configuration>
181+
<showWarnings>true</showWarnings>
182+
<compilerVersion>1.8</compilerVersion>
178183
<compilerArguments>
179184
<extdirs>${idea.ic.dir}/lib/</extdirs>
180185
</compilerArguments>
181-
<source>1.6</source>
182-
<target>1.6</target>
186+
<source>1.8</source>
187+
<target>1.8</target>
183188
</configuration>
184189
</plugin>
185190
<plugin>
@@ -202,17 +207,4 @@
202207
</plugin>
203208
</plugins>
204209
</build>
205-
206-
<pluginRepositories>
207-
<pluginRepository>
208-
<id>sonatype-public-repository</id>
209-
<url>https://oss.sonatype.org/content/groups/public</url>
210-
<snapshots>
211-
<enabled>true</enabled>
212-
</snapshots>
213-
<releases>
214-
<enabled>true</enabled>
215-
</releases>
216-
</pluginRepository>
217-
</pluginRepositories>
218210
</project>

0 commit comments

Comments
 (0)