syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject [1/4] git commit: Partially applying pull request #1 - keeping license information as other ASF projects do
Date Mon, 03 Nov 2014 15:47:06 GMT
Repository: syncope
Updated Branches:
  refs/heads/1_1_X ca84d113e -> 0920d65c6
  refs/heads/1_2_X 6557a95e4 -> 98992e141
  refs/heads/master 61373f7ea -> e63047fda


Partially applying pull request #1 - keeping license information as other ASF projects do


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

Branch: refs/heads/1_1_X
Commit: 0920d65c6d7e2d03bab98ebc5dcbe7a9331f6689
Parents: ca84d11
Author: Francesco Chicchiriccò <ilgrosso@apache.org>
Authored: Mon Nov 3 16:35:21 2014 +0100
Committer: Francesco Chicchiriccò <ilgrosso@apache.org>
Committed: Mon Nov 3 16:35:21 2014 +0100

----------------------------------------------------------------------
 archetype/pom.xml  |  8 ++++----
 client/pom.xml     |  6 +++---
 common/pom.xml     |  2 +-
 console/pom.xml    | 18 +++++++++---------
 core/pom.xml       | 48 +++++++++++++++++++++++------------------------
 pom.xml            | 50 ++++++++++++++++++++++++-------------------------
 standalone/pom.xml | 24 ++++++++++++------------
 7 files changed, 78 insertions(+), 78 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/0920d65c/archetype/pom.xml
----------------------------------------------------------------------
diff --git a/archetype/pom.xml b/archetype/pom.xml
index 23445d3..91a8263 100644
--- a/archetype/pom.xml
+++ b/archetype/pom.xml
@@ -17,7 +17,7 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
@@ -40,7 +40,7 @@ under the License.
       <url>${site.deploymentBaseUrl}/${project.artifactId}</url>
     </site>
   </distributionManagement>
-  
+
   <build>
     <extensions>
       <extension>
@@ -106,7 +106,7 @@ under the License.
           </transformationSets>
         </configuration>
       </plugin>
-      
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
@@ -129,7 +129,7 @@ under the License.
           <include>NOTICE</include>
         </includes>
       </resource>
-      
+
       <resource>
         <directory>../core/src/main/resources</directory>
         <targetPath>${project.build.outputDirectory}/archetype-resources/core/src/main/resources</targetPath>

http://git-wip-us.apache.org/repos/asf/syncope/blob/0920d65c/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index f0e98cd..5488850 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -40,14 +40,14 @@ under the License.
       <url>${site.deploymentBaseUrl}/${project.artifactId}</url>
     </site>
   </distributionManagement>
-  
+
   <dependencies>
     <dependency>
       <groupId>org.apache.syncope</groupId>
       <artifactId>syncope-common</artifactId>
       <version>${project.version}</version>
     </dependency>
-  
+
     <dependency>
       <groupId>javax.ws.rs</groupId>
       <artifactId>javax.ws.rs-api</artifactId>
@@ -119,7 +119,7 @@ under the License.
         <artifactId>maven-pmd-plugin</artifactId>
       </plugin>
     </plugins>
-    
+
     <resources>
       <resource>
         <directory>..</directory>

http://git-wip-us.apache.org/repos/asf/syncope/blob/0920d65c/common/pom.xml
----------------------------------------------------------------------
diff --git a/common/pom.xml b/common/pom.xml
index 95f5d7f..8d7249f 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -111,7 +111,7 @@ under the License.
         <artifactId>maven-pmd-plugin</artifactId>
       </plugin>
     </plugins>
-    
+
     <resources>
       <resource>
         <directory>..</directory>

http://git-wip-us.apache.org/repos/asf/syncope/blob/0920d65c/console/pom.xml
----------------------------------------------------------------------
diff --git a/console/pom.xml b/console/pom.xml
index c147024..0979d31 100644
--- a/console/pom.xml
+++ b/console/pom.xml
@@ -41,7 +41,7 @@ under the License.
       <url>${site.deploymentBaseUrl}/${project.artifactId}</url>
     </site>
   </distributionManagement>
-  
+
   <dependencies>
 
     <dependency>
@@ -296,7 +296,7 @@ under the License.
           </deployables>
         </configuration>
       </plugin>
-      
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
@@ -405,7 +405,7 @@ under the License.
               </execution>
             </executions>
           </plugin>
-          
+
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-antrun-plugin</artifactId>
@@ -421,7 +421,7 @@ under the License.
               </execution>
             </executions>
           </plugin>
-      
+
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>
@@ -438,7 +438,7 @@ under the License.
               <skipTests>${skipTests}</skipTests>
             </configuration>
           </plugin>
-          
+
           <plugin>
             <groupId>org.codehaus.cargo</groupId>
             <artifactId>cargo-maven2-plugin</artifactId>
@@ -460,11 +460,11 @@ under the License.
 
     <profile>
       <id>debug</id>
-      
+
       <properties>
         <skipTests>true</skipTests>
       </properties>
-      
+
       <build>
         <defaultGoal>clean verify cargo:run</defaultGoal>
 
@@ -484,7 +484,7 @@ under the License.
                       <mappedresources>
                         <fileset dir="${project.build.directory}/test-classes" includes="web.xml"
/>
                         <globmapper from="web.xml" to="WEB-INF/web.xml" />
-                      </mappedresources>                      
+                      </mappedresources>
                     </war>
                   </target>
                 </configuration>
@@ -559,7 +559,7 @@ under the License.
               </execution>
             </executions>
           </plugin>
-          
+
           <plugin>
             <groupId>org.zeroturnaround</groupId>
             <artifactId>jrebel-maven-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/syncope/blob/0920d65c/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 1f14592..2794125 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -41,7 +41,7 @@ under the License.
       <url>${site.deploymentBaseUrl}/${project.artifactId}</url>
     </site>
   </distributionManagement>
-  
+
   <properties>
     <jdbcdriver.groupId>com.h2database</jdbcdriver.groupId>
     <jdbcdriver.artifactId>h2</jdbcdriver.artifactId>
@@ -210,7 +210,7 @@ under the License.
       <groupId>org.quartz-scheduler</groupId>
       <artifactId>quartz-weblogic</artifactId>
     </dependency>
-      
+
     <dependency>
       <groupId>org.apache.cocoon.sax</groupId>
       <artifactId>cocoon-sax</artifactId>
@@ -481,7 +481,7 @@ under the License.
                 <groupId>${jdbcdriver.groupId}</groupId>
                 <artifactId>${jdbcdriver.artifactId}</artifactId>
               </dependency>
-            </dependencies>            
+            </dependencies>
           </container>
           <configuration>
             <type>standalone</type>
@@ -544,7 +544,7 @@ under the License.
           </execution>
         </executions>
       </plugin>
-      
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
@@ -653,7 +653,7 @@ under the License.
   </build>
 
   <profiles>
-    
+
     <profile>
       <id>skipTests</id>
 
@@ -663,9 +663,9 @@ under the License.
           <artifactId>h2</artifactId>
         </dependency>
       </dependencies>
-      
+
       <build>
-        <plugins>      
+        <plugins>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>
@@ -682,7 +682,7 @@ under the License.
               <skipTests>${skipTests}</skipTests>
             </configuration>
           </plugin>
-          
+
           <plugin>
             <groupId>org.codehaus.cargo</groupId>
             <artifactId>cargo-maven2-plugin</artifactId>
@@ -737,11 +737,11 @@ under the License.
 
     <profile>
       <id>debug</id>
-      
+
       <properties>
         <skipTests>true</skipTests>
       </properties>
-      
+
       <build>
         <defaultGoal>clean verify cargo:run</defaultGoal>
 
@@ -822,7 +822,7 @@ under the License.
 
       <build>
         <defaultGoal>clean verify</defaultGoal>
-        
+
         <plugins>
           <!-- Strip Activiti-related entries from content.xml and indexes.xml -->
           <plugin>
@@ -859,7 +859,7 @@ under the License.
             </configuration>
           </plugin>
         </plugins>
-        
+
         <resources>
           <resource>
             <directory>src/main/resources</directory>
@@ -1115,7 +1115,7 @@ under the License.
         <defaultGoal>clean verify</defaultGoal>
 
         <plugins>
-          
+
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>
@@ -1124,7 +1124,7 @@ under the License.
               <skipTests>true</skipTests>
             </configuration>
           </plugin>
-      
+
           <!-- Disable MANIFEST.MF OSGi handling -->
           <plugin>
             <groupId>org.apache.felix</groupId>
@@ -1136,7 +1136,7 @@ under the License.
               </execution>
             </executions>
           </plugin>
-      
+
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-antrun-plugin</artifactId>
@@ -1158,7 +1158,7 @@ under the License.
               </execution>
             </executions>
           </plugin>
-                
+
           <plugin>
             <groupId>org.codehaus.cargo</groupId>
             <artifactId>cargo-maven2-plugin</artifactId>
@@ -1230,21 +1230,21 @@ under the License.
         </resources>
       </build>
     </profile>
-    
+
     <profile>
       <id>weblogic-it</id>
-      
+
       <properties>
         <weblogic.home>/opt/weblogic-12.1.1</weblogic.home>
       </properties>
-      
+
       <dependencies>
         <dependency>
           <groupId>com.h2database</groupId>
           <artifactId>h2</artifactId>
         </dependency>
       </dependencies>
-        
+
       <build>
         <defaultGoal>clean verify</defaultGoal>
 
@@ -1257,7 +1257,7 @@ under the License.
               <skipTests>true</skipTests>
             </configuration>
           </plugin>
-          
+
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-antrun-plugin</artifactId>
@@ -1295,7 +1295,7 @@ under the License.
                 <home>${weblogic.home}/wlserver</home>
 
                 <log>${cargo.log}</log>
-                <output>${cargo.output}</output>                
+                <output>${cargo.output}</output>
               </container>
               <configuration>
                 <properties>
@@ -1333,7 +1333,7 @@ under the License.
             </configuration>
           </plugin>
         </plugins>
-        
+
         <resources>
           <resource>
             <directory>src/main/resources</directory>
@@ -1347,7 +1347,7 @@ under the License.
             <filtering>true</filtering>
             <includes>
               <include>persistence.properties</include>
-            </includes>            
+            </includes>
           </resource>
         </resources>
         <testResources>

http://git-wip-us.apache.org/repos/asf/syncope/blob/0920d65c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3158c67..93b09ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,13 +17,13 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
   <name>Apache Syncope</name>
   <description>Apache Syncope parent POM</description>
-        
+
   <groupId>org.apache.syncope</groupId>
   <artifactId>syncope</artifactId>
   <version>1.1.9-SNAPSHOT</version>
@@ -53,7 +53,7 @@ under the License.
     <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/syncope.git</developerConnection>
     <url>https://git-wip-us.apache.org/repos/asf?p=syncope.git</url>
   </scm>
-  
+
   <issueManagement>
     <system>jira</system>
     <url>https://issues.apache.org/jira/browse/SYNCOPE</url>
@@ -71,7 +71,7 @@ under the License.
       <url>${site.deploymentBaseUrl}</url>
     </site>
   </distributionManagement>
-  
+
   <mailingLists>
     <mailingList>
       <name>Syncope User List</name>
@@ -109,7 +109,7 @@ under the License.
       </otherArchives>
     </mailingList>
   </mailingLists>
-    
+
   <developers>
     <developer>
       <id>ilgrosso</id>
@@ -142,10 +142,10 @@ under the License.
         <role>PMC member</role>
       </roles>
       <url>http://people.apache.org/~mdisabatino/</url>
-    </developer>    
+    </developer>
     <developer>
       <id>massi</id>
-      <name>Massimiliano Perrone</name>            
+      <name>Massimiliano Perrone</name>
       <organization>Tirasa</organization>
       <organizationUrl>http://www.tirasa.net/</organizationUrl>
       <roles>
@@ -155,17 +155,17 @@ under the License.
     </developer>    
     <developer>
       <id>rene</id>
-      <name>René Mulder</name>            
+      <name>René Mulder</name>
       <organization>Everett</organization>
       <organizationUrl>http://www.everett.nl/</organizationUrl>
       <roles>
         <role>committer</role>
       </roles>
       <url>http://people.apache.org/~rene/</url>
-    </developer>    
+    </developer>
     <developer>
       <id>simonetripodi</id>
-      <name>Simone Tripodi</name>            
+      <name>Simone Tripodi</name>
       <organization>The Apache Software Foundation</organization>
       <organizationUrl>http://www.apache.org/</organizationUrl>
       <roles>
@@ -176,7 +176,7 @@ under the License.
     </developer>
     <developer>
       <id>elecharny</id>
-      <name>Emmanuel Lecharny</name>            
+      <name>Emmanuel Lecharny</name>
       <organization>The Apache Software Foundation</organization>
       <organizationUrl>http://www.apache.org/</organizationUrl>
       <roles>
@@ -508,7 +508,7 @@ under the License.
         <artifactId>commons-dbcp</artifactId>
         <version>${commons-dbcp.version}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>javax.validation</groupId>
         <artifactId>validation-api</artifactId>
@@ -525,7 +525,7 @@ under the License.
         <artifactId>velocity</artifactId>
         <version>${velocity.version}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.apache.velocity</groupId>
         <artifactId>velocity-tools</artifactId>
@@ -721,7 +721,7 @@ under the License.
         <artifactId>quartz-weblogic</artifactId>
         <version>${quartz.version}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.apache.cocoon.sax</groupId>
         <artifactId>cocoon-sax</artifactId>
@@ -814,7 +814,7 @@ under the License.
         <artifactId>h2</artifactId>
         <version>${h2.version}</version>
       </dependency>
-            
+
       <dependency>
         <groupId>org.apache.directory.server</groupId>
         <artifactId>apacheds-all</artifactId>
@@ -962,7 +962,7 @@ under the License.
             <dependency>
               <groupId>xalan</groupId>
               <artifactId>xalan</artifactId>
-              <version>2.7.1</version>              
+              <version>2.7.1</version>
             </dependency>
           </dependencies>
         </plugin>
@@ -1124,8 +1124,8 @@ under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-checkstyle-plugin</artifactId>
-          <version>2.12.1</version>        
-          <dependencies>    
+          <version>2.12.1</version>
+          <dependencies>
             <dependency>
               <groupId>org.apache.syncope</groupId>
               <artifactId>syncope-build-tools</artifactId>
@@ -1419,11 +1419,11 @@ under the License.
   </build>
 
   <profiles>
-    
+
     <profile>
       <id>apache-release</id>
 
-      <build>        
+      <build>
         <plugins>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
@@ -1448,13 +1448,13 @@ under the License.
         </plugins>
       </build>
     </profile>
-        
+
     <profile>
       <id>site</id>
       <build>
         <defaultGoal>clean site-deploy</defaultGoal>
-        
-        <plugins>          
+
+        <plugins>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-site-plugin</artifactId>
@@ -1507,7 +1507,7 @@ under the License.
         </plugins>
       </build>
     </profile>
-    
+
     <profile>
       <id>skipTests</id>
       <properties>
@@ -1517,7 +1517,7 @@ under the License.
         <defaultGoal>clean install</defaultGoal>
       </build>
     </profile>
-    
+
   </profiles>
 
   <modules>

http://git-wip-us.apache.org/repos/asf/syncope/blob/0920d65c/standalone/pom.xml
----------------------------------------------------------------------
diff --git a/standalone/pom.xml b/standalone/pom.xml
index bb4ac4b..7959855 100644
--- a/standalone/pom.xml
+++ b/standalone/pom.xml
@@ -17,7 +17,7 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
@@ -40,11 +40,11 @@ under the License.
       <url>${site.deploymentBaseUrl}/${project.artifactId}</url>
     </site>
   </distributionManagement>
-  
+
   <properties>
     <connid.location>connid://${testconnectorserver.key}@localhost:${testconnectorserver.port}</connid.location>
     <log.directory>./logs</log.directory>
-    
+
     <work.dir>${project.build.directory}/standalone</work.dir>
   </properties>
 
@@ -75,7 +75,7 @@ under the License.
   </dependencies>
 
   <build>
-    
+
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -90,7 +90,7 @@ under the License.
             <configuration>
               <target>
                 <mkdir dir="${work.dir}" />
-                
+
                 <!-- legal stuff -->
                 <copy file="${project.build.outputDirectory}/README" todir="${work.dir}"
/>
                 <copy file="../legal_ext/LICENSE" todir="${work.dir}" />
@@ -108,7 +108,7 @@ under the License.
                 <copy todir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope/WEB-INF/classes"
overwrite="true">
                   <fileset dir="${project.build.outputDirectory}/core" />
                 </copy>
-                
+
                 <!-- Syncope console (exploded) -->
                 <copy todir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-console">
                   <fileset dir="../console/target/syncope-console" includes="**/*" />
@@ -116,7 +116,7 @@ under the License.
                 <copy todir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-console/WEB-INF/classes"
overwrite="true">
                   <fileset dir="${project.build.outputDirectory}/console" />
                 </copy>
-                                
+
                 <!-- ConnId's SOAP wssample (provides endpoint for SOAP resources) -->
                 <copy file="${settings.localRepository}/org/connid/bundles/soap/wssample/${connid.soap.version}/wssample-${connid.soap.version}.war"
tofile="${work.dir}/apache-tomcat-${tomcat.version}/webapps/wssample.war" />
 
@@ -126,12 +126,12 @@ under the License.
                   <fileset dir="../core/target/bundles" includes="**/*" />
                 </copy>
                 <zip destfile="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-build-tools.war"
basedir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-build-tools" />
-                <delete dir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-build-tools"
/>                  
+                <delete dir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-build-tools"
/>
 
                 <!-- Tomcat shared libraries: H2 and groovy -->
                 <copy file="${settings.localRepository}/com/h2database/h2/${h2.version}/h2-${h2.version}.jar"
todir="${work.dir}/apache-tomcat-${tomcat.version}/lib" />
                 <copy file="${settings.localRepository}/org/codehaus/groovy/groovy-all/${groovy.version}/groovy-all-${groovy.version}.jar"
todir="${work.dir}/apache-tomcat-${tomcat.version}/lib" />
-                
+
                 <!-- Other custom Tomcat resources -->
                 <copy file="../core/target/test-classes/context.xml" todir="${work.dir}/apache-tomcat-${tomcat.version}/conf"
overwrite="true" />
                 <copy file="src/main/resources/setenv.sh" todir="${work.dir}/apache-tomcat-${tomcat.version}/bin"
/>
@@ -142,7 +142,7 @@ under the License.
           </execution>
         </executions>
       </plugin>
-      
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
@@ -212,11 +212,11 @@ under the License.
       </resource>
     </resources>
   </build>
-  
+
   <profiles>
     <profile>
       <id>apache-release</id>
-      
+
       <build>
         <plugins>      
           <plugin>


Mime
View raw message