Author: sdumitriu
Date: 2007-12-29 02:13:15 +0100 (Sat, 29 Dec 2007)
New Revision: 6516
Modified:
xwiki-platform/core/trunk/xwiki-action/pom.xml
xwiki-platform/core/trunk/xwiki-containers/pom.xml
xwiki-platform/core/trunk/xwiki-containers/xwiki-container-servlet/pom.xml
xwiki-platform/core/trunk/xwiki-core/pom.xml
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/render/groovy/GroovyTemplateEngine.java
xwiki-platform/core/trunk/xwiki-plexus/pom.xml
xwiki-platform/core/trunk/xwiki-url/pom.xml
xwiki-platform/core/trunk/xwiki-velocity/pom.xml
Log:
XWIKI-1972: Upgrade to groovy-1.1-rc-1
Done.
[cleanup] Fix Maven warnings about deprecated variable usage.
[cleanup] Filter-out some java files which cause the checkstyle plugin to fail.
Modified: xwiki-platform/core/trunk/xwiki-action/pom.xml
===================================================================
--- xwiki-platform/core/trunk/xwiki-action/pom.xml 2007-12-29 01:06:17 UTC
(rev 6515)
+++ xwiki-platform/core/trunk/xwiki-action/pom.xml 2007-12-29 01:13:15 UTC
(rev 6516)
@@ -38,17 +38,17 @@
<dependency>
<groupId>org.xwiki.platform</groupId>
<artifactId>xwiki-core-container-api</artifactId>
- <version>${version}</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.xwiki.platform</groupId>
<artifactId>xwiki-core-component</artifactId>
- <version>${version}</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.xwiki.platform</groupId>
<artifactId>xwiki-core-url</artifactId>
- <version>${version}</version>
+ <version>${pom.version}</version>
</dependency>
</dependencies>
</project>
Modified: xwiki-platform/core/trunk/xwiki-containers/pom.xml
===================================================================
--- xwiki-platform/core/trunk/xwiki-containers/pom.xml 2007-12-29 01:06:17 UTC
(rev 6515)
+++ xwiki-platform/core/trunk/xwiki-containers/pom.xml 2007-12-29 01:13:15 UTC
(rev 6516)
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.xwiki.platform</groupId>
<artifactId>xwiki-core-url</artifactId>
- <version>${version}</version>
+ <version>${pom.version}</version>
</dependency>
</dependencies>
<modules>
Modified:
xwiki-platform/core/trunk/xwiki-containers/xwiki-container-servlet/pom.xml
===================================================================
--- xwiki-platform/core/trunk/xwiki-containers/xwiki-container-servlet/pom.xml
2007-12-29 01:06:17 UTC (rev 6515)
+++ xwiki-platform/core/trunk/xwiki-containers/xwiki-container-servlet/pom.xml
2007-12-29 01:13:15 UTC (rev 6516)
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.xwiki.platform</groupId>
<artifactId>xwiki-core-container-api</artifactId>
- <version>${version}</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: xwiki-platform/core/trunk/xwiki-core/pom.xml
===================================================================
--- xwiki-platform/core/trunk/xwiki-core/pom.xml 2007-12-29 01:06:17 UTC
(rev 6515)
+++ xwiki-platform/core/trunk/xwiki-core/pom.xml 2007-12-29 01:13:15 UTC
(rev 6516)
@@ -368,8 +368,8 @@
</dependency>
<dependency>
<groupId>groovy</groupId>
- <artifactId>groovy-all-1.0-jsr</artifactId>
- <version>06</version>
+ <artifactId>groovy-all</artifactId>
+ <version>1.1-rc-1</version>
</dependency>
<dependency>
<groupId>picocontainer</groupId>
@@ -483,7 +483,7 @@
<dependency>
<groupId>org.xwiki.platform</groupId>
<artifactId>xwiki-core-component</artifactId>
- <version>${version}</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>joda-time</groupId>
@@ -524,15 +524,12 @@
**/content/**/*.java,
**/XWikiMessageTool.java,
**/XWikiListFilter.java,
- **/MyPersistentLoginManager.java,
- **/XWikiDocumentArchive.java,
**/doc/rcs/*.java,
**/api/RevisionInfo.java,
**/web/DeleteVersions*.java,
**/migration/**.java,
**/*RecycleBin*.java,
**/*DeletedDocument.java,
- **/DeleteAction.java,
**/UndeleteAction.java,
**/rightsmanager/**/*.java
</includes>
@@ -541,7 +538,8 @@
<!-- these files are clean, but failed in checkstyle
because http://jira.codehaus.org/browse/MCHECKSTYLE-54 : -->
**/XWikiPatchUtils.java,
**/XWikiRCSArchive.java,
- **/XWikiHibernateRecycleBinStore.java
+ **/XWikiHibernateRecycleBinStore.java,
+ **/migration/AbstractXWikiMigrationManager.java
</excludes>
</configuration>
</plugin>
Modified:
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/render/groovy/GroovyTemplateEngine.java
===================================================================
---
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/render/groovy/GroovyTemplateEngine.java
2007-12-29 01:06:17 UTC (rev 6515)
+++
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/render/groovy/GroovyTemplateEngine.java
2007-12-29 01:13:15 UTC (rev 6516)
@@ -42,6 +42,7 @@
import org.codehaus.groovy.runtime.DefaultGroovyMethods;
import org.codehaus.groovy.runtime.DefaultGroovyStaticMethods;
import org.codehaus.groovy.runtime.InvokerHelper;
+import org.codehaus.groovy.runtime.metaclass.MetaClassRegistryImpl;
import java.beans.Introspector;
import java.io.BufferedReader;
@@ -331,9 +332,9 @@
public static void flushCache()
{
// Clear up groovy registry
- MetaClassRegistry mcr = MetaClassRegistry.getIntance(0);
+ MetaClassRegistry mcr = MetaClassRegistryImpl.getInstance(0);
clearMetaClassRegistry(mcr);
- mcr = MetaClassRegistry.getIntance(1);
+ mcr = MetaClassRegistryImpl.getInstance(1);
clearMetaClassRegistry(mcr);
mcr = InvokerHelper.getInstance().getMetaRegistry();
clearMetaClassRegistry(mcr);
@@ -343,9 +344,9 @@
public static void removeClass(Class clazz)
{
// Clear up groovy registry
- MetaClassRegistry mcr = MetaClassRegistry.getIntance(0);
+ MetaClassRegistry mcr = MetaClassRegistryImpl.getInstance(0);
mcr.removeMetaClass(clazz);
- mcr = MetaClassRegistry.getIntance(1);
+ mcr = MetaClassRegistryImpl.getInstance(1);
mcr.removeMetaClass(clazz);
mcr = InvokerHelper.getInstance().getMetaRegistry();
mcr.removeMetaClass(clazz);
Modified: xwiki-platform/core/trunk/xwiki-plexus/pom.xml
===================================================================
--- xwiki-platform/core/trunk/xwiki-plexus/pom.xml 2007-12-29 01:06:17 UTC
(rev 6515)
+++ xwiki-platform/core/trunk/xwiki-plexus/pom.xml 2007-12-29 01:13:15 UTC
(rev 6516)
@@ -38,22 +38,22 @@
<dependency>
<groupId>org.xwiki.platform</groupId>
<artifactId>xwiki-core-component</artifactId>
- <version>${version}</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.xwiki.platform</groupId>
<artifactId>xwiki-core-container-api</artifactId>
- <version>${version}</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.xwiki.platform</groupId>
<artifactId>xwiki-core-container-servlet</artifactId>
- <version>${version}</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.xwiki.platform</groupId>
<artifactId>xwiki-core-action</artifactId>
- <version>${version}</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
Modified: xwiki-platform/core/trunk/xwiki-url/pom.xml
===================================================================
--- xwiki-platform/core/trunk/xwiki-url/pom.xml 2007-12-29 01:06:17 UTC (rev
6515)
+++ xwiki-platform/core/trunk/xwiki-url/pom.xml 2007-12-29 01:13:15 UTC (rev
6516)
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.xwiki.platform</groupId>
<artifactId>xwiki-core-component</artifactId>
- <version>${version}</version>
+ <version>${pom.version}</version>
</dependency>
</dependencies>
</project>
Modified: xwiki-platform/core/trunk/xwiki-velocity/pom.xml
===================================================================
--- xwiki-platform/core/trunk/xwiki-velocity/pom.xml 2007-12-29 01:06:17 UTC
(rev 6515)
+++ xwiki-platform/core/trunk/xwiki-velocity/pom.xml 2007-12-29 01:13:15 UTC
(rev 6516)
@@ -38,17 +38,17 @@
<dependency>
<groupId>org.xwiki.platform</groupId>
<artifactId>xwiki-core-component</artifactId>
- <version>${version}</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.xwiki.platform</groupId>
<artifactId>xwiki-core-container-api</artifactId>
- <version>${version}</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.xwiki.platform</groupId>
<artifactId>xwiki-core-container-servlet</artifactId>
- <version>${version}</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
_______________________________________________
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications
