Skip to content

Commit c1674cb

Browse files
cffkcffk
committed
Revert back to net.sf for package coords. Update docs.
1 parent 36a576b commit c1674cb

File tree

26 files changed

+134
-209
lines changed

26 files changed

+134
-209
lines changed

‎HOWTO-RELEASE.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ package: javadoc sources
66
verify: sign
77

88
Version update checks
9-
https://search.maven.org/artifact/com.github.geographiclib/GeographicLib-Java/1.52/jar
9+
https://search.maven.org/artifact/net.sf.geographiclib/GeographicLib-Java/1.52/jar
1010
https://search.maven.org/artifact/net.sf.geographiclib/GeographicLib-Java/1.52/jar
1111
# Java
1212
# java/pom.xml java/*/pom.xml
13-
# java/src/main/java/com/github/geographiclib/package-info.java (date +
13+
# java/src/main/java/net/sf/geographiclib/package-info.java (date +
1414
# update change log)
1515
# (remember to remove SNAPSHOT from version number of lib in test programs)
1616
# probably should deploy a SNAPSHOT version of the lib to grease the

‎Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ WEBDEPLOY = $(USER),geographiclib@web.sourceforge.net:./htdocs
66
FRSDEPLOY = $(USER)@frs.sourceforge.net:/home/frs/project/geographiclib
77
FULLVERSION = $(shell grep /version pom.xml | tr '<>\n' / | cut -d/ -f3)
88
VERSION = $(shell echo $(FULLVERSION) | sed s/-.*//)
9-
SOURCEDIR = src/main/java/com/github/geographiclib
10-
TESTDIR = src/test/java/com/github/geographiclib
9+
SOURCEDIR = src/main/java/net/sf/geographiclib
10+
TESTDIR = src/test/java/net/sf/geographiclib
1111

1212
SOURCES= \
1313
$(SOURCEDIR)/Accumulator.java \
@@ -80,7 +80,7 @@ clean:
8080
mvn clean
8181

8282
reallyclean: clean
83-
rm -rf $(HOME)/.m2/repository/com/github/geographiclib/GeographicLib-Java/$(FULLVERSION)
83+
rm -rf $(HOME)/.m2/repository/net/sf/geographiclib/GeographicLib-Java/$(FULLVERSION)
8484

8585
checkversion:
8686
grep "<version>$(FULLVERSION)</version>" pom.xml \

‎README.md‎

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -14,36 +14,15 @@ The algorithms are documented in
1414
[Addenda](https://geographiclib.sourceforge.io/miscgeod-addenda.html).
1515

1616
The Java package is available
17-
[here OLD](https://search.maven.org/artifact/net.sf.geographiclib/GeographicLib-Java).
18-
[here NEW](https://search.maven.org/artifact/com.github.geographiclib/GeographicLib-Java).
17+
[here](https://search.maven.org/artifact/net.sf.geographiclib/GeographicLib-Java).
1918

2019
Here is the documentation on the
21-
[application programming interface](https://geographiclib.sourceforge.io/html/java/)
20+
[application programming interface](https://geographiclib.sourceforge.io/Java/doc/)
2221

23-
You can build the example programs using, for example,
22+
You can build the example programs `direct`, `inverse`, or
23+
`planimeter`, with, for example:
2424
```sh
25-
cd inverse/src/main/java
26-
javac -cp .:../../../../src/main/java Inverse.java
27-
echo -30 0 29.5 179.5 | java -cp .:../../../../src/main/java Inverse
28-
```
29-
30-
On Windows, change this to
31-
```sh
32-
cd inverse\src\main\java
33-
javac -cp .;../../../../src/main/java Inverse.java
34-
echo -30 0 29.5 179.5 | java -cp .;../../../../src/main/java Inverse
35-
```
36-
37-
Building with maven:
38-
```sh
39-
mvn install
4025
cd inverse
4126
mvn compile
4227
echo -30 0 29.5 179.5 | mvn -q exec:java
4328
```
44-
45-
Deploy the package with
46-
```sh
47-
mvn -q package -P release
48-
mvn clean deploy -P release
49-
```

‎direct/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<modelVersion>4.0.0</modelVersion>
88

9-
<groupId>com.github.geographiclib.example</groupId>
9+
<groupId>net.sf.geographiclib.example</groupId>
1010
<artifactId>Direct</artifactId>
1111
<name>Direct</name>
1212
<version>2.0-SNAPSHOT</version>
@@ -26,7 +26,7 @@
2626

2727
<dependencies>
2828
<dependency>
29-
<groupId>com.github.geographiclib</groupId>
29+
<groupId>net.sf.geographiclib</groupId>
3030
<artifactId>GeographicLib-Java</artifactId>
3131
<version>2.0-SNAPSHOT</version>
3232
</dependency>

‎direct/src/main/java/Direct.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
**********************************************************************/
44

55
import java.util.*;
6-
import com.github.geographiclib.*;
6+
import net.sf.geographiclib.*;
77
public class Direct {
88
/**
99
* Solve the direct geodesic problem.

‎inverse/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<modelVersion>4.0.0</modelVersion>
88

9-
<groupId>com.github.geographiclib.example</groupId>
9+
<groupId>net.sf.geographiclib.example</groupId>
1010
<artifactId>Inverse</artifactId>
1111
<name>Inverse</name>
1212
<version>2.0-SNAPSHOT</version>
@@ -26,7 +26,7 @@
2626

2727
<dependencies>
2828
<dependency>
29-
<groupId>com.github.geographiclib</groupId>
29+
<groupId>net.sf.geographiclib</groupId>
3030
<artifactId>GeographicLib-Java</artifactId>
3131
<version>2.0-SNAPSHOT</version>
3232
</dependency>

‎inverse/src/main/java/Inverse.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
**********************************************************************/
44

55
import java.util.*;
6-
import com.github.geographiclib.*;
6+
import net.sf.geographiclib.*;
77
/**
88
* Solve the inverse geodesic problem.
99
*

‎planimeter/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<modelVersion>4.0.0</modelVersion>
88

9-
<groupId>com.github.geographiclib.example</groupId>
9+
<groupId>net.sf.geographiclib.example</groupId>
1010
<artifactId>Planimeter</artifactId>
1111
<name>Planimeter</name>
1212
<version>2.0-SNAPSHOT</version>
@@ -26,7 +26,7 @@
2626

2727
<dependencies>
2828
<dependency>
29-
<groupId>com.github.geographiclib</groupId>
29+
<groupId>net.sf.geographiclib</groupId>
3030
<artifactId>GeographicLib-Java</artifactId>
3131
<version>2.0-SNAPSHOT</version>
3232
</dependency>

‎planimeter/src/main/java/Planimeter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
**********************************************************************/
44

55
import java.util.*;
6-
import com.github.geographiclib.*;
6+
import net.sf.geographiclib.*;
77
/**
88
* Compute the area of a geodesic polygon.
99
*

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<modelVersion>4.0.0</modelVersion>
88

9-
<groupId>com.github.geographiclib</groupId>
9+
<groupId>net.sf.geographiclib</groupId>
1010
<artifactId>GeographicLib-Java</artifactId>
1111
<version>2.0-SNAPSHOT</version>
1212

0 commit comments

Comments
 (0)