Skip to content

Commit

Permalink
Merge pull request #1 from ControlSystemStudio/protobuf_update
Browse files Browse the repository at this point in the history
Updating protobuf version
  • Loading branch information
shroffk authored Nov 17, 2022
2 parents 15eb7bd + 220388d commit adc4749
Show file tree
Hide file tree
Showing 8 changed files with 15,066 additions and 5,546 deletions.
2 changes: 1 addition & 1 deletion .classpath
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" path="src/main"/>
<classpathentry kind="src" path="src/test"/>
<classpathentry kind="lib" path="lib/protobuf-java-2.4.1.jar"/>
<classpathentry kind="lib" path="lib/protobuf-java-3.21.9.jar"/>
<classpathentry kind="lib" path="lib/test/junit-4.10.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="build/classes"/>
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
build/
bin/
.idea/**
*iml
62 changes: 31 additions & 31 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<description>The build file for the EPICS archiver appliance pbrawclient.</description>

<property environment="env"/>
<property name="ver" value="0.0.9"/>
<property name="ver" value="0.0.10"/>
<property name="src" location="src/main"/>
<property name="classes" location="bin/"/>
<property name="stage" location="stage/"/>
Expand Down Expand Up @@ -60,36 +60,36 @@
<delete dir="${stage}"/>
<delete file="${dist}/pbrawclient-${ver}.jar"/>
</target>

<target name="test" depends="clientjar">
<junit fork="yes" haltonfailure="true" printsummary="on" maxmemory="4096M">
<batchtest fork="yes">
<fileset dir="${test.dir}">
<include name="**/*Test.java" />
<include name="**/Test*.java" />
</fileset>
</batchtest>
<formatter type="brief" usefile="no" />
<classpath>
<pathelement path="${classes}"/>
<pathelement path="."/>
<fileset dir="lib">
<include name="**/*.jar"/>
</fileset>
<fileset dir="${tomcathome}/lib">
<include name="**/*.jar"/>
</fileset>
<fileset dir="${tomcathome}/bin">
<include name="**/*.jar"/>
</fileset>
<fileset dir="lib/test">
<include name="**/*.jar"/>
</fileset>
</classpath>
<assertions>
<enable/>
</assertions>
<jvmarg value="-Dlog4j.configuration=log4j.properties"/>
</junit>
<junit fork="yes" haltonfailure="true" printsummary="on" maxmemory="4096M">
<batchtest fork="yes">
<fileset dir="${test.dir}">
<include name="**/*Test.java" />
<include name="**/Test*.java" />
</fileset>
</batchtest>
<formatter type="brief" usefile="no" />
<classpath>
<pathelement path="${classes}"/>
<pathelement path="."/>
<fileset dir="lib">
<include name="**/*.jar"/>
</fileset>
<fileset dir="${tomcathome}/lib">
<include name="**/*.jar"/>
</fileset>
<fileset dir="${tomcathome}/bin">
<include name="**/*.jar"/>
</fileset>
<fileset dir="lib/test">
<include name="**/*.jar"/>
</fileset>
</classpath>
<assertions>
<enable/>
</assertions>
<jvmarg value="-Dlog4j.configuration=log4j.properties"/>
</junit>
</target>
</project>
Binary file removed lib/protobuf-java-2.4.1.jar
Binary file not shown.
Binary file added lib/protobuf-java-3.21.9.jar
Binary file not shown.
Loading

0 comments on commit adc4749

Please sign in to comment.