-
-
Notifications
You must be signed in to change notification settings - Fork 550
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'xwiki:master' into XWIKI-22165
- Loading branch information
Showing
158 changed files
with
30,971 additions
and
273 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| This directory material is a fork of twbs/bootstrap 3.4.x branch with some specific fixes for XWiki. | ||
|
|
||
| ## Copyright and license | ||
|
|
||
| Code and documentation copyright 2011-2019 Twitter, Inc. Code released under [the MIT license](https://github.com/twbs/bootstrap/blob/master/LICENSE). Docs released under [Creative Commons](https://github.com/twbs/bootstrap/blob/master/docs/LICENSE). |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,190 @@ | ||
| <?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>org.xwiki.platform</groupId> | ||
| <artifactId>xwiki-platform-core</artifactId> | ||
| <version>16.8.0-SNAPSHOT</version> | ||
| </parent> | ||
| <packaging>webjar</packaging> | ||
| <artifactId>xwiki-platform-bootstrap</artifactId> | ||
| <name>XWiki Platform - Bootstrap</name> | ||
| <properties> | ||
| <!-- Name to display by the Extension Manager --> | ||
| <xwiki.extension.name>Bootstrap WebJar</xwiki.extension.name> | ||
| <!-- Category for the Extension Manager --> | ||
| <xwiki.extension.category>webjar</xwiki.extension.category> | ||
| <!-- Old name of this module used for retro compatibility when resolving dependencies of old extensions --> | ||
| <xwiki.extension.features>org.webjars:bootstrap</xwiki.extension.features> | ||
| </properties> | ||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <artifactId>maven-resources-plugin</artifactId> | ||
| <executions> | ||
| <execution> | ||
| <id>copy-bootstrap-resources</id> | ||
| <phase>validate</phase> | ||
| <goals> | ||
| <goal>copy-resources</goal> | ||
| </goals> | ||
| <configuration> | ||
| <outputDirectory>${project.build.directory}/bootstrap</outputDirectory> | ||
| <resources> | ||
| <resource> | ||
| <directory>src/main/</directory> | ||
| </resource> | ||
| </resources> | ||
| </configuration> | ||
| </execution> | ||
| <execution> | ||
| <id>copy-bootstrap-tests-resources</id> | ||
| <phase>validate</phase> | ||
| <goals> | ||
| <goal>copy-resources</goal> | ||
| </goals> | ||
| <configuration> | ||
| <outputDirectory>${project.build.directory}/bootstrap/js/tests</outputDirectory> | ||
| <resources> | ||
| <resource> | ||
| <directory>src/tests/</directory> | ||
| </resource> | ||
| </resources> | ||
| </configuration> | ||
| </execution> | ||
| <execution> | ||
| <!-- Copy the generated bootstrap components to the WebJar folder. --> | ||
| <id>copy-bootstrap-components</id> | ||
| <phase>process-resources</phase> | ||
| <goals> | ||
| <goal>copy-resources</goal> | ||
| </goals> | ||
| <configuration> | ||
| <outputDirectory>${project.build.outputDirectory}/META-INF/resources/webjars/${project.artifactId}/${project.version}</outputDirectory> | ||
| <resources> | ||
| <resource> | ||
| <directory>${project.build.directory}/bootstrap/dist</directory> | ||
| </resource> | ||
| </resources> | ||
| </configuration> | ||
| </execution> | ||
| <execution> | ||
| <!-- Copy the less bootstrap components to the WebJar folder. --> | ||
| <id>copy-bootstrap-less-components</id> | ||
| <phase>process-resources</phase> | ||
| <goals> | ||
| <goal>copy-resources</goal> | ||
| </goals> | ||
| <configuration> | ||
| <outputDirectory>${project.build.outputDirectory}/META-INF/resources/webjars/${project.artifactId}/${project.version}/less</outputDirectory> | ||
| <resources> | ||
| <resource> | ||
| <directory>${project.build.directory}/bootstrap/less</directory> | ||
| </resource> | ||
| </resources> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <!-- We're disabling the JSHint check associated with the WebJar packaging because we use frontend-maven-plugin | ||
| below to perform linting. --> | ||
| <plugin> | ||
| <groupId>org.xwiki.contrib</groupId> | ||
| <artifactId>jshint-maven-plugin</artifactId> | ||
| <executions> | ||
| <execution> | ||
| <id>default-lint</id> | ||
| <phase>none</phase> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>com.github.eirslett</groupId> | ||
| <artifactId>frontend-maven-plugin</artifactId> | ||
| <executions> | ||
| <execution> | ||
| <id>install-node-and-npm</id> | ||
| <goals> | ||
| <goal>install-node-and-npm</goal> | ||
| </goals> | ||
| <configuration> | ||
| <nodeVersion>${node.version}</nodeVersion> | ||
| <npmVersion>${npm.version}</npmVersion> | ||
| </configuration> | ||
| </execution> | ||
| <execution> | ||
| <id>npm-install</id> | ||
| <goals> | ||
| <goal>npm</goal> | ||
| </goals> | ||
| <configuration> | ||
| <arguments>ci</arguments> | ||
| </configuration> | ||
| </execution> | ||
| <execution> | ||
| <id>npm-run-build</id> | ||
| <goals> | ||
| <goal>npm</goal> | ||
| </goals> | ||
| <configuration> | ||
| <arguments>run build</arguments> | ||
| </configuration> | ||
| </execution> | ||
| <execution> | ||
| <id>npm-run-test</id> | ||
| <goals> | ||
| <goal>npm</goal> | ||
| </goals> | ||
| <configuration> | ||
| <arguments>run test</arguments> | ||
| </configuration> | ||
| <phase>test</phase> | ||
| </execution> | ||
| <execution> | ||
| <id>npm-run-lint</id> | ||
| <goals> | ||
| <goal>npm</goal> | ||
| </goals> | ||
| <configuration> | ||
| <arguments>run lint</arguments> | ||
| </configuration> | ||
| <phase>test</phase> | ||
| </execution> | ||
| </executions> | ||
| <configuration> | ||
| <workingDirectory>${project.build.directory}/bootstrap/</workingDirectory> | ||
| </configuration> | ||
| </plugin> | ||
| <!-- We're skipping the license check because we put the actual original license in bootstrap file and not the | ||
| XWiki license --> | ||
| <plugin> | ||
| <groupId>com.mycila</groupId> | ||
| <artifactId>license-maven-plugin</artifactId> | ||
| <configuration> | ||
| <skip>true</skip> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </project> |
1 change: 1 addition & 0 deletions
1
xwiki-platform-core/xwiki-platform-bootstrap/src/main/.eslintignore
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| /dist/ |
1 change: 1 addition & 0 deletions
1
xwiki-platform-core/xwiki-platform-bootstrap/src/main/.gitignore
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| node_modules/ |
Oops, something went wrong.