maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bri...@apache.org
Subject svn commit: r694549 - in /maven/enforcer/trunk: ./ enforcer-api/ enforcer-api/src/site/ enforcer-api/src/site/apt/ enforcer-rules/ enforcer-rules/src/site/ maven-enforcer-plugin/ maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/ ma...
Date Thu, 11 Sep 2008 23:55:35 GMT
Author: brianf
Date: Thu Sep 11 16:55:34 2008
New Revision: 694549

URL: http://svn.apache.org/viewvc?rev=694549&view=rev
Log:
rollback release, fix the poms and site urls

Modified:
    maven/enforcer/trunk/enforcer-api/pom.xml
    maven/enforcer/trunk/enforcer-api/src/site/apt/index.apt
    maven/enforcer/trunk/enforcer-api/src/site/site.xml
    maven/enforcer/trunk/enforcer-rules/pom.xml
    maven/enforcer/trunk/enforcer-rules/src/site/site.xml
    maven/enforcer/trunk/maven-enforcer-plugin/pom.xml
    maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/EnforceOnceMojo.java
    maven/enforcer/trunk/maven-enforcer-plugin/src/site/site.xml
    maven/enforcer/trunk/pom.xml

Modified: maven/enforcer/trunk/enforcer-api/pom.xml
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-api/pom.xml?rev=694549&r1=694548&r2=694549&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-api/pom.xml (original)
+++ maven/enforcer/trunk/enforcer-api/pom.xml Thu Sep 11 16:55:34 2008
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.maven.enforcer</groupId>
     <artifactId>enforcer</artifactId>
-    <version>2-SNAPSHOT</version>
+    <version>1-SNAPSHOT</version>
   </parent>
   <artifactId>enforcer-api</artifactId>
   <packaging>jar</packaging>
-  <version>1.0-alpha-5-SNAPSHOT</version>
+  <version>1.0-alpha-4-SNAPSHOT</version>
   <name>Enforcer API</name>
   <description>
     This component provides the generic interfaces needed to implement custom rules for the
maven-enforcer-plugin.

Modified: maven/enforcer/trunk/enforcer-api/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-api/src/site/apt/index.apt?rev=694549&r1=694548&r2=694549&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-api/src/site/apt/index.apt (original)
+++ maven/enforcer/trunk/enforcer-api/src/site/apt/index.apt Thu Sep 11 16:55:34 2008
@@ -26,7 +26,7 @@
 Maven Enforcer Rule API - Extending The Loving Iron Fist of Maven\x99
 
   Custom rules are easy to make with the <<<maven-enforcer-rule-api>>>.
These rules can then be invoked with the 
-  {{{http://maven.apache.org/plugins/maven-enforcer-plugin/}maven-enforcer-plugin}}. 
+  {{{../../plugins/maven-enforcer-plugin/}maven-enforcer-plugin}}. 
   
   See {{{./writing-a-custom-rule.html}here}} for instructions on how to make your own rule.
  
\ No newline at end of file

Modified: maven/enforcer/trunk/enforcer-api/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-api/src/site/site.xml?rev=694549&r1=694548&r2=694549&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-api/src/site/site.xml (original)
+++ maven/enforcer/trunk/enforcer-api/src/site/site.xml Thu Sep 11 16:55:34 2008
@@ -24,7 +24,7 @@
       <item name="Writing a custom rule" href="writing-a-custom-rule.html"/>
     </menu>
     <menu name="Rule Execution Engines">
-      <item name="Maven Enforcer Plugin" href="http://maven.apache.org/plugins/maven-enforcer-plugin"/>
+      <item name="Maven Enforcer Plugin" href="../../plugins/maven-enforcer-plugin"/>
     </menu>
   </body>
 </project>
\ No newline at end of file

Modified: maven/enforcer/trunk/enforcer-rules/pom.xml
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/pom.xml?rev=694549&r1=694548&r2=694549&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/pom.xml (original)
+++ maven/enforcer/trunk/enforcer-rules/pom.xml Thu Sep 11 16:55:34 2008
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.maven.enforcer</groupId>
     <artifactId>enforcer</artifactId>
-    <version>2-SNAPSHOT</version>
+    <version>1-SNAPSHOT</version>
   </parent>
   <artifactId>enforcer-rules</artifactId>
   <packaging>jar</packaging>
-  <version>1.0-alpha-5-SNAPSHOT</version>
+  <version>1.0-alpha-4-SNAPSHOT</version>
   <name>Enforcer Rules</name>
   <description>This component contains the standard Enforcer Rules</description>
   <build>

Modified: maven/enforcer/trunk/enforcer-rules/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/site/site.xml?rev=694549&r1=694548&r2=694549&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/site/site.xml (original)
+++ maven/enforcer/trunk/enforcer-rules/src/site/site.xml Thu Sep 11 16:55:34 2008
@@ -21,11 +21,11 @@
   <body>
     <menu name="Overview">
       <item name="Introduction" href="index.html"/>
-      <item name="Rule API" href="http://maven.apache.org/enforcer/enforcer-api/"/>
-      <item name="Maven Enforcer Plugin" href="http://maven.apache.org/plugins/maven-enforcer-plugin/"/>
+      <item name="Rule API" href="../enforcer-api/"/>
+      <item name="Maven Enforcer Plugin" href="../../plugins/maven-enforcer-plugin/"/>
     </menu>
     <menu name="Custom Rules">
-      <item name="Writing a custom rule" href="http://maven.apache.org/enforcer/enforcer-api/writing-a-custom-rule.html"/>
+      <item name="Writing a custom rule" href="../enforcer-api/writing-a-custom-rule.html"/>
     </menu>
   </body>
 </project>

Modified: maven/enforcer/trunk/maven-enforcer-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/pom.xml?rev=694549&r1=694548&r2=694549&view=diff
==============================================================================
--- maven/enforcer/trunk/maven-enforcer-plugin/pom.xml (original)
+++ maven/enforcer/trunk/maven-enforcer-plugin/pom.xml Thu Sep 11 16:55:34 2008
@@ -23,14 +23,14 @@
   <parent>
     <groupId>org.apache.maven.enforcer</groupId>
     <artifactId>enforcer</artifactId>
-    <version>2-SNAPSHOT</version>
+    <version>1-SNAPSHOT</version>
   </parent>
   <groupId>org.apache.maven.plugins</groupId>
   <artifactId>maven-enforcer-plugin</artifactId>
   <packaging>maven-plugin</packaging>
   <name>Maven Enforcer Plugin</name>
   <description>The Loving Iron Fist of Maven</description>
-  <version>1.0-alpha-5-SNAPSHOT</version>
+  <version>1.0-alpha-4-SNAPSHOT</version>
   <url>http://maven.apache.org/plugins/maven-enforcer-plugin/</url>
   <issueManagement>
     <system>JIRA</system>
@@ -61,7 +61,7 @@
   <distributionManagement>
     <site>
       <id>apache.website</id>
-      <url>scp://people.apache.org/www/maven.apache.org/plugins/maven-enforcer-plugin</url>
+      <url>${site.deploy.url}/plugins/maven-enforcer-plugin</url>
     </site>
   </distributionManagement>
   <build>
@@ -69,7 +69,6 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>cobertura-maven-plugin</artifactId>
-        <version>2.0</version>
         <executions>
           <execution>
             <phase>clean</phase>
@@ -87,6 +86,18 @@
           </stagingSiteURL>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-plugin-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>generated-helpmojo</id>
+            <goals>
+              <goal>helpmojo</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
     <resources>
       <!-- Include super-pom defined main/resources
@@ -143,4 +154,13 @@
       <artifactId>maven-plugin-testing-harness</artifactId>
     </dependency>
   </dependencies>
+  <reporting>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-plugin-plugin</artifactId>
+            <version>${maven.plugin.plugin.version}</version>
+          </plugin>
+        </plugins>
+      </reporting>
 </project>

Modified: maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/EnforceOnceMojo.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/EnforceOnceMojo.java?rev=694549&r1=694548&r2=694549&view=diff
==============================================================================
--- maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/EnforceOnceMojo.java
(original)
+++ maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/EnforceOnceMojo.java
Thu Sep 11 16:55:34 2008
@@ -22,7 +22,7 @@
  */
 
 /**
- * This goal executes the defined enforcer-rules once per build.
+ * This goal has been deprecated.
  * 
  * @deprecated
  * @goal enforce-once

Modified: maven/enforcer/trunk/maven-enforcer-plugin/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/site/site.xml?rev=694549&r1=694548&r2=694549&view=diff
==============================================================================
--- maven/enforcer/trunk/maven-enforcer-plugin/src/site/site.xml (original)
+++ maven/enforcer/trunk/maven-enforcer-plugin/src/site/site.xml Thu Sep 11 16:55:34 2008
@@ -24,10 +24,10 @@
       <item name="Goals" href="plugin-info.html"/>
       <item name="Usage" href="usage.html"/>
       <item name="FAQ" href="faq.html"/>
-      <item name="Standard Rules" href="http://maven.apache.org/enforcer/enforcer-rules/index.html"/>
+      <item name="Standard Rules" href="../../enforcer/enforcer-rules/index.html"/>
     </menu>
     <menu name="Custom Rules">
-      <item name="Writing a custom rule" href="http://maven.apache.org/enforcer/enforcer-api/writing-a-custom-rule.html"/>
+      <item name="Writing a custom rule" href="../../enforcer/enforcer-api/writing-a-custom-rule.html"/>
     </menu>
     <menu name="Resources">
       <item name="Maven 2.0.x Version Range Syntax" href="http://docs.codehaus.org/display/MAVEN/Dependency+Mediation+and+Conflict+Resolution#DependencyMediationandConflictResolution-DependencyVersionRanges"
/>

Modified: maven/enforcer/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/pom.xml?rev=694549&r1=694548&r2=694549&view=diff
==============================================================================
--- maven/enforcer/trunk/pom.xml (original)
+++ maven/enforcer/trunk/pom.xml Thu Sep 11 16:55:34 2008
@@ -23,13 +23,12 @@
     <artifactId>maven-parent</artifactId>
     <groupId>org.apache.maven</groupId>
     <version>9</version>
-    <relativePath>../pom/maven/pom.xml</relativePath>
   </parent>
   <groupId>org.apache.maven.enforcer</groupId>
   <artifactId>enforcer</artifactId>
   <packaging>pom</packaging>
   <name>Enforcer</name>
-  <version>2-SNAPSHOT</version>
+  <version>1-SNAPSHOT</version>
   <description>Enforcer is a build rule execution framework.</description>
   <url>http://maven.apache.org/enforcer</url>
   <prerequisites>
@@ -115,6 +114,8 @@
     <api.version>1.0-alpha-4-SNAPSHOT</api.version>
     <rules.version>1.0-alpha-4-SNAPSHOT</rules.version>
     <maven.version>2.0.9</maven.version>
+    <maven.plugin.plugin.version>2.4.3</maven.plugin.plugin.version>
+    <site.deploy.url>scp://people.apache.org/www/maven.apache.org</site.deploy.url>
   </properties>
   <build>
     <resources>
@@ -131,36 +132,15 @@
     <pluginManagement>
       <plugins>
         <plugin>
-          <artifactId>maven-install-plugin</artifactId>
-          <version>2.2</version>
-        </plugin>
-        <plugin>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>2.0.2</version>
           <configuration>
             <source>1.4</source>
             <target>1.4</target>
           </configuration>
         </plugin>
         <plugin>
-          <artifactId>maven-deploy-plugin</artifactId>
-          <version>2.3</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-jar-plugin</artifactId>
-          <version>2.1</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.3</version>
-        </plugin>
-        <plugin>
           <artifactId>maven-plugin-plugin</artifactId>
-          <version>2.3</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-resources-plugin</artifactId>
-          <version>2.2</version>
+          <version>${maven.plugin.plugin.version}</version>
         </plugin>
         <plugin>
           <artifactId>maven-release-plugin</artifactId>
@@ -168,17 +148,13 @@
             <tagBase>https://svn.apache.org/repos/asf/maven/enforcer/tags</tagBase>
           </configuration>
         </plugin>
-        <plugin>
-          <artifactId>maven-site-plugin</artifactId>
-          <version>2.0-beta-7</version>
-        </plugin>
       </plugins>
     </pluginManagement>
   </build>
   <distributionManagement>
     <site>
       <id>apache.website</id>
-      <url>scp://people.apache.org/www/maven.apache.org/enforcer/</url>
+      <url>${site.deploy.url}/enforcer/</url>
     </site>
   </distributionManagement>
   <dependencyManagement>
@@ -186,17 +162,17 @@
       <dependency>
         <groupId>org.apache.maven.enforcer</groupId>
         <artifactId>enforcer-api</artifactId>
-        <version>1.0-alpha-5-SNAPSHOT</version>
+        <version>${api.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven.enforcer</groupId>
         <artifactId>enforcer-rules</artifactId>
-        <version>1.0-alpha-5-SNAPSHOT</version>
+        <version>${rules.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven.enforcer</groupId>
         <artifactId>enforcer-rules</artifactId>
-        <version>1.0-alpha-5-SNAPSHOT</version>
+        <version>${rules.version}</version>
         <classifier>tests</classifier>
         <scope>test</scope>
       </dependency>
@@ -249,8 +225,27 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>cobertura-maven-plugin</artifactId>
-        <version>2.0</version>
+        <version>2.2</version>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.5</version>
+        <configuration>
+           <tagletArtifacts>
+             <tagletArtifact>
+                <groupId>org.apache.maven.plugin-tools</groupId>
+                <artifactId>maven-plugin-tools-javadoc</artifactId>
+                <version>2.4.3</version>
+             </tagletArtifact>
+             <tagletArtifact>
+               <groupId>org.codehaus.plexus</groupId>
+               <artifactId>plexus-javadoc</artifactId>
+               <version>1.0</version>
+             </tagletArtifact>
+           </tagletArtifacts>
+          </configuration>
+       </plugin>
     </plugins>
   </reporting>
   <modules>



Mime
View raw message