syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject [3/3] syncope git commit: Merge from 1_2_X
Date Sat, 21 Feb 2015 11:49:42 GMT
Merge from 1_2_X


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/57a3914b
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/57a3914b
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/57a3914b

Branch: refs/heads/master
Commit: 57a3914bdbd3ade042c1067e28d39076f67ca783
Parents: fecf301 8081553
Author: Francesco Chicchiriccò <ilgrosso@apache.org>
Authored: Sat Feb 21 11:58:41 2015 +0100
Committer: Francesco Chicchiriccò <ilgrosso@apache.org>
Committed: Sat Feb 21 11:58:41 2015 +0100

----------------------------------------------------------------------
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/57a3914b/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 58666bd,c22f140..71b4f97
--- a/pom.xml
+++ b/pom.xml
@@@ -1193,19 -1236,97 +1193,19 @@@ under the License
              <targetJdk>${targetJdk}</targetJdk>
            </configuration>
          </plugin>
 +        
          <plugin>
 -          <groupId>org.apache.maven.plugins</groupId>
 -          <artifactId>maven-assembly-plugin</artifactId>
 -          <version>2.5.3</version>
 +          <groupId>org.vafer</groupId>
 +          <artifactId>jdeb</artifactId>
-           <version>1.3</version>
++          <version>1.4</version>
          </plugin>
 +        
          <plugin>
 -          <groupId>org.eclipse.m2e</groupId>
 -          <artifactId>lifecycle-mapping</artifactId>
 -          <version>1.0.0</version>
 -          <configuration>
 -            <lifecycleMappingMetadata>
 -              <pluginExecutions>
 -                <pluginExecution>
 -                  <pluginExecutionFilter>
 -                    <groupId>org.apache.maven.plugins</groupId>
 -                    <artifactId>maven-antrun-plugin</artifactId>
 -                    <versionRange>[1.7.0,)</versionRange>
 -                    <goals>
 -                      <goal>run</goal>
 -                    </goals>
 -                  </pluginExecutionFilter>
 -                  <action>
 -                    <execute>
 -                      <runOnIncremental>false</runOnIncremental>
 -                    </execute>
 -                  </action>
 -                </pluginExecution>
 -                <pluginExecution>
 -                  <pluginExecutionFilter>
 -                    <groupId>org.apache.maven.plugins</groupId>
 -                    <artifactId>maven-dependency-plugin</artifactId>
 -                    <versionRange>[2.0.0,)</versionRange>
 -                    <goals>
 -                      <goal>copy</goal>
 -                    </goals>
 -                  </pluginExecutionFilter>
 -                  <action>
 -                    <execute>
 -                      <runOnIncremental>false</runOnIncremental>
 -                    </execute>
 -                  </action>
 -                </pluginExecution>
 -                <pluginExecution>
 -                  <pluginExecutionFilter>
 -                    <groupId>org.codehaus.gmaven</groupId>
 -                    <artifactId>gmaven-plugin</artifactId>
 -                    <versionRange>[1.5.0,)</versionRange>
 -                    <goals>
 -                      <goal>execute</goal>
 -                    </goals>
 -                  </pluginExecutionFilter>
 -                  <action>
 -                    <execute>
 -                      <runOnIncremental>false</runOnIncremental>
 -                    </execute>
 -                  </action>
 -                </pluginExecution>
 -                <pluginExecution>
 -                  <pluginExecutionFilter>
 -                    <groupId>org.apache.openjpa</groupId>
 -                    <artifactId>openjpa-maven-plugin</artifactId>
 -                    <versionRange>[2.0.0,)</versionRange>
 -                    <goals>
 -                      <goal>enhance</goal>
 -                    </goals>
 -                  </pluginExecutionFilter>
 -                  <action>
 -                    <execute>
 -                      <runOnIncremental>false</runOnIncremental>
 -                    </execute>
 -                  </action>
 -                </pluginExecution>
 -                <pluginExecution>
 -                  <pluginExecutionFilter>
 -                    <groupId>org.codehaus.mojo</groupId>
 -                    <artifactId>xml-maven-plugin</artifactId>
 -                    <versionRange>[1.0,)</versionRange>
 -                    <goals>
 -                      <goal>transform</goal>
 -                    </goals>
 -                  </pluginExecutionFilter>
 -                  <action>
 -                    <execute>
 -                      <runOnIncremental>false</runOnIncremental>
 -                    </execute>
 -                  </action>
 -                </pluginExecution>
 -              </pluginExecutions>
 -            </lifecycleMappingMetadata>
 -          </configuration>
 +          <groupId>org.apache.maven.plugins</groupId>
 +          <artifactId>maven-shade-plugin</artifactId>
 +          <version>2.3</version>
          </plugin>
 +        
          <plugin>
            <groupId>org.codehaus.izpack</groupId>
            <artifactId>izpack-maven-plugin</artifactId>


Mime
View raw message