Skip to content

Commit 270d8bd

Browse files
author
phasenraum2010
committed
work in progress
1 parent 1ec9bdb commit 270d8bd

File tree

2 files changed

+33
-26
lines changed

2 files changed

+33
-26
lines changed

Diff for: README.md

+11-11
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Base Project for practical experience and projects with JAVA
88

99
## URLs
1010
+ Demo on Heroku [https://holohoax_stgb130.herokuapp.com/]
11-
+ Github [https://github.com/phasenraum2010/holohoax_StGB130]
11+
+ Github [https://phasenraum2010.github.io/javabase]
1212
+ Maven Reports [https://holohoax_StGB130.herokuapp.com/maven]
1313

1414
## public BETA
@@ -69,7 +69,7 @@ Werfen Sie dazu bitte auch einen Blick auf: [Needing Help Items on Github (Label
6969

7070
### Repository
7171
- Get Source Code: git clone [https://github.com/phasenraum2010/javabase.git]
72-
- Issues: [https://github.com/phasenraum2010/holohoax_StGB130/issues]
72+
- Issues: [https://phasenraum2010.github.io/javabase/issues]
7373

7474
### heroku CLI
7575
- export APP_NAME=stopholohoaxstgb130
@@ -152,7 +152,7 @@ Except where otherwise noted, Documentation of this work is licensed under [Crea
152152

153153
## Thank Your for your attention and interest and reading until here
154154

155-
[Github Repository]:https://github.com/phasenraum2010/holohoax_StGB130 (Github Repository)
155+
[Github Repository]:https://phasenraum2010.github.io/javabase (Github Repository)
156156
[juris GmbH, Saarbrücken und BMJV]:https://www.gesetze-im-internet.de/stgb/__130.html] (for the Law STGB 130)
157157
[GNU GENERAL PUBLIC LICENSE Version 3]:https://www.gnu.org/licenses/gpl-3.0.de.html (https://www.gnu.org/licenses/gpl-3.0.de.html)
158158
[Creative Commons CC BY-ND 3.0]:http://creativecommons.org/licenses/by-nd/3.0/ (http://creativecommons.org/licenses/by-nd/3.0/)
@@ -170,20 +170,20 @@ Except where otherwise noted, Documentation of this work is licensed under [Crea
170170
[jquery]: http://jquery.org (jquery)
171171
[google-analytics]:https://analytics.google.com/analytics/web/ (Google Analytics)
172172
[google-maps-javascript-api]:https://developers.google.com/maps/documentation/javascript/ (Google Maps)
173-
[https://twitter.com/ThomasWoehlke]:https://twitter.com/port80guru (Twitter port80guru)
173+
[https://twitter.com/ThomasWoehlke]:https://twitter.com/ThomasWoehlke (Twitter ThomasWoehlke)
174174
[https://github.com/phasenraum2010]:https://github.com/phasenraum2010 (Github: phasenraum2010)
175175
[https://thomas-woehlke.blogspot.de]:https://port80gru.blogspot.de (Blog port80guru)
176-
[av-site]: https://twitter.com/port80guru (Twitter port80guru)
176+
[av-site]: https://twitter.com/ThomasWoehlke (Twitter ThomasWoehlke)
177177
[donate]: https://www.paypal.me/ThomasWoehlke (donate via paypal)
178178
[maven Remote Reporitories by Artifactory on localhost]:http://localhost:8081/artifactory/webapp/#/admin/repositories/remote (maven Remote Reporitories by Artifactory on localhost)
179-
[https://github.com/phasenraum2010/holohoax_StGB130.git]:https://github.com/phasenraum2010/holohoax_StGB130.git (git clone url)
180-
[https://github.com/phasenraum2010/holohoax_StGB130/issues]:https://github.com/phasenraum2010/holohoax_StGB130/issues (Issues at github)
181-
[javabase-issues]: https://github.com/phasenraum2010/holohoax_StGB130/issues
179+
[https://phasenraum2010.github.io/javabase.git]:https://phasenraum2010.github.io/javabase.git (git clone url)
180+
[https://phasenraum2010.github.io/javabase/issues]:https://phasenraum2010.github.io/javabase/issues (Issues at github)
181+
[javabase-issues]: https://phasenraum2010.github.io/javabase/issues
182182
[necolas's guidelines]: http://github.com/necolas/issue-guidelines/#readme
183-
[Git repository at GitHub]:https://github.com/phasenraum2010/holohoax_StGB130.git
183+
[Git repository at GitHub]:https://phasenraum2010.github.io/javabase.git
184184
[GitHub pull requests]: http://help.github.com/articles/using-pull-requests
185-
[Needing Help Items on Github (Project)]:https://github.com/phasenraum2010/holohoax_StGB130/projects/1
186-
[Needing Help Items on Github (Labels)]::https://github.com/phasenraum2010/holohoax_StGB130/labels/help%20wanted
185+
[Needing Help Items on Github (Project)]:https://phasenraum2010.github.io/javabase/projects/1
186+
[Needing Help Items on Github (Labels)]:https://phasenraum2010.github.io/javabase/labels/help%20wanted
187187
[heroku command-line]:[https://devcenter.heroku.com/categories/command-line]
188188
[heroku-cli]:https://devcenter.heroku.com/articles/heroku-cli
189189
[spring:boot]:https://projects.spring.io/spring-boot/

Diff for: defcon-parent/pom.xml

+22-15
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.springframework.boot</groupId>
88
<artifactId>spring-boot-starter-parent</artifactId>
9-
<version>2.0.4.RELEASE</version>
9+
<version>2.0.5.RELEASE</version>
1010
<relativePath/> <!-- lookup parent from repository -->
1111
</parent>
1212
<modelVersion>4.0.0</modelVersion>
@@ -35,20 +35,20 @@
3535
<developers>
3636
<developer>
3737
<name>Natural-Born-Codert</name>
38-
<url>https://twitter.com/port80guru</url>
38+
<url>https://twitter.com/ThomasWoehlke</url>
3939
</developer>
4040
</developers>
4141

4242
<scm>
43-
<url>https://github.com/phasenraum2010/holohoax_StGB130.git</url>
44-
<connection>scm:git:https://github.com/phasenraum2010/holohoax_StGB130.git</connection>
45-
<developerConnection>scm:git:https://github.com/phasenraum2010/holohoax_StGB130.git</developerConnection>
43+
<url>https://github.com/phasenraum2010/javabase.git</url>
44+
<connection>scm:git:https://github.com/phasenraum2010/javabase.git</connection>
45+
<developerConnection>scm:git:https://github.com/phasenraum2010/javabase.git</developerConnection>
4646
<tag>master</tag>
4747
</scm>
4848

4949
<issueManagement>
5050
<system>GitHub</system>
51-
<url>https://github.com/phasenraum2010/holohoax_StGB130/issues</url>
51+
<url>https://github.com/phasenraum2010/javabase/issues</url>
5252
</issueManagement>
5353

5454
<distributionManagement>
@@ -65,8 +65,8 @@
6565
<maven.version>3.3.9</maven.version>
6666

6767
<!-- spring-boot -->
68-
<spring-boot.version>2.0.4.RELEASE</spring-boot.version>
69-
<spring-boot-admin.version>2.0.1</spring-boot-admin.version>
68+
<spring-boot.version>2.0.5.RELEASE</spring-boot.version>
69+
<spring-boot-admin.version>2.0.3</spring-boot-admin.version>
7070
<spring-cloud-gcp.version>1.0.0.RC1</spring-cloud-gcp.version>
7171
<spring-cloud-services.version>2.0.1.RELEASE</spring-cloud-services.version>
7272
<spring-cloud-task.version>2.0.0.RELEASE</spring-cloud-task.version>
@@ -75,8 +75,8 @@
7575
<spring-cloud.version>Finchley.RELEASE</spring-cloud.version>
7676

7777
<!-- Spring Web MVC -->
78-
<org.springframework.spring.version>5.0.7.RELEASE</org.springframework.spring.version>
79-
<org.springframework.security.version>5.0.6.RELEASE</org.springframework.security.version>
78+
<org.springframework.spring.version>5.1.0.RELEASE</org.springframework.spring.version>
79+
<org.springframework.security.version>5.1.0.RELEASE</org.springframework.security.version>
8080

8181
<!-- Frontend -->
8282
<org.webjars.bootstrap.version>3.3.7</org.webjars.bootstrap.version>
@@ -309,15 +309,14 @@
309309
<artifactId>spring-cloud-starter-sleuth</artifactId>
310310
<version>${org.springframework.cloud.version}</version>
311311
</dependency>
312-
313312
<dependency>
314313
<groupId>org.springframework.cloud</groupId>
315314
<artifactId>spring-cloud-starter-config</artifactId>
316315
<version>${org.springframework.cloud.version}</version>
317316
</dependency>
318317
<dependency>
319318
<groupId>org.springframework.cloud</groupId>
320-
<artifactId>spring-cloud-netflix-hystrix-stream</artifactId>
319+
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
321320
<version>${org.springframework.cloud.version}</version>
322321
</dependency>
323322
<!-- https://mvnrepository.com/artifact/org.springframework.cloud/spring-cloud-stream-binder-kafka -->
@@ -337,7 +336,7 @@
337336
<dependency>
338337
<groupId>org.springframework.cloud</groupId>
339338
<artifactId>spring-cloud-starter-bus-amqp</artifactId>
340-
<version>2.0.0.RELEASE</version>
339+
<version>2.0.1.RELEASE</version>
341340
</dependency>
342341
<dependency>
343342
<groupId>org.springframework.cloud</groupId>
@@ -376,8 +375,8 @@
376375
-->
377376
<dependency>
378377
<groupId>org.springframework.cloud</groupId>
379-
<artifactId>spring-cloud-netflix-hystrix-contract</artifactId>
380-
<version>2.0.0.RELEASE</version>
378+
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
379+
<version>2.0.1.RELEASE</version>
381380
<type>pom</type>
382381
<scope>import</scope>
383382
</dependency>
@@ -794,6 +793,14 @@
794793
TODO: #20
795794
-->
796795
<repositories>
796+
<repository>
797+
<id>spring-release</id>
798+
<name>Spring Milestones</name>
799+
<url>https://repo.spring.io/release</url>
800+
<snapshots>
801+
<enabled>false</enabled>
802+
</snapshots>
803+
</repository>
797804
<repository>
798805
<id>spring-milestones</id>
799806
<name>Spring Milestones</name>

0 commit comments

Comments
 (0)