This is an automated email from the ASF dual-hosted git repository.
sgoeschl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/freemarker-generator.git
The following commit(s) were added to refs/heads/master by this push:
new a4a3fcd Revert "FMG-011 Update the README and Maven coordinates after
fork" (#48)
a4a3fcd is described below
commit a4a3fcded15d07d2f82269dac2d07170485aaf2f
Author: Siegfried Goeschl <[email protected]>
AuthorDate: Sun Jun 8 21:23:29 2025 +0200
Revert "FMG-011 Update the README and Maven coordinates after fork" (#48)
This reverts commit f427a26ac6ec2034411ab77ce8d59777bc6b7fc0.
---
CHANGELOG.md | 10 -----
README.md | 27 +++++++------
freemarker-generator-cli/pom.xml | 2 +-
freemarker-generator-maven-plugin-sample/pom.xml | 4 +-
freemarker-generator-maven-plugin/pom.xml | 4 +-
freemarker-generator-tools/pom.xml | 4 +-
pom.xml | 48 +++++++++++++++++++-----
travis.bat | 2 +-
travis.sh | 2 +-
9 files changed, 61 insertions(+), 42 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
deleted file mode 100644
index 971c392..0000000
--- a/CHANGELOG.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Change Log
-
-## [Unreleased]
-
-### Added
-- FMG-0001 Document the current state of the project as fork of the official
"Apache Freemarker Generator" project
-
-### Changed
-
-### Fixed
diff --git a/README.md b/README.md
index b0c4771..3c9770e 100644
--- a/README.md
+++ b/README.md
@@ -1,28 +1,27 @@
Apache FreeMarker Generator
=============================================================================
-Introduction
------------------------------------------------------------------------------
-
-The [Apache Freemarker
Generator](https://github.com/apache/freemarker-generator) project has quite a
long and unsuccessful history
+For documentation or to report bugs visit:
[https://freemarker.apache.org](https://freemarker.apache.org)
-* It started when I migrated one of my pet projects from Apache Velocity &
Groovy to Apache Freemarker & Java many moons ago
-* I contributed the code 2022 to the Apache Software Foundation and became a
committer to the Apache Freemarker project
-* During the next two years I worked on Apache Freemarker Generator, but I did
not see a chance to have to code officially released
-* No public release, no users, no community to grow, another failed open
source project
-* In March 2025 I became an [Emeritus
Member](https://www.apache.org/foundation/members) of the ASF
-* Since I frequently require Apache Freemarker Generator myself I decided to
fork and further work it
+Regarding pull requests on GitHub
+-----------------------------------------------------------------------------
-**Disclaimer - this is a fork of Apache Freemarker Generator and/but I did not
change the package names so all of my private releases won't go to Maven
Central**
+By sending a pull request you grant the Apache Software Foundation
+sufficient rights to use and release the submitted work under the
+Apache license. You grant the same rights (copyright license, patent
+license, etc.) to the Apache Software Foundation as if you have signed
+a [Contributor License
Agreement](https://www.apache.org/dev/new-committers-guide.html#cla).
+For contributions that are judged to be non-trivial, you will be asked
+to actually signing a Contributor License Agreement.
What is Apache FreeMarker Generator?
-----------------------------------------------------------------------------
FreeMarker Generator is a set of tools that generates files based on FreeMarker
templates and data that's typically provided in files (such as JSON files) as
-well. It can be used to generate source code, configuration files, etc.
+well. It can be used to generated source code, configuration files, etc.
-Currently, it can be invoked as a
+Currently it can be invoked as a
* Command-line interface `freemarker-generator`
* Maven plug-in `freemarker-generator-maven-plugin`
@@ -43,4 +42,4 @@ Licensing
Apache FreeMarker Generator is licensed under the Apache License, Version 2.0.
-See the LICENSE file for more details!
\ No newline at end of file
+See the LICENSE file for more details!
diff --git a/freemarker-generator-cli/pom.xml b/freemarker-generator-cli/pom.xml
index 9ee3e0c..57ca79d 100755
--- a/freemarker-generator-cli/pom.xml
+++ b/freemarker-generator-cli/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.freemarker.generator</groupId>
<artifactId>freemarker-generator</artifactId>
- <version>0.3.0-SNAPSHOT</version>
+ <version>0.2.0-SNAPSHOT</version>
</parent>
<artifactId>freemarker-generator-cli</artifactId>
diff --git a/freemarker-generator-maven-plugin-sample/pom.xml
b/freemarker-generator-maven-plugin-sample/pom.xml
index a141e68..1ce4a10 100644
--- a/freemarker-generator-maven-plugin-sample/pom.xml
+++ b/freemarker-generator-maven-plugin-sample/pom.xml
@@ -18,9 +18,9 @@
<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/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.github.sgoeschl.freemarker.generator</groupId>
+ <groupId>org.apache.freemarker.generator</groupId>
<artifactId>freemarker-generator</artifactId>
- <version>0.3.0-SNAPSHOT</version>
+ <version>0.2.0-SNAPSHOT</version>
</parent>
<artifactId>freemarker-generator-maven-plugin-sample</artifactId>
<name>Apache FreeMarker Generator: Maven Plugin Sample</name>
diff --git a/freemarker-generator-maven-plugin/pom.xml
b/freemarker-generator-maven-plugin/pom.xml
index a051956..d7d640f 100644
--- a/freemarker-generator-maven-plugin/pom.xml
+++ b/freemarker-generator-maven-plugin/pom.xml
@@ -20,9 +20,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.github.sgoeschl.freemarker.generator</groupId>
+ <groupId>org.apache.freemarker.generator</groupId>
<artifactId>freemarker-generator</artifactId>
- <version>0.3.0-SNAPSHOT</version>
+ <version>0.2.0-SNAPSHOT</version>
</parent>
<artifactId>freemarker-generator-maven-plugin</artifactId>
diff --git a/freemarker-generator-tools/pom.xml
b/freemarker-generator-tools/pom.xml
index 454b29a..7c39bea 100644
--- a/freemarker-generator-tools/pom.xml
+++ b/freemarker-generator-tools/pom.xml
@@ -20,9 +20,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.github.sgoeschl.freemarker.generator</groupId>
+ <groupId>org.apache.freemarker.generator</groupId>
<artifactId>freemarker-generator</artifactId>
- <version>0.3.0-SNAPSHOT</version>
+ <version>0.2.0-SNAPSHOT</version>
</parent>
<artifactId>freemarker-generator-tools</artifactId>
diff --git a/pom.xml b/pom.xml
index 0eb35ad..067ea8e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,23 +24,53 @@
<version>23</version>
</parent>
- <groupId>org.github.sgoeschl.freemarker.generator</groupId>
+ <groupId>org.apache.freemarker.generator</groupId>
<artifactId>freemarker-generator</artifactId>
<packaging>pom</packaging>
- <version>0.3.0-SNAPSHOT</version>
+ <version>0.2.0-SNAPSHOT</version>
<name>Apache FreeMarker Generator</name>
- <url>https://github.com/sgoeschl/freemarker-generator</url>
+ <url>https://freemarker-generator.apache.org/</url>
<issueManagement>
- <system>GITHUB</system>
- <url>https://github.com/sgoeschl/freemarker-generator/issues</url>
+ <system>jira</system>
+ <url>https://issues.apache.org/jira/browse/FREEMARKER/</url>
</issueManagement>
+ <distributionManagement>
+ <site>
+ <id>apache.website</id>
+ <name>Apache Website</name>
+ <url>scp://people.apache.org/www/freemarker-generator/</url>
+ </site>
+ </distributionManagement>
+
+ <mailingLists>
+ <mailingList>
+ <name>FreeMarker developer list</name>
+ <post>[email protected]</post>
+ <subscribe>[email protected]</subscribe>
+ <unsubscribe>[email protected]</unsubscribe>
+
<archive>http://mail-archives.apache.org/mod_mbox/freemarker-dev/</archive>
+ </mailingList>
+ <mailingList>
+ <name>FreeMarker commit and Jira notifications list</name>
+ <post>[email protected]</post>
+
<subscribe>[email protected]</subscribe>
+
<unsubscribe>[email protected]</unsubscribe>
+
<archive>http://mail-archives.apache.org/mod_mbox/freemarker-notifications/</archive>
+ </mailingList>
+ <mailingList>
+ <name>FreeMarker management private</name>
+ <post>[email protected]</post>
+ </mailingList>
+ </mailingLists>
+
<scm>
- <url>https://github.com/sgoeschl/freemarker-cli</url>
-
<connection>scm:git:git://github.com/sgoeschl/freemarker-cli.git</connection>
-
<developerConnection>scm:git:[email protected]:sgoeschl/freemarker-cli.git</developerConnection>
- <tag>HEAD</tag>
+
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/freemarker-generator.git</connection>
+
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/freemarker-generator.git
+ </developerConnection>
+
<url>https://git-wip-us.apache.org/repos/asf?p=freemarker-generator.git</url>
+ <tag />
</scm>
<modules>
diff --git a/travis.bat b/travis.bat
index 7c91d30..9e033a6 100755
--- a/travis.bat
+++ b/travis.bat
@@ -17,7 +17,7 @@ REM specific language governing permissions and limitations
REM under the License.
REM
REM Simulate the Travis build locally
-CALL mvn clean install site
+CALL mvn clean install site site:stage
cd .\freemarker-generator-cli\target\appassembler\
CALL .\run-examples.bat
cd ..\..\..\freemarker-generator-maven-plugin-sample
diff --git a/travis.sh b/travis.sh
index 4892413..a962f8e 100755
--- a/travis.sh
+++ b/travis.sh
@@ -17,7 +17,7 @@
# under the License.
#
# Simulate the Travis build locally
-mvn clean install site
+mvn clean install site site:stage
cd ./freemarker-generator-cli/target/appassembler/
sh ./bin/freemarker-generator @examples.args
sh ./run-examples.sh
