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 branch '1_2_X'
Date Thu, 16 Apr 2015 14:13:28 GMT
Merge branch '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/bfa7172e
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/bfa7172e
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/bfa7172e

Branch: refs/heads/master
Commit: bfa7172ec6ccb4fa8d748c3dd36947675565c938
Parents: 0b87dbd 1ed0e38
Author: Francesco Chicchiriccò <ilgrosso@apache.org>
Authored: Thu Apr 16 16:13:00 2015 +0200
Committer: Francesco Chicchiriccò <ilgrosso@apache.org>
Committed: Thu Apr 16 16:13:00 2015 +0200

----------------------------------------------------------------------
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/bfa7172e/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 22650c8,0120db9..b57900f
--- a/pom.xml
+++ b/pom.xml
@@@ -1048,9 -1050,23 +1048,9 @@@ under the License
          <plugin>
            <groupId>org.apache.maven.plugins</groupId>
            <artifactId>maven-javadoc-plugin</artifactId>
-           <version>2.10.2</version>          
+           <version>2.10.3</version>          
          </plugin>
 -        <plugin>
 -          <groupId>org.apache.cxf</groupId>
 -          <artifactId>cxf-java2wadl-plugin</artifactId>
 -          <version>${cxf.version}</version>
 -        </plugin>
 -        <plugin>
 -          <groupId>com.google.code.maven-replacer-plugin</groupId>
 -          <artifactId>replacer</artifactId>
 -          <version>1.5.3</version>
 -        </plugin>
 -        <plugin>
 -          <groupId>org.codehaus.mojo</groupId>
 -          <artifactId>exec-maven-plugin</artifactId>
 -          <version>1.4.0</version>
 -        </plugin>
 +        
          <plugin>
            <groupId>org.apache.openjpa</groupId>
            <artifactId>openjpa-maven-plugin</artifactId>
@@@ -1439,9 -1561,9 +1439,9 @@@
                  <plugin>
                    <groupId>org.apache.maven.plugins</groupId>
                    <artifactId>maven-javadoc-plugin</artifactId>
-                   <version>2.10.2</version>
+                   <version>2.10.3</version>
                    <configuration>
 -                    <destDir>apidocs/1.2</destDir>
 +                    <destDir>apidocs/2.0</destDir>
                      <detectLinks>true</detectLinks>
                      <detectJavaApiLink>true</detectJavaApiLink>
                      <links>


Mime
View raw message