Skip to content
This repository has been archived by the owner on May 18, 2023. It is now read-only.

Commit

Permalink
Merge pull request #624 from JeffersonLab/versionBump
Browse files Browse the repository at this point in the history 
Version bump and groot upgrade
  • Loading branch information
@raffaelladevita
raffaelladevita authored Oct 23, 2020
2 parents 62ac36b + 3775ffb commit 401de76
Show file tree
Hide file tree
Showing 35 changed files with 123 additions and 122 deletions.
16 changes: 8 additions & 8 deletions common-tools/clas-analysis/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-analysis</artifactId>
<version>6.5.11-SNAPSHOT</version>
<version>6.5.12-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.jlab.clas</groupId>
<artifactId>clas12rec</artifactId>
<relativePath>../../parent/pom.xml</relativePath>
<version>6.5.11-SNAPSHOT</version>
<version>6.5.12-SNAPSHOT</version>
</parent>

<build>
Expand All @@ -30,37 +30,37 @@
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-utils</artifactId>
<version>6.5.11-SNAPSHOT</version>
<version>6.5.12-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-physics</artifactId>
<version>6.5.11-SNAPSHOT</version>
<version>6.5.12-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-io</artifactId>
<version>6.5.11-SNAPSHOT</version>
<version>6.5.12-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-geometry</artifactId>
<version>6.5.11-SNAPSHOT</version>
<version>6.5.12-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-detector</artifactId>
<version>6.5.11-SNAPSHOT</version>
<version>6.5.12-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab</groupId>
<artifactId>groot</artifactId>
<version>2.2.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</dependency>
</dependencies>

Expand Down
5 changes: 3 additions & 2 deletions common-tools/clas-analysis/src/main/java/org/jlab/analysis/plotting/TCanvasP.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,16 @@ public TCanvasP(String name, int xsize, int ysize, int nColumns, int nRows) {
this.divide(nColumns, nRows);
}

@Override
public void divide(int nColumns, int nRows) {
@Override
public TCanvasP divide(int nColumns, int nRows) {
super.divide(nColumns, nRows);
this.nColumns = nColumns;
this.nRows = nRows;
if(nColumns*nRows <= 9) setFontSizes(22);
else if(nColumns*nRows > 9 && nColumns*nRows <= 16) setFontSizes(20);
else if(nColumns*nRows > 16 && nColumns*nRows <= 25) setFontSizes(16);
else setFontSizes(14);
return this;
}

public void setFontSizes(int size) {
Expand Down
12 changes: 6 additions & 6 deletions common-tools/clas-detector/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-detector</artifactId>
<version>6.5.11-SNAPSHOT</version>
<version>6.5.12-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.jlab.clas</groupId>
<artifactId>clas12rec</artifactId>
<relativePath>../../parent/pom.xml</relativePath>
<version>6.5.11-SNAPSHOT</version>
<version>6.5.12-SNAPSHOT</version>
</parent>

<build>
Expand All @@ -30,7 +30,7 @@
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-utils</artifactId>
<version>6.5.11-SNAPSHOT</version>
<version>6.5.12-SNAPSHOT</version>
</dependency>

<dependency>
Expand All @@ -42,19 +42,19 @@
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-io</artifactId>
<version>6.5.11-SNAPSHOT</version>
<version>6.5.12-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-geometry</artifactId>
<version>6.5.11-SNAPSHOT</version>
<version>6.5.12-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab</groupId>
<artifactId>groot</artifactId>
<version>2.2.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</dependency>
</dependencies>

Expand Down
4 changes: 2 additions & 2 deletions common-tools/clas-geometry/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-geometry</artifactId>
<version>6.5.11-SNAPSHOT</version>
<version>6.5.12-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.jlab.clas</groupId>
<artifactId>clas12rec</artifactId>
<relativePath>../../parent/pom.xml</relativePath>
<version>6.5.11-SNAPSHOT</version>
<version>6.5.12-SNAPSHOT</version>
</parent>

<build>
Expand Down
6 changes: 3 additions & 3 deletions common-tools/clas-io/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-io</artifactId>
<version>6.5.11-SNAPSHOT</version>
<version>6.5.12-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.jlab.clas</groupId>
<artifactId>clas12rec</artifactId>
<relativePath>../../parent/pom.xml</relativePath>
<version>6.5.11-SNAPSHOT</version>
<version>6.5.12-SNAPSHOT</version>
</parent>

<build>
Expand Down Expand Up @@ -75,7 +75,7 @@
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-utils</artifactId>
<version>6.5.11-SNAPSHOT</version>
<version>6.5.12-SNAPSHOT</version>
</dependency>
</dependencies>

Expand Down
8 changes: 4 additions & 4 deletions common-tools/clas-jcsg/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-jcsg</artifactId>
<version>6.5.11-SNAPSHOT</version>
<version>6.5.12-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.jlab.clas</groupId>
<artifactId>clas12rec</artifactId>
<relativePath>../../parent/pom.xml</relativePath>
<version>6.5.11-SNAPSHOT</version>
<version>6.5.12-SNAPSHOT</version>
</parent>

<build>
Expand Down Expand Up @@ -40,12 +40,12 @@
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-geometry</artifactId>
<version>6.5.11-SNAPSHOT</version>
<version>6.5.12-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-detector</artifactId>
<version>6.5.11-SNAPSHOT</version>
<version>6.5.12-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>java3d</groupId>
Expand Down
4 changes: 2 additions & 2 deletions common-tools/clas-math/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-math</artifactId>
<version>6.5.11-SNAPSHOT</version>
<version>6.5.12-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.jlab.clas</groupId>
<artifactId>clas12rec</artifactId>
<relativePath>../../parent/pom.xml</relativePath>
<version>6.5.11-SNAPSHOT</version>
<version>6.5.12-SNAPSHOT</version>
</parent>

<build>
Expand Down
4 changes: 2 additions & 2 deletions common-tools/clas-physics/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>org.jlab.clas</groupId>
<artifactId>clas-physics</artifactId>
<version>6.5.11-SNAPSHOT</version>
<version>6.5.12-SNAPSHOT</version>
<packaging>jar</packaging>
<build>
<plugins>
Expand All @@ -23,7 +23,7 @@
<groupId>org.jlab.clas</groupId>
<artifactId>clas12rec</artifactId>
<relativePath>../../parent/pom.xml</relativePath>
<version>6.5.11-SNAPSHOT</version>
<version>6.5.12-SNAPSHOT</version>
</parent>

</project>
16 changes: 8 additions & 8 deletions common-tools/clas-reco/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-reco</artifactId>
<version>6.5.11-SNAPSHOT</version>
<version>6.5.12-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.jlab.clas</groupId>
<artifactId>clas12rec</artifactId>
<relativePath>../../parent/pom.xml</relativePath>
<version>6.5.11-SNAPSHOT</version>
<version>6.5.12-SNAPSHOT</version>
</parent>

<build>
Expand All @@ -37,7 +37,7 @@
<dependency>
<groupId>org.jlab</groupId>
<artifactId>groot</artifactId>
<version>2.2.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -67,7 +67,7 @@
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-math</artifactId>
<version>6.5.11-SNAPSHOT</version>
<version>6.5.12-SNAPSHOT</version>
</dependency>
<!--
<dependency>
Expand All @@ -80,25 +80,25 @@
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-io</artifactId>
<version>6.5.11-SNAPSHOT</version>
<version>6.5.12-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-physics</artifactId>
<version>6.5.11-SNAPSHOT</version>
<version>6.5.12-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-utils</artifactId>
<version>6.5.11-SNAPSHOT</version>
<version>6.5.12-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-detector</artifactId>
<version>6.5.11-SNAPSHOT</version>
<version>6.5.12-SNAPSHOT</version>
</dependency>

<!--
Expand Down
4 changes: 2 additions & 2 deletions common-tools/clas-utils/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-utils</artifactId>
<version>6.5.11-SNAPSHOT</version>
<version>6.5.12-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.jlab.clas</groupId>
<artifactId>clas12rec</artifactId>
<relativePath>../../parent/pom.xml</relativePath>
<version>6.5.11-SNAPSHOT</version>
<version>6.5.12-SNAPSHOT</version>
</parent>

<build>
Expand Down
8 changes: 4 additions & 4 deletions common-tools/cnuphys/ced/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,25 +69,25 @@
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clasrec-main</artifactId>
<version>6.5.11-SNAPSHOT</version>
<version>6.5.12-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-io</artifactId>
<version>6.5.11-SNAPSHOT</version>
<version>6.5.12-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-geometry</artifactId>
<version>6.5.11-SNAPSHOT</version>
<version>6.5.12-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-detector</artifactId>
<version>6.5.11-SNAPSHOT</version>
<version>6.5.12-SNAPSHOT</version>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion common-tools/cnuphys/magfield/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-math</artifactId>
<version>6.5.11-SNAPSHOT</version>
<version>6.5.12-SNAPSHOT</version>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion common-tools/cnuphys/swimmer/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-math</artifactId>
<version>6.5.11-SNAPSHOT</version>
<version>6.5.12-SNAPSHOT</version>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion common-tools/coat-lib/deployDistribution.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ cd `dirname $0`
# Script is exporting existing Jar files to repository
#-------------------------------------------------------------------------------------------------

VERSION=6.5.11
VERSION=6.5.12

mvn org.apache.maven.plugins:maven-install-plugin:2.5.2:install-file \
-Dfile=target/coat-libs-${VERSION}-SNAPSHOT.jar \
Expand Down
Loading

0 comments on commit 401de76

Please sign in to comment.