You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ts...@apache.org on 2017/07/09 19:17:52 UTC

[01/12] logging-log4cxx git commit: Ignore additional generated files.

Repository: logging-log4cxx
Updated Branches:
  refs/heads/master faff5ab24 -> f218830cb


Ignore additional generated files.


Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/43869c85
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/43869c85
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/43869c85

Branch: refs/heads/master
Commit: 43869c8563ae143abbf76a6c29780eb6b65b925b
Parents: 275de04
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Sat Jul 8 12:47:42 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Sat Jul 8 12:47:42 2017 +0200

----------------------------------------------------------------------
 .gitignore | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/43869c85/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 2f7896d..8ddcac6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,25 @@
+.deps
+.dirstamp
+*.lo
+*.m4
+*.o
+*.swp
+
+ar-lib
+config**
+depcomp
+install-sh
+liblog4cxx.pc
+libtool
+ltmain.sh
+Makefile
+Makefile.in
+missing
+pom.xml.releaseBackup
+release.properties
+
+autom4te.cache/
+src/main/include/log4cxx/log4cxx.h
+src/main/include/log4cxx/private/log4cxx_private.h
+src/site/doxy/Doxyfile
 target/


[05/12] logging-log4cxx git commit: Additional files to ignore.

Posted by ts...@apache.org.
Additional files to ignore.


Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/af32a133
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/af32a133
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/af32a133

Branch: refs/heads/master
Commit: af32a1331fd7bc5cf27aed04849a5da1bef2395b
Parents: 682a319
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Sat Jul 8 14:28:37 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Sat Jul 8 14:28:37 2017 +0200

----------------------------------------------------------------------
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/af32a133/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 8ddcac6..2378691 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,7 +19,10 @@ pom.xml.releaseBackup
 release.properties
 
 autom4te.cache/
+src/main/cpp/.libs/
+src/main/cpp/liblog4cxx.la
 src/main/include/log4cxx/log4cxx.h
 src/main/include/log4cxx/private/log4cxx_private.h
 src/site/doxy/Doxyfile
+src/site/doxy/manual/
 target/


[06/12] logging-log4cxx git commit: Removing signRelease.sh for now, because I'm not sure that such files really need to be in a release and am creating new files later regarding release only. Without the git repo the release process of maven doesn't see

Posted by ts...@apache.org.
Removing signRelease.sh for now, because I'm not sure that such files really need to be in a release and am creating new files later regarding release only. Without the git repo the release process of maven doesn't seem to work properlys anyway.


Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/ae155d7c
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/ae155d7c
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/ae155d7c

Branch: refs/heads/master
Commit: ae155d7cf6595d3cdc9019c18e51ebd8ede77aa5
Parents: af32a13
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Sun Jul 9 10:30:19 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Sun Jul 9 10:30:19 2017 +0200

----------------------------------------------------------------------
 src/assembly/source.xml | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/ae155d7c/src/assembly/source.xml
----------------------------------------------------------------------
diff --git a/src/assembly/source.xml b/src/assembly/source.xml
index cc19125..c01a47a 100644
--- a/src/assembly/source.xml
+++ b/src/assembly/source.xml
@@ -30,7 +30,6 @@
 				<include>autogen.sh</include>
 				<include>configure.bat</include>
 				<include>configure-aprutil.bat</include>
-				<include>signRelease.sh</include>
 			</includes>
 
 			<fileMode>0755</fileMode>


[09/12] logging-log4cxx git commit: Tried to get versionWoSuffix using Groovy, doesn't work as wlel. The keyword is model interpolation in maven and that seems to happen to soon in case of my site-deploy-target dir from distirbutionManagement..

Posted by ts...@apache.org.
Tried to get versionWoSuffix using Groovy, doesn't work as wlel. The keyword is model interpolation in maven and that seems to happen to soon in case of my site-deploy-target dir from distirbutionManagement..


Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/69998e14
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/69998e14
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/69998e14

Branch: refs/heads/master
Commit: 69998e146277f9e9ac91cbe0515c6e915cc1d992
Parents: 2558085
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Sun Jul 9 11:39:51 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Sun Jul 9 11:39:51 2017 +0200

----------------------------------------------------------------------
 pom.xml | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/69998e14/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 03b9e10..dcefd73 100644
--- a/pom.xml
+++ b/pom.xml
@@ -324,6 +324,28 @@
 			</plugin>
 
 			<plugin>
+				<groupId>org.codehaus.groovy.maven</groupId>
+				<artifactId>gmaven-plugin</artifactId>
+				<version>1.0</version>
+
+				<executions>
+					<execution>
+						<id>regex-property</id>
+						<phase>site-deploy</phase>
+						<goals>
+							<goal>execute</goal>
+						</goals>
+
+						<configuration>
+							<source>
+								System.setProperty("versionWoSuffix", "${project.version}".replace('-SNAPSHOT', ''))
+							</source>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
 				<artifactId>maven-site-plugin</artifactId>
 				<version>3.3</version>
 				<configuration>
@@ -392,7 +414,7 @@
 		</repository>
 		<site>
 			<id>logging.site</id>
-			<url>file:///${user.dir}/target/site-deploy/${project.version}</url>
+			<url>file:///${user.dir}/target/site-deploy/${project.versionWoSuffix}</url>
 		</site>
 	</distributionManagement>
 </project>


[07/12] logging-log4cxx git commit: Tried to reduce the version number by the suffix SNAPSHOT for site-deploy, but the reduced version number is only available in build.xml this way, not in the distributionManagement in pom.xml.

Posted by ts...@apache.org.
Tried to reduce the version number by the suffix SNAPSHOT for site-deploy, but the reduced version number is only available in build.xml this way, not in the distributionManagement in pom.xml.


Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/6860a07e
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/6860a07e
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/6860a07e

Branch: refs/heads/master
Commit: 6860a07eb8565932672fe8ac0e3aa78a3c9c3614
Parents: ae155d7
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Sun Jul 9 11:17:49 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Sun Jul 9 11:17:49 2017 +0200

----------------------------------------------------------------------
 build.xml |  2 +-
 pom.xml   | 26 +++++++++++++++++++++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/6860a07e/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index e43d719..082dd98 100644
--- a/build.xml
+++ b/build.xml
@@ -177,7 +177,7 @@
 				value="target/site-deploy"
 	/>
 	<property	name="site.deployDir.curVersion"
-				value="${site.deployDir}/${project.version}"
+				value="${site.deployDir}/${project.versionWoSuffix}"
 	/>
 
 	<propertyregex	property="version.major"

http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/6860a07e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 03b9e10..55fbad8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -324,6 +324,30 @@
 			</plugin>
 
 			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<version>1.7</version>
+
+				<executions>
+					<execution>
+						<id>regex-property</id>
+						<phase>post-site</phase>
+						<goals>
+							<goal>regex-property</goal>
+						</goals>
+
+						<configuration>
+							<name>project.versionWoSuffix</name>
+							<value>${project.version}</value>
+							<regex>^(\d+)\.(\d+)\.(\d+)(?:-SNAPSHOT)?$</regex>
+							<replacement>$1.$2.$3</replacement>
+							<failIfNoMatch>true</failIfNoMatch>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
 				<artifactId>maven-site-plugin</artifactId>
 				<version>3.3</version>
 				<configuration>
@@ -392,7 +416,7 @@
 		</repository>
 		<site>
 			<id>logging.site</id>
-			<url>file:///${user.dir}/target/site-deploy/${project.version}</url>
+			<url>file:///${user.dir}/target/site-deploy/${project.versionWoSuffix}</url>
 		</site>
 	</distributionManagement>
 </project>


[02/12] logging-log4cxx git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4cxx

Posted by ts...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4cxx


Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/a1edda2c
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/a1edda2c
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/a1edda2c

Branch: refs/heads/master
Commit: a1edda2c88d9370e7cc4b7a7d41970dc2085213d
Parents: 43869c8 b8ed81c
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Sat Jul 8 12:58:12 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Sat Jul 8 12:58:12 2017 +0200

----------------------------------------------------------------------
 src/assembly/source.xml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------



[04/12] logging-log4cxx git commit: autogen.sh has to be run even with releases now, but that saves as some space and should prevent incompatibilities with old generated files form other systems.

Posted by ts...@apache.org.
autogen.sh has to be run even with releases now, but that saves as some space and should prevent incompatibilities with old generated files form other systems.


Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/682a319e
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/682a319e
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/682a319e

Branch: refs/heads/master
Commit: 682a319e17525ffdcd326d9bce84c78e208b8e66
Parents: 1911f93
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Sat Jul 8 14:25:54 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Sat Jul 8 14:25:54 2017 +0200

----------------------------------------------------------------------
 src/site/apt/building/autotools.apt | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/682a319e/src/site/apt/building/autotools.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/building/autotools.apt b/src/site/apt/building/autotools.apt
index 9f025f3..2738877 100644
--- a/src/site/apt/building/autotools.apt
+++ b/src/site/apt/building/autotools.apt
@@ -28,15 +28,13 @@ Building Apache log4cxx with autotools
 +------------+
 $ apt-get install build-essential automake libtool libapr1-dev libaprutil1-dev gzip zip
 $ cd apache-log4cxx-x.x.x
-$[./autogen.sh]
+$ ./autogen.sh
 $ ./configure
 $ make
 $ make check
 $ sudo make install
 +------------+
 
-  Those lines in brackets are only necessary if you directly build from source.
-
 * configure options
 
 *-------------------+---------------------------------------------------------------------------------------------+


[08/12] logging-log4cxx git commit: Revert "Tried to reduce the version number by the suffix SNAPSHOT for site-deploy, but the reduced version number is only available in build.xml this way, not in the distributionManagement in pom.xml."

Posted by ts...@apache.org.
Revert "Tried to reduce the version number by the suffix SNAPSHOT for site-deploy, but the reduced version number is only available in build.xml this way, not in the distributionManagement in pom.xml."

This reverts commit 6860a07eb8565932672fe8ac0e3aa78a3c9c3614.


Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/25580859
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/25580859
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/25580859

Branch: refs/heads/master
Commit: 25580859f564506bc060171dfaec873068cfa6e3
Parents: 6860a07
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Sun Jul 9 11:18:50 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Sun Jul 9 11:18:50 2017 +0200

----------------------------------------------------------------------
 build.xml |  2 +-
 pom.xml   | 26 +-------------------------
 2 files changed, 2 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/25580859/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 082dd98..e43d719 100644
--- a/build.xml
+++ b/build.xml
@@ -177,7 +177,7 @@
 				value="target/site-deploy"
 	/>
 	<property	name="site.deployDir.curVersion"
-				value="${site.deployDir}/${project.versionWoSuffix}"
+				value="${site.deployDir}/${project.version}"
 	/>
 
 	<propertyregex	property="version.major"

http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/25580859/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 55fbad8..03b9e10 100644
--- a/pom.xml
+++ b/pom.xml
@@ -324,30 +324,6 @@
 			</plugin>
 
 			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>1.7</version>
-
-				<executions>
-					<execution>
-						<id>regex-property</id>
-						<phase>post-site</phase>
-						<goals>
-							<goal>regex-property</goal>
-						</goals>
-
-						<configuration>
-							<name>project.versionWoSuffix</name>
-							<value>${project.version}</value>
-							<regex>^(\d+)\.(\d+)\.(\d+)(?:-SNAPSHOT)?$</regex>
-							<replacement>$1.$2.$3</replacement>
-							<failIfNoMatch>true</failIfNoMatch>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-
-			<plugin>
 				<artifactId>maven-site-plugin</artifactId>
 				<version>3.3</version>
 				<configuration>
@@ -416,7 +392,7 @@
 		</repository>
 		<site>
 			<id>logging.site</id>
-			<url>file:///${user.dir}/target/site-deploy/${project.versionWoSuffix}</url>
+			<url>file:///${user.dir}/target/site-deploy/${project.version}</url>
 		</site>
 	</distributionManagement>
 </project>


[12/12] logging-log4cxx git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4cxx

Posted by ts...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4cxx


Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/f218830c
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/f218830c
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/f218830c

Branch: refs/heads/master
Commit: f218830cb641f7f874e7cfd4adbcb3c3dea95e68
Parents: 6b28c6e faff5ab
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Sun Jul 9 21:08:18 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Sun Jul 9 21:08:18 2017 +0200

----------------------------------------------------------------------
 build.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------



[03/12] logging-log4cxx git commit: Removed config* and similar files which seems to get generated by autogen.sh. Don't why we should include them in a release, should be better to generate those at each system.

Posted by ts...@apache.org.
Removed config* and similar files which seems to get generated by autogen.sh. Don't why we should include them in a release, should be better to generate those at each system.


Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/1911f933
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/1911f933
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/1911f933

Branch: refs/heads/master
Commit: 1911f933eb2f6d4b496238f4a23806b766e4f1be
Parents: a1edda2
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Sat Jul 8 14:22:11 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Sat Jul 8 14:22:11 2017 +0200

----------------------------------------------------------------------
 src/assembly/source.xml | 8 --------
 1 file changed, 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/1911f933/src/assembly/source.xml
----------------------------------------------------------------------
diff --git a/src/assembly/source.xml b/src/assembly/source.xml
index 520b6f2..cc19125 100644
--- a/src/assembly/source.xml
+++ b/src/assembly/source.xml
@@ -27,15 +27,9 @@
 		<!-- Some files need to be executable. -->
 		<fileSet>
 			<includes>
-				<include>ar-lib</include>
 				<include>autogen.sh</include>
 				<include>configure.bat</include>
 				<include>configure-aprutil.bat</include>
-				<include>configure</include>
-				<include>depcomp</include>
-				<include>install-sh</include>
-				<include>ltmain.sh</include>
-				<include>missing</include>
 				<include>signRelease.sh</include>
 			</includes>
 
@@ -47,8 +41,6 @@
 				<include>aclocal.m4</include>
 				<include>build.xml</include>
 				<include>configure.ac</include>
-				<include>config.guess</include>
-				<include>config.sub</include>
 				<include>INSTALL</include>
 				<include>KEYS</include>
 				<include>liblog4cxx.pc.in</include>


[11/12] logging-log4cxx git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4cxx

Posted by ts...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4cxx


Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/6b28c6ec
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/6b28c6ec
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/6b28c6ec

Branch: refs/heads/master
Commit: 6b28c6ec4d7be1a7b60111a441f4ee914f95f2c1
Parents: 1110bc7 2869cc8
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Sun Jul 9 14:05:45 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Sun Jul 9 14:05:45 2017 +0200

----------------------------------------------------------------------
 build.xml | 82 ++++++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 62 insertions(+), 20 deletions(-)
----------------------------------------------------------------------



[10/12] logging-log4cxx git commit: Revert "Tried to get versionWoSuffix using Groovy, doesn't work as wlel. The keyword is model interpolation in maven and that seems to happen to soon in case of my site-deploy-target dir from distirbutionManagement.."

Posted by ts...@apache.org.
Revert "Tried to get versionWoSuffix using Groovy, doesn't work as wlel. The keyword is model interpolation in maven and that seems to happen to soon in case of my site-deploy-target dir from distirbutionManagement.."

This reverts commit 69998e146277f9e9ac91cbe0515c6e915cc1d992.


Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/1110bc7c
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/1110bc7c
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/1110bc7c

Branch: refs/heads/master
Commit: 1110bc7c8556a0232a55ef09ad6ff11b34cb2d9c
Parents: 69998e1
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Sun Jul 9 11:41:07 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Sun Jul 9 11:41:07 2017 +0200

----------------------------------------------------------------------
 pom.xml | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/1110bc7c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index dcefd73..03b9e10 100644
--- a/pom.xml
+++ b/pom.xml
@@ -324,28 +324,6 @@
 			</plugin>
 
 			<plugin>
-				<groupId>org.codehaus.groovy.maven</groupId>
-				<artifactId>gmaven-plugin</artifactId>
-				<version>1.0</version>
-
-				<executions>
-					<execution>
-						<id>regex-property</id>
-						<phase>site-deploy</phase>
-						<goals>
-							<goal>execute</goal>
-						</goals>
-
-						<configuration>
-							<source>
-								System.setProperty("versionWoSuffix", "${project.version}".replace('-SNAPSHOT', ''))
-							</source>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-
-			<plugin>
 				<artifactId>maven-site-plugin</artifactId>
 				<version>3.3</version>
 				<configuration>
@@ -414,7 +392,7 @@
 		</repository>
 		<site>
 			<id>logging.site</id>
-			<url>file:///${user.dir}/target/site-deploy/${project.versionWoSuffix}</url>
+			<url>file:///${user.dir}/target/site-deploy/${project.version}</url>
 		</site>
 	</distributionManagement>
 </project>