commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t.@apache.org
Subject svn commit: r1763644 - in /commons/proper/jcs/trunk: ./ commons-jcs-core/ commons-jcs-jcache-extras/ commons-jcs-jcache-openjpa/ commons-jcs-jcache/ commons-jcs-sandbox/yajcache/ commons-jcs-tck-tests/
Date Thu, 06 Oct 2016 19:36:47 GMT
Author: tv
Date: Thu Oct  6 19:36:47 2016
New Revision: 1763644

URL: http://svn.apache.org/viewvc?rev=1763644&view=rev
Log:
Use standards from Apache parent POM

Removed:
    commons/proper/jcs/trunk/commons-jcs-core/LICENSE.txt
    commons/proper/jcs/trunk/commons-jcs-core/NOTICE.txt
    commons/proper/jcs/trunk/commons-jcs-jcache-extras/LICENSE.txt
    commons/proper/jcs/trunk/commons-jcs-jcache-extras/NOTICE.txt
    commons/proper/jcs/trunk/commons-jcs-jcache-openjpa/LICENSE.txt
    commons/proper/jcs/trunk/commons-jcs-jcache-openjpa/NOTICE.txt
    commons/proper/jcs/trunk/commons-jcs-jcache/LICENSE.txt
    commons/proper/jcs/trunk/commons-jcs-jcache/NOTICE.txt
    commons/proper/jcs/trunk/commons-jcs-sandbox/yajcache/LICENSE.txt
Modified:
    commons/proper/jcs/trunk/commons-jcs-tck-tests/pom.xml
    commons/proper/jcs/trunk/pom.xml

Modified: commons/proper/jcs/trunk/commons-jcs-tck-tests/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-tck-tests/pom.xml?rev=1763644&r1=1763643&r2=1763644&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-tck-tests/pom.xml (original)
+++ commons/proper/jcs/trunk/commons-jcs-tck-tests/pom.xml Thu Oct  6 19:36:47 2016
@@ -239,5 +239,6 @@
     </profile>
   </profiles>
 
+  <packaging>pom</packaging>
 </project>
 

Modified: commons/proper/jcs/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/pom.xml?rev=1763644&r1=1763643&r2=1763644&view=diff
==============================================================================
--- commons/proper/jcs/trunk/pom.xml (original)
+++ commons/proper/jcs/trunk/pom.xml Thu Oct  6 19:36:47 2016
@@ -145,7 +145,7 @@
   <modules>
     <module>commons-jcs-core</module>
     <module>commons-jcs-jcache</module>
-    <module>commons-jcs-tck-tests</module>
+    <!-- module>commons-jcs-tck-tests</module -->
     <module>commons-jcs-jcache-extras</module>
     <module>commons-jcs-jcache-openjpa</module>
   </modules>
@@ -207,8 +207,36 @@
         <targetPath>${project.build.outputDirectory}</targetPath>
       </resource>
     </resources>
+    
+    <pluginManagement>
+      <plugins>
+        <!-- Re-enable standard copying of N&L files from apache parent -->
+        <plugin>
+          <artifactId>maven-remote-resources-plugin</artifactId>
+          <configuration>
+            <skip>false</skip>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
 
     <plugins>
+      <!-- Disable copying of N&L files from commons parent -->
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>javadoc.resources</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <skip>true</skip>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.apache.rat</groupId>
         <artifactId>apache-rat-plugin</artifactId>
@@ -225,104 +253,6 @@
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>copy-notices</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <configuration>
-              <target xmlns:if="ant:if" xmlns:unless="ant:unless">
-                <presetdef name="truth">
-                  <condition value="true" else="false" />
-                </presetdef>
-
-                <macrodef name="seek">
-                  <attribute name="name" />
-                  <attribute name="addto" />
-                  <sequential>
-                    <union id="@{name}-ws" />
-                    <step dir="${user.dir}" name="@{name}" addto="@{addto}" ws="@{name}-ws"
/>
-                  </sequential>
-                </macrodef>
-
-                <macrodef name="step">
-                  <attribute name="name" />
-                  <attribute name="dir" />
-                  <attribute name="addto" />
-                  <attribute name="ws" />
-                  <sequential>
-                    <local name="seenDir" />
-                    <truth property="seenDir">
-                      <resourcecount when="gt" count="0">
-                        <intersect id="intersection">
-                          <resources refid="@{ws}" />
-                          <file name="@{dir}" />
-                        </intersect>
-                      </resourcecount>
-                    </truth>
-                    <sequential unless:true="${seenDir}">
-                      <augment id="@{ws}">
-                        <file file="@{dir}" />
-                      </augment>
-                      <local name="exists" />
-                      <truth property="exists">
-                        <available file="@{dir}/@{name}" />
-                      </truth>
-
-                      <sequential if:true="${exists}">
-                        <augment id="@{addto}">
-                          <file file="@{dir}/@{name}" />
-                        </augment>
-                      </sequential>
-                      <sequential unless:true="${exists}">
-                        <local name="parent.dir" />
-                        <dirname property="parent.dir" file="@{dir}" />
-                        <step dir="${parent.dir}" name="@{name}" addto="@{addto}" ws="@{ws}"
/>
-                      </sequential>
-                    </sequential>
-                  </sequential>
-                </macrodef>
-
-                <truth property="pom-only">
-                  <equals arg1="${project.packaging}" arg2="pom" />
-                </truth>
-                <sequential unless:true="${pom-only}">
-                  <union id="notices" />
-                  <seek name="LICENSE.txt" addto="notices" />
-                  <seek name="NOTICE.txt" addto="notices" />
-
-                  <mkdir dir="${project.build.directory}/generated-resources/notices/META-INF"
/>
-                  <copy verbose="true" todir="${project.build.directory}/generated-resources/notices/META-INF">
-                    <resources refid="notices" />
-                  </copy>
-
-                  <mkdir dir="${project.build.directory}/generated-test-resources/notices/META-INF"
/>
-                  <copy verbose="true" todir="${project.build.directory}/generated-test-resources/notices/META-INF">
-                    <resources refid="notices" />
-                  </copy>
-
-                  <mkdir dir="${project.build.directory}/apidocs/META-INF" />
-                  <copy verbose="true" todir="${project.build.directory}/apidocs/META-INF">
-                    <resources refid="notices" />
-                  </copy>
-                </sequential>
-              </target>
-            </configuration>
-          </execution>
-        </executions>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.ant</groupId>
-            <artifactId>ant</artifactId>
-            <version>1.9.4</version>
-          </dependency>
-        </dependencies>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <executions>
           <execution>
@@ -372,40 +302,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>add-source-notices</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>add-resource</goal>
-            </goals>
-            <configuration>
-              <resources>
-                <resource>
-                  <directory>${project.build.directory}/generated-resources/notices</directory>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-          <execution>
-            <id>add-test-notices</id>
-            <phase>generate-test-resources</phase>
-            <goals>
-              <goal>add-test-resource</goal>
-            </goals>
-            <configuration>
-              <resources>
-                <resource>
-                  <directory>${project.build.directory}/generated-test-resources/notices</directory>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 
@@ -683,7 +579,7 @@
     <maven.compiler.target>1.6</maven.compiler.target>
 
     <commons.componentid>jcs</commons.componentid>
-    <commons.release.version>2.0-beta-1</commons.release.version>
+    <commons.release.version>2.0-beta-2</commons.release.version>
     <commons.release.desc>(Java 6.0+)</commons.release.desc>
     <!-- The RC version used in the staging repository URL. -->
     <commons.rc.version>RC1</commons.rc.version>



Mime
View raw message