Attachment 589533 Details for Bug 826456 – Patch for moving the settings out of release profile

[patch] Patch for moving the settings out of release profile

0003-moved-compiler-settings-from-release-profile-to-buil.patch (text/plain), 2.20 KB, created by Lukáš Fryč on 2012-06-05 14:04:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lukáš Fryč

Created: 2012-06-05 14:04:48 UTC

Size: 2.20 KB

patch

obsolete

>From c0ba6619f0cc898970ab2e21e1058ee36076861e Mon Sep 17 00:00:00 2001
>From: Lukas Fryc <lfryc@redhat.com>
>Date: Tue, 5 Jun 2012 15:59:10 +0200
>Subject: [PATCH 3/3] moved compiler settings from release profile to build settings https://bugzilla.redhat.com/show_bug.cgi?id=826456
>
>---
> pom.xml |   16 +++++++++-------
> 1 files changed, 9 insertions(+), 7 deletions(-)
>
>diff --git a/pom.xml b/pom.xml
>index 55e75f2..125bf3b 100644
>--- a/pom.xml
>+++ b/pom.xml
>@@ -24,6 +24,8 @@
>         <jbas7.manifest.dependencies>org.slf4j,org.jboss.as.controller-client,org.jboss.as.protocol,org.jboss.dmr,org.jboss.logging,org.jboss.marshalling,org.jboss.marshalling.river,org.jboss.remoting3,org.jboss.threads</jbas7.manifest.dependencies>
>         <jbas71.excluded.libraries>${jbas7.excluded.libraries},WEB-INF/lib/guava*,WEB-INF/lib/jsr305*</jbas71.excluded.libraries>
>         <jbas71.manifest.dependencies>com.google.guava,${jbas7.manifest.dependencies}</jbas71.manifest.dependencies>
>+        <maven.compiler.target>1.6</maven.compiler.target>
>+        <maven.compiler.source>1.6</maven.compiler.source>
>     </properties>
> 
>     <dependencyManagement>
>@@ -239,6 +241,13 @@
>         </resources>
>         <plugins>
>             <plugin>
>+                <artifactId>maven-compiler-plugin</artifactId>
>+                <configuration>
>+                    <source>${maven.compiler.source}</source>
>+                    <target>${maven.compiler.target}</target>
>+                </configuration>
>+            </plugin>
>+            <plugin>
>                 <artifactId>maven-checkstyle-plugin</artifactId>
>                 <version>2.6</version>
>             </plugin>
>@@ -325,13 +334,6 @@
>             <build>
>                 <plugins>
>                     <plugin>
>-                        <artifactId>maven-compiler-plugin</artifactId>
>-                        <configuration>
>-                            <source>1.6</source>
>-                            <target>1.6</target>
>-                        </configuration>
>-                    </plugin>
>-                    <plugin>
>                         <artifactId>maven-assembly-plugin</artifactId>
> 
>                         <executions>
>-- 
>1.7.1
>

Actions: View | Diff

Attachments on bug 826456: 587675 | 589533