You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2017/10/22 07:52:29 UTC
[struts] branch master updated (6e96f11 -> 2bb122e)
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git.
from 6e96f11 Merge pull request #175 from lukaszlenart/act-of-law
new de6adde Uses <target/> instead of <tasks/> to avoid warnings
new 2e7f5c0 Changes how docs are fetched
new 2bb122e Excludes fonts
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
apps/pom.xml | 4 ++--
assembly/pom.xml | 20 ++++++++------------
assembly/src/main/resources/docs-urls.txt | 6 ++++++
pom.xml | 1 +
4 files changed, 17 insertions(+), 14 deletions(-)
create mode 100644 assembly/src/main/resources/docs-urls.txt
--
To stop receiving notification emails like this one, please contact
['"commits@struts.apache.org" <co...@struts.apache.org>'].
[struts] 01/03: Uses instead of to avoid warnings
Posted by lu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git
commit de6adde37e9144e914c45d2ed9187ff54673f850
Author: Lukasz Lenart <lu...@apache.org>
AuthorDate: Sun Oct 22 09:51:04 2017 +0200
Uses <target/> instead of <tasks/> to avoid warnings
---
apps/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/apps/pom.xml b/apps/pom.xml
index e7e0fa6..9d6e4ff 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -51,14 +51,14 @@
<id>copy-sources</id>
<phase>process-sources</phase>
<configuration>
- <tasks>
+ <target>
<copy todir="${project.build.directory}/${project.artifactId}/WEB-INF/src/java" failonerror="false">
<fileset dir="${basedir}/src/main/java" />
</copy>
<copy todir="${project.build.directory}/${project.artifactId}/WEB-INF/src/java" failonerror="false">
<fileset dir="${basedir}/src/main/resources" />
</copy>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
--
To stop receiving notification emails like this one, please contact
"commits@struts.apache.org" <co...@struts.apache.org>.
[struts] 03/03: Excludes fonts
Posted by lu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 2bb122e4bba677042d0e4a41df853f321675e54b
Author: Lukasz Lenart <lu...@apache.org>
AuthorDate: Sun Oct 22 09:52:23 2017 +0200
Excludes fonts
---
pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/pom.xml b/pom.xml
index 96f722b..ac2a837 100644
--- a/pom.xml
+++ b/pom.xml
@@ -248,6 +248,7 @@
<exclude>src/main/resources/static/css/**/*.css</exclude>
<exclude>src/main/resources/static/js/**/*.js</exclude>
<exclude>src/main/resources/docs.cfg</exclude>
+ <exclude>src/main/webapp/fonts/**/*</exclude>
</excludes>
</configuration>
</plugin>
--
To stop receiving notification emails like this one, please contact
"commits@struts.apache.org" <co...@struts.apache.org>.
[struts] 02/03: Changes how docs are fetched
Posted by lu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 2e7f5c0d4009d17d2e327e9caecfaa4ab6f44e7c
Author: Lukasz Lenart <lu...@apache.org>
AuthorDate: Sun Oct 22 09:51:23 2017 +0200
Changes how docs are fetched
---
assembly/pom.xml | 20 ++++++++------------
assembly/src/main/resources/docs-urls.txt | 6 ++++++
2 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/assembly/pom.xml b/assembly/pom.xml
index a7518ba..eaffae9 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -75,33 +75,29 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>cwiki-docs</id>
+ <id>docs</id>
<phase>prepare-package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
- <tasks>
- <mkdir dir="${project.build.directory}/cwiki/" />
+ <target>
+ <mkdir dir="${project.build.directory}/docs/" />
<exec executable="wget">
<arg value="-erobots=off" />
<arg value="-nH" />
- <arg value="--cut-dirs=3" />
+ <arg value="-x" />
<arg value="-nv" />
<arg value="-E" />
<arg value="-L" />
- <arg value="-l 0" />
<arg value="-np" />
- <arg value="--directory-prefix=${project.build.directory}/cwiki" />
+ <arg value="--directory-prefix=${project.build.directory}/docs" />
<arg value="--no-check-certificate" />
<arg value="-r" />
- <arg value="http://struts.apache.org/docs/" />
+ <arg value="-i" />
+ <arg value="src/main/resources/docs-urls.txt" />
</exec>
- <delete>
- <fileset dir="${project.build.directory}/cwiki/" includes="**/index.*" />
- </delete>
- <copy file="${project.build.directory}/cwiki/home.html" tofile="${project.build.directory}/cwiki/index.html" />
- </tasks>
+ </target>
</configuration>
</execution>
</executions>
diff --git a/assembly/src/main/resources/docs-urls.txt b/assembly/src/main/resources/docs-urls.txt
new file mode 100644
index 0000000..845dab8
--- /dev/null
+++ b/assembly/src/main/resources/docs-urls.txt
@@ -0,0 +1,6 @@
+http://struts.apache.org/getting-started/
+http://struts.apache.org/security/
+http://struts.apache.org/core-developers/
+http://struts.apache.org/tag-developers/
+http://struts.apache.org/maven-archetypes/
+http://struts.apache.org/plugins/
--
To stop receiving notification emails like this one, please contact
"commits@struts.apache.org" <co...@struts.apache.org>.