Skip to content

Commit ed7f517

Browse files
committed
cleanup, set versions etc...
Signed-off-by: Terence Parr <parrt@antlr.org>
1 parent ee04b8a commit ed7f517

5 files changed

Lines changed: 34 additions & 399 deletions

File tree

doc/java.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
## Installation
44

5-
All you need to do is get the StringTemplate jar into your CLASSPATH as well as its dependent ANTLR jar. [Download Java StringTemplate 4.3.1 binary jar](http://www.stringtemplate.org/download.html) and put into your favorite lib directory such as `/usr/local/lib` on UNIX. Add to your CLASSPATH. On UNIX that looks like
5+
All you need to do is get the StringTemplate jar into your CLASSPATH as well as its dependent ANTLR jar. [Download Java StringTemplate 4.3.2 binary jar](http://www.stringtemplate.org/download.html) and put into your favorite lib directory such as `/usr/local/lib` on UNIX. Add to your CLASSPATH. On UNIX that looks like
66

77
```bash
8-
$ export CLASSPATH="/usr/local/lib/ST-4.3.1.jar:$CLASSPATH"
8+
$ export CLASSPATH="/usr/local/lib/ST-4.3.2.jar:$CLASSPATH"
99
```
1010

1111
Java will now see all the libraries necessary to execute ST stuff. Also, check out the [StringTemplate repo](https://github.com/antlr/stringtemplate4).

doc/releasing-st4.md

Lines changed: 28 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Cutting an ANTLR Release
1+
# Cutting an ST Release
22

33
## Github
44

@@ -9,23 +9,23 @@ Create a pre-release or full release at github.
99
Wack any existing tag as mvn will create one and it fails if already there.
1010

1111
```
12-
$ git tag -d 4.1
13-
$ git push origin :refs/tags/4.1
14-
$ git push upstream :refs/tags/4.1
12+
$ git tag -d 4.3.2
13+
$ git push origin :refs/tags/4.3.2
14+
$ git push upstream :refs/tags/4.3.2
1515
```
1616

1717
## Bump version
1818

19-
Here is a simple script to display any line from the critical files with, say, `4.0.8` in it:
19+
Here is a simple script to display any line from the critical files with, say, `4.3.2` in it:
2020

2121
```bash
22-
find . -type f -exec grep -l '4\.0\.8' {} \;
22+
find . -type f -exec grep -l '4\.3\.2' {} \;
2323
```
2424

2525
For sure change `ST.java`:
2626

2727
```java
28-
public final static String VERSION = "4.1";
28+
public final static String VERSION = "4.3.2";
2929
```
3030

3131
Commit to repository.
@@ -77,24 +77,24 @@ Here is the file template
7777

7878
## Maven deploy snapshot
7979

80-
The goal is to get a snapshot, such as `4.3-SNAPSHOT`, to the [staging server](https://oss.sonatype.org/#stagingRepositories).
80+
The goal is to get a snapshot, such as `4.3.2-SNAPSHOT`, to the [staging server](https://oss.sonatype.org/#stagingRepositories).
8181

8282
Do this:
8383

8484
```bash
85-
$ export JAVA_HOME=`/usr/libexec/java_home -v 1.8`; mvn deploy -DskipTests
85+
$ mvn deploy -DskipTests
8686
...
8787
[INFO] --- maven-deploy-plugin:2.7:deploy (default-deploy) @ ST4 ---
88-
Downloading from sonatype-nexus-snapshots: https://oss.sonatype.org/content/repositories/snapshots/org/antlr/ST4/4.1-SNAPSHOT/maven-metadata.xml
89-
Downloaded from sonatype-nexus-snapshots: https://oss.sonatype.org/content/repositories/snapshots/org/antlr/ST4/4.1-SNAPSHOT/maven-metadata.xml (756 B at 925 B/s)
90-
Uploading to sonatype-nexus-snapshots: https://oss.sonatype.org/content/repositories/snapshots/org/antlr/ST4/4.1-SNAPSHOT/ST4-4.1-20181110.190125-4.jar
91-
Uploaded to sonatype-nexus-snapshots: https://oss.sonatype.org/content/repositories/snapshots/org/antlr/ST4/4.1-SNAPSHOT/ST4-4.1-20181110.190125-4.jar (302 kB at 257 kB/s)
92-
Uploading to sonatype-nexus-snapshots: https://oss.sonatype.org/content/repositories/snapshots/org/antlr/ST4/4.1-SNAPSHOT/ST4-4.1-20181110.190125-4.pom
93-
Uploaded to sonatype-nexus-snapshots: https://oss.sonatype.org/content/repositories/snapshots/org/antlr/ST4/4.1-SNAPSHOT/ST4-4.1-20181110.190125-4.pom (2.6 kB at 4.1 kB/s)
88+
Downloading from sonatype-nexus-snapshots: https://oss.sonatype.org/content/repositories/snapshots/org/antlr/ST4/4.3.2-SNAPSHOT/maven-metadata.xml
89+
Downloaded from sonatype-nexus-snapshots: https://oss.sonatype.org/content/repositories/snapshots/org/antlr/ST4/4.3.2-SNAPSHOT/maven-metadata.xml (756 B at 925 B/s)
90+
Uploading to sonatype-nexus-snapshots: https://oss.sonatype.org/content/repositories/snapshots/org/antlr/ST4/4.3.2-SNAPSHOT/ST4-4.3.2-20181110.190125-4.jar
91+
Uploaded to sonatype-nexus-snapshots: https://oss.sonatype.org/content/repositories/snapshots/org/antlr/ST4/4.3.2-SNAPSHOT/ST4-4.3.2-20181110.190125-4.jar (302 kB at 257 kB/s)
92+
Uploading to sonatype-nexus-snapshots: https://oss.sonatype.org/content/repositories/snapshots/org/antlr/ST4/4.3.2-SNAPSHOT/ST4-4.3.2-20181110.190125-4.pom
93+
Uploaded to sonatype-nexus-snapshots: https://oss.sonatype.org/content/repositories/snapshots/org/antlr/ST4/4.3.2-SNAPSHOT/ST4-4.3.2-20181110.190125-4.pom (2.6 kB at 4.3.2 kB/s)
9494
Downloading from sonatype-nexus-snapshots: https://oss.sonatype.org/content/repositories/snapshots/org/antlr/ST4/maven-metadata.xml
9595
Downloaded from sonatype-nexus-snapshots: https://oss.sonatype.org/content/repositories/snapshots/org/antlr/ST4/maven-metadata.xml (370 B at 1.7 kB/s)
96-
Uploading to sonatype-nexus-snapshots: https://oss.sonatype.org/content/repositories/snapshots/org/antlr/ST4/4.1-SNAPSHOT/maven-metadata.xml
97-
Uploaded to sonatype-nexus-snapshots: https://oss.sonatype.org/content/repositories/snapshots/org/antlr/ST4/4.1-SNAPSHOT/maven-metadata.xml (756 B at 1.2 kB/s)
96+
Uploading to sonatype-nexus-snapshots: https://oss.sonatype.org/content/repositories/snapshots/org/antlr/ST4/4.3.2-SNAPSHOT/maven-metadata.xml
97+
Uploaded to sonatype-nexus-snapshots: https://oss.sonatype.org/content/repositories/snapshots/org/antlr/ST4/4.3.2-SNAPSHOT/maven-metadata.xml (756 B at 1.2 kB/s)
9898
Uploading to sonatype-nexus-snapshots: https://oss.sonatype.org/content/repositories/snapshots/org/antlr/ST4/maven-metadata.xml
9999
Uploaded to sonatype-nexus-snapshots: https://oss.sonatype.org/content/repositories/snapshots/org/antlr/ST4/maven-metadata.xml (370 B at 599 B/s)
100100
[INFO] ------------------------------------------------------------------------
@@ -110,13 +110,13 @@ Uploaded to sonatype-nexus-snapshots: https://oss.sonatype.org/content/repositor
110110
The maven deploy lifecycle phased deploys the artifacts and the poms for the ANTLR project to the [sonatype remote staging server](https://oss.sonatype.org/content/repositories/snapshots/org/antlr/ST4).
111111

112112
```bash
113-
export JAVA_HOME=`/usr/libexec/java_home -v 1.8`; mvn deploy -DskipTests
113+
mvn deploy -DskipTests
114114
```
115115

116116
Now, do this:
117117

118118
```bash
119-
export JAVA_HOME=`/usr/libexec/java_home -v 1.8`; mvn release:prepare -Darguments="-DskipTests"
119+
mvn release:prepare -Darguments="-DskipTests"
120120
```
121121

122122
Hm...per https://github.com/keybase/keybase-issues/issues/1712 we need this to make gpg work (needed for releasing not build):
@@ -125,36 +125,20 @@ Hm...per https://github.com/keybase/keybase-issues/issues/1712 we need this to m
125125
export GPG_TTY=$(tty)
126126
```
127127

128-
Side note to set jdk 1.8 on os x:
129-
130-
```bash
131-
alias java='/Library/Java/JavaVirtualMachines/jdk1.7.0_21.jdk/Contents/Home/bin/java'
132-
alias javac='/Library/Java/JavaVirtualMachines/jdk1.7.0_21.jdk/Contents/Home/bin/javac'
133-
alias javadoc='/Library/Java/JavaVirtualMachines/jdk1.7.0_21.jdk/Contents/Home/bin/javadoc'
134-
alias jar='/Library/Java/JavaVirtualMachines/jdk1.7.0_21.jdk/Contents/Home/bin/jar'
135-
export JAVA_HOME=`/usr/libexec/java_home -v 1.8`
136-
```
137-
138-
But I think just this on front of mvn works:
139-
140-
```
141-
export JAVA_HOME=`/usr/libexec/java_home -v 1.8`; mvn ...
142-
```
143-
144128
It will start out by asking you the version number:
145129

146130
```
147131
...
148-
What is the release version for "StringTemplate 4"? (org.antlr:ST4) 4.1: :
149-
What is SCM release tag or label for "StringTemplate 4"? (org.antlr:ST4) ST4-4.1: : 4.1
150-
What is the new development version for "StringTemplate 4"? (org.antlr:ST4) 4.2-SNAPSHOT: : 4.2.1-SNAPSHOT
132+
What is the release version for "StringTemplate 4"? (org.antlr:ST4) 4.3.2: :
133+
What is SCM release tag or label for "StringTemplate 4"? (org.antlr:ST4) ST4-4.3.2: : 4.3.2
134+
What is the new development version for "StringTemplate 4"? (org.antlr:ST4) 4.3.3-SNAPSHOT: : 4.3.3-SNAPSHOT
151135
...
152136
```
153137

154138
Now release
155139

156140
```bash
157-
export JAVA_HOME=`/usr/libexec/java_home -v 1.8`; mvn release:perform -Darguments="-DskipTests"
141+
mvn release:perform -Darguments="-DskipTests"
158142
```
159143

160144
Maven will use git to push pom.xml changes.
@@ -165,15 +149,16 @@ Now, go here:
165149

166150
and on the left click "Staging Repositories". You click the staging repo and close it, then you refresh, click it and release it. It's done when you see it here:
167151

168-
&nbsp;&nbsp;&nbsp;&nbsp;[http://repo1.maven.org/maven2/org/antlr/ST4/](http://repo1.maven.org/maven2/org/antlr/ST4/)
152+
&nbsp;&nbsp;&nbsp;&nbsp;[https://oss.sonatype.org/service/local/repositories/releases/content/org/antlr/ST4/4.3.2](https://oss.sonatype.org/service/local/repositories/releases/content/org/antlr/ST4/4.3.2)
169153

154+
All releases should be here: [https://repo1.maven.org/maven2/org/antlr/ST4/](https://repo1.maven.org/maven2/org/antlr/ST4/).
170155

171156
Seems to take a while to propogate.
172157

173158
## Javadoc
174159

175160
```bash
176-
export JAVA_HOME=`/usr/libexec/java_home -v 1.8`; mvn javadoc:javadoc
161+
mvn javadoc:javadoc
177162
```
178163

179164
```bash
@@ -184,9 +169,9 @@ cp -r ~/antlr/code/stringtemplate4/target/apidocs/* ~/antlr/sites/website-st4/ap
184169
Copy the jars to stringtemplate.org site and update download/index.html
185170
186171
```bash
187-
cp ~/.m2/repository/org/antlr/ST4/4.3/ST4-4.3.jar ~/antlr/sites/website-st4/download/ST-4.3.jar
172+
cp ~/.m2/repository/org/antlr/ST4/4.3.2/ST4-4.3.2.jar ~/antlr/sites/website-st4/download/ST-4.3.2.jar
188173
cd ~/antlr/sites/website-st4/download
189-
git add ST-4.3.jar
174+
git add ST-4.3.2.jar
190175
```
191176

192177
## Update site

doxyfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#---------------------------------------------------------------------------
66
DOXYFILE_ENCODING = UTF-8
77
PROJECT_NAME = "StringTemplate 4 API"
8-
PROJECT_NUMBER = 4.3.1
8+
PROJECT_NUMBER = 4.3.2
99
OUTPUT_DIRECTORY = api
1010
CREATE_SUBDIRS = NO
1111
OUTPUT_LANGUAGE = English

0 commit comments

Comments
 (0)