Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
57c6680
Prepare next release 6.5.0-SNAPSHOT
juanfeSanahuja Jan 29, 2025
5b662dd
FIX CI/CD workflow to delete task docker images on merge fails #TASK-…
juanfeSanahuja Feb 19, 2025
6758de2
Merge pull request #719 from opencb/TASK-6880
juanfeSanahuja Feb 19, 2025
a9f28ff
Prepare Port Patch 5.8.5 -> 6.5.0 XB 1.10.9 - 2.5.0 #TASK-7531
juanfeSanahuja May 7, 2025
92d9979
Merge branch 'release-6.x.x' into TASK-7531
juanfeSanahuja May 7, 2025
82480f1
lib: resolve conflics in CosmicIndexer, #TASK-7531
jtarraga May 7, 2025
3e3bd64
Merge pull request #724 from opencb/TASK-7531
juanfeSanahuja Jun 2, 2025
b40f6b2
Fix org in cellbase for deploy docker #TASK-7531
juanfeSanahuja Jun 2, 2025
06398e9
Merge branch 'release-6.x.x' of https://github.com/opencb/cellbase in…
juanfeSanahuja Jun 2, 2025
08359f8
Prepare release 6.5.0
juanfeSanahuja Jun 5, 2025
f984423
Prepare next release 6.6.0-SNAPSHOT
juanfeSanahuja Jun 5, 2025
208d660
pom: update mongodb driver to 4.11.5, #TASK-7775, #TASK-7772
jtarraga Jun 26, 2025
232ff24
Added org param in docker build #TASK-7549
juanfeSanahuja Jun 27, 2025
03dfac3
Merge branch 'release-6.x.x' of https://github.com/opencb/cellbase in…
juanfeSanahuja Jun 27, 2025
31a8bc9
Merge branch 'release-6.x.x' into TASK-7772
ifiancu Jun 27, 2025
bec25af
Added org param in docker build #TASK-7549
juanfeSanahuja Jun 27, 2025
17c825d
Merge branch 'release-6.x.x' into TASK-7772
juanfeSanahuja Jun 27, 2025
7942acb
Merge pull request #732 from opencb/TASK-7772
pfurio Jul 7, 2025
097db19
pom: Update pom to adapt to the new central maven repository requisit…
juanfeSanahuja Aug 5, 2025
c03a962
Prepare release 6.6.0
juanfeSanahuja Aug 5, 2025
5004476
Preparing port patch from version 6.6.0 to 7.1.0-SNAPSHOT
juanfeSanahuja Aug 11, 2025
001817b
Merge branch 'release-7.x.x' into TASK-7843
juanfeSanahuja Aug 11, 2025
03d0267
fix deploy-zetta-docker #TASK-7843
juanfeSanahuja Aug 11, 2025
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/pull-request-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ jobs:
uses: opencb/cellbase/.github/workflows/reusable-delete-docker.yml@develop
with:
task: ${{ github.head_ref }}
secrets: inherit
secrets: inherit
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ jobs:

release:
uses: opencb/java-common-libs/.github/workflows/release-github-workflow.yml@develop
needs: [deploy-maven, deploy-docker, deploy-python]
needs: [deploy-maven, deploy-zetta-docker, deploy-python]
1 change: 1 addition & 0 deletions cellbase-app/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

<artifactId>cellbase-app</artifactId>
<packaging>jar</packaging>
<name>OpenCB CellBase Application</name>

<properties>
<build.dir>${project.basedir}/../build</build.dir>
Expand Down
1 change: 1 addition & 0 deletions cellbase-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

<artifactId>cellbase-client</artifactId>
<packaging>jar</packaging>
<name>OpenCB CellBase Client</name>

<dependencies>
<dependency>
Expand Down
1 change: 1 addition & 0 deletions cellbase-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

<artifactId>cellbase-core</artifactId>
<packaging>jar</packaging>
<name>OpenCB CellBase Core</name>

<dependencies>
<dependency>
Expand Down
1 change: 1 addition & 0 deletions cellbase-lib/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

<artifactId>cellbase-lib</artifactId>
<packaging>jar</packaging>
<name>OpenCB CellBase Library</name>

<dependencies>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import org.opencb.biodata.formats.io.FileFormatException;
import org.opencb.biodata.formats.variant.cosmic.CosmicParser;
import org.opencb.cellbase.core.exception.CellBaseException;

import org.opencb.cellbase.lib.EtlCommons;
import org.rocksdb.RocksDB;
import org.rocksdb.RocksDBException;
Expand Down
1 change: 1 addition & 0 deletions cellbase-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

<artifactId>cellbase-server</artifactId>
<packaging>war</packaging>
<name>OpenCB CellBase Server</name>

<dependencies>
<dependency>
Expand Down
60 changes: 42 additions & 18 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@
<swagger-annotations.version>1.6.5</swagger-annotations.version>
<javax.servlet-api.version>3.1.0</javax.servlet-api.version>
<poi.version>4.1.2</poi.version>
<mongodb.version>4.11.4</mongodb.version>
<mongodb.version>4.11.5</mongodb.version>

<junit.version>4.12</junit.version>
<commons-codec.version>1.13</commons-codec.version>
<jakarta.xml.bind-api.version>2.3.3</jakarta.xml.bind-api.version>
Expand Down Expand Up @@ -108,7 +109,7 @@
<repositories>
<repository>
<id>ossrh</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<url>https://central.sonatype.com/repository/maven-snapshots/</url>
<snapshots>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
Expand Down Expand Up @@ -650,30 +651,57 @@
<profile>
<id>deploy-maven</id>
<distributionManagement>
<!-- Releases repository using the Sonatype OSSRH Staging API for staging and deployment -->
<repository>
<id>ossrh</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
<name>OSSRH Staging API Releases</name>
<url>https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/</url>
</repository>

<!-- Snapshots repository pointing to Maven Central’s snapshot feed for ongoing development versions -->
<snapshotRepository>
<id>ossrh</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<name>Central Portal Snapshots</name>
<url>https://central.sonatype.com/repository/maven-snapshots/</url>
</snapshotRepository>
</distributionManagement>
<build>
<plugins>
<!-- Central Publishing Plugin: handles both snapshots and releases via the Sonatype Central API -->
<plugin>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<version>0.8.0</version>
<!-- extensions=true allows this plugin to hook into the build lifecycle -->
<extensions>true</extensions>
<configuration>
<!-- ID of the <server> in your settings.xml containing your Sonatype credentials -->
<publishingServerId>ossrh</publishingServerId>
<!-- autoPublish=true will automatically close and release the staging repository after deploy -->
<autoPublish>true</autoPublish>
<!-- waitUntil=published makes the build wait until the artifacts are fully available in Central -->
<waitUntil>published</waitUntil>
<!-- ignorePublishedComponents skips already-published modules in multimodule builds -->
<ignorePublishedComponents>true</ignorePublishedComponents>
</configuration>
</plugin>
<!-- Source Plugin: generates and attaches a -sources.jar containing all your project’s source files -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.0</version>
<version>3.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<!-- jar-no-fork: create the sources jar without running the default lifecycle again -->
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>

<!-- Javadoc Plugin: generates and attaches a -javadoc.jar containing your project’s API documentation -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
Expand All @@ -682,27 +710,34 @@
<execution>
<id>attach-javadocs</id>
<goals>
<!-- jar: package the generated Javadocs into a jar file -->
<goal>jar</goal>
</goals>
</execution>
</executions>
<configuration>
<!-- disable strict checking of HTML tags in comments -->
<doclint>none</doclint>
<!-- do not fail the build if Javadoc generation issues errors -->
<failOnError>false</failOnError>
</configuration>
</plugin>

<!-- GPG Plugin: signs all deployable artifacts (.jar, .pom, sources, javadoc) with your GPG key -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>deploy</phase>
<!-- bind signing to the verify phase, so signatures are created before deploy -->
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
<configuration>
<!-- Prevent `gpg` from using pinentry programs -->
<!-- Use loopback pinentry to allow unattended signing in CI -->
<gpgArguments>
<arg>--pinentry-mode</arg>
<arg>loopback</arg>
Expand All @@ -711,17 +746,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.8</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
</configuration>
</plugin>
</plugins>
</build>
</profile>
Expand Down
Loading