Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix of a merge error after commit f10c09e #2

Merged
merged 26 commits into from
Jul 2, 2024
Merged

Fix of a merge error after commit f10c09e #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
87011e4
Changed the data bank to process the hits in AHDCEngine:
efuchey Feb 16, 2024
3863e74
Merge branch 'JeffersonLab:development' into development
efuchey Feb 22, 2024
10559cd
reversed the change in AHDCEngine.
efuchey Feb 29, 2024
8ac4238
Merge branch 'development' of github.com:efuchey/coatjava into develo…
efuchey Mar 1, 2024
e9377c4
Merge branch 'development' of github.com:efuchey/coatjava into develo…
efuchey Mar 18, 2024
81b637e
Merge branch 'JeffersonLab:development' into development
efuchey Apr 12, 2024
4046143
Merge branch 'JeffersonLab:development' into development
efuchey Apr 22, 2024
08cd675
Reverted (again???) the hit type to be read in AHDC reconstruction fr…
efuchey Apr 22, 2024
acde32e
Merge branch 'JeffersonLab:development' into development
efuchey May 14, 2024
0df2ea3
added RG-D network per request of the run group
raffaelladevita Jun 11, 2024
f137c4f
Merge branch 'JeffersonLab:development' into development
efuchey Jun 14, 2024
a145248
build(deps): bump org.glassfish.jaxb:jaxb-runtime from 2.3.2 to 4.0.5
dependabot[bot] Apr 15, 2024
3ab639c
build(deps): bump jakarta.xml.bind:jakarta.xml.bind-api
dependabot[bot] Apr 15, 2024
f3c6b7c
add required dependencies for Java 11+
baltzell Jun 14, 2024
4bee5ec
roll back
baltzell Jun 14, 2024
7c6593a
Merge branch 'JeffersonLab:development' into development
efuchey Jun 17, 2024
f10c09e
Merge pull request #1 from mpaolone/development
efuchey Jun 18, 2024
2e86a66
fixed a merge error that slipped through the cracks.
efuchey Jun 18, 2024
c56fb7a
build(deps): bump org.jacoco:jacoco-maven-plugin from 0.8.10 to 0.8.12
dependabot[bot] Jun 17, 2024
fe384e4
build(deps): bump org.apache.commons:commons-text from 1.11.0 to 1.12.0
dependabot[bot] Jun 17, 2024
a7c5035
version bump
baltzell Jun 20, 2024
cd96410
build(deps): bump org.apache.maven.plugins:maven-javadoc-plugin
dependabot[bot] Jun 24, 2024
db256de
build(deps): bump jakarta.xml.bind:jakarta.xml.bind-api
dependabot[bot] Jun 24, 2024
cbac197
api moved to different packages
baltzell Jun 24, 2024
bc19b74
build(deps): bump com.sun.xml.bind:jaxb-impl from 2.3.3 to 4.0.5
dependabot[bot] Jul 1, 2024
7514d48
Merge branch 'JeffersonLab:development' into development
efuchey Jul 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions common-tools/clara-io/pom.xml
View file
Open in desktop
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>clara-io</artifactId>
<version>10.1.1-SNAPSHOT</version>
<version>10.1.2-SNAPSHOT</version>
<packaging>jar</packaging>

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

<dependencies>
Expand Down Expand Up @@ -61,7 +61,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>1.11.0</version>
<version>1.12.0</version>
</dependency>

</dependencies>
Expand Down
20 changes: 10 additions & 10 deletions common-tools/clas-analysis/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,63 +3,63 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-analysis</artifactId>
<version>10.1.1-SNAPSHOT</version>
<version>10.1.2-SNAPSHOT</version>
<packaging>jar</packaging>

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

<dependencies>
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-utils</artifactId>
<version>10.1.1-SNAPSHOT</version>
<version>10.1.2-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-physics</artifactId>
<version>10.1.1-SNAPSHOT</version>
<version>10.1.2-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-io</artifactId>
<version>10.1.1-SNAPSHOT</version>
<version>10.1.2-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-geometry</artifactId>
<version>10.1.1-SNAPSHOT</version>
<version>10.1.2-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-jcsg</artifactId>
<version>10.1.1-SNAPSHOT</version>
<version>10.1.2-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>swim-tools</artifactId>
<version>10.1.1-SNAPSHOT</version>
<version>10.1.2-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-detector</artifactId>
<version>10.1.1-SNAPSHOT</version>
<version>10.1.2-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-reco</artifactId>
<version>10.1.1-SNAPSHOT</version>
<version>10.1.2-SNAPSHOT</version>
</dependency>
</dependencies>

Expand Down
10 changes: 5 additions & 5 deletions common-tools/clas-detector/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-detector</artifactId>
<version>10.1.1-SNAPSHOT</version>
<version>10.1.2-SNAPSHOT</version>
<packaging>jar</packaging>

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

<dependencies>
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-utils</artifactId>
<version>10.1.1-SNAPSHOT</version>
<version>10.1.2-SNAPSHOT</version>
</dependency>

<dependency>
Expand All @@ -29,13 +29,13 @@
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-io</artifactId>
<version>10.1.1-SNAPSHOT</version>
<version>10.1.2-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-geometry</artifactId>
<version>10.1.1-SNAPSHOT</version>
<version>10.1.2-SNAPSHOT</version>
</dependency>
</dependencies>

Expand Down
4 changes: 2 additions & 2 deletions common-tools/clas-geometry/pom.xml
View file
Open in desktop
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>10.1.1-SNAPSHOT</version>
<version>10.1.2-SNAPSHOT</version>
<packaging>jar</packaging>

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

<dependencies>
Expand Down
23 changes: 16 additions & 7 deletions common-tools/clas-io/pom.xml
View file
Open in desktop
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>10.1.1-SNAPSHOT</version>
<version>10.1.2-SNAPSHOT</version>
<packaging>jar</packaging>

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

<dependencies>
Expand All @@ -25,16 +25,25 @@
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>2.3.2</version>
<version>4.0.2</version>
</dependency>

<!-- Runtime, com.sun.xml.bind module -->
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>2.3.2</version>
<version>4.0.5</version>
<scope>runtime</scope>
</dependency>


<!-- Unnecessary prior to Java 11 -->
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>4.0.5</version>
<scope>runtime</scope>
</dependency>

<dependency>
<groupId>org.jlab.coda</groupId>
<artifactId>jevio</artifactId>
Expand Down Expand Up @@ -87,13 +96,13 @@
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-utils</artifactId>
<version>10.1.1-SNAPSHOT</version>
<version>10.1.2-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-logging</artifactId>
<version>10.1.1-SNAPSHOT</version>
<version>10.1.2-SNAPSHOT</version>
<scope>compile</scope>
</dependency>

Expand Down
12 changes: 3 additions & 9 deletions common-tools/clas-io/src/main/java/org/jlab/io/bos/BankDescriptorXML.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/

package org.jlab.io.bos;

import java.util.ArrayList;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlAttribute;
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlRootElement;

/**
*
Expand Down
18 changes: 6 additions & 12 deletions common-tools/clas-io/src/main/java/org/jlab/io/bos/BankDictionaryXML.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,15 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/

package org.jlab.io.bos;

import java.io.File;
import java.util.ArrayList;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.JAXBContext;
import jakarta.xml.bind.JAXBException;
import jakarta.xml.bind.Marshaller;
import jakarta.xml.bind.Unmarshaller;
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlRootElement;


/**
Expand Down
10 changes: 2 additions & 8 deletions common-tools/clas-io/src/main/java/org/jlab/io/bos/BankEntryXML.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/

package org.jlab.io.bos;

import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlAttribute;
import jakarta.xml.bind.annotation.XmlRootElement;

/**
*
Expand Down
8 changes: 4 additions & 4 deletions common-tools/clas-jcsg/pom.xml
View file
Open in desktop
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>10.1.1-SNAPSHOT</version>
<version>10.1.2-SNAPSHOT</version>
<packaging>jar</packaging>

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

<dependencies>
Expand All @@ -27,12 +27,12 @@
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-geometry</artifactId>
<version>10.1.1-SNAPSHOT</version>
<version>10.1.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-detector</artifactId>
<version>10.1.1-SNAPSHOT</version>
<version>10.1.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>java3d</groupId>
Expand Down
4 changes: 2 additions & 2 deletions common-tools/clas-logging/pom.xml
View file
Open in desktop
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-logging</artifactId>
<version>10.1.1-SNAPSHOT</version>
<version>10.1.2-SNAPSHOT</version>
<packaging>jar</packaging>

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

</project>
4 changes: 2 additions & 2 deletions common-tools/clas-math/pom.xml
View file
Open in desktop
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>10.1.1-SNAPSHOT</version>
<version>10.1.2-SNAPSHOT</version>
<packaging>jar</packaging>

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

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

<groupId>org.jlab.clas</groupId>
<artifactId>clas-physics</artifactId>
<version>10.1.1-SNAPSHOT</version>
<version>10.1.2-SNAPSHOT</version>
<packaging>jar</packaging>

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

</project>
Loading