adds maven build; updates vlkb-volib to 0.9.5; disables legacy-param parsing in MCutout json-JDL (04816161) · Commits · ViaLactea / vlkb-soda

auth/mvn-install-uws-locally.sh

0 → 100755

+22 −0

Original line number	Diff line number	Diff line




		mvn install:install-file \
		-Dfile="../java-libs/lib/auth-lib-2.0.0-SNAPSHOT.jar" \
		-DgroupId=auth \
		-DartifactId=auth-lib \
		-Dversion=2.0.0-SNAPSHOT \
		-Dpackaging=jar \
		-DgeneratePom=true

		mvn install:install-file \
		-Dfile="../java-libs/lib/rap-client-1.0-SNAPSHOT.jar" \
		-DgroupId=auth \
		-DartifactId=rap-client \
		-Dversion=1.0-SNAPSHOT \
		-Dpackaging=jar \
		-DgeneratePom=true

auth/mvn-install-vlkb-auth-locally.sh

0 → 100755

+13 −0

Original line number	Diff line number	Diff line




		mvn install:install-file \
		-Dfile=target/vlkb-auth-0.1-SNAPSHOT.jar \
		-DgroupId=auth \
		-DartifactId=vlkb-auth \
		-Dversion=0.1-SNAPSHOT \
		-Dpackaging=jar \
		-DgeneratePom=true

auth/pom.xml

0 → 100644

+173 −0

Original line number	Diff line number	Diff line
		<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
		<modelVersion>4.0.0</modelVersion>
		<groupId>auth</groupId>
		<artifactId>vlkb-auth</artifactId>
		<packaging>jar</packaging>
		<version>x.y.z</version>
		<name>vlkb-auth Maven library</name>
		<url>http://maven.apache.org</url>

		<properties>
		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
		<maven.compiler.source>9</maven.compiler.source>
		<maven.compiler.target>9</maven.compiler.target>
		</properties>


		<dependencies>

		<!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-api -->
		<dependency>
		<groupId>org.slf4j</groupId>
		<artifactId>slf4j-api</artifactId>
		<version>1.7.36</version>
		</dependency>
		<!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-simple -->
		<dependency>
		<groupId>org.slf4j</groupId>
		<artifactId>slf4j-simple</artifactId>
		<version>1.7.36</version>
		<scope>test</scope>
		</dependency>

		<!-- https://mvnrepository.com/artifact/ch.qos.logback/logback-classic -->
		<dependency>
		<groupId>ch.qos.logback</groupId>
		<artifactId>logback-classic</artifactId>
		<version>1.4.7</version>
		<scope>test</scope>
		</dependency>
		<!-- https://mvnrepository.com/artifact/ch.qos.logback/logback-core -->
		<dependency>
		<groupId>ch.qos.logback</groupId>
		<artifactId>logback-core</artifactId>
		<version>1.4.7</version>
		</dependency>

		<!-- https://mvnrepository.com/artifact/javax.servlet/javax.servlet-api -->
		<dependency>
		<groupId>javax.servlet</groupId>
		<artifactId>javax.servlet-api</artifactId>
		<version>3.1.0</version>
		<scope>provided</scope>
		</dependency>

		<!-- https://mvnrepository.com/artifact/io.jsonwebtoken/jjwt-jackson -->
		<dependency>
		<groupId>io.jsonwebtoken</groupId>
		<artifactId>jjwt-jackson</artifactId>
		<version>0.12.3</version>
		<scope>runtime</scope>
		</dependency>
		<!-- https://mvnrepository.com/artifact/io.jsonwebtoken/jjwt-api -->
		<dependency>
		<groupId>io.jsonwebtoken</groupId>
		<artifactId>jjwt-api</artifactId>
		<version>0.12.3</version>
		</dependency>
		<!-- https://mvnrepository.com/artifact/io.jsonwebtoken/jjwt-api -->
		<dependency>
		<groupId>io.jsonwebtoken</groupId>
		<artifactId>jjwt-impl</artifactId>
		<version>0.12.3</version>
		</dependency>
		<!-- https://mvnrepository.com/artifact/io.jsonwebtoken/jjwt -->
		<!-- dependency>
		<groupId>io.jsonwebtoken</groupId>
		<artifactId>jjwt</artifactId>
		<version>0.12.3</version>
		</dependency -->
		<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core -->
		<dependency>
		<groupId>com.fasterxml.jackson.core</groupId>
		<artifactId>jackson-core</artifactId>
		<version>2.9.10</version>
		</dependency>
		<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations -->
		<dependency>
		<groupId>com.fasterxml.jackson.core</groupId>
		<artifactId>jackson-annotations</artifactId>
		<version>2.9.10</version>
		</dependency>
		<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
		<dependency>
		<groupId>com.fasterxml.jackson.core</groupId>
		<artifactId>jackson-databind</artifactId>
		<version>2.9.10</version>
		</dependency>

		<!-- https://mvnrepository.com/artifact/jakarta.xml.bind/jakarta.xml.bind-api -->
		<dependency>
		<groupId>jakarta.xml.bind</groupId>
		<artifactId>jakarta.xml.bind-api</artifactId>
		<version>2.3.2</version>
		</dependency>

		<!-- https://mvnrepository.com/artifact/com.googlecode.json-simple/json-simple -->
		<dependency>
		<groupId>com.googlecode.json-simple</groupId>
		<artifactId>json-simple</artifactId>
		<version>1.1</version>
		</dependency>

		<dependency>
		<groupId>auth</groupId>
		<artifactId>auth-lib</artifactId>
		<version>2.0.0-SNAPSHOT</version>
		</dependency>

		<dependency>
		<groupId>auth</groupId>
		<artifactId>rap-client</artifactId>
		<version>1.0-SNAPSHOT</version>
		</dependency>



		<dependency>
		<groupId>junit</groupId>
		<artifactId>junit</artifactId>
		<version>4.13.1</version>
		<scope>test</scope>
		</dependency>

		</dependencies>

		<build>
		<finalName>${project.artifactId}-${git.buildnumber}</finalName>
		<plugins>
		<plugin>
		<groupId>ru.concerteza.buildnumber</groupId>
		<artifactId>maven-jgit-buildnumber-plugin</artifactId>
		<version>1.2.7</version>
		<executions>
		<execution>
		<id>git-buildnumber</id>
		<goals>
		<goal>extract-buildnumber</goal>
		</goals>
		<phase>prepare-package</phase>
		</execution>
		</executions>
		</plugin>

		<plugin>
		<artifactId>maven-compiler-plugin</artifactId>
		<version>3.8.1</version>
		<configuration>
		<fork>true</fork>
		<executable>/etc/alternatives/javac</executable>
		<compilerArgument>-Xlint:unchecked</compilerArgument>
		</configuration>
		</plugin>

		<!-- plugin>
		<artifactId>maven-war-plugin</artifactId>
		<version>3.3.2</version>
		</plugin -->
		</plugins>
		</build>

		</project>

auth/src/main/java/IamSigningKeyResolver.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -38,7 +38,7 @@ import io.jsonwebtoken.Jwt;
		import io.jsonwebtoken.Jws;
		import io.jsonwebtoken.JwsHeader;
		import io.jsonwebtoken.Jwts;
		import io.jsonwebtoken.jackson.io.JacksonDeserializer;
		//import io.jsonwebtoken.jackson.io.JacksonDeserializer;
		import io.jsonwebtoken.SigningKeyResolverAdapter;
		import io.jsonwebtoken.security.Jwk;
		import io.jsonwebtoken.security.Jwks;

auth/src/main/java/IamTokenFilter.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@ import io.jsonwebtoken.Claims;
		import io.jsonwebtoken.Jwt;
		import io.jsonwebtoken.Jws;
		import io.jsonwebtoken.Jwts;
		import io.jsonwebtoken.jackson.io.JacksonDeserializer;
		//import io.jsonwebtoken.jackson.io.JacksonDeserializer;

		import java.security.spec.InvalidKeySpecException;
		import java.security.NoSuchAlgorithmException;