Skip to content

Commit f33cc2a

Browse files
phasenraum2010phasenraum2010
phasenraum2010
authored and
phasenraum2010
committed
changed propeterties
1 parent c48ad77 commit f33cc2a

File tree

9 files changed

+134
-20
lines changed

9 files changed

+134
-20
lines changed

‎devtesting.sh

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
#!/opt/local/bin/bash
2+
3+
export BTW17_LOGIN_USERNAME=blubb
4+
export BTW17_LOGIN_PASSWORD=blablablablablablablablabla
5+
export BTW17_JPA_HIBERNATE_DDL_AUTO=update
6+
export BTW17_GOOGLE_APS_API_KEY=AIzaSyCMWLD6SK1QY3f-94mDS6x7u_jxwYASgqY
7+
export BTW17_GOOGLE_ANALYTICS_ID=UA-17174370-11
8+
export BTW17_GOOGLE_WEBMASTER_TOOLS_ID=3eksTC3Rvao6fLvSUwoRECBwd9Gdg4F51IhOE3DD-T8
9+
export BTW17_MICROSOFT_WEBMASTER_TOOLS_ID=52F1EDC0244BCDCF5C95E402E9E3E49B
10+
export BTW17_FACEBOOK_APP_ID=1721279777913278
11+
export BTW17_TWITTER_CARD_SITE=port80guru
12+
export BTW17_TWITTER_CARD_CREATOR=port80guru
13+
14+
psql -U kandidatentest < etc/drop-tables.sql
15+
16+
#psql -c 'DROP DATABASE kandidatentest;' -U postgres
17+
#psql -c 'DROP USER kandidatentest;' -U postgres
18+
#psql -c 'DROP ROLE kandidatentest;' -U postgres
19+
#psql -c "CREATE USER kandidatentest WITH PASSWORD 'kandidatentestpwd' LOGIN SUPERUSER INHERIT CREATEDB CREATEROLE NOREPLICATION;" -U postgres
20+
#psql -c 'GRANT pg_signal_backend, postgres TO kandidatentest WITH ADMIN OPTION;' -U postgres
21+
#psql -c "CREATE DATABASE kandidatentest WITH OWNER = kandidatentest TEMPLATE = template1 ENCODING = 'UTF8' LC_COLLATE = 'de_DE.UTF-8' LC_CTYPE = 'de_DE.UTF-8' CONNECTION LIMIT = -1;" -U postgres
22+
23+
#psql -c 'select * from version();' -U kandidatentest
24+
#psql -c '\l' -U postgres
25+
#psql -c '\dg' -U postgres
26+
#psql -c '\dn' -U postgres
27+
28+
./mvnw clean install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
29+
./mvnw clean test -Pdevtest -Dtest=AlphaTopLevelSuiteIT -Dmaven.javadoc.skip=true -B -V
30+
31+
exit 0

‎heroku.sh

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
#!/usr/bin/env bash
2+
3+
export PORT=8080
4+
export JAVA_OPTS='-Xmx350m -Xss512k'
5+
6+
export DATABASE_URL='jdbc:postgresql://localhost:5432/kandidaten?user=kandidaten&password=kandidatenpwd'
7+
export DATABASE_URL_TEST='jdbc:postgresql://localhost:5432/kandidaten?user=kandidaten&password=kandidatenpwd'
8+
export BTW17_LOGIN_USERNAME=blubb
9+
export BTW17_LOGIN_PASSWORD=blablablablablablablablabla
10+
export BTW17_JPA_HIBERNATE_DDL_AUTO=update
11+
export BTW17_GOOGLE_APS_API_KEY=AIzaSyCMWLD6SK1QY3f-94mDS6x7u_jxwYASgqY
12+
export BTW17_GOOGLE_ANALYTICS_ID=UA-17174370-11
13+
export BTW17_GOOGLE_WEBMASTER_TOOLS_ID=3eksTC3Rvao6fLvSUwoRECBwd9Gdg4F51IhOE3DD-T8
14+
export BTW17_MICROSOFT_WEBMASTER_TOOLS_ID=52F1EDC0244BCDCF5C95E402E9E3E49B
15+
export BTW17_FACEBOOK_APP_ID=1721279777913278
16+
export BTW17_TWITTER_CARD_SITE=port80guru
17+
export BTW17_TWITTER_CARD_CREATOR=port80guru
18+
19+
./mvnw clean install
20+
21+
java -Dserver.port=$PORT $JAVA_OPTS -jar target/kandidaten-0.0.18-SNAPSHOT.jar

‎pom.xml

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,17 @@
208208
<groupId>org.springframework.boot</groupId>
209209
<artifactId>spring-boot-starter-security</artifactId>
210210
</dependency>
211+
<dependency>
212+
<groupId>javax.transaction</groupId>
213+
<artifactId>javax.transaction-api</artifactId>
214+
<scope>compile</scope>
215+
</dependency>
216+
<dependency>
217+
<groupId>javax.interceptor</groupId>
218+
<artifactId>javax.interceptor-api</artifactId>
219+
<version>1.2</version>
220+
<scope>compile</scope>
221+
</dependency>
211222
</dependencies>
212223

213224
<build>
@@ -216,10 +227,12 @@
216227
<groupId>org.springframework.boot</groupId>
217228
<artifactId>spring-boot-maven-plugin</artifactId>
218229
</plugin>
230+
<!--
219231
<plugin>
220232
<groupId>org.apache.maven.plugins</groupId>
221233
<artifactId>maven-dependency-plugin</artifactId>
222234
</plugin>
235+
-->
223236
<plugin>
224237
<groupId>pl.project13.maven</groupId>
225238
<artifactId>git-commit-id-plugin</artifactId>
@@ -244,11 +257,6 @@
244257
</executions>
245258
</plugin>
246259

247-
<plugin>
248-
<groupId>org.springframework.boot</groupId>
249-
<artifactId>spring-boot-maven-plugin</artifactId>
250-
</plugin>
251-
252260
<plugin>
253261
<groupId>org.apache.maven.plugins</groupId>
254262
<artifactId>maven-compiler-plugin</artifactId>
@@ -292,10 +300,11 @@
292300
<artifactId>maven-javadoc-plugin</artifactId>
293301
<configuration>
294302
<linksource>true</linksource>
295-
<maxmemory>2048m</maxmemory>
296-
<source>1.8</source>
303+
<maxmemory>4096m</maxmemory>
304+
<source>${java.version}</source>
297305
<encoding>${project.build.sourceEncoding}</encoding>
298306
<javadocExecutable>${java.home}/../bin/javadoc</javadocExecutable>
307+
<additionalparam>-Xdoclint:none</additionalparam>
299308
</configuration>
300309
<executions>
301310
<execution>
@@ -305,13 +314,12 @@
305314
<goal>javadoc</goal>
306315
</goals>
307316
<configuration>
308-
<!--
309317
<linksource>true</linksource>
310-
-->
311-
<maxmemory>2048m</maxmemory>
312-
<source>1.8</source>
318+
<maxmemory>4096m</maxmemory>
319+
<source>${java.version}</source>
313320
<encoding>${project.build.sourceEncoding}</encoding>
314321
<javadocExecutable>${java.home}/../bin/javadoc</javadocExecutable>
322+
<additionalparam>-Xdoclint:none</additionalparam>
315323
</configuration>
316324
</execution>
317325
</executions>
@@ -457,6 +465,7 @@
457465
<artifactId>cobertura-maven-plugin</artifactId>
458466
<version>2.7</version>
459467
</plugin>
468+
460469
</plugins>
461470
</build>
462471

@@ -606,11 +615,6 @@
606615
</reportSet>
607616
</reportSets>
608617
</plugin>
609-
<plugin>
610-
<groupId>org.codehaus.mojo</groupId>
611-
<artifactId>cobertura-maven-plugin</artifactId>
612-
<version>2.7</version>
613-
</plugin>
614618
</plugins>
615619
</reporting>
616620
</project>

‎release.sh

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
#!/bin/sh
2+
3+
export DATABASE_URL='jdbc:postgresql://localhost:5432/kandidatentest?user=kandidatentest&password=kandidatentestpwd'
4+
export DATABASE_URL_TEST='jdbc:postgresql://localhost:5432/kandidatentest?user=kandidatentest&password=kandidatentestpwd'
5+
export BTW17_LOGIN_USERNAME=blubb
6+
export BTW17_LOGIN_PASSWORD=blablablablablablablablabla
7+
export BTW17_JPA_HIBERNATE_DDL_AUTO=update
8+
export BTW17_GOOGLE_APS_API_KEY=AIzaSyCMWLD6SK1QY3f-94mDS6x7u_jxwYASgqY
9+
export BTW17_GOOGLE_ANALYTICS_ID=UA-17174370-11
10+
export BTW17_GOOGLE_WEBMASTER_TOOLS_ID=3eksTC3Rvao6fLvSUwoRECBwd9Gdg4F51IhOE3DD-T8
11+
export BTW17_MICROSOFT_WEBMASTER_TOOLS_ID=52F1EDC0244BCDCF5C95E402E9E3E49B
12+
export BTW17_FACEBOOK_APP_ID=1721279777913278
13+
export BTW17_TWITTER_CARD_SITE=port80guru
14+
export BTW17_TWITTER_CARD_CREATOR=port80guru
15+
16+
./mvnw clean install
17+
18+
./mvnw clean release:prepare
19+
20+
echo "./mvnw release:perform"
21+
22+
echo "git commit -m 'after release'"
23+
24+
echo "git push"
25+
26+
exit 0

‎src/main/java/org/woehlke/learn/learnneo4j/model/common/CrudServiceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ protected CrudServiceImpl(CrudRepository<T, ID> repository){
1111
}
1212

1313
protected CrudRepository<T, ID> getRepository(){
14-
return (CrudRepository) super.getRepository();
14+
return (CrudRepository<T, ID>) super.getRepository();
1515
}
1616

1717
@Override

‎src/main/java/org/woehlke/learn/learnneo4j/model/common/JpaServiceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ protected JpaServiceImpl(JpaRepository<T,ID> repository){
1212
}
1313

1414
protected JpaRepository<T, ID> getRepository(){
15-
return (JpaRepository) super.getRepository();
15+
return (JpaRepository<T, ID>) super.getRepository();
1616
}
1717
}

‎src/main/java/org/woehlke/learn/learnneo4j/model/common/Neo4jServiceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ protected Neo4jServiceImpl(Neo4jRepository<T,ID> repository){
1111
}
1212

1313
protected Neo4jRepository<T, ID> getRepository(){
14-
return (Neo4jRepository) super.getRepository();
14+
return (Neo4jRepository<T, ID>) super.getRepository();
1515
}
1616
}

‎src/main/java/org/woehlke/learn/learnneo4j/model/common/PagingAndSortingServiceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ protected PagingAndSortingServiceImpl(PagingAndSortingRepository<T, ID> reposito
1414
}
1515

1616
protected PagingAndSortingRepository<T, ID> getRepository(){
17-
return (PagingAndSortingRepository) super.getRepository();
17+
return (PagingAndSortingRepository<T, ID>) super.getRepository();
1818
}
1919

2020
@Override

‎travis.sh

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
#!/opt/local/bin/bash
2+
3+
export BTW17_LOGIN_USERNAME=blubb
4+
export BTW17_LOGIN_PASSWORD=blablablablablablablablabla
5+
#export BTW17_JPA_HIBERNATE_DDL_AUTO=update
6+
export BTW17_JPA_HIBERNATE_DDL_AUTO=drop-create
7+
export BTW17_GOOGLE_APS_API_KEY=AIzaSyCMWLD6SK1QY3f-94mDS6x7u_jxwYASgqY
8+
export BTW17_GOOGLE_ANALYTICS_ID=UA-17174370-11
9+
export BTW17_GOOGLE_WEBMASTER_TOOLS_ID=3eksTC3Rvao6fLvSUwoRECBwd9Gdg4F51IhOE3DD-T8
10+
export BTW17_MICROSOFT_WEBMASTER_TOOLS_ID=52F1EDC0244BCDCF5C95E402E9E3E49B
11+
export BTW17_FACEBOOK_APP_ID=1721279777913278
12+
export BTW17_TWITTER_CARD_SITE=port80guru
13+
export BTW17_TWITTER_CARD_CREATOR=port80guru
14+
15+
psql -U kandidatentest < etc/drop-tables.sql
16+
17+
#psql -c 'DROP DATABASE kandidatentest;' -U postgres
18+
#psql -c 'DROP USER kandidatentest;' -U postgres
19+
#psql -c 'DROP ROLE kandidatentest;' -U postgres
20+
#psql -c "CREATE USER kandidatentest WITH PASSWORD 'kandidatentestpwd' LOGIN SUPERUSER INHERIT CREATEDB CREATEROLE NOREPLICATION;" -U postgres
21+
#psql -c 'GRANT pg_signal_backend, postgres TO kandidatentest WITH ADMIN OPTION;' -U postgres
22+
#psql -c "CREATE DATABASE kandidatentest WITH OWNER = kandidatentest TEMPLATE = template1 ENCODING = 'UTF8' LC_COLLATE = 'de_DE.UTF-8' LC_CTYPE = 'de_DE.UTF-8' CONNECTION LIMIT = -1;" -U postgres
23+
24+
psql -c 'select * from version();' -U kandidatentest
25+
psql -c '\l' -U postgres
26+
psql -c '\dg' -U postgres
27+
psql -c '\dn' -U postgres
28+
29+
./mvnw install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
30+
./mvnw clean site site:deploy -Ptravis -Dtest=AlphaTopLevelSuiteIT -B -V
31+
32+
exit 0

0 commit comments

Comments
 (0)