Merge branch 'feature-applyLicense' into 'dev' (eb465d2f) · Commits · REDMIC Project / Server / OAuth

pom.xml

+4 −46

Original line number	Diff line number	Diff line
		@@ -4,34 +4,23 @@
		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

		<parent>
		<groupId>org.springframework.boot</groupId>
		<artifactId>spring-boot-starter-parent</artifactId>
		<version>2.0.0.RELEASE</version>
		<groupId>es.redmic</groupId>
		<artifactId>server-parent</artifactId>
		<version>0.1.0</version>
		<relativePath />
		</parent>

		<modelVersion>4.0.0</modelVersion>
		<groupId>es.redmic</groupId>
		<artifactId>oauth</artifactId>
		<packaging>jar</packaging>
		<version>0.7.0-feature-updateCI</version>
		<version>0.7.0-feature-applyLicense</version>
		<name>OAuth</name>
		<description>Oauth authorization server</description>

		<properties>
		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
		<maven.compiler.source>1.8</maven.compiler.source>
		<maven.compiler.target>1.8</maven.compiler.target>
		<java.version>1.8</java.version>
		<tomcat.version>8.5.28</tomcat.version>

		<!-- REDMIC -->
		<redmic.db-commons.version>0.6.0</redmic.db-commons.version>
		<redmic.exceptions.version>0.6.0</redmic.exceptions.version>

		<!-- Plugins -->
		<jacoco.version>0.8.1</jacoco.version>
		</properties>

		<dependencies>
		@@ -79,17 +68,6 @@
		<artifactId>micrometer-registry-prometheus</artifactId>
		</dependency>

		<!-- Logs -->
		<dependency>
		<groupId>org.apache.logging.log4j</groupId>
		<artifactId>log4j-api</artifactId>
		</dependency>

		<dependency>
		<groupId>org.apache.logging.log4j</groupId>
		<artifactId>log4j-core</artifactId>
		</dependency>

		<!-- tests -->

		<dependency>
		@@ -128,26 +106,6 @@
		</execution>
		</executions>
		</plugin>
		<plugin>
		<groupId>org.jacoco</groupId>
		<artifactId>jacoco-maven-plugin</artifactId>
		<version>${jacoco.version}</version>
		<executions>
		<execution>
		<id>pre-unit-test</id>
		<goals>
		<goal>prepare-agent</goal>
		</goals>
		</execution>
		<execution>
		<id>post-unit-test</id>
		<phase>test</phase>
		<goals>
		<goal>report</goal>
		</goals>
		</execution>
		</executions>
		</plugin>
		</plugins>
		</build>
		</project>

src/main/java/es/redmic/oauth/OauthApplication.java

+20 −0

Original line number	Diff line number	Diff line
		package es.redmic.oauth;

		/*-
		* #%L
		* OAuth
		* %%
		* Copyright (C) 2019 REDMIC Project / Server
		* %%
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		* #L%
		*/

		import org.springframework.beans.factory.annotation.Value;
		import org.springframework.boot.SpringApplication;
		import org.springframework.boot.actuate.autoconfigure.metrics.MeterRegistryCustomizer;

src/main/java/es/redmic/oauth/common/dto/TokenDTO.java

+20 −0

Original line number	Diff line number	Diff line
		package es.redmic.oauth.common.dto;

		/*-
		* #%L
		* OAuth
		* %%
		* Copyright (C) 2019 REDMIC Project / Server
		* %%
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		* #L%
		*/

		public class TokenDTO {
		String token;

src/main/java/es/redmic/oauth/config/AuthorizationServerConfiguration.java

+20 −0

Original line number	Diff line number	Diff line
		package es.redmic.oauth.config;

		/*-
		* #%L
		* OAuth
		* %%
		* Copyright (C) 2019 REDMIC Project / Server
		* %%
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		* #L%
		*/

		import javax.sql.DataSource;

		import org.springframework.beans.factory.annotation.Autowired;

src/main/java/es/redmic/oauth/config/ResourceServerConfiguration.java

+20 −0

Original line number	Diff line number	Diff line
		package es.redmic.oauth.config;

		/*-
		* #%L
		* OAuth
		* %%
		* Copyright (C) 2019 REDMIC Project / Server
		* %%
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		* #L%
		*/

		import org.springframework.beans.factory.annotation.Autowired;
		import org.springframework.context.annotation.Configuration;
		import org.springframework.context.annotation.DependsOn;