You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2014/11/22 16:37:54 UTC
[5/6] syncope git commit: Merge from 1_1_X
Merge from 1_1_X
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/5836c0e6
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/5836c0e6
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/5836c0e6
Branch: refs/heads/1_2_X
Commit: 5836c0e687efe2168a915aa60460efd871cea170
Parents: a0db589 ca4752f
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Sat Nov 22 16:36:00 2014 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Sat Nov 22 16:36:00 2014 +0100
----------------------------------------------------------------------
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/5836c0e6/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index efc45d5,3683200..57a6195
--- a/pom.xml
+++ b/pom.xml
@@@ -1226,10 -1158,26 +1226,10 @@@ under the License
</configuration>
</plugin>
<plugin>
- <groupId>com.googlecode.maven-java-formatter-plugin</groupId>
- <artifactId>maven-java-formatter-plugin</artifactId>
- <version>0.4</version>
- <configuration>
- <configFile>org/apache/syncope/java-formatter.xml</configFile>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.syncope</groupId>
- <artifactId>syncope-build-tools</artifactId>
- <version>${project.version}</version>
- <classifier>classes</classifier>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.5.1</version>
- </plugin>
+ <version>2.5.2</version>
+ </plugin>
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>