Skip to content

Commit 73247fb

Browse files
pgleesonpgleeson
authored
Merge pull request #5 from LEMS/development
Development
2 parents 0b21d3c + daf4017 commit 73247fb

4 files changed

Lines changed: 182 additions & 200 deletions

File tree

‎pom.xml‎

Lines changed: 176 additions & 194 deletions
Original file line numberDiff line numberDiff line change
@@ -1,198 +1,180 @@
11
<?xml version="1.0"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4-
<modelVersion>4.0.0</modelVersion>
5-
<groupId>org.lemsml.exprparser</groupId>
6-
<artifactId>org.lemsml.exprparser</artifactId>
7-
<version>0.0.4</version>
8-
<packaging>bundle</packaging>
9-
<properties>
10-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
11-
</properties>
12-
<dependencies>
13-
<dependency>
14-
<groupId>org.antlr</groupId>
15-
<artifactId>antlr4-runtime</artifactId>
16-
<version>4.7</version>
17-
</dependency>
18-
<dependency>
19-
<groupId>junit</groupId>
20-
<artifactId>junit</artifactId>
21-
<version>4.11</version>
22-
</dependency>
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
5+
<groupId>org.lemsml.exprparser</groupId>
6+
<artifactId>org.lemsml.exprparser</artifactId>
7+
<version>0.0.5</version>
8+
<packaging>bundle</packaging>
9+
<properties>
10+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
11+
</properties>
12+
<dependencies>
13+
<dependency>
14+
<groupId>org.antlr</groupId>
15+
<artifactId>antlr4-runtime</artifactId>
16+
<version>4.7</version>
17+
</dependency>
18+
<dependency>
19+
<groupId>junit</groupId>
20+
<artifactId>junit</artifactId>
21+
<version>4.11</version>
22+
</dependency>
2323

24-
<dependency>
25-
<groupId>com.github.unitsofmeasurement</groupId>
26-
<artifactId>unit-ri</artifactId>
27-
<version>0.8-RC2</version>
28-
</dependency>
29-
<dependency>
30-
<groupId>org.apache.commons</groupId>
31-
<artifactId>commons-lang3</artifactId>
32-
<version>3.3.2</version>
33-
</dependency>
34-
</dependencies>
35-
<repositories>
36-
<repository>
37-
<id>jitpack.io</id>
38-
<url>https://jitpack.io</url>
39-
</repository>
40-
<repository>
41-
<snapshots>
42-
<enabled>false</enabled>
43-
</snapshots>
44-
<id>bintray-unitsofmeasurement-maven</id>
45-
<name>bintray</name>
46-
<url>http://dl.bintray.com/unitsofmeasurement/maven</url>
47-
</repository>
48-
<repository>
49-
<id>org.geppetto-mvn-repo</id>
50-
<url>https://raw.github.com/openworm/org.geppetto.maven/mvn-repo-nml-1.5.1-lems2</url>
51-
<snapshots>
52-
<enabled>true</enabled>
53-
<updatePolicy>always</updatePolicy>
54-
</snapshots>
55-
</repository>
56-
</repositories>
57-
<build>
58-
<plugins>
59-
<plugin>
60-
<groupId>org.eclipse.m2e</groupId>
61-
<artifactId>lifecycle-mapping</artifactId>
62-
<version>1.0.0</version>
63-
<configuration>
64-
<lifecycleMappingMetadata>
65-
<pluginExecutions>
66-
<pluginExecution>
67-
<pluginExecutionFilter>
68-
<groupId>org.antlr</groupId>
69-
<artifactId>antlr4-maven-plugin</artifactId>
70-
<versionRange>[4.1,)</versionRange>
71-
<goals>
72-
<goal>antlr4</goal>
73-
</goals>
74-
</pluginExecutionFilter>
75-
<action>
76-
<execute>
77-
<runOnIncremental>true</runOnIncremental>
78-
</execute>
79-
</action>
80-
</pluginExecution>
81-
</pluginExecutions>
82-
</lifecycleMappingMetadata>
83-
</configuration>
84-
</plugin>
85-
<plugin>
86-
<groupId>org.apache.felix</groupId>
87-
<artifactId>maven-bundle-plugin</artifactId>
88-
<version>2.3.7</version>
89-
<extensions>true</extensions>
90-
<configuration>
91-
<manifestLocation>src/main/java/META-INF</manifestLocation>
92-
<supportedProjectTypes>
93-
<supportedProjectType>jar</supportedProjectType>
94-
<supportedProjectType>bundle</supportedProjectType>
95-
</supportedProjectTypes>
96-
<instructions>
97-
<Bundle-Name>${project.artifactId}-${project.version}</Bundle-Name>
98-
<Bundle-SymbolicName>${project.artifactId}-${project.version}</Bundle-SymbolicName>
99-
<Provide-Capability>osgi.ee;osgi.ee=JavaSE;version=1.7</Provide-Capability>
100-
</instructions>
101-
</configuration>
102-
</plugin>
103-
<plugin>
104-
<groupId>org.apache.maven.plugins</groupId>
105-
<artifactId>maven-compiler-plugin</artifactId>
106-
<version>3.1</version>
107-
<configuration>
108-
<source>1.7</source>
109-
<target>1.7</target>
110-
</configuration>
111-
</plugin>
112-
<plugin>
113-
<groupId>org.codehaus.mojo</groupId>
114-
<artifactId>exec-maven-plugin</artifactId>
115-
<version>1.5.0</version>
116-
<executions>
117-
<execution>
118-
<goals>
119-
<goal>java</goal>
120-
</goals>
121-
</execution>
122-
</executions>
123-
<configuration>
124-
<mainClass>Run</mainClass>
125-
</configuration>
126-
</plugin>
127-
<plugin>
128-
<dependencies>
129-
<dependency>
130-
<groupId>org.antlr</groupId>
131-
<artifactId>antlr4-maven-plugin</artifactId>
132-
<version>4.7</version>
133-
</dependency>
134-
</dependencies>
135-
<groupId>org.antlr</groupId>
136-
<artifactId>antlr4-maven-plugin</artifactId>
137-
<version>4.7</version>
138-
<configuration>
139-
<listener>false</listener>
140-
<visitor>true</visitor>
141-
</configuration>
142-
<executions>
143-
<execution>
144-
<goals>
145-
<goal>antlr4</goal>
146-
</goals>
147-
</execution>
148-
</executions>
149-
</plugin>
150-
<plugin>
151-
<groupId>org.apache.maven.plugins</groupId>
152-
<artifactId>maven-dependency-plugin</artifactId>
153-
<configuration>
154-
<outputDirectory>${project.build.outputDirectory}/lib</outputDirectory>
155-
<includeScope>runtime</includeScope>
156-
<excludeScope>provided</excludeScope>
157-
</configuration>
158-
<executions>
159-
<execution>
160-
<id>copy-dependencies</id>
161-
<phase>generate-resources</phase>
162-
<goals>
163-
<goal>copy-dependencies</goal>
164-
</goals>
165-
</execution>
166-
</executions>
167-
</plugin>
168-
</plugins>
169-
<pluginManagement>
170-
<plugins>
171-
<plugin>
172-
<groupId>org.eclipse.m2e</groupId>
173-
<artifactId>lifecycle-mapping</artifactId>
174-
<version>1.0.0</version>
175-
<configuration>
176-
<lifecycleMappingMetadata>
177-
<pluginExecutions>
178-
<pluginExecution>
179-
<pluginExecutionFilter>
180-
<groupId>org.apache.maven.plugins</groupId>
181-
<artifactId>maven-dependency-plugin</artifactId>
182-
<versionRange>[2.0,)</versionRange>
183-
<goals>
184-
<goal>copy-dependencies</goal>
185-
</goals>
186-
</pluginExecutionFilter>
187-
<action>
188-
<ignore />
189-
</action>
190-
</pluginExecution>
191-
</pluginExecutions>
192-
</lifecycleMappingMetadata>
193-
</configuration>
194-
</plugin>
195-
</plugins>
196-
</pluginManagement>
197-
</build>
24+
<!-- https://mvnrepository.com/artifact/tec.units/unit-ri -->
25+
<dependency>
26+
<groupId>tec.units</groupId>
27+
<artifactId>unit-ri</artifactId>
28+
<version>1.0.3</version>
29+
</dependency>
30+
31+
32+
<dependency>
33+
<groupId>org.apache.commons</groupId>
34+
<artifactId>commons-lang3</artifactId>
35+
<version>3.3.2</version>
36+
</dependency>
37+
</dependencies>
38+
39+
<build>
40+
<plugins>
41+
<plugin>
42+
<groupId>org.eclipse.m2e</groupId>
43+
<artifactId>lifecycle-mapping</artifactId>
44+
<version>1.0.0</version>
45+
<configuration>
46+
<lifecycleMappingMetadata>
47+
<pluginExecutions>
48+
<pluginExecution>
49+
<pluginExecutionFilter>
50+
<groupId>org.antlr</groupId>
51+
<artifactId>antlr4-maven-plugin</artifactId>
52+
<versionRange>[4.1,)</versionRange>
53+
<goals>
54+
<goal>antlr4</goal>
55+
</goals>
56+
</pluginExecutionFilter>
57+
<action>
58+
<execute>
59+
<runOnIncremental>true</runOnIncremental>
60+
</execute>
61+
</action>
62+
</pluginExecution>
63+
</pluginExecutions>
64+
</lifecycleMappingMetadata>
65+
</configuration>
66+
</plugin>
67+
<plugin>
68+
<groupId>org.apache.felix</groupId>
69+
<artifactId>maven-bundle-plugin</artifactId>
70+
<version>2.3.7</version>
71+
<extensions>true</extensions>
72+
<configuration>
73+
<manifestLocation>src/main/java/META-INF</manifestLocation>
74+
<supportedProjectTypes>
75+
<supportedProjectType>jar</supportedProjectType>
76+
<supportedProjectType>bundle</supportedProjectType>
77+
</supportedProjectTypes>
78+
<instructions>
79+
<Bundle-Name>${project.artifactId}-${project.version}</Bundle-Name>
80+
<Bundle-SymbolicName>${project.artifactId}-${project.version}</Bundle-SymbolicName>
81+
<Provide-Capability>osgi.ee;osgi.ee=JavaSE;version=1.7</Provide-Capability>
82+
</instructions>
83+
</configuration>
84+
</plugin>
85+
<plugin>
86+
<groupId>org.apache.maven.plugins</groupId>
87+
<artifactId>maven-compiler-plugin</artifactId>
88+
<version>3.1</version>
89+
<configuration>
90+
<source>1.7</source>
91+
<target>1.7</target>
92+
</configuration>
93+
</plugin>
94+
<plugin>
95+
<groupId>org.codehaus.mojo</groupId>
96+
<artifactId>exec-maven-plugin</artifactId>
97+
<version>1.5.0</version>
98+
<executions>
99+
<execution>
100+
<goals>
101+
<goal>java</goal>
102+
</goals>
103+
</execution>
104+
</executions>
105+
<configuration>
106+
<mainClass>Run</mainClass>
107+
</configuration>
108+
</plugin>
109+
<plugin>
110+
<dependencies>
111+
<dependency>
112+
<groupId>org.antlr</groupId>
113+
<artifactId>antlr4-maven-plugin</artifactId>
114+
<version>4.7</version>
115+
</dependency>
116+
</dependencies>
117+
<groupId>org.antlr</groupId>
118+
<artifactId>antlr4-maven-plugin</artifactId>
119+
<version>4.7</version>
120+
<configuration>
121+
<listener>false</listener>
122+
<visitor>true</visitor>
123+
</configuration>
124+
<executions>
125+
<execution>
126+
<goals>
127+
<goal>antlr4</goal>
128+
</goals>
129+
</execution>
130+
</executions>
131+
</plugin>
132+
<plugin>
133+
<groupId>org.apache.maven.plugins</groupId>
134+
<artifactId>maven-dependency-plugin</artifactId>
135+
<configuration>
136+
<outputDirectory>${project.build.outputDirectory}/lib</outputDirectory>
137+
<includeScope>runtime</includeScope>
138+
<excludeScope>provided</excludeScope>
139+
</configuration>
140+
<executions>
141+
<execution>
142+
<id>copy-dependencies</id>
143+
<phase>generate-resources</phase>
144+
<goals>
145+
<goal>copy-dependencies</goal>
146+
</goals>
147+
</execution>
148+
</executions>
149+
</plugin>
150+
</plugins>
151+
<pluginManagement>
152+
<plugins>
153+
<plugin>
154+
<groupId>org.eclipse.m2e</groupId>
155+
<artifactId>lifecycle-mapping</artifactId>
156+
<version>1.0.0</version>
157+
<configuration>
158+
<lifecycleMappingMetadata>
159+
<pluginExecutions>
160+
<pluginExecution>
161+
<pluginExecutionFilter>
162+
<groupId>org.apache.maven.plugins</groupId>
163+
<artifactId>maven-dependency-plugin</artifactId>
164+
<versionRange>[2.0,)</versionRange>
165+
<goals>
166+
<goal>copy-dependencies</goal>
167+
</goals>
168+
</pluginExecutionFilter>
169+
<action>
170+
<ignore />
171+
</action>
172+
</pluginExecution>
173+
</pluginExecutions>
174+
</lifecycleMappingMetadata>
175+
</configuration>
176+
</plugin>
177+
</plugins>
178+
</pluginManagement>
179+
</build>
198180
</project>

‎src/test/java/org/lemsml/exprparser/parser/test/DimensionalAnalysisVisitorTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import static org.junit.Assert.assertFalse;
44
import static org.junit.Assert.assertTrue;
55
import static tec.units.ri.AbstractUnit.ONE;
6-
import static tec.units.ri.unit.SI.AMPERE;
7-
import static tec.units.ri.unit.SI.METRE;
6+
import static tec.units.ri.unit.Units.AMPERE;
7+
import static tec.units.ri.unit.Units.METRE;
88
import static tec.units.ri.unit.MetricPrefix.CENTI;
99
import static tec.units.ri.unit.MetricPrefix.MILLI;
1010

0 commit comments

Comments
 (0)