Skip to content

Commit

Permalink
Merge pull request #66 from draeger-lab/65-fix-build
Browse files Browse the repository at this point in the history
[fix] revert jdom upgrade
  • Loading branch information
draeger authored Jul 11, 2024
2 parents 6695372 + 51cb076 commit a0500b5
Show file tree
Hide file tree
Showing 6 changed files with 47 additions and 49 deletions.
22 changes: 2 additions & 20 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 25 additions & 0 deletions .idea/jarRepositories.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions .idea/material_theme_project_new.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 2 additions & 14 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 0 additions & 9 deletions .idea/modules.xml

This file was deleted.

12 changes: 6 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<properties>
<jdk.version>1.8</jdk.version>
<maven.build.timestamp.format>yyyy</maven.build.timestamp.format>
<year>${maven.build.timestamp}</year><!-- This property is used for filtering
<year>${maven.build.timestamp}</year><!-- This property is used for filtering
the variable ${year} in some resource files -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.license.url>http://www.opensource.org/licenses/mit-license.php</project.license.url>
Expand Down Expand Up @@ -96,7 +96,7 @@

<dependencies>

<!-- To update or install local non-MAVEN JAR files run the command in
<!-- To update or install local non-MAVEN JAR files run the command in
the comments -->
<dependency>
<groupId>junit</groupId>
Expand Down Expand Up @@ -195,10 +195,10 @@
<!-- https://mvnrepository.com/artifact/org.jdom/jdom -->
<dependency>
<groupId>org.jdom</groupId>
<artifactId>jdom2</artifactId>
<version>2.0.6.1</version>
<artifactId>jdom</artifactId>
<version>1.1.3</version>
</dependency>

<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
Expand Down Expand Up @@ -402,7 +402,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.7</version>

</plugin>

</plugins>
Expand Down

0 comments on commit a0500b5

Please sign in to comment.