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

Jump to bottom

build: use aggregator POM #105

Merged
merged 2 commits into from
Sep 11, 2023
Merged

build: use aggregator POM #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bdbe994
build: use aggregator POM
c-dilks Sep 9, 2023
af72964
doc: formatting
c-dilks Sep 9, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
java-version: 11
distribution: zulu
- name: build
run: ./bin/build-all.sh
run: mvn package
- name: tar # to preserve any permissions
run: |
tar czvf build_detectors.tar.gz detectors/target
Expand Down
8 changes: 6 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,13 @@ git clone https://github.com/JeffersonLab/clas12-timeline.git

To build,
```bash
bin/build-all.sh # standard build
bin/build-all.sh clean # alternatively, a clean build
mvn package
```
#### Additional Build Notes:
- Use `mvn clean` if you want to clean build targets.
- The [top-level POM](pom.xml) includes the following submodules, which you may build individually with the `-f` option of `mvn`:
1. [`monitoring`](monitoring): generate histograms for detectors
1. [`detectors`](detectors): uses detector histograms to generate timelines

## Procedure

Expand Down
18 changes: 0 additions & 18 deletions bin/build-all.sh
View file
Open in desktop

This file was deleted.

39 changes: 16 additions & 23 deletions detectors/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,21 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<artifactId>clas12-timeline</artifactId>
<groupId>org.jlab.clas.timeline</groupId>
<version>1.0-SNAPSHOT</version>
</parent>

<groupId>org.jlab.clas.timeline</groupId>
<artifactId>timelineMon</artifactId>
<packaging>jar</packaging>
<artifactId>clas12-timeline-detectors</artifactId>
<version>1.0-SNAPSHOT</version>
<name>timelineMon</name>
<url>http://maven.apache.org</url>
<name>clas12-timeline-detectors</name>
<url>http://www.github.com/JeffersonLab/clas12-timeline</url>

<packaging>jar</packaging>

<build>
<plugins>
<plugin>
Expand All @@ -29,8 +38,8 @@
</plugins>
</build>


<dependencies>
<!-- https://mvnrepository.com/artifact/org.codehaus.groovy/groovy-all -->
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
Expand All @@ -43,34 +52,18 @@
</exclusion>
</exclusions>
</dependency>

<!-- https://mvnrepository.com/artifact/org.codehaus.groovy/groovy-dateutil -->
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-dateutil</artifactId>
<version>3.0.7</version>
</dependency>

<!-- https://mvnrepository.com/artifact/org.codehaus.gpars/gpars -->
<dependency>
<groupId>org.codehaus.gpars</groupId>
<artifactId>gpars</artifactId>
<version>1.1.0</version>
</dependency>

<dependency>
<groupId>org.jlab.coat</groupId>
<artifactId>coat-libs</artifactId>
<version>9.0.0-SNAPSHOT</version>
</dependency>
</dependencies>


<repositories>
<repository>
<id>clas12maven</id>
<url>https://clasweb.jlab.org/clas12maven</url>
</repository>
</repositories>

</project>
58 changes: 25 additions & 33 deletions monitoring/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.jlab.clas12.monitoring</groupId>
<artifactId>clas12-monitoring</artifactId>
<version>v0.0-alpha</version>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.jlab.coat</groupId>
<artifactId>coat-libs</artifactId>
<version>9.0.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
</dependencies>
<modelVersion>4.0.0</modelVersion>

<parent>
<artifactId>clas12-timeline</artifactId>
<groupId>org.jlab.clas.timeline</groupId>
<version>1.0-SNAPSHOT</version>
</parent>

<groupId>org.jlab.clas12.monitoring</groupId>
<artifactId>clas12-timeline-monitoring</artifactId>
<version>1.0-SNAPSHOT</version>
<name>clas12-timeline-monitoring</name>
<url>http://www.github.com/JeffersonLab/clas12-timeline</url>

<packaging>jar</packaging>

<build>
<extensions>
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh-external</artifactId>
<version>2.8</version>
</extension>
</extensions>
</build>

<build>
<extensions>
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh-external</artifactId>
<version>2.8</version>
</extension>
</extensions>
</build>
<repositories>
<repository>
<id>clas12maven</id>
<url>https://clasweb.jlab.org/clas12maven</url>
</repository>
</repositories>
<name>clas12-monitoring</name>
<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
</properties>
</project>
40 changes: 40 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>org.jlab.clas.timeline</groupId>
<artifactId>clas12-timeline</artifactId>
<version>1.0-SNAPSHOT</version>
<name>clas12-timeline</name>
<url>http://www.github.com/JeffersonLab/clas12-timeline</url>

<packaging>pom</packaging>

<modules>
<module>monitoring</module>
<module>detectors</module>
</modules>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
</properties>

<dependencies>
<dependency>
<groupId>org.jlab.coat</groupId>
<artifactId>coat-libs</artifactId>
<version>9.0.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
</dependencies>

<repositories>
<repository>
<id>clas12maven</id>
<url>https://clasweb.jlab.org/clas12maven</url>
</repository>
</repositories>

</project>