Skip to content

Commit 46b0127

Browse files
reinhapareinhapa
committed
Updated dependencies
1 parent 4167b57 commit 46b0127

File tree

7 files changed

+40
-35
lines changed

7 files changed

+40
-35
lines changed

‎OCPPDemo/.classpath

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,18 @@
1010
<attributes>
1111
<attribute name="optional" value="true"/>
1212
<attribute name="maven.pomderived" value="true"/>
13+
<attribute name="test" value="true"/>
1314
</attributes>
1415
</classpathentry>
15-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
16+
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
1617
<attributes>
1718
<attribute name="maven.pomderived" value="true"/>
19+
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
1820
</attributes>
1921
</classpathentry>
20-
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
22+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
2123
<attributes>
2224
<attribute name="maven.pomderived" value="true"/>
23-
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
2425
</attributes>
2526
</classpathentry>
2627
<classpathentry kind="output" path="target/classes"/>

‎OCPPDemo/.project

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,21 +35,27 @@
3535
<arguments>
3636
</arguments>
3737
</buildCommand>
38+
<buildCommand>
39+
<name>org.eclipse.babel.editor.rbeBuilder</name>
40+
<arguments>
41+
</arguments>
42+
</buildCommand>
3843
<buildCommand>
3944
<name>org.eclipse.m2e.core.maven2Builder</name>
4045
<arguments>
4146
</arguments>
4247
</buildCommand>
4348
</buildSpec>
4449
<natures>
45-
<nature>org.eclipse.m2e.core.maven2Nature</nature>
50+
<nature>com.jaspersoft.studio.babel.editor.rbeNature</nature>
51+
<nature>org.eclipse.jdt.core.javanature</nature>
4652
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
53+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
4754
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
4855
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
49-
<nature>org.eclipse.jdt.core.javanature</nature>
5056
<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
51-
<nature>org.jboss.tools.jst.web.kb.kbnature</nature>
5257
<nature>org.jboss.tools.cdi.core.cdinature</nature>
5358
<nature>org.jboss.tools.jsf.jsfnature</nature>
59+
<nature>org.jboss.tools.jst.web.kb.kbnature</nature>
5460
</natures>
5561
</projectDescription>

‎OCPPDemo/.settings/org.eclipse.jdt.core.prefs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
eclipse.preferences.version=1
22
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
33
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
4-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
4+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
55
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
6-
org.eclipse.jdt.core.compiler.compliance=1.7
6+
org.eclipse.jdt.core.compiler.compliance=1.8
77
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
88
org.eclipse.jdt.core.compiler.debug.localVariable=generate
99
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
1010
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
11+
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
1112
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
1213
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
13-
org.eclipse.jdt.core.compiler.source=1.7
14+
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
15+
org.eclipse.jdt.core.compiler.release=disabled
16+
org.eclipse.jdt.core.compiler.source=1.8

‎OCPPDemo/.settings/org.eclipse.wst.common.component

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,17 @@
11
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
2-
<wb-module deploy-name="OCPPDemo">
2+
3+
<wb-module deploy-name="OCPPDemo-0.0.2-SNAPSHOT">
4+
35
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
6+
47
<wb-resource deploy-path="/" source-path="/WebContent" tag="defaultRootSource"/>
8+
59
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
10+
611
<property name="java-output-path" value="/OCPPDemo/build/classes"/>
12+
713
<property name="context-root" value="OCPPDemo"/>
14+
815
</wb-module>
16+
917
</project-modules>

‎OCPPDemo/.settings/org.eclipse.wst.common.project.facet.core.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<faceted-project>
3-
<runtime name="GlassFish 4.0"/>
43
<fixed facet="wst.jsdt.web"/>
54
<fixed facet="java"/>
65
<fixed facet="jst.web"/>
7-
<installed facet="java" version="1.7"/>
86
<installed facet="jst.web" version="3.1"/>
9-
<installed facet="glassfish.web" version="4.0"/>
107
<installed facet="wst.jsdt.web" version="1.0"/>
118
<installed facet="jst.jaxrs" version="2.0"/>
129
<installed facet="jst.cdi" version="1.1"/>
1310
<installed facet="jboss.m2" version="1.0"/>
1411
<installed facet="jst.jsf" version="2.2"/>
12+
<installed facet="jst.cdi" version="1.1"/>
13+
<installed facet="jboss.m2" version="1.0"/>
14+
<installed facet="java" version="1.8"/>
1515
</faceted-project>

‎OCPPDemo/WebContent/WEB-INF/web.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@
22
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" version="3.1">
33
<display-name>OCPPDemo</display-name>
44
<welcome-file-list>
5-
<welcome-file>index.html</welcome-file>
6-
<welcome-file>index.htm</welcome-file>
75
<welcome-file>index.jsp</welcome-file>
8-
<welcome-file>default.html</welcome-file>
9-
<welcome-file>default.htm</welcome-file>
10-
<welcome-file>default.jsp</welcome-file>
116
</welcome-file-list>
127
</web-app>

‎OCPPDemo/pom.xml

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1+
<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/xsd/maven-4.0.0.xsd">
32
<modelVersion>4.0.0</modelVersion>
4-
<groupId>net.reini</groupId>
53
<artifactId>OCPPDemo</artifactId>
6-
<version>0.0.1-SNAPSHOT</version>
4+
<version>0.0.2-SNAPSHOT</version>
75
<packaging>war</packaging>
86
<description>Open Charge Point Protocol</description>
97
<build>
@@ -18,14 +16,6 @@
1816
</resource>
1917
</resources>
2018
<plugins>
21-
<plugin>
22-
<artifactId>maven-compiler-plugin</artifactId>
23-
<version>3.1</version>
24-
<configuration>
25-
<source>1.7</source>
26-
<target>1.7</target>
27-
</configuration>
28-
</plugin>
2919
<plugin>
3020
<artifactId>maven-war-plugin</artifactId>
3121
<version>2.3</version>
@@ -58,17 +48,19 @@
5848
<dependency>
5949
<groupId>javax</groupId>
6050
<artifactId>javaee-api</artifactId>
61-
<version>7.0</version>
51+
<version>8.0.1-b5</version>
6252
<scope>provided</scope>
6353
</dependency>
6454
<dependency>
6555
<groupId>junit</groupId>
6656
<artifactId>junit</artifactId>
67-
<version>4.11</version>
57+
<version>4.13.2</version>
6858
<scope>test</scope>
6959
</dependency>
7060
</dependencies>
71-
<properties>
72-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
73-
</properties>
61+
<parent>
62+
<groupId>net.reini</groupId>
63+
<artifactId>net.reini</artifactId>
64+
<version>1.0</version>
65+
</parent>
7466
</project>

0 commit comments

Comments
 (0)