Merge remote-tracking branch 'origin/2.3.24-gae-stabilization' into 2.3
Conflicts:
build.xml
diff --git a/build.xml b/build.xml
index 154ac9e..676eb1c 100644
--- a/build.xml
+++ b/build.xml
@@ -31,6 +31,9 @@
<!-- Properties -->
<!-- ================================================================== -->
+ <!-- Maven project coordinates: -->
+ <property name="mavenGroupId" value="org.freemarker" />
+ <property name="mavenArtifactId" value="freemarker" />
<!-- Ivy project coordinates: -->
<property name="moduleOrg" value="org.freemarker" />
<property name="moduleName" value="freemarker" />
@@ -91,7 +94,7 @@
<filter token="version" value="${version}" />
<property name="dist.dir" value="build/dist" />
- <property name="dist.archiveBaseName" value="apache-freemarker-${version}" />
+ <property name="dist.archiveBaseName" value="apache-${mavenArtifactId}-${version}" />
<property name="dist.bin.dir" value="${dist.dir}/bin/${dist.archiveBaseName}" />
<property name="dist.src.dir" value="${dist.dir}/src/${dist.archiveBaseName}-src" />
@@ -781,8 +784,8 @@
<version>17</version>
</parent>
- <groupId>org.freemarker</groupId>
- <artifactId>freemarker</artifactId>
+ <groupId>${mavenGroupId}</groupId>
+ <artifactId>${mavenArtifactId}</artifactId>
<version>${mavenVersion}</version>
<packaging>jar</packaging>
@@ -858,27 +861,36 @@
<metainf dir="${dist.src.dir}" includes="LICENSE, NOTICE, DISCLAIMER" />
</jar>
+ <mkdir dir="build/javadoc-attachment-metainf"/>
+ <copy todir="build/javadoc-attachment-metainf">
+ <fileset dir="${dist.bin.dir}" includes="LICENSE, DISCLAIMER" />
+ </copy>
+ <copy file="src/dist/javadoc/META-INF/NOTICE" todir="build/javadoc-attachment-metainf" />
<jar destfile="build/maven-javadoc-attachment.jar">
<fileset dir="${dist.bin.dir}/documentation/_html/api" />
- <metainf dir="${dist.bin.dir}" includes="LICENSE, DISCLAIMER" />
+ <metainf dir="build/javadoc-attachment-metainf" includes="**/*" />
</jar>
+ <delete dir="build/javadoc-attachment-metainf" />
<!-- These were copy-pasted from the org.apacha:apache parent POM: -->
<property name="maven-server-id" value="apache.releases.https" />
- <property name="maven-repository-url" value="https://repository.apache.org/service/local/staging/deploy/maven2" />
- <!--
- Don't deploy to public snapshot repositories here!
- It isn't backward compatible as version ranges will pick them up.
- -->
+ <condition property="maven-repository-url"
+ value="https://repository.apache.org/content/repositories/snapshots/"
+ else="https://repository.apache.org/service/local/staging/deploy/maven2">
+ <matches pattern="-SNAPSHOT$" string="${mavenVersion}" />
+ </condition>
+ <!-- Snapshot repo: https://repository.apache.org/content/repositories/snapshots/ -->
<input
validargs="y,n"
addproperty="mavenUpload.answer"
>
You are about uploading
${dist.bin.dir}/freemarker.jar
-and its attachments to this Maven repository:
+and its attachments with Maven coordinates
+${mavenGroupId}:${mavenArtifactId}:${mavenVersion}
+to this Maven repository:
${maven-repository-url}
-with Maven artifact version number ${mavenVersion}.
+
Note that it's assumed that you have run `ant dist` just before this.
Proceed? </input>
<condition property="mavenUpload.yes">
diff --git a/src/dist/javadoc/META-INF/NOTICE b/src/dist/javadoc/META-INF/NOTICE
new file mode 100644
index 0000000..62a65c0
--- /dev/null
+++ b/src/dist/javadoc/META-INF/NOTICE
@@ -0,0 +1,5 @@
+Apache FreeMarker
+Copyright 2015-2016 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
