Skip to content

Commit 61cc13c

Browse files
committed
Merge pull request #36 from phillipross/master
Modifications to source headers to use proper GPL 2.1+ license template
2 parents 518a9d7 + 7db1323 commit 61cc13c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+868
-595
lines changed

.idea/libraries/Maven__junit_junit_4_10.xml

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Maven__org_apache_ant_ant_1_7_0.xml

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Maven__org_apache_ant_ant_launcher_1_7_0.xml

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Maven__org_testng_testng_6_9_4.xml renamed to .idea/libraries/Maven__org_testng_testng_6_9_9.xml

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Maven__org_yaml_snakeyaml_1_15.xml

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jdbc/postgis-jdbc.iml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,13 @@
1616
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.3" level="project" />
1717
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.3" level="project" />
1818
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.12" level="project" />
19-
<orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.9.4" level="project" />
20-
<orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />
19+
<orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.9.9" level="project" />
20+
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.10" level="project" />
21+
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
2122
<orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.48" level="project" />
23+
<orderEntry type="library" scope="TEST" name="Maven: org.apache.ant:ant:1.7.0" level="project" />
24+
<orderEntry type="library" scope="TEST" name="Maven: org.apache.ant:ant-launcher:1.7.0" level="project" />
25+
<orderEntry type="library" scope="TEST" name="Maven: org.yaml:snakeyaml:1.15" level="project" />
26+
<orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />
2227
</component>
2328
</module>

jdbc/src/main/java/examples/TestAutoregister.java

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,22 @@
44
* PostGIS extension for PostgreSQL JDBC driver - example and test classes
55
*
66
* (C) 2005 Markus Schaber, [email protected]
7+
*
8+
* (C) 2015 Phillip Ross, [email protected]
79
*
8-
* This program is free software; you can redistribute it and/or modify it under
9-
* the terms of the GNU General Public License as published by the Free Software
10-
* Foundation; either version 2 of the License.
11-
*
12-
* This program is distributed in the hope that it will be useful, but WITHOUT
13-
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
14-
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
15-
* details.
16-
*
17-
* You should have received a copy of the GNU General Public License along with
18-
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple
19-
* Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
20-
* http://www.gnu.org.
10+
* This library is free software; you can redistribute it and/or
11+
* modify it under the terms of the GNU Lesser General Public
12+
* License as published by the Free Software Foundation; either
13+
* version 2.1 of the License, or (at your option) any later version.
14+
*
15+
* This library is distributed in the hope that it will be useful,
16+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
17+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
18+
* Lesser General Public License for more details.
19+
*
20+
* You should have received a copy of the GNU Lesser General Public
21+
* License along with this library; if not, write to the Free Software
22+
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
2123
*
2224
*/
2325

jdbc/src/main/java/org/postgis/ComposedGeom.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@
99
*
1010
* (C) 2015 Phillip Ross, [email protected]
1111
*
12-
* This library is free software; you can redistribute it and/or modify it under
13-
* the terms of the GNU Lesser General Public License as published by the Free
14-
* Software Foundation, either version 2.1 of the License.
15-
*
16-
* This library is distributed in the hope that it will be useful, but WITHOUT
17-
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
18-
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
19-
* details.
20-
*
21-
* You should have received a copy of the GNU Lesser General Public License
22-
* along with this library; if not, write to the Free Software Foundation, Inc.,
23-
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
24-
* http://www.gnu.org.
12+
* This library is free software; you can redistribute it and/or
13+
* modify it under the terms of the GNU Lesser General Public
14+
* License as published by the Free Software Foundation; either
15+
* version 2.1 of the License, or (at your option) any later version.
16+
*
17+
* This library is distributed in the hope that it will be useful,
18+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
19+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
20+
* Lesser General Public License for more details.
21+
*
22+
* You should have received a copy of the GNU Lesser General Public
23+
* License along with this library; if not, write to the Free Software
24+
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
2525
*
2626
*/
2727

jdbc/src/main/java/org/postgis/DriverWrapper.java

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,21 @@
55
*
66
* (C) 2005 Markus Schaber, [email protected]
77
*
8-
* This library is free software; you can redistribute it and/or modify it under
9-
* the terms of the GNU Lesser General Public License as published by the Free
10-
* Software Foundation, either version 2.1 of the License.
11-
*
12-
* This library is distributed in the hope that it will be useful, but WITHOUT
13-
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
14-
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
15-
* details.
16-
*
17-
* You should have received a copy of the GNU Lesser General Public License
18-
* along with this library; if not, write to the Free Software Foundation, Inc.,
19-
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
20-
* http://www.gnu.org.
8+
* (C) 2015 Phillip Ross, [email protected]
9+
*
10+
* This library is free software; you can redistribute it and/or
11+
* modify it under the terms of the GNU Lesser General Public
12+
* License as published by the Free Software Foundation; either
13+
* version 2.1 of the License, or (at your option) any later version.
14+
*
15+
* This library is distributed in the hope that it will be useful,
16+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
17+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
18+
* Lesser General Public License for more details.
19+
*
20+
* You should have received a copy of the GNU Lesser General Public
21+
* License along with this library; if not, write to the Free Software
22+
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
2123
*
2224
*/
2325

0 commit comments

Comments
 (0)