Development #246
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,7 +6,7 @@ | |
| <groupId>org.roda-project</groupId> | ||
| <artifactId>commons-ip2</artifactId> | ||
| <packaging>jar</packaging> | ||
| <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. | ||
|
|
@@ -50,7 +50,7 @@ | |
| <properties> | ||
| <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> | ||
| <java_version>17</java_version> | ||
| <version.jackson>2.16.1</version.jackson> | ||
| </properties> | ||
|
|
||
| <profiles> | ||
|
|
@@ -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> | ||
|
There was a problem hiding this comment.
|
||
| <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> | ||
|
|
@@ -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> | ||
|
There was a problem hiding this comment.
|
||
| <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> | ||
|
There was a problem hiding this comment.
|
||
| <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> | ||
|
|
@@ -303,23 +419,23 @@ | |
| <dependency> | ||
| <groupId>ch.qos.logback</groupId> | ||
| <artifactId>logback-classic</artifactId> | ||
| <version>1.4.14</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>junit</groupId> | ||
| <artifactId>junit</artifactId> | ||
| <version>4.13.2</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.apache.commons</groupId> | ||
| <artifactId>commons-lang3</artifactId> | ||
| <version>3.14.0</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>commons-io</groupId> | ||
| <artifactId>commons-io</artifactId> | ||
| <version>2.15.1</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>gov.loc</groupId> | ||
|
|
@@ -352,22 +468,22 @@ | |
| <dependency> | ||
| <groupId>joda-time</groupId> | ||
| <artifactId>joda-time</artifactId> | ||
| <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.5</version> | ||
| </dependency> | ||
|
|
||
| <!-- Java11 dependencies --> | ||
| <dependency> | ||
| <groupId>jakarta.xml.bind</groupId> | ||
| <artifactId>jakarta.xml.bind-api</artifactId> | ||
| <version>4.0.1</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>javax.activation</groupId> | ||
|
|
@@ -377,14 +493,14 @@ | |
| <dependency> | ||
| <groupId>org.glassfish.jaxb</groupId> | ||
| <artifactId>jaxb-runtime</artifactId> | ||
| <version>4.0.4</version> | ||
| </dependency> | ||
|
|
||
| <!-- PyIP dependencies --> | ||
| <dependency> | ||
| <groupId>com.github.joschi.jackson</groupId> | ||
| <artifactId>jackson-datatype-threetenbp</artifactId> | ||
| <version>2.15.2</version> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
|
|
@@ -394,7 +510,7 @@ | |
| <dependency> | ||
| <groupId>org.apache.commons</groupId> | ||
| <artifactId>commons-text</artifactId> | ||
| <version>1.11.0</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.fasterxml.jackson.core</groupId> | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Line is longer than 120 characters (found 124).