Merge branch 'IvyConf' into 'master'

ivy configurations fixed See merge request exedio/copeconsole!86
exedio · Jun 5, 2024 · 9b46854 · 9b46854
2 parents 37ae248 + 3ba3f3f
commit 9b46854
Show file tree

Hide file tree

Showing 21 changed files with 13 additions and 13 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -141,8 +141,8 @@ try
 			assertGitUnchanged()
 
 			// There should be an assertIvyExtends for each <conf name="abc" extends="def" /> in ivy/ivy.xml.
-			assertIvyExtends("runtime", "compile")
 			assertIvyExtends("test", "runtime")
+			assertIvyExtends("example", "runtime")
 			assertIvyExtends("ide", "runtime")
 			assertIvyExtends("ide", "test")
 		}

diff --git a/build.xml b/build.xml
@@ -90,7 +90,7 @@
 	<target name="src.compile" depends="src.jspm">
 		<compile srcdir="src">
 			<classpath>
-				<fileset dir="lib/compile" />
+				<fileset dir="lib/runtime" />
 			</classpath>
 		</compile>
 	</target>
@@ -175,7 +175,7 @@
 			<fileset dir="build/classes/websrc" />
 		</copy>
 		<copy todir="web/WEB-INF/lib">
-			<fileset dir="lib/runtime">
+			<fileset dir="lib/example">
 				<exclude name="javax.servlet-api.jar" />
 			</fileset>
 		</copy>
@@ -258,7 +258,7 @@
 			<fileset file="src/com" includes="**/*.java" />
 			<arg value="-Xdoclint:all,-missing" />
 			<classpath>
-				<fileset dir="lib/compile" />
+				<fileset dir="lib/runtime" />
 				<pathelement location="lib/instrument/exedio-cope-instrument-annotations.jar" />
 			</classpath>
 		</javadoc>
@@ -272,7 +272,7 @@
 				fork="yes" failonerror="yes">
 			<classpath>
 				<pathelement location="build/classes/src" />
-				<fileset dir="lib/compile" />
+				<fileset dir="lib/runtime" />
 			</classpath>
 			<arg value="build/testprotocol.html"/>
 			<assertions><enable/></assertions>

diff --git a/ivy/ivy.xml b/ivy/ivy.xml
@@ -14,12 +14,12 @@
 	</info>
 	<configurations>
 		<!-- There should be an assertIvyExtends in Jenkinsfile for each <conf name="abc" extends="def" /> here. -->
-		<conf name="compile" />
-		<conf name="runtime" extends="compile" />
+		<conf name="runtime" />
 		<conf name="changelog" />
 		<conf visibility="private" name="jspm" />
 		<conf visibility="private" name="instrument" />
 		<conf visibility="private" name="test" extends="runtime" />
+		<conf visibility="private" name="example" extends="runtime" />
 		<conf visibility="private" name="ant" />
 		<conf visibility="private" name="ant-contrib" />
 		<conf visibility="private" name="ivy" />
@@ -33,13 +33,13 @@
 		<artifact name="exedio-cope-console" conf="changelog" type="log" ext="txt" />
 	</publications>
 	<dependencies>
-		<dependency org="javax.servlet" name="javax.servlet-api" rev="3.1.0" conf="compile->default; ide->sources" />
+		<dependency org="javax.servlet" name="javax.servlet-api" rev="3.1.0" conf="runtime->default; ide->sources" />
 		<dependency org="junit" name="junit" rev="4.10" conf="test->default">
 			<exclude org="org.hamcrest" />
 		</dependency>
-		<dependency org="com.exedio" name="cops" rev="388" conf="compile->runtime; ide->runtime,sources,changelog" />
-		<dependency org="com.exedio" name="cope" rev="10926" conf="compile->runtime; runtime->hsqldb,mysql; instrument->instrument; ide->sources,changelog" />
-		<dependency org="com.exedio" name="copeutil" rev="857" conf="compile->runtime; ide->sources,changelog" />
+		<dependency org="com.exedio" name="cops" rev="388" conf="runtime->runtime; ide->runtime,sources,changelog" />
+		<dependency org="com.exedio" name="cope" rev="10926" conf="runtime->runtime; test,example->hsqldb,mysql; instrument->instrument; ide->sources,changelog" />
+		<dependency org="com.exedio" name="copeutil" rev="857" conf="runtime->runtime; ide->sources,changelog" />
 		<dependency org="org.apache.ant" name="ant"       rev="1.10.11" conf="ant->default" />
 		<dependency org="org.apache.ant" name="ant-junit" rev="1.10.11" conf="ant->default">
 			<exclude org="junit" module="junit" />
@@ -52,8 +52,8 @@
 		<dependency org="org.apache.tomcat" name="tomcat" rev="9.0.31" conf="tomcat->default">
 			<artifact name="tomcat" type="tar.gz" />
 		</dependency>
-		<dependency org="org.slf4j" name="slf4j-api" rev="1.7.25" conf="compile->default; ide->sources" />
-		<dependency org="ch.qos.logback" name="logback-classic" rev="1.1.3" conf="runtime->default" />
+		<dependency org="org.slf4j" name="slf4j-api" rev="1.7.25" conf="runtime->default; ide->sources" />
+		<dependency org="ch.qos.logback" name="logback-classic" rev="1.1.3" conf="example->default" />
 		<!--
 			This project depends on micrometer for accessing meters created by cope. It does not
 			create meters on its own. Therefore it does not require the micrometer dependency

diff --git a/lib/compile/LatencyUtils.jar → lib/example/LatencyUtils.jar b/lib/compile/LatencyUtils.jar → lib/example/LatencyUtils.jar
diff --git a/lib/runtime/exedio-cope-hsqldb.jar → lib/example/exedio-cope-hsqldb.jar b/lib/runtime/exedio-cope-hsqldb.jar → lib/example/exedio-cope-hsqldb.jar
diff --git a/lib/runtime/exedio-cope-mysql.jar → lib/example/exedio-cope-mysql.jar b/lib/runtime/exedio-cope-mysql.jar → lib/example/exedio-cope-mysql.jar
diff --git a/lib/compile/exedio-cope-util.jar → lib/example/exedio-cope-util.jar b/lib/compile/exedio-cope-util.jar → lib/example/exedio-cope-util.jar
diff --git a/lib/compile/exedio-cope.jar → lib/example/exedio-cope.jar b/lib/compile/exedio-cope.jar → lib/example/exedio-cope.jar
diff --git a/lib/compile/exedio-cops.jar → lib/example/exedio-cops.jar b/lib/compile/exedio-cops.jar → lib/example/exedio-cops.jar
diff --git a/lib/runtime/hsqldb.jar → lib/example/hsqldb.jar b/lib/runtime/hsqldb.jar → lib/example/hsqldb.jar
diff --git a/lib/compile/javax.servlet-api.jar → lib/example/javax.servlet-api.jar b/lib/compile/javax.servlet-api.jar → lib/example/javax.servlet-api.jar
diff --git a/lib/ide/logback-classic.jar → lib/example/logback-classic.jar b/lib/ide/logback-classic.jar → lib/example/logback-classic.jar
diff --git a/lib/ide/logback-core.jar → lib/example/logback-core.jar b/lib/ide/logback-core.jar → lib/example/logback-core.jar
diff --git a/lib/compile/micrometer-core.jar → lib/example/micrometer-core.jar b/lib/compile/micrometer-core.jar → lib/example/micrometer-core.jar
diff --git a/lib/runtime/mysql-connector-java.jar → lib/example/mysql-connector-java.jar b/lib/runtime/mysql-connector-java.jar → lib/example/mysql-connector-java.jar
diff --git a/lib/compile/slf4j-api.jar → lib/example/slf4j-api.jar b/lib/compile/slf4j-api.jar → lib/example/slf4j-api.jar
diff --git a/lib/compile/trove4j.jar → lib/example/trove4j.jar b/lib/compile/trove4j.jar → lib/example/trove4j.jar
diff --git a/lib/runtime/logback-classic.jar b/lib/runtime/logback-classic.jar
diff --git a/lib/runtime/logback-core.jar b/lib/runtime/logback-core.jar
diff --git a/lib/test/logback-classic.jar b/lib/test/logback-classic.jar
diff --git a/lib/test/logback-core.jar b/lib/test/logback-core.jar