Skip to content

Commit

Permalink
Build system updates, Maven 3.3.1 is now required.
Browse files Browse the repository at this point in the history
  • Loading branch information
@ened
ened committed Apr 7, 2015
1 parent 40dd939 commit 25e196f
Show file tree
Hide file tree
Showing 8 changed files with 33 additions and 28 deletions.
2 changes: 1 addition & 1 deletion core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
<!-- Website lifecycle -->
<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>3.3</version>
<version>${maven.site.plugin.version}</version>
<configuration>
<reportPlugins>
<!-- THESE IGNORE GLOBAL PLUGIN MANAGEMENT! -->
Expand Down
2 changes: 1 addition & 1 deletion demo/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>3.3</version>
<version>${maven.site.plugin.version}</version>
<configuration>
<skip>true</skip>
</configuration>
Expand Down
2 changes: 1 addition & 1 deletion distribution/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>3.3</version>
<version>${maven.site.plugin.version}</version>
<configuration>
<skip>true</skip>
</configuration>
Expand Down
2 changes: 1 addition & 1 deletion mediarenderer/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<!-- Website lifecycle -->
<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>3.3</version>
<version>${maven.site.plugin.version}</version>
<configuration>
<reportPlugins>
<!-- THESE IGNORE GLOBAL PLUGIN MANAGEMENT! -->
Expand Down
47 changes: 26 additions & 21 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<prerequisites>
<maven>3.3.1</maven>
</prerequisites>

<!-- ##################################################################################################### -->
<!--
Expand Down Expand Up @@ -82,20 +86,21 @@

<seamless.version>1.1.0</seamless.version>
<lemma.version>1.1.1</lemma.version>
<testng.version>6.2</testng.version>
<apache.httpcomponents.httpclient.version>4.2.2</apache.httpcomponents.httpclient.version>
<apache.httpcomponents.httpcore.version>4.2.3</apache.httpcomponents.httpcore.version>
<testng.version>6.8.21</testng.version>
<apache.httpcomponents.httpclient.version>4.4.1</apache.httpcomponents.httpclient.version>
<apache.httpcomponents.httpcore.version>4.4.1</apache.httpcomponents.httpcore.version>
<android.version>4.1.1.4</android.version>
<android.maven.plugin.version>4.1.0</android.maven.plugin.version>
<android.maven.plugin.version>4.1.1</android.maven.plugin.version>
<maven.site.plugin.version>3.4</maven.site.plugin.version>
<jetty.version>8.1.8.v20121106</jetty.version>
<cdi.api.version>1.0-SP4</cdi.api.version>
<cdi.api.version>1.2</cdi.api.version>
<ejb.api.version>3.0</ejb.api.version>
<slf4j.version>1.6.1</slf4j.version>
<slf4j.version>1.7.12</slf4j.version>
<jna.version>3.2.5</jna.version>
<gstreamer.version>1.4</gstreamer.version>
<args4j.version>2.0.12</args4j.version>
<weld.version>1.1.10.Final</weld.version>
<javassist.version>3.14.0-GA</javassist.version>
<javassist.version>3.19.0-GA</javassist.version>
<kxml.version>2.3.0</kxml.version>

</properties>
Expand Down Expand Up @@ -153,13 +158,13 @@
<!-- Assembly -->
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2.1</version>
<version>2.5.3</version>
</plugin>

<!-- Unit tests -->
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.9</version>
<version>2.18.1</version>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
</configuration>
Expand All @@ -168,7 +173,7 @@
<!-- Javadoc generation settings -->
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.8</version>
<version>2.10.2</version>
<configuration>
<quiet>true</quiet>
</configuration>
Expand All @@ -177,37 +182,37 @@
<!-- Source JARs -->
<plugin>
<artifactId>maven-source-plugin</artifactId>
<version>2.1.2</version>
<version>2.4</version>
</plugin>

<!-- Cross-referenced source code -->
<plugin>
<artifactId>maven-jxr-plugin</artifactId>
<version>2.1</version>
<version>2.5</version>
</plugin>

<!-- Deploy phase -->
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.7</version>
<version>2.8.2</version>
</plugin>

<!-- Ant fallback -->
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.3</version>
<version>1.8</version>
</plugin>

<!-- Cleanup -->
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>2.4.1</version>
<version>2.6.1</version>
</plugin>

<!-- Website lifecycle -->
<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>3.3</version>
<version>${maven.site.plugin.version}</version>
<dependencies>
<!-- We have raw XHTML files -->
<dependency>
Expand All @@ -222,7 +227,7 @@
<plugin>
<groupId>org.dstovall</groupId>
<artifactId>onejar-maven-plugin</artifactId>
<version>1.4.4</version>
<version>1.4.5</version>
</plugin>

<!-- Manual generation settings -->
Expand All @@ -242,17 +247,17 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>2.3.1</version>
<version>2.5.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<version>2.7</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<version>3.3</version>
<configuration>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
Expand All @@ -261,7 +266,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<version>2.6</version>
</plugin>

</plugins>
Expand Down
2 changes: 1 addition & 1 deletion support/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
<!-- Website lifecycle -->
<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>3.3</version>
<version>${maven.site.plugin.version}</version>
<configuration>
<reportPlugins>
<!-- THESE IGNORE GLOBAL PLUGIN MANAGEMENT! -->
Expand Down
2 changes: 1 addition & 1 deletion website/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>3.3</version>
<version>${maven.site.plugin.version}</version>
</plugin>

<plugin>
Expand Down
2 changes: 1 addition & 1 deletion workbench/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<!-- Website lifecycle -->
<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>3.3</version>
<version>${maven.site.plugin.version}</version>
<configuration>
<reportPlugins>
<!-- THESE IGNORE GLOBAL PLUGIN MANAGEMENT! -->
Expand Down

0 comments on commit 25e196f

Please sign in to comment.