From fb3b4f5140081bb655fcaaa7ffb8d527b3f93236 Mon Sep 17 00:00:00 2001 From: Spencer Bliven Date: Fri, 29 Jun 2018 14:17:54 +0200 Subject: [PATCH 1/3] Tailor javadoc parameters for Java 7 Unfortunately, java 8 requires the --allow-script-in-comments for javadocs, while java 7 prohibits it. I'm now assuming the 4.2 branch will be built on java 7 and commenting out the param. --- pom.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index df71524514..3fd3596fc4 100644 --- a/pom.xml +++ b/pom.xml @@ -212,12 +212,14 @@ 2.10.3 - --allow-script-in-comments + From 701442ca8a8762e86eaa4a16e6ef8ef9f5a54885 Mon Sep 17 00:00:00 2001 From: Spencer Bliven Date: Fri, 29 Jun 2018 22:46:11 +0200 Subject: [PATCH 2/3] [maven-release-plugin] prepare release biojava-4.2.12 --- biojava-aa-prop/pom.xml | 6 +++--- biojava-alignment/pom.xml | 6 +++--- biojava-core/pom.xml | 2 +- biojava-genome/pom.xml | 6 +++--- biojava-integrationtest/pom.xml | 4 ++-- biojava-modfinder/pom.xml | 4 ++-- biojava-ontology/pom.xml | 2 +- biojava-phylo/pom.xml | 4 ++-- biojava-protein-disorder/pom.xml | 4 ++-- biojava-sequencing/pom.xml | 4 ++-- biojava-structure-gui/pom.xml | 6 +++--- biojava-structure/pom.xml | 6 +++--- biojava-survival/pom.xml | 2 +- biojava-ws/pom.xml | 4 ++-- pom.xml | 4 ++-- 15 files changed, 32 insertions(+), 32 deletions(-) diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml index 6352d5af40..0694a99737 100644 --- a/biojava-aa-prop/pom.xml +++ b/biojava-aa-prop/pom.xml @@ -2,7 +2,7 @@ biojava org.biojava - 4.2.12-SNAPSHOT + 4.2.12 4.0.0 biojava-aa-prop @@ -70,12 +70,12 @@ org.biojava biojava-core - 4.2.12-SNAPSHOT + 4.2.12 org.biojava biojava-structure - 4.2.12-SNAPSHOT + 4.2.12 diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml index f2c439e436..486fee9409 100644 --- a/biojava-alignment/pom.xml +++ b/biojava-alignment/pom.xml @@ -4,7 +4,7 @@ biojava org.biojava - 4.2.12-SNAPSHOT + 4.2.12 biojava-alignment biojava-alignment @@ -46,7 +46,7 @@ org.biojava biojava-core - 4.2.12-SNAPSHOT + 4.2.12 compile @@ -74,7 +74,7 @@ org.biojava biojava-phylo - 4.2.12-SNAPSHOT + 4.2.12 diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml index f77c604c2b..f51acc7edc 100644 --- a/biojava-core/pom.xml +++ b/biojava-core/pom.xml @@ -3,7 +3,7 @@ biojava org.biojava - 4.2.12-SNAPSHOT + 4.2.12 4.0.0 biojava-core diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml index ec6268d40b..2b36629f50 100644 --- a/biojava-genome/pom.xml +++ b/biojava-genome/pom.xml @@ -3,7 +3,7 @@ biojava org.biojava - 4.2.12-SNAPSHOT + 4.2.12 4.0.0 biojava-genome @@ -85,13 +85,13 @@ org.biojava biojava-core - 4.2.12-SNAPSHOT + 4.2.12 compile org.biojava biojava-alignment - 4.2.12-SNAPSHOT + 4.2.12 compile diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml index 1afb667b88..28d13754e9 100644 --- a/biojava-integrationtest/pom.xml +++ b/biojava-integrationtest/pom.xml @@ -4,7 +4,7 @@ biojava org.biojava - 4.2.12-SNAPSHOT + 4.2.12 biojava-integrationtest jar @@ -32,7 +32,7 @@ org.biojava biojava-structure - 4.2.12-SNAPSHOT + 4.2.12 diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml index 07e92365c6..9f4c8d622d 100644 --- a/biojava-modfinder/pom.xml +++ b/biojava-modfinder/pom.xml @@ -4,7 +4,7 @@ biojava org.biojava - 4.2.12-SNAPSHOT + 4.2.12 biojava-modfinder biojava-modfinder @@ -31,7 +31,7 @@ org.biojava biojava-structure - 4.2.12-SNAPSHOT + 4.2.12 jar compile diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml index b99724a119..c041220537 100644 --- a/biojava-ontology/pom.xml +++ b/biojava-ontology/pom.xml @@ -4,7 +4,7 @@ org.biojava biojava - 4.2.12-SNAPSHOT + 4.2.12 biojava-ontology diff --git a/biojava-phylo/pom.xml b/biojava-phylo/pom.xml index c1179d7e0b..016e0c1743 100644 --- a/biojava-phylo/pom.xml +++ b/biojava-phylo/pom.xml @@ -3,7 +3,7 @@ biojava org.biojava - 4.2.12-SNAPSHOT + 4.2.12 4.0.0 biojava-phylo @@ -44,7 +44,7 @@ org.biojava biojava-core - 4.2.12-SNAPSHOT + 4.2.12 compile diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml index 3b4217a3bd..da1d8f9953 100644 --- a/biojava-protein-disorder/pom.xml +++ b/biojava-protein-disorder/pom.xml @@ -3,7 +3,7 @@ biojava org.biojava - 4.2.12-SNAPSHOT + 4.2.12 biojava-protein-disorder jar @@ -63,7 +63,7 @@ org.biojava biojava-core - 4.2.12-SNAPSHOT + 4.2.12 diff --git a/biojava-sequencing/pom.xml b/biojava-sequencing/pom.xml index 4db70daf05..221a63a424 100644 --- a/biojava-sequencing/pom.xml +++ b/biojava-sequencing/pom.xml @@ -3,7 +3,7 @@ biojava org.biojava - 4.2.12-SNAPSHOT + 4.2.12 4.0.0 biojava-sequencing @@ -47,7 +47,7 @@ org.biojava biojava-core - 4.2.12-SNAPSHOT + 4.2.12 compile diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml index 8394355d6c..0dcf752da4 100644 --- a/biojava-structure-gui/pom.xml +++ b/biojava-structure-gui/pom.xml @@ -3,7 +3,7 @@ biojava org.biojava - 4.2.12-SNAPSHOT + 4.2.12 4.0.0 biojava-structure-gui @@ -25,13 +25,13 @@ org.biojava biojava-structure - 4.2.12-SNAPSHOT + 4.2.12 compile org.biojava biojava-core - 4.2.12-SNAPSHOT + 4.2.12 compile diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml index db2a12b7db..8e8e7d5b98 100644 --- a/biojava-structure/pom.xml +++ b/biojava-structure/pom.xml @@ -4,7 +4,7 @@ biojava org.biojava - 4.2.12-SNAPSHOT + 4.2.12 biojava-structure biojava-structure @@ -22,13 +22,13 @@ org.biojava biojava-alignment - 4.2.12-SNAPSHOT + 4.2.12 compile org.biojava biojava-core - 4.2.12-SNAPSHOT + 4.2.12 compile diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml index dd2c4e3ea1..6203145120 100644 --- a/biojava-survival/pom.xml +++ b/biojava-survival/pom.xml @@ -4,7 +4,7 @@ org.biojava biojava - 4.2.12-SNAPSHOT + 4.2.12 biojava-survival diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml index 365b3d3f65..fe81b67066 100644 --- a/biojava-ws/pom.xml +++ b/biojava-ws/pom.xml @@ -3,7 +3,7 @@ biojava org.biojava - 4.2.12-SNAPSHOT + 4.2.12 biojava-ws biojava-ws @@ -19,7 +19,7 @@ org.biojava biojava-core - 4.2.12-SNAPSHOT + 4.2.12 compile diff --git a/pom.xml b/pom.xml index 3fd3596fc4..9a255aacb8 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.biojava biojava pom - 4.2.12-SNAPSHOT + 4.2.12 biojava BioJava is an open-source project dedicated to providing a Java framework for processing biological data. It provides analytical and statistical routines, parsers for common file formats and allows the @@ -44,7 +44,7 @@ scm:git:git@github.com:biojava/biojava.git https://github.com/biojava/biojava - biojava-4.2.1 + biojava-4.2.12 diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml index 486fee9409..6b537a7a95 100644 --- a/biojava-alignment/pom.xml +++ b/biojava-alignment/pom.xml @@ -4,7 +4,7 @@ biojava org.biojava - 4.2.12 + 4.2.13-SNAPSHOT biojava-alignment biojava-alignment @@ -46,7 +46,7 @@ org.biojava biojava-core - 4.2.12 + 4.2.13-SNAPSHOT compile @@ -74,7 +74,7 @@ org.biojava biojava-phylo - 4.2.12 + 4.2.13-SNAPSHOT diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml index f51acc7edc..6f29afde32 100644 --- a/biojava-core/pom.xml +++ b/biojava-core/pom.xml @@ -3,7 +3,7 @@ biojava org.biojava - 4.2.12 + 4.2.13-SNAPSHOT 4.0.0 biojava-core diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml index 2b36629f50..742cb9eace 100644 --- a/biojava-genome/pom.xml +++ b/biojava-genome/pom.xml @@ -3,7 +3,7 @@ biojava org.biojava - 4.2.12 + 4.2.13-SNAPSHOT 4.0.0 biojava-genome @@ -85,13 +85,13 @@ org.biojava biojava-core - 4.2.12 + 4.2.13-SNAPSHOT compile org.biojava biojava-alignment - 4.2.12 + 4.2.13-SNAPSHOT compile diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml index 28d13754e9..b6e3a7f324 100644 --- a/biojava-integrationtest/pom.xml +++ b/biojava-integrationtest/pom.xml @@ -4,7 +4,7 @@ biojava org.biojava - 4.2.12 + 4.2.13-SNAPSHOT biojava-integrationtest jar @@ -32,7 +32,7 @@ org.biojava biojava-structure - 4.2.12 + 4.2.13-SNAPSHOT diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml index 9f4c8d622d..764818ab2b 100644 --- a/biojava-modfinder/pom.xml +++ b/biojava-modfinder/pom.xml @@ -4,7 +4,7 @@ biojava org.biojava - 4.2.12 + 4.2.13-SNAPSHOT biojava-modfinder biojava-modfinder @@ -31,7 +31,7 @@ org.biojava biojava-structure - 4.2.12 + 4.2.13-SNAPSHOT jar compile diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml index c041220537..cd0918a9b0 100644 --- a/biojava-ontology/pom.xml +++ b/biojava-ontology/pom.xml @@ -4,7 +4,7 @@ org.biojava biojava - 4.2.12 + 4.2.13-SNAPSHOT biojava-ontology diff --git a/biojava-phylo/pom.xml b/biojava-phylo/pom.xml index 016e0c1743..6387510e2e 100644 --- a/biojava-phylo/pom.xml +++ b/biojava-phylo/pom.xml @@ -3,7 +3,7 @@ biojava org.biojava - 4.2.12 + 4.2.13-SNAPSHOT 4.0.0 biojava-phylo @@ -44,7 +44,7 @@ org.biojava biojava-core - 4.2.12 + 4.2.13-SNAPSHOT compile diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml index da1d8f9953..b0f1c44787 100644 --- a/biojava-protein-disorder/pom.xml +++ b/biojava-protein-disorder/pom.xml @@ -3,7 +3,7 @@ biojava org.biojava - 4.2.12 + 4.2.13-SNAPSHOT biojava-protein-disorder jar @@ -63,7 +63,7 @@ org.biojava biojava-core - 4.2.12 + 4.2.13-SNAPSHOT diff --git a/biojava-sequencing/pom.xml b/biojava-sequencing/pom.xml index 221a63a424..f0ddb725de 100644 --- a/biojava-sequencing/pom.xml +++ b/biojava-sequencing/pom.xml @@ -3,7 +3,7 @@ biojava org.biojava - 4.2.12 + 4.2.13-SNAPSHOT 4.0.0 biojava-sequencing @@ -47,7 +47,7 @@ org.biojava biojava-core - 4.2.12 + 4.2.13-SNAPSHOT compile diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml index 0dcf752da4..f7036e5dd9 100644 --- a/biojava-structure-gui/pom.xml +++ b/biojava-structure-gui/pom.xml @@ -3,7 +3,7 @@ biojava org.biojava - 4.2.12 + 4.2.13-SNAPSHOT 4.0.0 biojava-structure-gui @@ -25,13 +25,13 @@ org.biojava biojava-structure - 4.2.12 + 4.2.13-SNAPSHOT compile org.biojava biojava-core - 4.2.12 + 4.2.13-SNAPSHOT compile diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml index 8e8e7d5b98..3c83321dcc 100644 --- a/biojava-structure/pom.xml +++ b/biojava-structure/pom.xml @@ -4,7 +4,7 @@ biojava org.biojava - 4.2.12 + 4.2.13-SNAPSHOT biojava-structure biojava-structure @@ -22,13 +22,13 @@ org.biojava biojava-alignment - 4.2.12 + 4.2.13-SNAPSHOT compile org.biojava biojava-core - 4.2.12 + 4.2.13-SNAPSHOT compile diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml index 6203145120..586c780fbb 100644 --- a/biojava-survival/pom.xml +++ b/biojava-survival/pom.xml @@ -4,7 +4,7 @@ org.biojava biojava - 4.2.12 + 4.2.13-SNAPSHOT biojava-survival diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml index fe81b67066..6b50d66b57 100644 --- a/biojava-ws/pom.xml +++ b/biojava-ws/pom.xml @@ -3,7 +3,7 @@ biojava org.biojava - 4.2.12 + 4.2.13-SNAPSHOT biojava-ws biojava-ws @@ -19,7 +19,7 @@ org.biojava biojava-core - 4.2.12 + 4.2.13-SNAPSHOT compile diff --git a/pom.xml b/pom.xml index 9a255aacb8..406e596fc2 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.biojava biojava pom - 4.2.12 + 4.2.13-SNAPSHOT biojava BioJava is an open-source project dedicated to providing a Java framework for processing biological data. It provides analytical and statistical routines, parsers for common file formats and allows the @@ -44,7 +44,7 @@ scm:git:git@github.com:biojava/biojava.git https://github.com/biojava/biojava - biojava-4.2.12 + biojava-4.2.1