-
Notifications
You must be signed in to change notification settings - Fork 0
fork xwiki-core-velocity to celements-xwiki-velocity #281
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: dev
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -70,6 +70,12 @@ | |
| <version>7.0-SNAPSHOT</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.celements</groupId> | ||
| <artifactId>celements-xwiki-velocity</artifactId> | ||
| <version>7.0-SNAPSHOT</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.celements</groupId> | ||
| <artifactId>celements-servlet</artifactId> | ||
|
|
@@ -190,10 +196,6 @@ | |
| </dependency> | ||
|
|
||
| <!-- Other XWiki modules --> | ||
| <dependency> | ||
| <groupId>org.xwiki.platform</groupId> | ||
| <artifactId>xwiki-core-velocity</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.xwiki.platform</groupId> | ||
| <artifactId>xwiki-core-script</artifactId> | ||
|
|
@@ -262,7 +264,8 @@ | |
| <scope>runtime</scope> | ||
| </dependency> | ||
|
|
||
| <!-- XWiki rendering modules, listed here so that they are included in the distribution | ||
| <!-- XWiki rendering modules, listed here so that they are included in the | ||
| distribution | ||
| TODO: Move these dependencies elsewhere. --> | ||
| <!-- Please try to keep them in alphabetical order --> | ||
| <dependency> | ||
|
|
@@ -413,17 +416,6 @@ | |
| </exclusion> | ||
| </exclusions> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.xwiki.platform</groupId> | ||
| <artifactId>xwiki-core-rendering-macro-velocity</artifactId> | ||
| <version>2.7.2</version> | ||
| <exclusions> | ||
| <exclusion> | ||
| <groupId>org.xwiki.platform</groupId> | ||
| <artifactId>xwiki-core-component-api</artifactId> | ||
| </exclusion> | ||
| </exclusions> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.xwiki.platform</groupId> | ||
| <artifactId>xwiki-core-rendering-macro-cache</artifactId> | ||
|
|
@@ -438,7 +430,8 @@ | |
|
|
||
| <!-- copy crap from xwiki-core pom.xml --> | ||
|
|
||
| <!-- The JRCS JARS are are in our repo till we get them published on the central repository. | ||
| <!-- The JRCS JARS are are in our repo till we get them published on the | ||
| central repository. | ||
|
Comment on lines
+433
to
+434
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. your formatter is wrapping lines too early. is max width set to low in your IDE? |
||
| JRCS home page: http://www.suigeneris.org/kb/display/jrcs/JRCS+Home --> | ||
| <dependency> | ||
| <groupId>org.suigeneris</groupId> | ||
|
|
@@ -515,9 +508,12 @@ | |
| <groupId>xerces</groupId> | ||
| <artifactId>xercesImpl</artifactId> | ||
| </dependency> | ||
| <!-- JTidy hasn't been released for ages (since 2001). A snapshot version exists at | ||
| http://jtidy.sourceforge.net/snapshots/ but Maven requires non-snapshots in order to | ||
| allow a release (this is for reproducibility). Thus we've had to upload JTidy into | ||
| <!-- JTidy hasn't been released for ages (since 2001). A snapshot version | ||
| exists at | ||
| http://jtidy.sourceforge.net/snapshots/ but Maven requires non-snapshots in | ||
| order to | ||
| allow a release (this is for reproducibility). Thus we've had to upload JTidy | ||
| into | ||
|
Comment on lines
+511
to
+516
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. your formatter is wrapping lines too early. is max width set to low in your IDE? |
||
| our custom repository --> | ||
| <dependency> | ||
| <groupId>jtidy</groupId> | ||
|
|
@@ -616,6 +612,10 @@ | |
| <version>2.5.1</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>cglib</groupId> | ||
| <artifactId>cglib</artifactId> | ||
| </dependency> | ||
|
|
||
| </dependencies> | ||
| <scm> | ||
|
|
||
This file was deleted.
This file was deleted.
This file was deleted.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,186 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <!-- | ||
| * | ||
| * See the NOTICE file distributed with this work for additional | ||
| * information regarding copyright ownership. | ||
| * | ||
| * This is free software; you can redistribute it and/or modify it | ||
| * under the terms of the GNU Lesser General Public License as | ||
| * published by the Free Software Foundation; either version 2.1 of | ||
| * the License, or (at your option) any later version. | ||
| * | ||
| * This software is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| * Lesser General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public | ||
| * License along with this software; if not, write to the Free | ||
| * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA | ||
| * 02110-1301 USA, or see the FSF site: http://www.fsf.org. | ||
| * | ||
| --> | ||
|
|
||
| <project xmlns="http://maven.apache.org/POM/4.0.0" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <parent> | ||
| <groupId>com.celements</groupId> | ||
| <artifactId>base-pom</artifactId> | ||
| <version>7.0-SNAPSHOT</version> | ||
| </parent> | ||
| <artifactId>celements-xwiki-velocity</artifactId> | ||
| <version>7.0-SNAPSHOT</version> | ||
| <dependencies> | ||
| <dependency> | ||
| <groupId>com.celements</groupId> | ||
| <artifactId>celements-component</artifactId> | ||
| <version>7.0-SNAPSHOT</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.celements</groupId> | ||
| <artifactId>celements-reference</artifactId> | ||
| <version>7.0-SNAPSHOT</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.celements</groupId> | ||
| <artifactId>celements-config-source-api</artifactId> | ||
| <version>7.0-SNAPSHOT</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.celements</groupId> | ||
| <artifactId>celements-config-source</artifactId> | ||
| <version>7.0-SNAPSHOT</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.celements</groupId> | ||
| <artifactId>celements-servlet</artifactId> | ||
| <version>7.0-SNAPSHOT</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
|
|
||
| <!-- Commons --> | ||
| <dependency> | ||
| <groupId>javax.annotation</groupId> | ||
| <artifactId>javax.annotation-api</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>commons-beanutils</groupId> | ||
| <artifactId>commons-beanutils</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>commons-codec</groupId> | ||
| <artifactId>commons-codec</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>commons-collections</groupId> | ||
| <artifactId>commons-collections</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>commons-configuration</groupId> | ||
| <artifactId>commons-configuration</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>commons-dbcp</groupId> | ||
| <artifactId>commons-dbcp</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>commons-fileupload</groupId> | ||
| <artifactId>commons-fileupload</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>commons-io</groupId> | ||
| <artifactId>commons-io</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>commons-lang</groupId> | ||
| <artifactId>commons-lang</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.apache.commons</groupId> | ||
| <artifactId>commons-lang3</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>commons-net</groupId> | ||
| <artifactId>commons-net</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.slf4j</groupId> | ||
| <artifactId>slf4j-api</artifactId> | ||
| </dependency> | ||
|
|
||
| <!-- XWiki --> | ||
| <dependency> | ||
| <groupId>org.xwiki.platform</groupId> | ||
| <artifactId>xwiki-core-properties</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.xwiki.platform</groupId> | ||
| <artifactId>xwiki-core-script</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.xwiki.platform</groupId> | ||
| <artifactId>xwiki-core-bridge</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.xwiki.platform</groupId> | ||
| <artifactId>xwiki-core-xml</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.xwiki.platform</groupId> | ||
| <artifactId>xwiki-core-management</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.apache.velocity</groupId> | ||
| <artifactId>velocity</artifactId> | ||
| <version>1.7</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>velocity-tools</groupId> | ||
| <artifactId>velocity-tools</artifactId> | ||
| <version>1.4</version> | ||
| </dependency> | ||
|
|
||
| <!-- testing --> | ||
| <dependency> | ||
| <groupId>com.celements</groupId> | ||
| <artifactId>celements-base-tests</artifactId> | ||
| <version>7.0-SNAPSHOT</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.easymock</groupId> | ||
| <artifactId>easymock</artifactId> | ||
| <scope>test</scope> | ||
| </dependency> | ||
|
|
||
| <!-- xwiki legacy testing --> | ||
| <dependency> | ||
| <groupId>org.xwiki.platform</groupId> | ||
| <artifactId>xwiki-core-shared-tests</artifactId> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>jmock</groupId> | ||
| <artifactId>jmock</artifactId> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.jmock</groupId> | ||
| <artifactId>jmock-legacy</artifactId> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>jmock</groupId> | ||
| <artifactId>jmock-cglib</artifactId> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| </dependencies> | ||
| </project> | ||
|
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
your formatter is wrapping lines too early. is max width set to low in your IDE?