You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2014/04/12 22:07:52 UTC
svn commit: r1586889 - in /maven/enforcer/trunk:
maven-enforcer-plugin/src/it/projects/always-fail-warn/verify.groovy pom.xml
Author: hboutemy
Date: Sat Apr 12 20:07:51 2014
New Revision: 1586889
URL: http://svn.apache.org/r1586889
Log:
updated parent pom
Modified:
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/always-fail-warn/verify.groovy
maven/enforcer/trunk/pom.xml
Modified: maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/always-fail-warn/verify.groovy
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/always-fail-warn/verify.groovy?rev=1586889&r1=1586888&r2=1586889&view=diff
==============================================================================
--- maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/always-fail-warn/verify.groovy (original)
+++ maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/always-fail-warn/verify.groovy Sat Apr 12 20:07:51 2014
@@ -1,23 +1,23 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-File buildLog = new File( basedir, 'build.log' )
-assert buildLog.text.contains( '[WARNING] Rule 0: org.apache.maven.plugins.enforcer.AlwaysFail warned with message:' )
-
-
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+File buildLog = new File( basedir, 'build.log' )
+assert buildLog.text.contains( '[WARNING] Rule 0: org.apache.maven.plugins.enforcer.AlwaysFail warned with message:' )
+
+
\ No newline at end of file
Modified: maven/enforcer/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/pom.xml?rev=1586889&r1=1586888&r2=1586889&view=diff
==============================================================================
--- maven/enforcer/trunk/pom.xml (original)
+++ maven/enforcer/trunk/pom.xml Sat Apr 12 20:07:51 2014
@@ -23,7 +23,7 @@
<parent>
<artifactId>maven-parent</artifactId>
<groupId>org.apache.maven</groupId>
- <version>23</version>
+ <version>24</version>
<relativePath>../pom/maven/pom.xml</relativePath>
</parent>
<groupId>org.apache.maven.enforcer</groupId>
@@ -123,7 +123,7 @@
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/maven/enforcer/trunk/</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/enforcer/trunk/</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/maven/enforcer/trunk</url>
+ <url>http://svn.apache.org/viewvc/maven/enforcer/trunk</url>
</scm>
<issueManagement>
<system>jira</system>
@@ -248,7 +248,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-publish-plugin</artifactId>
<configuration>
- <content>${project.build.directory}/staging/${maven.site.path}</content>
+ <content>${project.build.directory}/staging</content>
<checkoutDirectory>${maven.site.cache}/${maven.site.path}</checkoutDirectory>
<tryUpdate>true</tryUpdate>
</configuration>
@@ -256,23 +256,19 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.3</version>
- </plugin>
+ <configuration>
+ <topSiteURL>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/content/enforcer-archives/enforcer-LATEST</topSiteURL>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>
<reporting>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.7</version>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9.1</version> <!-- due to CVE-2013-1571, can be removed when using maven-parent 24 -->
<configuration>
<linksource>true</linksource>
<notimestamp>true</notimestamp>