Skip to content

Commit

Permalink
Prepare jboss-parent 20
Browse files Browse the repository at this point in the history 
 - main improvement is compatibility with JDK9 verona project
  • Loading branch information
@ctomc
ctomc committed Feb 15, 2016
1 parent 4a21c45 commit e3e1edc
Show file tree
Hide file tree
Showing 2 changed files with 61 additions and 31 deletions.
8 changes: 4 additions & 4 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Start out by adding the parent configuration to your pom.
<parent>
<groupId>org.jboss</groupId>
<artifactId>jboss-parent</artifactId>
<version>19</version>
<version>20</version>
</parent>

The pom includes properties which allow various build configuration to be
Expand All @@ -32,11 +32,11 @@ maven-compiler-plugin, just set a property.
</properties>

Or override the default Java compiler source and target level used in the build.
Note the default level is 1.7.
Note the default level is 1.8.

<properties>
<maven.compiler.target>1.6</maven.compiler.target>
<maven.compiler.source>1.6</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
<maven.compiler.source>1.7</maven.compiler.source>
</properties>

The minimum version of Java or Maven required to run a build can also be set via
Expand Down
84 changes: 57 additions & 27 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,27 +68,27 @@
<!-- Plugins versions -->
<!-- **************** -->
<version.antrun.plugin>1.8</version.antrun.plugin>
<version.assembly.plugin>2.5.5</version.assembly.plugin>
<version.buildhelper.plugin>1.9.1</version.buildhelper.plugin>
<version.buildnumber.plugin>1.3</version.buildnumber.plugin>
<version.assembly.plugin>2.6</version.assembly.plugin>
<version.buildhelper.plugin>1.10</version.buildhelper.plugin>
<version.buildnumber.plugin>1.4</version.buildnumber.plugin>
<version.bundle.plugin>3.0.1</version.bundle.plugin>
<version.checkstyle.plugin>2.15</version.checkstyle.plugin>
<version.clean.plugin>2.6.1</version.clean.plugin>
<version.clover2.plugin>4.0.4</version.clover2.plugin>
<version.checkstyle.plugin>2.17</version.checkstyle.plugin>
<version.clean.plugin>3.0.0</version.clean.plugin>
<version.clover2.plugin>4.0.6</version.clover2.plugin>
<version.cobertura.plugin>2.7</version.cobertura.plugin>
<version.compiler.plugin>3.1</version.compiler.plugin>
<version.compiler.plugin>3.5.1</version.compiler.plugin>
<version.dependency.plugin>2.10</version.dependency.plugin>
<version.deploy.plugin>2.8.2</version.deploy.plugin>
<version.ear.plugin>2.10</version.ear.plugin>
<version.eclipse.plugin>2.10</version.eclipse.plugin>
<version.ear.plugin>2.10.1</version.ear.plugin>
<version.eclipse.plugin>2.10</version.eclipse.plugin><!-- we should probably remove this in next version it is deprecated & not supported anymore -->
<version.org.eclipse.m2e.lifecycle-mapping>1.0.0</version.org.eclipse.m2e.lifecycle-mapping>
<version.ejb.plugin>2.5</version.ejb.plugin>
<version.ejb.plugin>2.5.1</version.ejb.plugin>
<version.exec.plugin>1.4.0</version.exec.plugin>
<version.enforcer.plugin>1.4</version.enforcer.plugin>
<version.findbugs.plugin>3.0.1</version.findbugs.plugin>
<version.enforcer.plugin>1.4.1</version.enforcer.plugin>
<version.findbugs.plugin>3.0.3</version.findbugs.plugin>
<version.gpg.plugin>1.6</version.gpg.plugin>
<version.help.plugin>2.2</version.help.plugin>
<version.idlj.plugin>1.2.1</version.idlj.plugin>
<version.idlj.plugin>1.2.1</version.idlj.plugin> <!-- also probable candidate for removal -->
<version.injection.plugin>1.0.2</version.injection.plugin>
<version.install.plugin>2.5.2</version.install.plugin>
<version.jar.plugin>2.6</version.jar.plugin>
Expand All @@ -98,21 +98,24 @@
<version.jdepend.plugin>2.0</version.jdepend.plugin>
<version.jxr.plugin>2.5</version.jxr.plugin>
<version.license.plugin>1.8</version.license.plugin>
<version.pir.plugin>2.8</version.pir.plugin><!-- maven-project-info-reports-plugins -->
<version.pir.plugin>2.8.1</version.pir.plugin><!-- maven-project-info-reports-plugins -->
<version.plugin.plugin>3.4</version.plugin.plugin>
<version.pmd.plugin>3.4</version.pmd.plugin>
<version.pmd.plugin>3.6</version.pmd.plugin>
<version.rar.plugin>2.4</version.rar.plugin>
<version.release.plugin>2.5.2</version.release.plugin>
<version.release.plugin>2.5.3</version.release.plugin>
<version.resources.plugin>2.7</version.resources.plugin>
<version.shade.plugin>2.3</version.shade.plugin>
<version.shade.plugin>2.4.3</version.shade.plugin>
<version.site.plugin>3.4</version.site.plugin>
<version.sonar.plugin>2.5</version.sonar.plugin>
<version.sonar.plugin>5.1</version.sonar.plugin>
<version.source.plugin>2.4</version.source.plugin>
<version.surefire.plugin>2.18.1</version.surefire.plugin>
<version.surefire.plugin>2.19.1</version.surefire.plugin>
<version.failsafe.plugin>${version.surefire.plugin}</version.failsafe.plugin>
<version.war.plugin>2.6</version.war.plugin>
<version.zanata.plugin>3.8.1</version.zanata.plugin>

<!-- we override plexus Archiver with version 3.0.3 as older don't work on JDK9 -->
<version.plexus.archiver>3.0.3</version.plexus.archiver>


<!-- ***************** -->
<!-- Repository Deployment URLs -->
Expand All @@ -129,8 +132,8 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<!-- maven-compiler-plugin -->
<maven.compiler.target>1.7</maven.compiler.target>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.testTarget>${maven.compiler.target}</maven.compiler.testTarget>
<maven.compiler.testSource>${maven.compiler.source}</maven.compiler.testSource>

Expand Down Expand Up @@ -159,7 +162,7 @@

<!-- maven-assembly-plugin -->
<sourceReleaseAssemblyDescriptor>source-release</sourceReleaseAssemblyDescriptor>
<version.checkstyle>6.7</version.checkstyle>
<version.checkstyle>6.15</version.checkstyle>
<!-- exposed additional params for javadoc, such as Xlint -->
<javadoc.additional.params />
</properties>
Expand All @@ -183,6 +186,13 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>${version.assembly.plugin}</version>
<dependencies>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
<version>${version.plexus.archiver}</version>
</dependency>
</dependencies>
<configuration>
<archive>
<index>true</index>
Expand Down Expand Up @@ -380,6 +390,13 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>${version.jar.plugin}</version>
<dependencies>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
<version>${version.plexus.archiver}</version>
</dependency>
</dependencies>
<configuration>
<archive>
<index>true</index>
Expand Down Expand Up @@ -506,6 +523,13 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>${version.source.plugin}</version>
<dependencies>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
<version>${version.plexus.archiver}</version>
</dependency>
</dependencies>
<configuration>
<archive>
<index>true</index>
Expand Down Expand Up @@ -706,12 +730,18 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>${version.assembly.plugin}</version>
<dependencies>
<dependency>
<groupId>org.apache.apache.resources</groupId>
<artifactId>apache-source-release-assembly-descriptor</artifactId>
<version>1.0.5</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
<version>${version.plexus.archiver}</version>
</dependency>
<dependency>
<groupId>org.apache.apache.resources</groupId>
<artifactId>apache-source-release-assembly-descriptor</artifactId>
<version>1.0.5</version>
</dependency>
</dependencies>
<executions>
<execution>
Expand Down

0 comments on commit e3e1edc

Please sign in to comment.