Skip to content

made it easier to run roller on latest JVMs (tested with JDK 13). #51

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

Merged
snoopdave merged 1 commit into from
Nov 24, 2019
Merged

made it easier to run roller on latest JVMs (tested with JDK 13). #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 25 additions & 10 deletions app/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,21 +40,22 @@ limitations under the License.
<jstl.version>1.2</jstl.version>

<angular.version>1.7.8</angular.version>
<ant.version>1.10.5</ant.version>
<ant.version>1.10.7</ant.version>
<asm.version>7.2</asm.version>
<commons-validator.version>1.6</commons-validator.version>
<commons-beanutils.version>1.9.3</commons-beanutils.version>
<commons-beanutils.version>1.9.4</commons-beanutils.version>
<commons-httpclient.version>3.1</commons-httpclient.version>
<commons-codec.version>1.12</commons-codec.version>
<eclipse-link.version>2.7.4</eclipse-link.version>
<commons-codec.version>1.13</commons-codec.version>
<eclipse-link.version>2.7.5</eclipse-link.version>
<guice.version>4.2.2</guice.version>
<log4j.version>1.2.17</log4j.version>
<log4j2.version>2.10.0</log4j2.version>
<lucene.version>8.1.1</lucene.version>
<lucene.version>8.3.0</lucene.version>
<oauth-core.version>20100527</oauth-core.version>
<maven-war.version>3.1.0</maven-war.version>
<maven-war.version>3.2.3</maven-war.version>
<maven-surefire.version>2.17</maven-surefire.version>
<maven-antrun.version>1.0b3</maven-antrun.version>
<rome.version>1.12.0</rome.version>
<rome.version>1.12.2</rome.version>
<slf4j.version>1.7.26</slf4j.version>
<spring.version>4.1.4.RELEASE</spring.version>
<spring.security.version>3.2.5.RELEASE</spring.security.version>
Expand Down Expand Up @@ -108,6 +109,13 @@ limitations under the License.
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.1</version>
<exclusions>
<exclusion>
<!--api is already in the javax.activation artifact-->
<groupId>javax.activation</groupId>
<artifactId>javax.activation-api</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- Eclipselink JPA is the default JPA implementation used by
Expand Down Expand Up @@ -184,19 +192,19 @@ limitations under the License.
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>7.0</version>
<version>${asm.version}</version>
</dependency>

<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-commons</artifactId>
<version>7.0</version>
<version>${asm.version}</version>
</dependency>

<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-tree</artifactId>
<version>7.0</version>
<version>${asm.version}</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -383,6 +391,12 @@ limitations under the License.
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-openid</artifactId>
<version>${spring.security.version}</version>
<exclusions>
<exclusion>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down Expand Up @@ -416,6 +430,7 @@ limitations under the License.
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<version>${guice.version}</version>
<classifier>no_aop</classifier>
</dependency>

<dependency>
Expand Down
12 changes: 10 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ limitations under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<version>3.8.1</version>
<configuration>
<source>11</source>
<target>11</target>
Expand Down Expand Up @@ -91,6 +91,14 @@ limitations under the License.
<monitorPort>11527</monitorPort>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.7</version>
<configuration>
<rulesUri>file:version-rules.xml</rulesUri>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
Expand All @@ -100,7 +108,7 @@ limitations under the License.
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>5.1.0</version>
<version>5.5.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
16 changes: 16 additions & 0 deletions version-rules.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<ruleset comparisonMethod="maven"
xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 http://mojo.codehaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
<ignoreVersions>
<!--only release builds-->
<ignoreVersion type="regex">.*(alpha|ALPHA|beta|BETA|b|rc|RC|M).*</ignoreVersion>

<!--ignore some specific version strings which don't follow the common version format-->
<ignoreVersion type="exact">20020829</ignoreVersion>
Copy link
Copy Markdown
Contributor

@snoopdave snoopdave Nov 23, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the purpose of these ignoreVersions?

Copy link
Copy Markdown
Member Author

@mbien mbien Nov 23, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

version-rules.xml is for the version-maven-plugin* i added to the main pom.xml.

the plugin can be run manually with "mvn versions:display-dependency-updates" and will list all dependencies in this project which could be updated (just for convenience, the command itself does not update anything - but it could be used for that too).

The ignoreVersion regex tries to filter out any recommendations which aren't release versions. The remaining rules in that file blacklist some old artifact snapshots.

the maven-antrun-plugin for example has an old artifact with the version 20020829, which would be always recommended by the plugin if not blacklisted since it would read it as very high version number. There might be a better way of doing this but luckily it needed only a handful of entries on the blacklist.

*https://www.mojohaus.org/versions-maven-plugin/index.html

<ignoreVersion type="exact">20040616</ignoreVersion>
<ignoreVersion type="exact">20040102.233541</ignoreVersion>
<ignoreVersion type="exact">20031027.000000</ignoreVersion>
<ignoreVersion type="exact">20030418.083655</ignoreVersion>
</ignoreVersions>

</ruleset>