Skip to content
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

Jump to bottom

Update versions #35

Merged
merged 5 commits into from
Nov 20, 2023
Merged

Update versions #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b31e94c
Update plugin versions
adamretter Nov 20, 2023
cc1e5f0
JUnit is only used for tests
adamretter Nov 20, 2023
a12a157
Switch to JSR-305 @Nullable annotation from the IntelliJ annotation
adamretter Nov 20, 2023
39b93ed
Update to the latest license-maven-plugin
adamretter Nov 20, 2023
51ceef9
Switch from baked-in functional/Either previously needed for Java 1.6…
adamretter Nov 20, 2023
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
82 changes: 53 additions & 29 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,49 +62,48 @@
<version>${parboiled.version}</version>
</dependency>
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations-java5</artifactId>
<version>17.0.0</version>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>3.0.2</version>
</dependency>
<dependency>
<groupId>com.evolvedbinary.j8fu</groupId>
<artifactId>j8fu</artifactId>
<version>1.23.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
</plugin>
</plugins>
</pluginManagement>

<plugins>
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>3.0</version>
<version>4.3</version>
<configuration>
<header>GPL2-template.txt</header>
<failIfMissing>true</failIfMissing>
<aggregate>true</aggregate>
<strictCheck>true</strictCheck>
<properties>
<organization>${project.organization.name}</organization>
</properties>
<excludes>
<exclude>**/pom.xml</exclude>
<exclude>**/README.md</exclude>
<exclude>**/LICENSE</exclude>
<exclude>.github/**</exclude>
<exclude>src/main/resources/**</exclude>
</excludes>
<encoding>${project.build.sourceEncoding}</encoding>
<licenseSets>
<licenseSet>
<header>GPL2-template.txt</header>
<properties>
<organization>${project.organization.name}</organization>
</properties>
<excludes>
<exclude>**/pom.xml</exclude>
<exclude>**/README.md</exclude>
<exclude>**/LICENSE</exclude>
<exclude>.github/**</exclude>
<exclude>src/main/resources/**</exclude>
</excludes>
</licenseSet>
</licenseSets>
</configuration>
<executions>
<execution>
Expand All @@ -119,7 +118,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.2.0</version>
<version>3.6.1</version>
<executions>
<execution>
<id>analyze</id>
Expand Down Expand Up @@ -148,6 +147,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<configuration>
<source>${project.build.source}</source>
<target>${project.build.target}</target>
Expand All @@ -157,7 +157,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.0</version>
<version>3.3.0</version>
<configuration>
<archive>
<manifest>
Expand Down Expand Up @@ -212,10 +212,34 @@
</execution>
</executions>
</plugin>
<plugin>
<!-- Attach javadoc jar -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.6.2</version>
<configuration>
<archive>
<manifest>
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
<manifestEntries>
<Build-Tag>${build-tag}</Build-Tag>
<Git-Commit>${build-commit}</Git-Commit>
<Git-Commit-Abbrev>${build-commit-abbrev}</Git-Commit-Abbrev>
<Build-Version>${build-version}</Build-Version>
<Build-Timestamp>${build-tstamp}</Build-Timestamp>
<Source-Repository>${project.scm.connection}</Source-Repository>
<Description>${project.description}</Description>
<Implementation-URL>${project.url}</Implementation-URL>
</manifestEntries>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.0.1</version>
<version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
196 changes: 0 additions & 196 deletions src/main/java/com/evolvedbinary/functional/Either.java
View file
Open in desktop

This file was deleted.

37 changes: 0 additions & 37 deletions src/main/java/com/evolvedbinary/functional/Function.java
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions src/main/java/com/evolvedbinary/xpath/parser/XPathParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
/*
* XPath 2 Parser
* A Parser for XPath 2
* Copyright (C) 2016 Evolved Binary Ltd.
Expand All @@ -19,9 +19,8 @@
*/
package com.evolvedbinary.xpath.parser;

import com.evolvedbinary.functional.Either;
import com.evolvedbinary.j8fu.Either;
import com.evolvedbinary.xpath.parser.ast.partial.*;
import org.jetbrains.annotations.Nullable;
import org.parboiled.BaseParser;
import org.parboiled.Rule;
import org.parboiled.annotations.BuildParseTree;
Expand All @@ -32,6 +31,7 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import javax.annotation.Nullable;

//TODO(AR) think about whether we can remove the use of org.parboiled.support.Var in favour of PartialASTNode, then we would have an immutable AST production
//TODO(AR) may be possible to replace some uses of Var with popAllR
Expand Down
Loading