WIP: Spring-Upgrade auf 2.2.0

[facebook-errors] / pom.xml

diff --git a/pom.xml b/pom.xml
index bc5df64..705cb06 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>1.3.7.RELEASE</version>
+    <version>2.2.0.RELEASE</version>
   </parent>
 
 
@@ -18,10 +18,6 @@
   <url>http://juplo.de/facebook-errors</url>
 
 
-  <prerequisites>
-    <maven>2.0.6</maven>
-  </prerequisites>
-
 
   <licenses>
     <license>
@@ -69,18 +65,16 @@
 
     <!-- Spring-Boot-Autoconfiguration -->
     <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-autoconfigure</artifactId>
-      <optional>true</optional>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-oauth2-client</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.springframework.social</groupId>
-      <artifactId>spring-social-facebook</artifactId>
-      <optional>true</optional>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.springframework.security.oauth</groupId>
-      <artifactId>spring-security-oauth2</artifactId>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-autoconfigure</artifactId>
       <optional>true</optional>
     </dependency>
 
@@ -135,24 +129,13 @@
   </dependencies>
 
   <repositories>
-    <repository>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <id>sonatype-nexus-snapshots</id>
-      <name>Sonatype Nexus Snapshots</name>
-      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-    </repository>
     <repository>
       <snapshots>
         <enabled>false</enabled>
       </snapshots>
-      <id>central</id>
-      <name>Central Repository</name>
-      <url>http://repo.maven.apache.org/maven2</url>
+      <id>juplo</id>
+      <name>Repository for internal artifacts on juplo.de</name>
+      <url>http://juplo.de/maven2</url>
     </repository>
   </repositories>
 
@@ -162,18 +145,14 @@
       <url>scpexe://juplo.de/var/www/juplo.de/facebook-errors-${project.version}</url>
     </site>
     <repository>
-      <id>sonatype-nexus-staging</id>
-      <name>Nexus Release Repository</name>
-      <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+      <id>juplo</id>
+      <name>Repository for internal artifacts on juplo.de</name>
+      <url>scpexe://juplo.de/var/www/juplo.de/maven2</url>
     </repository>
     <snapshotRepository>
-      <id>sonatype-nexus-snapshots</id>
-      <name>Sonatype Nexus Snapshots</name>
-      <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
     </snapshotRepository>
   </distributionManagement>
 
-
   <build>
     <pluginManagement>
       <plugins>