syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject svn commit: r1464907 - in /syncope/branches/1_1_X: build-tools/pom.xml pom.xml standalone/pom.xml standalone/src/assemble/standalone-zip.xml
Date Fri, 05 Apr 2013 10:18:08 GMT
Author: ilgrosso
Date: Fri Apr  5 10:18:07 2013
New Revision: 1464907

URL: http://svn.apache.org/r1464907
Log:
Fixing LICENSE and NOTICE issues with javadocs and GPG missing signature in standalone

Modified:
    syncope/branches/1_1_X/build-tools/pom.xml
    syncope/branches/1_1_X/pom.xml
    syncope/branches/1_1_X/standalone/pom.xml
    syncope/branches/1_1_X/standalone/src/assemble/standalone-zip.xml

Modified: syncope/branches/1_1_X/build-tools/pom.xml
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/build-tools/pom.xml?rev=1464907&r1=1464906&r2=1464907&view=diff
==============================================================================
--- syncope/branches/1_1_X/build-tools/pom.xml (original)
+++ syncope/branches/1_1_X/build-tools/pom.xml Fri Apr  5 10:18:07 2013
@@ -133,16 +133,6 @@ under the License.
           <archive>
             <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
           </archive>
-          <webResources>
-            <webResource>
-              <directory>${basedir}/src/main/webapp/WEB-INF</directory>
-              <includes>
-                <include>web.xml</include>
-              </includes>
-              <targetPath>WEB-INF</targetPath>
-              <filtering>true</filtering>
-            </webResource>
-          </webResources>
         </configuration>
       </plugin>
 

Modified: syncope/branches/1_1_X/pom.xml
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/pom.xml?rev=1464907&r1=1464906&r2=1464907&view=diff
==============================================================================
--- syncope/branches/1_1_X/pom.xml (original)
+++ syncope/branches/1_1_X/pom.xml Fri Apr  5 10:18:07 2013
@@ -916,6 +916,7 @@ under the License.
                 <directory>src/main/webapp</directory>
                 <includes>
                   <include>**/*.jsp</include>
+                  <include>WEB-INF/web.xml</include>
                 </includes>
                 <filtering>true</filtering>
               </resource>
@@ -1191,23 +1192,26 @@ under the License.
       <!-- Put NOTICE and LICENSE files in all javadoc artifacts -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>2.6</version>
         <executions>
           <execution>
+            <id>copy-javadoc-legal-files</id>
+            <phase>process-resources</phase>
             <goals>
-              <goal>run</goal>
+              <goal>copy-resources</goal>
             </goals>
-            <phase>process-resources</phase>
             <configuration>
-              <target name="copy-javadoc-files" description="Copy NOTICE/LICENSE files
for javadoc jars">
-                <mkdir dir="${project.build.directory}/apidocs/META-INF" />
-                <copy todir="${project.build.directory}/apidocs/META-INF">
-                  <fileset dir="..">
-                    <include name="NOTICE" />
-                    <include name="LICENSE" />
-                  </fileset>
-                </copy>
-              </target>
+              <outputDirectory>${project.build.directory}/apidocs/META-INF</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>..</directory>
+                  <includes>
+                    <include>LICENSE</include>
+                    <include>NOTICE</include>
+                  </includes>
+                </resource>
+              </resources>
             </configuration>
           </execution>
         </executions>
@@ -1222,10 +1226,6 @@ under the License.
               <goal>verify-legal-files</goal>
             </goals>
             <configuration>
-              <requiredFiles>
-                <requiredFile>LICENSE</requiredFile>
-                <requiredFile>NOTICE</requiredFile>
-              </requiredFiles>
               <!-- Fail the build if any artifacts are missing legal files -->
               <strict>true</strict>
             </configuration>

Modified: syncope/branches/1_1_X/standalone/pom.xml
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/standalone/pom.xml?rev=1464907&r1=1464906&r2=1464907&view=diff
==============================================================================
--- syncope/branches/1_1_X/standalone/pom.xml (original)
+++ syncope/branches/1_1_X/standalone/pom.xml Fri Apr  5 10:18:07 2013
@@ -90,55 +90,56 @@ under the License.
             <phase>verify</phase>
             <configuration>
               <target>
-                <mkdir dir="${work.dir}" />
+                <mkdir dir="${work.dir}"/>
                 
                 <!-- legal stuff -->
-                <copy file="${project.build.outputDirectory}/README" todir="${work.dir}"
/>
-                <copy file="../legal_ext/LICENSE" todir="${work.dir}" />
-                <copy file="../legal_ext/NOTICE" todir="${work.dir}" />
+                <copy file="${project.build.outputDirectory}/README" todir="${work.dir}"/>
+                <copy file="../legal_ext/LICENSE" todir="${work.dir}"/>
+                <copy file="../legal_ext/NOTICE" todir="${work.dir}"/>
 
                 <!-- Syncope core (as run for integration tests) -->
-                <unzip src="${settings.localRepository}/org/codehaus/cargo/cargo-container-archives/apache-tomcat-${tomcat.version}.zip"
dest="${work.dir}" />
+                <unzip src="${settings.localRepository}/org/codehaus/cargo/cargo-container-archives/apache-tomcat-${tomcat.version}.zip"
dest="${work.dir}"/>
                 <copy todir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope">
-                  <fileset dir="../core/target/syncope-core-test" includes="**/*" />
+                  <fileset dir="../core/target/syncope-core-test" includes="**/*"/>
                 </copy>
                 <copy todir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope/WEB-INF/classes"
overwrite="true">
-                  <fileset dir="${project.build.outputDirectory}/core" />
+                  <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="**/*" />
+                  <fileset dir="../console/target/syncope-console" includes="**/*"/>
                 </copy>
                 <copy todir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-console/WEB-INF/classes"
overwrite="true">
-                  <fileset dir="${project.build.outputDirectory}/console" />
+                  <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" />
+                <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"/>
 
                 <!-- Syncope build tools (provide H2 and Apache DS resources + ConnId
connector server) -->
-                <unzip src="../build-tools/target/syncope-build-tools-${project.version}.war"
dest="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-build-tools" />
+                <unzip src="../build-tools/target/syncope-build-tools-${project.version}.war"
dest="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-build-tools"/>
                 <copy todir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-build-tools/WEB-INF/lib">
-                  <fileset dir="../core/target/bundles" includes="**/*" />
+                  <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"
/>                  
+                <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"/>
                 
 
                 <!-- 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" />
+                <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"
/>
-                <copy file="src/main/resources/setenv.bat" todir="${work.dir}/apache-tomcat-${tomcat.version}/bin"
/>
-                <replace file="${work.dir}/apache-tomcat-${tomcat.version}/conf/server.xml"
token="8080" value="${cargo.servlet.port}" />
+                <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"/>
+                <copy file="src/main/resources/setenv.bat" todir="${work.dir}/apache-tomcat-${tomcat.version}/bin"/>
+                <replace file="${work.dir}/apache-tomcat-${tomcat.version}/conf/server.xml"
token="8080" value="${cargo.servlet.port}"/>
               </target>
             </configuration>
           </execution>
         </executions>
       </plugin>
+      
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
@@ -150,7 +151,7 @@ under the License.
         <executions>
           <execution>
             <id>make-standalone-zip</id>
-            <phase>install</phase>
+            <phase>verify</phase>
             <goals>
               <goal>single</goal>
             </goals>

Modified: syncope/branches/1_1_X/standalone/src/assemble/standalone-zip.xml
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/standalone/src/assemble/standalone-zip.xml?rev=1464907&r1=1464906&r2=1464907&view=diff
==============================================================================
--- syncope/branches/1_1_X/standalone/src/assemble/standalone-zip.xml (original)
+++ syncope/branches/1_1_X/standalone/src/assemble/standalone-zip.xml Fri Apr  5 10:18:07
2013
@@ -30,7 +30,7 @@ under the License.
   <fileSets>
     <fileSet>
       <directory>${work.dir}</directory>
-      <outputDirectory>apache-syncope-standalone-${project.version}</outputDirectory>
+      <outputDirectory>${project.build.finalName}</outputDirectory>
     </fileSet>
   </fileSets>
 </assembly>



Mime
View raw message