Skip to content

Commit

Permalink
Merge pull request #246 from keeps/development
Browse files Browse the repository at this point in the history 
Development
  • Loading branch information
@006627
006627 authored Feb 2, 2024
2 parents 63d705b + 4fabf30 commit 2dd81b3
Show file tree
Hide file tree
Showing 69 changed files with 434 additions and 19,897 deletions.
33 changes: 33 additions & 0 deletions .github/workflows/CI.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: CI
on:
push:
branches:
- "**"
tags-ignore:
- "**"

jobs:
continuous-integration:
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v2
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '17'
cache: 'maven'
- name: Cache
uses: actions/cache@v3
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-maven-
- name: Test
run: mvn --batch-mode test
- name: Build lib
run: mvn --batch-mode clean package -DskipTests
- name: Build CLI
run: mvn --batch-mode clean package -Pcli -DskipTests
144 changes: 130 additions & 14 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<groupId>org.roda-project</groupId>
<artifactId>commons-ip2</artifactId>
<packaging>jar</packaging>
<version>2.4.0-SNAPSHOT</version>
<version>2.6.0-SNAPSHOT</version>
<name>RODA Commons IP - Library to manipulate Information Packages of different formats: RODA,
E-ARK, BagIt,
Hungarian SIP 4, etc.
Expand Down Expand Up @@ -50,7 +50,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java_version>17</java_version>
<version.jackson>2.15.2</version.jackson>
<version.jackson>2.16.1</version.jackson>
</properties>

<profiles>
Expand Down Expand Up @@ -200,6 +200,64 @@
<format>json</format>
</configuration>
</plugin>
<plugin>
<groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb-maven-plugin</artifactId>
<version>4.0.0</version>
<executions>
<execution>
<id>generate-JAXB-METSv1</id>
<phase>generate-sources</phase>
<goals>
<goal>generate</goal>
</goals>
<configuration>
<schemaDirectory>src/main/resources/schemas</schemaDirectory>
<schemaIncludes>
<include>mets1_11.xsd</include>
</schemaIncludes>
<cleanPackageDirectories>true</cleanPackageDirectories>
<generatePackage>org.roda_project.commons_ip.mets_v1_11.beans</generatePackage>
<generateDirectory>${project.build.directory}/generated-sources/xjc1</generateDirectory>
<bindingIncludes>
<include>mets1_11.xjb</include>
</bindingIncludes>
</configuration>
</execution>
<execution>
<id>generate-JAXB</id>
<phase>generate-sources</phase>
<goals>
<goal>generate</goal>
</goals>
<configuration>
<schemaDirectory>src/main/resources/schemas2</schemaDirectory>
<schemaIncludes>
<include>mets1_12.xsd</include>
</schemaIncludes>
<cleanPackageDirectories>true</cleanPackageDirectories>
<generatePackage>org.roda_project.commons_ip2.mets_v1_12.beans</generatePackage>
<generateDirectory>${project.build.directory}/generated-sources/xjc2</generateDirectory>
<bindingIncludes>
<include>mets1_12.xjb</include>
</bindingIncludes>
</configuration>
</execution>
</executions>
<configuration>
<extension>true</extension>
<args>
<arg>-Xsimplify</arg>
</args>
<plugins>
<plugin>
<groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb-plugins</artifactId>
<version>3.0.0</version>
</plugin>
</plugins>
</configuration>
</plugin>
</plugins>
</build>
</profile>
Expand Down Expand Up @@ -294,6 +352,64 @@
<format>json</format>
</configuration>
</plugin>
<plugin>
<groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb-maven-plugin</artifactId>
<version>4.0.0</version>
<executions>
<execution>
<id>generate-JAXB-METSv1</id>
<phase>generate-sources</phase>
<goals>
<goal>generate</goal>
</goals>
<configuration>
<schemaDirectory>src/main/resources/schemas</schemaDirectory>
<schemaIncludes>
<include>mets1_11.xsd</include>
</schemaIncludes>
<cleanPackageDirectories>true</cleanPackageDirectories>
<generatePackage>org.roda_project.commons_ip.mets_v1_11.beans</generatePackage>
<generateDirectory>${project.build.directory}/generated-sources/xjc1</generateDirectory>
<bindingIncludes>
<include>mets1_11.xjb</include>
</bindingIncludes>
</configuration>
</execution>
<execution>
<id>generate-JAXB</id>
<phase>generate-sources</phase>
<goals>
<goal>generate</goal>
</goals>
<configuration>
<schemaDirectory>src/main/resources/schemas2</schemaDirectory>
<schemaIncludes>
<include>mets1_12.xsd</include>
</schemaIncludes>
<cleanPackageDirectories>true</cleanPackageDirectories>
<generatePackage>org.roda_project.commons_ip2.mets_v1_12.beans</generatePackage>
<generateDirectory>${project.build.directory}/generated-sources/xjc2</generateDirectory>
<bindingIncludes>
<include>mets1_12.xjb</include>
</bindingIncludes>
</configuration>
</execution>
</executions>
<configuration>
<extension>true</extension>
<args>
<arg>-Xsimplify</arg>
</args>
<plugins>
<plugin>
<groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb-plugins</artifactId>
<version>3.0.0</version>
</plugin>
</plugins>
</configuration>
</plugin>
</plugins>
</build>
</profile>
Expand All @@ -303,23 +419,23 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.4.9</version>
<version>1.4.14</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.13.0</version>
<version>3.14.0</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.14.0</version>
<version>2.15.1</version>
</dependency>
<dependency>
<groupId>gov.loc</groupId>
Expand Down Expand Up @@ -352,22 +468,22 @@
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>2.12.5</version>
<version>2.12.6</version>
</dependency>

<!-- CLI dependecies -->
<!-- https://mvnrepository.com/artifact/info.picocli/picocli -->
<dependency>
<groupId>info.picocli</groupId>
<artifactId>picocli</artifactId>
<version>4.7.4</version>
<version>4.7.5</version>
</dependency>

<!-- Java11 dependencies -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.1</version>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>4.0.1</version>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
Expand All @@ -377,14 +493,14 @@
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>2.3.8</version>
<version>4.0.4</version>
</dependency>

<!-- PyIP dependencies -->
<dependency>
<groupId>com.github.joschi.jackson</groupId>
<artifactId>jackson-datatype-threetenbp</artifactId>
<version>2.14.3</version>
<version>2.15.2</version>
</dependency>
</dependencies>

Expand All @@ -394,7 +510,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>1.10.0</version>
<version>1.11.0</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand Down
Loading

0 comments on commit 2dd81b3

Please sign in to comment.